More fixes to compilation

Author: BruceSherwood

GlowScriptOffline/glowscript_libraries/RScompiler.2.9.min.js

@@ -692,7 +692,6 @@ 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) {
@@ -877,8 +876,7 @@ 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
-			//program = program.replace(new RegExp('\\(function\\(\\)', 'g'), '(async function()')
+        	} // end handle Python imports
 
 		} else { // JavaScript
             var prog = 'function __main__() {\n"use strict";\n'
@@ -924,7 +922,6 @@ 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
@@ -942,55 +939,24 @@ 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
+		const awaitpatt2 = new RegExp('(\\w+)\\s*\\(')  // find a function call
 		while (true) {
-			m = prog.slice(start).match(awaitpatt)
-			var period = false
+			m = prog.slice(start).match(awaitpatt2)
 			if (m === null) break
-			period = (prog[start+m.index] == '.')
 			name = m[1]
-
-			// 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
-				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.option(...) or be color.gray(.7)
-			if ( name.slice(0,3) == 'RS_' || 
-					(period && (prog[start+m.index-1] == '"')) || 
-					(name == 'gray' && period) ) {
+			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)
 				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)
+				}
 				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()
-			var ptr = start+m.index+1
+			ptr = start+m.index //+1
 			var brackets = 0
 			var parens = 0
 			while (true) {
@@ -1006,7 +972,7 @@ where compile() was called, in untrusted/run.js.
 					if (parens === 0) break
 					parens++
 				}
-				if (prog[ptr] == ' ') {
+				if (prog[ptr] == ' ' || prog[ptr] == '=' || prog[ptr] == '\n') {
 					if (brackets === 0 && parens === 0) break
 				}
 			}
@@ -1027,7 +993,7 @@ where compile() was called, in untrusted/run.js.
 
 			// find the end of f(.....)
 			var parens = 0
-			var ptr = start+m.index+name.length+1
+			var ptr = start+m.index+name.length
 			while (true) { 
 				if (prog[ptr] == '(') parens++
 				else if (prog[ptr] == ')') {
@@ -1039,8 +1005,16 @@ where compile() was called, in untrusted/run.js.
 				ptr++
 			}
 			var pend = ptr // end of f(......)
+
+			// To my dismay, I found that "!" requires this special handling:
+			var pst = pstart
+			if (prog[pstart] == '!') {
+				if (prepend == '(') prepend = '!('
+				else prepend = ';!('
+				pstart++
+			}
 
-			prog = prog.slice(0,pstart)+prepend+'await '+prog.slice(pstart,pend)+')'+prog.slice(pend)
+			prog = prog.slice(0,pst)+prepend+'await '+prog.slice(pstart,pend)+')'+prog.slice(pend)
 			start += m.index+name.length+prepend.length+6
 		} // end of adding "await " to function calls
 
@@ -1053,7 +1027,9 @@ 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' || fcts.indexOf(m[3]) >= 0) {
+			if (m[2] != 'this') {
+				program = program.slice(0,start+m.index)+'await '+program.slice(start+m.index)
+			} else if (fcts.indexOf(m[3]) >= 0) {
 				program = program.slice(0,start+m.index)+'await '+program.slice(start+m.index)
 			}
 			start += m.index+kw.length
@@ -1079,8 +1055,8 @@ 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 = ')
-		// console.log(program.slice(i))
+		var i = program.search('scene = canvas()')
+		console.log(program.slice(i))
 		//console.log(program)
 		return program
     } // end of compile function

GlowScriptOffline/glowscript_libraries/RSrun.2.9.min.js

@@ -561,7 +561,7 @@
 
         __change: function() {  // Called when attributeVectors are changed, axis/center/up
             if (this.__lastevent !== null && this.hasmouse) this.mouse.__update(this.__lastevent)
-            this.__overlay_objects.__changed = true
+            if (this.__overlay_objects) this.__overlay_objects.__changed = true
         },
 
         // Changes to center/axis/up call this.__change():

GlowScriptOffline/glowscript_libraries/glow.2.9.min.js

@@ -713,10 +713,31 @@
     	if (axis === undefined) axis = new vec(0,0,1)
         return v.rotate({angle:angle, axis:axis})
     }
+
     function GS_power(x,n) { // Preprocessing converts Math.pow => GS_power
     	if (x instanceof vec) throw new Error("Cannot raise a vector to a power.")
     	return Math.pow(x,n)
     }
+
+    // Because RapydScript-NG compiles to the JavaScript string.replace function, which
+    //   replaces just one instance rather than multiple instances as in standard Python,
+    //   here we implement string.GSrep that acts like standard Python and we
+    //   replace all instances of ".replace" (in user code) with ".GSrep".
+    String.prototype.GSrep = function(t,r, n) {
+        if (n === undefined) n = 1000000
+        var s = this
+        if (t === r) return s
+        var tlong = t.length
+        var i = 0
+        while (true) {
+            if (i >= n) return s
+            i++
+            var loc = s.search(t)
+            if (loc < 0) return s
+            s = s.slice(0,loc) + r + s.slice(loc+tlong)
+        }
+    }
+
     var exports = {
         mag: mag,
         mag2: mag2,