wprk

src/binaryen-embind.cpp

@@ -79,10 +79,7 @@ EMSCRIPTEN_BINDINGS(Binaryen) {
   class_<Expression>("Expression")
     .property("type", &Expression::type);
 
-  class_<Nop, base<Expression>>("Nop");
-
-
-#if 0
+  // Expression types, autogenerated.
 
 #define DELEGATE_ID id
 
@@ -91,40 +88,49 @@ EMSCRIPTEN_BINDINGS(Binaryen) {
 #define DELEGATE_END(id) std::cout << '\n';
 
 #define DELEGATE_FIELD_CHILD(id, field)                                        \
-  std::cout << "BINARYEN_API BinaryenExpressionRef Binaryen" << #id << "Get"   \
-            << #field << "(BinaryenExpressionRef expr);\n";
-
+    .property(#field, &id::field);
 #define DELEGATE_FIELD_CHILD_VECTOR(id, field)                                 \
-  std::cout << "BINARYEN_API BinaryenExpressionRef Binaryen" << #id << "Get"   \
-            << #field                                 \
-            << "At(BinaryenExpressionRef expr, BinaryenIndex index);\n";
-
-// TODO
-#define DELEGATE_FIELD_TYPE(id, field)
-#define DELEGATE_FIELD_HEAPTYPE(id, field)
-#define DELEGATE_FIELD_OPTIONAL_CHILD(id, field)
-#define DELEGATE_FIELD_INT(id, field)
-#define DELEGATE_FIELD_LITERAL(id, field)
-#define DELEGATE_FIELD_NAME(id, field)
-#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)
-#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)
-#define DELEGATE_FIELD_ADDRESS(id, field)
-#define DELEGATE_FIELD_INT_ARRAY(id, field)
-#define DELEGATE_FIELD_INT_VECTOR(id, field)
-#define DELEGATE_FIELD_NAME_VECTOR(id, field)
-#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)
-#define DELEGATE_FIELD_TYPE_VECTOR(id, field)
-
-#define DELEGATE(clazz) \
-  class_<clazz, base<Expression>>(#clazz)
-#include "wasm-delegations-fields.def"
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_TYPE(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_HEAPTYPE(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_OPTIONAL_CHILD(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_INT(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_LITERAL(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_NAME(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_SCOPE_NAME_DEF(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_SCOPE_NAME_USE(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_ADDRESS(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_INT_ARRAY(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_INT_VECTOR(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_NAME_VECTOR(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_SCOPE_NAME_USE_VECTOR(id, field)                                        \
+    .property(#field, &id::field);
+#define DELEGATE_FIELD_TYPE_VECTOR(id, field)                                        \
+    .property(#field, &id::field);
+
+#define DELEGATE_FIELD_MAIN_START
+
+#define DELEGATE_FIELD_CASE_START(id) \
+  class_<id, base<Expression>>(#id)
+
+#define DELEGATE_FIELD_CASE_END(id) \
   ;
 
-#include "wasm-delegations.def"
-#endif
-
-
+#define DELEGATE_FIELD_MAIN_END
 
+#include "wasm-delegations-fields.def"
 
   // Module-level constructs.
 

src/wasm-delegations-fields.def

@@ -230,6 +230,7 @@
 
 // By default we emit a switch and cases, but that can be customized using the
 // following:
+
 #ifndef DELEGATE_FIELD_MAIN_START
 #define DELEGATE_FIELD_MAIN_START \
 switch (DELEGATE_ID) { \
@@ -239,11 +240,6 @@ switch (DELEGATE_ID) { \
   }
 #endif
 
-#ifndef DELEGATE_FIELD_MAIN_END
-#define DELEGATE_FIELD_MAIN_END \
-}
-#endif
-
 #ifndef DELEGATE_FIELD_CASE_START
 #define DELEGATE_FIELD_CASE_START(id) \
   case Expression::Id::id##Id: { \
@@ -257,6 +253,11 @@ switch (DELEGATE_ID) { \
   }
 #endif
 
+#ifndef DELEGATE_FIELD_MAIN_END
+#define DELEGATE_FIELD_MAIN_END \
+}
+#endif
+
 DELEGATE_FIELD_MAIN_START
 
 DELEGATE_FIELD_CASE_START(Block)