Merge pull request #411 from ethereum/callback-context

Support callback context in 0.6.x

Author: axic

wrapper.js

@@ -17,6 +17,8 @@ function setupMethods (soljson) {
     return translate.versionToSemver(version());
   };
 
+  var isVersion6 = semver.gt(versionToSemver(), '0.5.99');
+
   var license;
   if ('_solidity_license' in soljson) {
     license = soljson.cwrap('solidity_license', 'string', []);
@@ -51,7 +53,7 @@ function setupMethods (soljson) {
 
   var wrapCallbackWithKind = function (callback) {
     assert(typeof callback === 'function', 'Invalid callback specified.');
-    return function (kind, data, contents, error) {
+    return function (context, kind, data, contents, error) {
       var result = callback(soljson.Pointer_stringify(kind), soljson.Pointer_stringify(data));
       if (typeof result.contents === 'string') {
         copyString(result.contents, contents);
@@ -80,7 +82,7 @@ function setupMethods (soljson) {
     }
 
     var singleCallback;
-    if (semver.gt(versionToSemver(), '0.5.99')) {
+    if (isVersion6) {
       // After 0.6.x multiple kind of callbacks are supported.
       var smtSolverCallback = callbacks.smtSolver;
       if (smtSolverCallback === undefined) {
@@ -115,6 +117,10 @@ function setupMethods (soljson) {
     var output;
     try {
       args.push(cb);
+      if (isVersion6) {
+        // Callback context.
+        args.push(null);
+      }
       output = compile.apply(undefined, args);
     } catch (e) {
       removeFunction(cb);
@@ -126,16 +132,19 @@ function setupMethods (soljson) {
 
   var compileJSON = null;
   if ('_compileJSON' in soljson) {
+    // input (text), optimize (bool) -> output (jsontext)
     compileJSON = soljson.cwrap('compileJSON', 'string', ['string', 'number']);
   }
 
   var compileJSONMulti = null;
   if ('_compileJSONMulti' in soljson) {
+    // input (jsontext), optimize (bool) -> output (jsontext)
     compileJSONMulti = soljson.cwrap('compileJSONMulti', 'string', ['string', 'number']);
   }
 
   var compileJSONCallback = null;
   if ('_compileJSONCallback' in soljson) {
+    // input (jsontext), optimize (bool), callback (ptr) -> output (jsontext)
     var compileInternal = soljson.cwrap('compileJSONCallback', 'string', ['string', 'number', 'number']);
     compileJSONCallback = function (input, optimize, readCallback) {
       return runWithCallbacks(readCallback, compileInternal, [ input, optimize ]);
@@ -144,13 +153,21 @@ function setupMethods (soljson) {
 
   var compileStandard = null;
   if ('_compileStandard' in soljson) {
+    // input (jsontext), callback (ptr) -> output (jsontext)
     var compileStandardInternal = soljson.cwrap('compileStandard', 'string', ['string', 'number']);
     compileStandard = function (input, readCallback) {
       return runWithCallbacks(readCallback, compileStandardInternal, [ input ]);
     };
   }
   if ('_solidity_compile' in soljson) {
-    var solidityCompile = soljson.cwrap('solidity_compile', 'string', ['string', 'number']);
+    var solidityCompile;
+    if (isVersion6) {
+      // input (jsontext), callback (ptr), callback_context (ptr) -> output (jsontext)
+      solidityCompile = soljson.cwrap('solidity_compile', 'string', ['string', 'number', 'number']);
+    } else {
+      // input (jsontext), callback (ptr) -> output (jsontext)
+      solidityCompile = soljson.cwrap('solidity_compile', 'string', ['string', 'number']);
+    }
     compileStandard = function (input, callbacks) {
       return runWithCallbacks(callbacks, solidityCompile, [ input ]);
     };