modules/emscripten/src/relooper/emscripten/glue.js in webruby-0.1.2 vs modules/emscripten/src/relooper/emscripten/glue.js in webruby-0.2.1

@@ -1,36 +1,46 @@
 
-  var RBUFFER_SIZE = 20*1024*1024;
+  var RBUFFER_SIZE = RELOOPER_BUFFER_SIZE;
   var rbuffer = _malloc(RBUFFER_SIZE);
   _rl_set_output_buffer(rbuffer, RBUFFER_SIZE);
 
-  var TBUFFER_SIZE = 10*1024*1024;
+  var TBUFFER_SIZE = RELOOPER_BUFFER_SIZE/2;
   var tbuffer = _malloc(TBUFFER_SIZE);
 
+  var VBUFFER_SIZE = 256;
+  var vbuffer = _malloc(VBUFFER_SIZE);
+
   var RelooperGlue = {};
   RelooperGlue['init'] = function() {
     this.r = _rl_new_relooper();
   },
-  RelooperGlue['addBlock'] = function(text) {
+  RelooperGlue['cleanup'] = function() {
+    _rl_delete_relooper(this.r);
+  },
+  RelooperGlue['addBlock'] = function(text, branchVar) {
     assert(this.r);
-    assert(text.length+1 < TBUFFER_SIZE);
-    writeStringToMemory(text, tbuffer);
-    var b = _rl_new_block(tbuffer);
+    assert(text.length+1 < TBUFFER_SIZE, 'buffer too small, increase RELOOPER_BUFFER_SIZE');
+    writeAsciiToMemory(text, tbuffer);
+    if (branchVar) {
+      assert(branchVar.length+1 < VBUFFER_SIZE, 'buffer too small, increase RELOOPER_BUFFER_SIZE');
+      writeAsciiToMemory(branchVar, vbuffer);
+    }
+    var b = _rl_new_block(tbuffer, branchVar ? vbuffer : 0);
     _rl_relooper_add_block(this.r, b);
     return b;
   };
   RelooperGlue['addBranch'] = function(from, to, condition, code) {
     assert(this.r);
     if (condition) {
-      assert(condition.length+1 < TBUFFER_SIZE/2);
-      writeStringToMemory(condition, tbuffer);
+      assert(condition.length+1 < TBUFFER_SIZE/2, 'buffer too small, increase RELOOPER_BUFFER_SIZE');
+      writeAsciiToMemory(condition, tbuffer);
       condition = tbuffer;
     } else {
       condition = 0; // allow undefined, null, etc. as inputs
     }
     if (code) {
-      assert(code.length+1 < TBUFFER_SIZE/2);
-      writeStringToMemory(code, tbuffer + TBUFFER_SIZE/2);
+      assert(code.length+1 < TBUFFER_SIZE/2, 'buffer too small, increase RELOOPER_BUFFER_SIZE');
+      writeAsciiToMemory(code, tbuffer + TBUFFER_SIZE/2);
       code = tbuffer + TBUFFER_SIZE/2;
     } else {
       code = 0; // allow undefined, null, etc. as inputs
     }
     _rl_block_add_branch_to(from, to, condition, code);