fix: Provide native function reordering like standard functions

robertleeplummerjr · robertleeplummerjr · commit d489f1dcb851 · 2020-11-12T14:06:19.000-05:00
fix: Provide inline functions source when error
diff --git a/dist/gpu-browser-core.js b/dist/gpu-browser-core.js
@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.10.0
- * @date Tue Aug 25 2020 14:05:30 GMT-0400 (Eastern Daylight Time)
+ * @version 2.10.5
+ * @date Thu Nov 12 2020 14:04:03 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -2091,12 +2091,12 @@ class FunctionBuilder {
       functionBuilder.trackFunctionCall(functionName, calleeFunctionName, args);
     };
 
-    const onNestedFunction = (ast, returnType) => {
+    const onNestedFunction = (ast, source) => {
       const argumentNames = [];
       for (let i = 0; i < ast.params.length; i++) {
         argumentNames.push(ast.params[i].name);
       }
-      const nestedFunction = new FunctionNode(null, Object.assign({}, nodeOptions, {
+      const nestedFunction = new FunctionNode(source, Object.assign({}, nodeOptions, {
         returnType: null,
         ast,
         name: ast.id.name,
@@ -2259,8 +2259,12 @@ class FunctionBuilder {
     retList = retList || [];
 
     if (this.nativeFunctionNames.indexOf(functionName) > -1) {
-      if (retList.indexOf(functionName) === -1) {
+      const nativeFunctionIndex = retList.indexOf(functionName);
+      if (nativeFunctionIndex === -1) {
         retList.push(functionName);
+      } else {
+        const dependantNativeFunctionName = retList.splice(nativeFunctionIndex, 1)[0];
+        retList.push(dependantNativeFunctionName);
       }
       return retList;
     }
@@ -2551,6 +2555,7 @@ class FunctionBuilder {
 module.exports = {
   FunctionBuilder
 };
+
 },{}],9:[function(require,module,exports){
 const acorn = require('acorn');
 const { utils } = require('../utils');
@@ -2772,7 +2777,7 @@ class FunctionNode {
     }
 
     for (let i = 0; i < functions.length; i++) {
-      this.onNestedFunction(functions[i]);
+      this.onNestedFunction(functions[i], this.source);
     }
   }
 
diff --git a/dist/gpu-browser-core.min.js b/dist/gpu-browser-core.min.js
diff --git a/dist/gpu-browser.js b/dist/gpu-browser.js
@@ -4,8 +4,8 @@
  *
  * GPU Accelerated JavaScript
  *
- * @version 2.10.0
- * @date Tue Aug 25 2020 14:05:30 GMT-0400 (Eastern Daylight Time)
+ * @version 2.10.5
+ * @date Thu Nov 12 2020 14:04:02 GMT-0500 (Eastern Standard Time)
  *
  * @license MIT
  * The MIT License
@@ -6700,12 +6700,12 @@ class FunctionBuilder {
       functionBuilder.trackFunctionCall(functionName, calleeFunctionName, args);
     };
 
-    const onNestedFunction = (ast, returnType) => {
+    const onNestedFunction = (ast, source) => {
       const argumentNames = [];
       for (let i = 0; i < ast.params.length; i++) {
         argumentNames.push(ast.params[i].name);
       }
-      const nestedFunction = new FunctionNode(null, Object.assign({}, nodeOptions, {
+      const nestedFunction = new FunctionNode(source, Object.assign({}, nodeOptions, {
         returnType: null,
         ast,
         name: ast.id.name,
@@ -6868,8 +6868,12 @@ class FunctionBuilder {
     retList = retList || [];
 
     if (this.nativeFunctionNames.indexOf(functionName) > -1) {
-      if (retList.indexOf(functionName) === -1) {
+      const nativeFunctionIndex = retList.indexOf(functionName);
+      if (nativeFunctionIndex === -1) {
         retList.push(functionName);
+      } else {
+        const dependantNativeFunctionName = retList.splice(nativeFunctionIndex, 1)[0];
+        retList.push(dependantNativeFunctionName);
       }
       return retList;
     }
@@ -7160,6 +7164,7 @@ class FunctionBuilder {
 module.exports = {
   FunctionBuilder
 };
+
 },{}],10:[function(require,module,exports){
 const acorn = require('acorn');
 const { utils } = require('../utils');
@@ -7381,7 +7386,7 @@ class FunctionNode {
     }
 
     for (let i = 0; i < functions.length; i++) {
-      this.onNestedFunction(functions[i]);
+      this.onNestedFunction(functions[i], this.source);
     }
   }
 
diff --git a/dist/gpu-browser.min.js b/dist/gpu-browser.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gpu.js",
-  "version": "2.10.4",
+  "version": "2.10.5",
   "description": "GPU Accelerated JavaScript",
   "engines": {
     "node": ">=8.0.0"
diff --git a/src/backend/function-builder.js b/src/backend/function-builder.js
@@ -87,12 +87,12 @@ class FunctionBuilder {
       functionBuilder.trackFunctionCall(functionName, calleeFunctionName, args);
     };
 
-    const onNestedFunction = (ast, returnType) => {
+    const onNestedFunction = (ast, source) => {
       const argumentNames = [];
       for (let i = 0; i < ast.params.length; i++) {
         argumentNames.push(ast.params[i].name);
       }
-      const nestedFunction = new FunctionNode(null, Object.assign({}, nodeOptions, {
+      const nestedFunction = new FunctionNode(source, Object.assign({}, nodeOptions, {
         returnType: null,
         ast,
         name: ast.id.name,
@@ -276,8 +276,17 @@ class FunctionBuilder {
     retList = retList || [];
 
     if (this.nativeFunctionNames.indexOf(functionName) > -1) {
-      if (retList.indexOf(functionName) === -1) {
+      const nativeFunctionIndex = retList.indexOf(functionName);
+      if (nativeFunctionIndex === -1) {
         retList.push(functionName);
+      } else {
+        /**
+         * https://github.com/gpujs/gpu.js/issues/207
+         * if dependent function is already in the list, because a function depends on it, and because it has
+         * already been traced, we know that we must move the dependent function to the end of the the retList.
+         * */
+        const dependantNativeFunctionName = retList.splice(nativeFunctionIndex, 1)[0];
+        retList.push(dependantNativeFunctionName);
       }
       return retList;
     }
diff --git a/src/backend/function-node.js b/src/backend/function-node.js
@@ -255,7 +255,7 @@ class FunctionNode {
     }
 
     for (let i = 0; i < functions.length; i++) {
-      this.onNestedFunction(functions[i]);
+      this.onNestedFunction(functions[i], this.source);
     }
   }
 
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -508,7 +508,7 @@ export interface IFunctionSettings {
   returnType?: string;
   isRootKernel?: boolean;
   isSubKernel?: boolean;
-  onNestedFunction?(source: string, returnType: string): void;
+  onNestedFunction?(ast: any, source: string): void;
   lookupReturnType?(functionName: string, ast: any, node: FunctionNode): void;
   plugins?: any[];
 

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`*`
`5`	`5`	`* GPU Accelerated JavaScript`
`6`	`6`	`*`
`7`		`- * @version 2.10.0`
`8`		`- * @date Tue Aug 25 2020 14:05:30 GMT-0400 (Eastern Daylight Time)`
	`7`	`+ * @version 2.10.5`
	`8`	`+ * @date Thu Nov 12 2020 14:04:03 GMT-0500 (Eastern Standard Time)`
`9`	`9`	`*`
`10`	`10`	`* @license MIT`
`11`	`11`	`* The MIT License`
`@@ -2091,12 +2091,12 @@ class FunctionBuilder {`
`2091`	`2091`	`functionBuilder.trackFunctionCall(functionName, calleeFunctionName, args);`
`2092`	`2092`	`};`
`2093`	`2093`
`2094`		`- const onNestedFunction = (ast, returnType) => {`
	`2094`	`+ const onNestedFunction = (ast, source) => {`
`2095`	`2095`	`const argumentNames = [];`
`2096`	`2096`	`for (let i = 0; i < ast.params.length; i++) {`
`2097`	`2097`	`argumentNames.push(ast.params[i].name);`
`2098`	`2098`	`}`
`2099`		`- const nestedFunction = new FunctionNode(null, Object.assign({}, nodeOptions, {`
	`2099`	`+ const nestedFunction = new FunctionNode(source, Object.assign({}, nodeOptions, {`
`2100`	`2100`	`returnType: null,`
`2101`	`2101`	`ast,`
`2102`	`2102`	`name: ast.id.name,`
`@@ -2259,8 +2259,12 @@ class FunctionBuilder {`
`2259`	`2259`	`retList = retList \|\| [];`
`2260`	`2260`
`2261`	`2261`	`if (this.nativeFunctionNames.indexOf(functionName) > -1) {`
`2262`		`- if (retList.indexOf(functionName) === -1) {`
	`2262`	`+ const nativeFunctionIndex = retList.indexOf(functionName);`
	`2263`	`+ if (nativeFunctionIndex === -1) {`
`2263`	`2264`	`retList.push(functionName);`
	`2265`	`+ } else {`
	`2266`	`+ const dependantNativeFunctionName = retList.splice(nativeFunctionIndex, 1)[0];`
	`2267`	`+ retList.push(dependantNativeFunctionName);`
`2264`	`2268`	`}`
`2265`	`2269`	`return retList;`
`2266`	`2270`	`}`
`@@ -2551,6 +2555,7 @@ class FunctionBuilder {`
`2551`	`2555`	`module.exports = {`
`2552`	`2556`	`FunctionBuilder`
`2553`	`2557`	`};`
	`2558`	`+`
`2554`	`2559`	`},{}],9:[function(require,module,exports){`
`2555`	`2560`	`const acorn = require('acorn');`
`2556`	`2561`	`const { utils } = require('../utils');`
`@@ -2772,7 +2777,7 @@ class FunctionNode {`
`2772`	`2777`	`}`
`2773`	`2778`
`2774`	`2779`	`for (let i = 0; i < functions.length; i++) {`
`2775`		`- this.onNestedFunction(functions[i]);`
	`2780`	`+ this.onNestedFunction(functions[i], this.source);`
`2776`	`2781`	`}`
`2777`	`2782`	`}`
`2778`	`2783`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gpu.js",`
`3`		`- "version": "2.10.4",`
	`3`	`+ "version": "2.10.5",`
`4`	`4`	`"description": "GPU Accelerated JavaScript",`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": ">=8.0.0"`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ class FunctionNode {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`for (let i = 0; i < functions.length; i++) {`
`258`		`- this.onNestedFunction(functions[i]);`
	`258`	`+ this.onNestedFunction(functions[i], this.source);`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`