Fix up bindings

Author: kddnewton

ext/prism/extension.c

@@ -4,6 +4,8 @@
 #include <ruby/win32.h>
 #endif
 
+#include <errno.h>
+
 // NOTE: this file should contain only bindings. All non-trivial logic should be
 // in libprism so it can be shared its the various callers.
 

include/prism/internal/bit.h

@@ -11,27 +11,32 @@
  * (matching the behavior of __builtin_ctzll and _BitScanForward64).
  */
 #if defined(__GNUC__) || defined(__clang__)
-    #define pm_ctzll(v) ((unsigned) __builtin_ctzll(v))
+#define pm_ctzll(v) ((unsigned) __builtin_ctzll(v))
 #elif defined(_MSC_VER)
-    #include <intrin.h>
-    static PRISM_INLINE unsigned pm_ctzll(uint64_t v) {
-        unsigned long index;
-        _BitScanForward64(&index, v);
-        return (unsigned) index;
-    }
+#include <intrin.h>
+#include <stdint.h>
+
+static PRISM_INLINE unsigned
+pm_ctzll(uint64_t v) {
+    unsigned long index;
+    _BitScanForward64(&index, v);
+    return (unsigned) index;
+}
 #else
-    static PRISM_INLINE unsigned
-    pm_ctzll(uint64_t v) {
-        unsigned c = 0;
-        v &= (uint64_t) (-(int64_t) v);
-        if (v & 0x00000000FFFFFFFFULL) c += 0;  else c += 32;
-        if (v & 0x0000FFFF0000FFFFULL) c += 0;  else c += 16;
-        if (v & 0x00FF00FF00FF00FFULL) c += 0;  else c += 8;
-        if (v & 0x0F0F0F0F0F0F0F0FULL) c += 0;  else c += 4;
-        if (v & 0x3333333333333333ULL) c += 0;  else c += 2;
-        if (v & 0x5555555555555555ULL) c += 0;  else c += 1;
-        return c;
-    }
+#include <stdint.h>
+
+static PRISM_INLINE unsigned
+pm_ctzll(uint64_t v) {
+    unsigned c = 0;
+    v &= (uint64_t) (-(int64_t) v);
+    if (v & 0x00000000FFFFFFFFULL) c += 0;  else c += 32;
+    if (v & 0x0000FFFF0000FFFFULL) c += 0;  else c += 16;
+    if (v & 0x00FF00FF00FF00FFULL) c += 0;  else c += 8;
+    if (v & 0x0F0F0F0F0F0F0F0FULL) c += 0;  else c += 4;
+    if (v & 0x3333333333333333ULL) c += 0;  else c += 2;
+    if (v & 0x5555555555555555ULL) c += 0;  else c += 1;
+    return c;
+}
 #endif
 
 #endif

java-wasm/src/main/java/org/jruby/parser/prism/wasm/Prism.java

@@ -40,8 +40,7 @@ public Prism(WasiOptions wasiOpts) {
         preOptionsPointer = exports.calloc(1, PACKED_OPTIONS_BUFFER_SIZE);
         preSourcePointer = exports.calloc(1, SOURCE_SIZE);
 
-        bufferPointer = exports.calloc(exports.pmBufferSizeof(), 1);
-        exports.pmBufferInit(bufferPointer);
+        bufferPointer = exports.pmBufferNew();
     }
 
     public byte[] serialize(byte[] packedOptions, byte[] sourceBytes, int sourceLength) {
@@ -60,7 +59,8 @@ public byte[] serialize(byte[] packedOptions, byte[] sourceBytes, int sourceLeng
                 exports.calloc(1, packedOptions.length) : preOptionsPointer;
             instance.memory().write(optionsPointer, packedOptions);
 
-            exports.pmBufferClear(bufferPointer);
+            exports.pmBufferFree(bufferPointer);
+            bufferPointer = exports.pmBufferNew();
 
             exports.pmSerializeParse(
                 bufferPointer, sourcePointer, sourceLength, optionsPointer);

src/json.c

@@ -8,14 +8,10 @@
 
 #include "prism/json.h"
 
-/* We optionally support dumping to JSON. For systems that don not want or need
- * this functionality, it can be turned off with the PRISM_EXCLUDE_JSON define.
- */
-#ifdef PRISM_EXCLUDE_JSON
-
-void pm_dump_json(void) {}
+// Ensure this translation unit is never empty, even when JSON is excluded.
+typedef int pm_json_unused_t;
 
-#else
+#ifndef PRISM_EXCLUDE_JSON
 
 #include "prism/internal/buffer.h"
 #include "prism/internal/constant_pool.h"

src/prism.c

@@ -30,6 +30,7 @@
 
 #include "prism/excludes.h"
 #include "prism/serialize.h"
+#include "prism/stream.h"
 #include "prism/version.h"
 
 #include <assert.h>

templates/ext/prism/api_node.c.erb

@@ -2,6 +2,8 @@
 #include "prism/extension.h"
 #include "prism/internal/allocator.h"
 
+#include <assert.h>
+
 extern VALUE rb_cPrism;
 extern VALUE rb_cPrismNode;
 extern VALUE rb_cPrismSource;

templates/src/json.c.erb

@@ -1,8 +1,8 @@
 #include "prism/json.h"
 
-/* We optionally support dumping to JSON. For systems that don not want or need
- * this functionality, it can be turned off with the PRISM_EXCLUDE_JSON define.
- */
+// Ensure this translation unit is never empty, even when JSON is excluded.
+typedef int pm_json_unused_t;
+
 #ifndef PRISM_EXCLUDE_JSON
 
 #include "prism/internal/buffer.h"

templates/src/prettyprint.c.erb

@@ -6,7 +6,9 @@
  * PRISM_EXCLUDE_PRETTYPRINT define. */
 #ifdef PRISM_EXCLUDE_PRETTYPRINT
 
-void pm_prettyprint(void) {}
+/* Ensure this translation unit is never empty, even when prettyprint is
+ * excluded. */
+typedef int pm_prettyprint_unused_t;
 
 #else
 

templates/src/serialize.c.erb

@@ -5,7 +5,9 @@
  * PRISM_EXCLUDE_SERIALIZATION define. */
 #ifdef PRISM_EXCLUDE_SERIALIZATION
 
-void pm_serialize_lex(void) {}
+/* Ensure this translation unit is never empty, even when serialization is
+ * excluded. */
+typedef int pm_serialize_unused_t;
 
 #else