Fix bug in inserting await

Author: BruceSherwood

ide/ide.js

@@ -1364,7 +1364,7 @@ $(function () {
         })
 
         var frameSrc = run_link
-        var frameHTML = '<iframe style="border-style:none; border:0; width:650px; height:500px; margin:0; padding:0;" frameborder=0 src="' + frameSrc + '"></iframe>'
+        var frameHTML = '<iframe style="border-style:none; border:0; width:650px; height:500px; margin:0; padding:0;" allow="hid" frameborder=0 src="' + frameSrc + '"></iframe>'
         page.find(".frameSource").text( frameHTML );
     }
     pages.downloadProgram = function(route) { // Currently the only program option is download (download a program to user computer)

lib/compiling/GScompiler.js

@@ -910,6 +910,11 @@ where compile() was called, in untrusted/run.js.
 			var initialstart = prog.search(lineno_string)
 			start = initialstart
 
+			// console.log('fcts', fcts)
+			// console.log('classes', classes)
+			// console.log('classinstances', classinstances)
+			// console.log('classmethods', classmethods)
+
 			// Prepend 'async ' to all user functions
 			let filter_functions = []
 			while (true) { // locate Python filter(name, list)
@@ -938,9 +943,10 @@ where compile() was called, in untrusted/run.js.
 					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
-				
-			// Prepend "await " to calls to user functions and the GlowScript async functions (all user functions and class methods are marked async).
+			} 
+			// ===================== 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).
+			
 			start = initialstart
 
 			// VPython_import is the prefix of VPython objects, with value 'null' if no import statement
@@ -1094,23 +1100,20 @@ where compile() was called, in untrusted/run.js.
 				// be difficult in the transpiling to know whether "obj" is a user object or a VPython object,
 				// both of which have rotate methods, but only the user object needs await.
 
-
-
 				if ( // Test for cases that need await:
 					(period && prefix == 'self') ||                                                // in self.f, f may be a function passed to __init__
 					(period && prefix.slice(0,10) == 'ρσ_getitem' && classmethods.indexOf(name) >= 0) || // ρσ_getitem(...).usermethod
 					(period && classes.indexOf(prefix) >= 0 && classmethods.indexOf(name) >= 0) || // userclass.usermethod()
 					(period && classinstances.indexOf(prefix) < 0 && vpfcts.indexOf(name) >= 0) || // scene.pause(), scene.waitfor(), scene.capture()
 					(period && prefix === VPython_import && vpwaits.indexOf(name) >= 0) ||         // vp.rate/vp.sleep/vp.get_library/vp.read_local_file
 					(period && classinstances.indexOf(prefix) >= 0 && classmethods.indexOf(name) >= 0) || // userinstance.usermethod()
-					(period && classinstances.indexOf(name) < 0 && no_await2.indexOf(name) < 0) || // scene.bind()
+					(period && classinstances.indexOf(prefix) >= 0 && no_await2.indexOf(name) < 0) || // scene.bind()
 					(!period && fcts.indexOf(name) >= 0) ||                                        // f()
 					(!period && classmethods.indexOf(name) >= 0) ||                                // usermethod(), preceded by usermethod = userclass.method()
 					(!period && classes.indexOf(name) >= 0) ||                                     // userclass()
 					(!period && no_await.indexOf(name) < 0) ||                                     // cos()
 					(!period && no_await.indexOf(name) < 0 && no_await2.indexOf(name) < 0 &&
 								fcts.indexOf(name) < 0)) {                                         // probably a user function has been passed to a function
-						;
 				} else {  // probably no need to prepend await
 					if (period && prefix == 'ρσ_interpolate_kwargs' && name == 'call') { // ρσ_interpolate_kwargs.call(this, f, ....)
 						let end = prog.slice(start+m.index).search('\n')
@@ -1222,16 +1225,16 @@ where compile() was called, in untrusted/run.js.
 		// s = "    ρσ_list_decorate.prototype.pop = function(arg) {return this.pypop(arg)}\n"
 		// program = program.slice(0,sc)+s+program.slice(sc,program.length)
 
-        // var p = program.split('\n')
-		// for (var i=0; i<p.length; i++) console.log(i, p[i])
+        // let p = program.split('\n')
+		// for (let i=0; i<p.length; i++) console.log(i, p[i])
 		// console.log('fcts', fcts)
 		// console.log('vpfcts', vpfcts)
 		// console.log('classes', classes)
 		// console.log('classinstances', classinstances)
 		// console.log('classmethods', classmethods)
 		// console.log('============================================================================')
-		// var i = program.search('"2";')
-		// var i = program.search('async function __main__')
+		// let i = program.search('"2";')
+		// let i = program.search('async function __main__')
 		// console.log(program.slice(i))
 		// console.log(program)
 		return program