Fix passing of functions

Author: BruceSherwood

lib/compiling/GScompiler.js

@@ -692,6 +692,7 @@ where compile() was called, in untrusted/run.js.
 
 				if (!foundfct) {
 					// Check whether this line contains function calls inside strings, which will not need "await"
+					// const awaitpatt = new RegExp('\\W(\\w+)\\s*\\(')  // find a function call
 					while (true) {
 						var m = line.slice(start).match(awaitpatt)
 						if (m !== null) {
@@ -876,7 +877,8 @@ where compile() was called, in untrusted/run.js.
         		arr += "    Array.prototype['*']=function(r) {return __array_times_number(this, r)}\n" // multiplying Python list times number
 	        	if (VPython_names.length <= 0) arr += vars
 				program = program.slice(0,start) + arr + program.slice(start-4)
-        	} // end handle Python imports
+			} // end handle Python imports
+			//program = program.replace(new RegExp('\\(function\\(\\)', 'g'), '(async function()')
 
 		} else { // JavaScript
             var prog = 'function __main__() {\n"use strict";\n'
@@ -922,6 +924,7 @@ where compile() was called, in untrusted/run.js.
 
 		// Prepend 'async ' to all user functions
 		while (true) {
+			// const asyncpatt1 = new RegExp('\\Wfunction\\s*(\\w+)\\s*\\(')      // find "function f(...."
 			if (options.lang != 'javascript') m = prog.slice(start).match(asyncpatt1)
 			else m = prog.slice(start).match(jsasyncpatt1)
 			if (m === null) break
@@ -939,23 +942,53 @@ where compile() was called, in untrusted/run.js.
 
 		// Prepend "await " to calls to user functions and the GlowScript async functions (all user functions are marked async).
 		start = initialstart
+		const noawait = ['if', 'else', 'defineProperties', 'for', 'while', 'append', 'function', 'return',
+					   'vec', 'vector', 'cross', 'dot', 'add', 'divide', 'multiply', 'sub', 'mag', 'mag2', 'norm',
+					   'hat', 'proj', 'comp', 'diff_angle', 'radians', 'degrees', 'rotate', 'pow', 'radians', 'degrees',
+					   'GS_power', 'float', 'format', 'int', 'len', 'pow', 'print', 'range', 'arange', 'str',
+					   'abs', 'sqrt', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2', 'exp', 'log',
+					   'ceil', 'floor', 'sign', 'round', 'max', 'min', 'random', 'factorial', 'combin',
+						'box', 'cylinder', 'cone', 'pyramid', 'sphere', 'simple_sphere', 'arrow', 'curve', 'points',
+						'paths', 'shapes', 'helix', 'ring', 'compound', 'vertex', 'triangle', 'quad', 'label',
+						'distant_light', 'attach_trail', 'textures', 'bumpmaps', 'text', 'wtext', 'winput',
+						'radio', 'checkbox', 'button', 'slider', 'menu', 'input', 'extrusion',
+						'graph', 'gdisplay', 'series', 'gcurve', 'gdots', 'gvbars', 'ghbars', 'ghistogram']
+		const noawait_method = ['rotate', 'clone', 'rgb_to_hsv', 'hsv_to_rgb', 'norm', 'diff_angle', 'project',
+								'bind', 'unbind', 'trigger']
+								
+		// VPython_import is the prefix of VPython objects, with value 'null' if no import statement
+		// const awaitpatt = new RegExp('\\W(\\w+)\\s*\\(')  // find a function call
 		while (true) {
 			m = prog.slice(start).match(awaitpatt)
+			var period = false
 			if (m === null) break
+			period = (prog[start+m.index] == '.')
 			name = m[1]
-			if (fcts.indexOf(name) < 0) { // fcts is a list of user functions plus GlowScript async functions such as rate
-				// If this is a class, delete the call to __init__ (we will insert this call after creating the class instance)
+
+			// If this is a class, delete the call to __init__ (we will insert this call after creating the class instance)
+			if (!period && classes.indexOf(name) >= 0) {
 				start += m.index+name.length+1
-				if (classes.indexOf(m[1]) >= 0) {
-					var lbrace = prog.slice(start).search('{')
-					var rbrace = prog.slice(start).search('arguments')
-					prog = prog.slice(0,start+lbrace+1)+prog.slice(start+'arguments'.length+rbrace+1)
-				}
+				var lbrace = prog.slice(start).search('{')
+				var rbrace = prog.slice(start).search('arguments')
+				prog = prog.slice(0,start+lbrace+1)+prog.slice(start+'arguments'.length+rbrace+1)
 				continue
 			}
 
+			// Might start with 'RS_' or be string.format(...) or be color.gray(.7)
+			if ( name.slice(0,3) == 'RS_' || (name == 'format' && period) || (name == 'gray' && period) ) {
+				start += m.index+name.length+1
+				continue
+			}
+
+			// If not a user function nor pause/waitfor/rate/sleep/read_local_file/get_library, and it
+			// is in the list of functions not to need await, don't prepend await to this function call:
+			if (fcts.indexOf(name) < 0 && noawait.indexOf(name) >= 0) {
+				start += m.index+name.length+1
+				continue
+			} 
+
 			// find the beginning of ....f()
-			ptr = start+m.index+1
+			var ptr = start+m.index+1
 			var brackets = 0
 			var parens = 0
 			while (true) {
@@ -1018,9 +1051,7 @@ where compile() was called, in untrusted/run.js.
 		while (true) {
 			var m = program.slice(start).match(kw)
 			if (m == null) break
-			if (m[2] != 'this') {
-				program = program.slice(0,start+m.index)+'await '+program.slice(start+m.index)
-			} else if (fcts.indexOf(m[3]) >= 0) {
+			if (m[2] != 'this' || fcts.indexOf(m[3]) >= 0) {
 				program = program.slice(0,start+m.index)+'await '+program.slice(start+m.index)
 			}
 			start += m.index+kw.length
@@ -1046,7 +1077,7 @@ where compile() was called, in untrusted/run.js.
         // var p = program.split('\n')
 		// for (var i=0; i<p.length; i++) console.log(i, p[i])
 		// console.log('============================================================================')
-		// var i = program.search('scene = canvas()')
+		// var i = program.search('scene = ')
 		// console.log(program.slice(i))
 		//console.log(program)
 		return program