Enable pysort key

Author: BruceSherwood

GlowScriptOffline/glowscript_libraries/RScompiler.3.2.min.js

@@ -203,12 +203,14 @@ where compile() was called, in untrusted/run.js.
 	const asyncpatt1 = new RegExp('\\Wfunction\\s*(\\w+)\\s*\\(')      // find "function f(...."
 	const awaitpatt = new RegExp('\\W([ρσ\\w]+)[ ]*\\(')  // find a function call
 	const filterpatt = new RegExp('\\Wfilter\\s*\\(\\s*(\\w+)+\\s*,') // find name of filter function
+	const pysortkey = new RegExp('\\.pysort\\s*\\(\\s*key\\s*=\\s*(\\w+)\\s*\\)')
 
 	// fcts is a list of GlowScript functions that need "await" and of all user functions that are not 
 	//    classes, instances of classes, or methods of classes:
 	var vpfcts = ['pause', 'waitfor', 'capture'] // These are preceded by "scene."
 	var vpwaits = ['rate', 'sleep', 'get_library', 'read_local_file']
 	var fcts = []
+	var nonasyncfcts = [] // a list of functions that should NOT be labeled async
 
 	// If ...name(... is encountered inside a string during the first pass, it is changed
 	// to ...name+string_insert+.... to prevent finding this apparent function or function call,
@@ -629,6 +631,10 @@ where compile() was called, in untrusted/run.js.
 					}
 				}
 
+				// In the form a.pysort(key=k), k must not be prepended with async, nor the call to k be prepended with await
+				m = line.match(pysortkey)
+				if (m !== null) nonasyncfcts.push(m[1])
+
 				start = 0
 				const bindmethodpatt = new RegExp('(\\w+)\\.(\\w+)\\s*')
 				while (true) { // convert all classinstance.classmethod without parens to classinstance.classmethod.bind(classinstance)
@@ -923,7 +929,8 @@ where compile() was called, in untrusted/run.js.
 			// console.log('classinstances', classinstances)
 			// console.log('classmethods', classmethods)
 
-			// Prepend 'async ' to all user functions
+			// Prepend 'async ' to all user functions (but not if in nonasyncfcts)
+
 			let filter_functions = []
 			while (true) { // locate Python filter(name, list)
 				m = prog.slice(start).match(filterpatt)
@@ -933,6 +940,7 @@ where compile() was called, in untrusted/run.js.
 					no_await.push(m[1]) // add this user function to the no_await list
 				start += m.index+m[0].length
 			}
+
 			start = initialstart
 			while (true) {
 				// const asyncpatt1 =   new RegExp('\\Wfunction\\s*(\\w+)\\s*\\(')      // find "function f(...."
@@ -946,12 +954,19 @@ where compile() was called, in untrusted/run.js.
 					start += m[0].length
 					continue
 				}
+				if (nonasyncfcts.indexOf(name) >= 0) {
+					no_await.push(name)
+					start += m[0].length
+					continue
+				}
 				if (filter_functions.indexOf(name) >= 0) start += m[0].length
 				else {
 					prog = prog.slice(0,start+m.index+1)+'async function '+name+string_insert+prog.slice(start+m.index+m[0].length)
 					start += m.index+'async function '.length+m[1].length+string_insert.length+1
 				}
+
 			} 
+
 			// ===================== End of prepending 'async' to user functions =====================
 			// Next, prepend "await " to calls to user functions and the GlowScript async functions (all user functions and class methods are marked async).
 
@@ -1245,8 +1260,8 @@ where compile() was called, in untrusted/run.js.
 		// console.log('classmethods', classmethods)
 		// console.log('============================================================================')
 		// let i = program.search('"2";')
-		// let i = program.search('async function __main__')
-		// console.log(program.slice(i))
+		let i = program.search('async function __main__')
+		console.log(program.slice(i))
 		// console.log(program)
 		return program
     } // end of compile function