From 9061318dd691359578322736fa131c90305c7005 Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Sat, 16 Nov 2013 07:56:47 +0100
Subject: [PATCH] Import combinator and allocator APIs into SWIG. Next is glue.
Need to fix unions in HParsedToken and HCaseResult.
---
src/allocator.h | 4 ++++
src/bindings/swig/hammer.i | 4 ++++
src/hammer.h | 20 +++++++++++---------
3 files changed, 19 insertions(+), 9 deletions(-)
create mode 100644 src/bindings/swig/hammer.i
diff --git a/src/allocator.h b/src/allocator.h
index 2dfc14e6..a02d97cd 100644
--- a/src/allocator.h
+++ b/src/allocator.h
@@ -29,7 +29,11 @@ typedef struct HAllocator_ {
typedef struct HArena_ HArena ; // hidden implementation
HArena *h_new_arena(HAllocator* allocator, size_t block_size); // pass 0 for default...
+#ifndef SWIG
void* h_arena_malloc(HArena *arena, size_t count) __attribute__(( malloc, alloc_size(2) ));
+#else
+void* h_arena_malloc(HArena *arena, size_t count);
+#endif
void h_arena_free(HArena *arena, void* ptr); // For future expansion, with alternate memory managers.
void h_delete_arena(HArena *arena);
diff --git a/src/bindings/swig/hammer.i b/src/bindings/swig/hammer.i
new file mode 100644
index 00000000..95870e26
--- /dev/null
+++ b/src/bindings/swig/hammer.i
@@ -0,0 +1,4 @@
+%module hammer
+
+%import "hammer/allocator.h"
+%import "hammer/hammer.h"
diff --git a/src/hammer.h b/src/hammer.h
index f5a9e135..e4355876 100644
--- a/src/hammer.h
+++ b/src/hammer.h
@@ -29,7 +29,9 @@
#define BIT_LITTLE_ENDIAN 0x0
#define BYTE_LITTLE_ENDIAN 0x0
+#ifndef HAMMER_INTERNAL__NO_STDARG_H
typedef int bool;
+#endif // HAMMER_INTERNAL__NO_STDARG_H
typedef struct HParseState_ HParseState;
@@ -177,7 +179,7 @@ typedef struct HBenchmarkResults_ {
rtype_t name(__VA_ARGS__) attr; \
rtype_t name##__m(HAllocator* mm__, __VA_ARGS__) attr
-#ifndef HAMMER_INTERNAL__NO_STDARG_H
+#ifndef SWIG
#define HAMMER_FN_DECL_VARARGS(rtype_t, name, ...) \
rtype_t name(__VA_ARGS__, ...); \
rtype_t name##__m(HAllocator* mm__, __VA_ARGS__, ...); \
@@ -195,17 +197,17 @@ typedef struct HBenchmarkResults_ {
rtype_t name##__a(void *args[]); \
rtype_t name##__ma(HAllocator *mm__, void *args[])
#else
-#define HAMMER_FN_DECL_VARARGS(rtype_t, name, ...) \
- rtype_t name(__VA_ARGS__, ...); \
- rtype_t name##__m(HAllocator* mm__, __VA_ARGS__, ...); \
- rtype_t name##__a(void *args[]); \
+#define HAMMER_FN_DECL_VARARGS(rtype_t, name, params...) \
+ rtype_t name(params, ...); \
+ rtype_t name##__m(HAllocator* mm__, params, ...); \
+ rtype_t name##__a(void *args[]); \
rtype_t name##__ma(HAllocator *mm__, void *args[])
// Note: this drops the attributes on the floor for the __v versions
-#define HAMMER_FN_DECL_VARARGS_ATTR(attr, rtype_t, name, ...) \
- rtype_t name(__VA_ARGS__, ...) attr; \
- rtype_t name##__m(HAllocator* mm__, __VA_ARGS__, ...) attr; \
- rtype_t name##__a(void *args[]); \
+#define HAMMER_FN_DECL_VARARGS_ATTR(attr, rtype_t, name, params...) \
+ rtype_t name(params, ...); \
+ rtype_t name##__m(HAllocator* mm__, params, ...); \
+ rtype_t name##__a(void *args[]); \
rtype_t name##__ma(HAllocator *mm__, void *args[])
#endif // HAMMER_INTERNAL__NO_STDARG_H
// }}}
--
GitLab