Fix callbacks with just return value

John Haley · John Haley · commit 2aff3c0dbcd0 · 2015-02-24T12:35:53.000-07:00
diff --git a/generate/input/callbacks.json b/generate/input/callbacks.json
@@ -455,7 +455,7 @@
     ],
     "return": {
       "type": "int",
-      "noResults": 1,
+      "noResults": 0,
       "success": 0,
       "error": -1
     }
diff --git a/generate/templates/filters/returns_info.js b/generate/templates/filters/returns_info.js
@@ -14,12 +14,12 @@ module.exports = function(fn, argReturnsOnly, isAsync) {
     return_info.parsedClassName = (return_info.cppClassName || '').toLowerCase() + "_t";
     return_info.returnNameOrName = return_info.returnName || return_info.name;
     return_info.jsOrCppClassName = return_info.jsClassName || return_info.cppClassName;
+    return_info.isOutParam = true;
 
     result.push(return_info);
   });
 
   if (!result.length
-      && !fn.isCallbackFunction
       && !argReturnsOnly
       && fn.return
       && !fn.return.isErrorCode
diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc
@@ -86,16 +86,25 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_asyncAfter(
 
   {{ cbFunction.return.type }} resultStatus;
 
-  {% each cbFunction|returnsInfo true false as _return %}
+  {% each cbFunction|returnsInfo false true as _return %}
     if (result.IsEmpty() || result->IsNativeError()) {
       baton->result = {{ cbFunction.return.error }};
     }
     else if (!result->IsNull() && !result->IsUndefined()) {
+      {% if _return.isOutParam %}
       {{ _return.cppClassName }}* wrapper = ObjectWrap::Unwrap<{{ _return.cppClassName }}>(result->ToObject());
       wrapper->selfFreeing = false;
 
       baton->{{ _return.name }} = wrapper->GetRefValue();
       baton->result = {{ cbFunction.return.success }};
+      {% else %}
+      if (result->IsNumber()) {
+        baton->result = (int)   result->ToNumber()->Value();
+      }
+      else {
+        baton->result = {{ cbFunction.return.noResults }};
+      }
+      {% endif %}
     }
     else {
       baton->result = {{ cbFunction.return.noResults }};
@@ -126,16 +135,25 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_asyncPromis
     Handle<v8::Value> result = resultFn->Call(0, argv);
     {{ cbFunction.return.type }} resultStatus;
 
-    {% each cbFunction|returnsInfo true false as _return %}
+    {% each cbFunction|returnsInfo false true as _return %}
       if (result.IsEmpty() || result->IsNativeError()) {
         baton->result = {{ cbFunction.return.error }};
       }
       else if (!result->IsNull() && !result->IsUndefined()) {
+        {% if _return.isOutParam %}
         {{ _return.cppClassName }}* wrapper = ObjectWrap::Unwrap<{{ _return.cppClassName }}>(result->ToObject());
         wrapper->selfFreeing = false;
 
         baton->{{ _return.name }} = wrapper->GetRefValue();
         baton->result = {{ cbFunction.return.success }};
+        {% else %}
+        if (result->IsNumber()) {
+          baton->result = (int)   result->ToNumber()->Value();
+        }
+        else {
+          baton->result = {{ cbFunction.return.noResults }};
+        }
+        {% endif %}
       }
       else {
         baton->result = {{ cbFunction.return.noResults }};
diff --git a/lib/index.js b/lib/index.js
@@ -19,17 +19,17 @@ Index.prototype.entries = function() {
 
 var addAll = Index.prototype.addAll;
 Index.prototype.addAll = function(pathspec, flags, matchedCallback) {
-  return addAll.call(this, pathspec, flags, matchedCallback, null);
+  return addAll.call(this, pathspec || "*", flags, matchedCallback, null);
 };
 
 var removeAll = Index.prototype.removeAll;
 Index.prototype.removeAll = function(pathspec, matchedCallback) {
-  return removeAll.call(this, pathspec, matchedCallback, null);
+  return removeAll.call(this, pathspec || "*", matchedCallback, null);
 };
 
 var updateAll = Index.prototype.updateAll;
 Index.prototype.updateAll = function(pathspec, matchedCallback) {
-  return updateAll.call(this, pathspec, matchedCallback, null);
+  return updateAll.call(this, pathspec || "*", matchedCallback, null);
 };
 
 module.exports = Index;
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "which-native-nodish": "^1.0.3"
   },
   "devDependencies": {
-    "combyne": "^0.6.4",
+    "combyne": "^0.6.5",
     "istanbul": "^0.3.5",
     "js-beautify": "^1.5.4",
     "jshint": "^2.6.0",

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@`
`455`	`455`	`],`
`456`	`456`	`"return": {`
`457`	`457`	`"type": "int",`
`458`		`- "noResults": 1,`
	`458`	`+ "noResults": 0,`
`459`	`459`	`"success": 0,`
`460`	`460`	`"error": -1`
`461`	`461`	`}`