From 8f427b5a6d4d9b8b36552c51f20ff1cebd3a88d2 Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Sat, 16 Nov 2013 08:12:29 +0100
Subject: [PATCH] fixed nested unions
---
src/bindings/swig/hammer.i | 1 +
src/hammer.h | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/src/bindings/swig/hammer.i b/src/bindings/swig/hammer.i
index 95870e26..81274c3a 100644
--- a/src/bindings/swig/hammer.i
+++ b/src/bindings/swig/hammer.i
@@ -2,3 +2,4 @@
%import "hammer/allocator.h"
%import "hammer/hammer.h"
+
diff --git a/src/hammer.h b/src/hammer.h
index 02e4085a..c8a2bf38 100644
--- a/src/hammer.h
+++ b/src/hammer.h
@@ -70,8 +70,21 @@ typedef struct HBytes_ {
size_t len;
} HBytes;
+#ifdef SWIG
+typedef union {
+ HBytes bytes;
+ int64_t sint;
+ uint64_t uint;
+ double dbl;
+ float flt;
+ HCountedArray *seq;
+ void *user;
+} HTokenData;
+#endif
+
typedef struct HParsedToken_ {
HTokenType token_type;
+#ifndef SWIG
union {
HBytes bytes;
int64_t sint;
@@ -81,6 +94,9 @@ typedef struct HParsedToken_ {
HCountedArray *seq; // a sequence of HParsedToken's
void *user;
};
+#else
+ HTokenData token_data;
+#endif
size_t index;
char bit_offset;
} HParsedToken;
@@ -144,12 +160,23 @@ typedef struct HParserTestcase_ {
char* output_unambiguous;
} HParserTestcase;
+#ifdef SWIG
+typedef union {
+ const char* actual_results;
+ size_t parse_time;
+} HResultTiming;
+#endif
+
typedef struct HCaseResult_ {
bool success;
+#ifndef SWIG
union {
const char* actual_results; // on failure, filled in with the results of h_write_result_unamb
size_t parse_time; // on success, filled in with time for a single parse, in nsec
};
+#else
+ HResultTiming timestamp;
+#endif
} HCaseResult;
typedef struct HBackendResults_ {
--
GitLab