Python dict methods; named radio buttons

Author: BruceSherwood

ForInstalledPython/glow.min.js

@@ -108,6 +108,7 @@ <h1><font color="#0000A0">Widgets:
 <p class="attributes"><font color="#FF0000">checked</font> If True, the radio button is highlighted; default is False. Can be changed at any time.</p>
 <p class="attributes"><font color="#FF0000">disabled</font> If True, the radio button is grayed out and the radio button is inactive. Can be changed at any time.</p>
 <p class="attributes"><font color="#FF0000">delete()</font> If R is a radio button, R.delete() deletes the radio button from the display.</p>
+<p class="attributes"><font color="#FF0000">name</font> If you specify a name (as a string, such as &quot;group&quot;) for several radio buttons, clicking on one of the unhighlighted &quot;group&quot; radio buttons unhighlights all the others. Clicking on an already hightlighted radio button has no effect. If you do not specify a name, radio buttons simply behave as toggles, just like checkbox widgets; the only difference is that radio widgets are round and checkbox widgets are square.The name cannot be changed after creating the radio button.</p>
 <p class="Normal"></p>
 <p class="Header"><strong><font color="#0000a0">checkbox</font></strong></p>
 <p class="Normal">Here are the attributes of a <strong>checkbox</strong> widget:</p>

GlowScriptOffline/glowscript_libraries/RScompiler.3.2.min.js

@@ -33,26 +33,14 @@ Search for "Embedding the RapydScript compiler in your webpage". There you will
 with instructions for how to use it. Store the file in lib/rapydscript/compiler.js.
 
 The in-browser transpiler includes a minimized copy of the run-time function. However, for a program exported
-to the user's own web page, the transpiler is not present and a run-time file is need. Here is how to build
-the rapydscript-ng runtime library (but see below for an alternative procedure):
-1) Make sure node is installed.
-2) In a new folder, execute "npm install rapydscript-ng".
-3) Create a file named "input.py" in this folder that contains "a=1".
-4) Execute this (modify if not on Windows): node.exe .\node_modules\rapydscript-ng\bin\rapydscript --bare input.py > runtime.js
-5) At the end of the file "runtime.js", delete these lines:
-	var __name__ = "__main__";
-	
-	var a;
-	a = 1;
-6) Copy the file to lib/rapydscript/runtime.js.
-For GlowScript 3.1 runtime.js had the encoding "UCS-2 LE BOM" which the Uglify
-machinery could not handle. Using (on Windows) notepad++ the encoding was changed
-to "UTF-8" which solved the problem.
-
-The instructions above for building the two RapydScript files are adequate if it is not necessary to
+to the user's own web page, the transpiler is not present and a run-time file is needed:
+Copy the Github file release/baselib-plain-pretty.js to lib/runtime.js.
+
+===========================================================================================
+The instructions above for obtaining the two RapydScript files are adequate if it is not necessary to
 get the very latest version from the rapydscript-ng repository. If there have been commits to the
 repository that you want, but the key files haven't been updated, replace the instructions with the
-following. If on Windows, omit "sudo" from commands.
+following. If on Windows, omit "sudo" from commands, and change "/" to "\" in file names.
 
 Build rapydscript-ng from source (from "Installation" section at rapydscript-ng):
 1) Make sure node and git are installed.
@@ -64,25 +52,24 @@ Build rapydscript-ng from source (from "Installation" section at rapydscript-ng)
 3) Execute "sudo bin/rapydscript self --complete --test". This will build files in the "release" folder.
 
 Build embedded compiler: (from "Embedding the RapydScript compiler in your webpage" section at rapydscript-ng)
-4) Execute "sudo bin/web-repl-export embedded". This builds the "embedded" (in-browser) compiler.
+4) Execute "sudo bin/web-repl-export embed". In the (new) folder "embed" the file rapydscript.js is the
+   (in-browser) compiler. In December 2021 this did NOT work on Windows and had to be done on a Mac.
 
 Move new files to glowscript source:
-5) Copy the file dev/baselib-plain-pretty.js to lib/rapydscript and change the name to runtime.js.
-6) Copy the file embedded/rapydscript.js to lib/rapydscript and change the name to compiler.js.
-7) If not already present, insert these statements at the start of runtime.js (this is a kludge; don't know how to invoke the new compiler):
-	var ρσ_iterator_symbol = (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") ? Symbol.iterator : "iterator-Symbol-5d0927e5554349048cf0e3762a228256";
-	var ρσ_kwargs_symbol = (typeof Symbol === "function") ? Symbol("kwargs-object") : "kwargs-object-Symbol-5d0927e5554349048cf0e3762a228256";
-	var ρσ_cond_temp, ρσ_expr_temp, ρσ_last_exception;
-	var ρσ_object_counter = 0;
+5) Copy the file release/baselib-plain-pretty.js to lib/rapydscript runtime.js.
+6) Copy the file embed/rapydscript.js to lib/rapydscript/compiler.js.
+
+However you obtain the two RapydScript-NG files, you need to make the following changes
+in order to enable tests for two vectors being equal or unequal:
 
 Make RapydScript-NG handle vec == vec and vec != vec:
-In lib/rapydscript/compiler.js, search for "function ρσ_equals" (two places)
+In lib/rapydscript/compiler.js, search for "function ρσ_equals"
 and insert the following string just before "if (a === b)"
     if (a instanceof vec) {\n if (!(b instanceof vec)) return false;\nreturn (a.x === b.x && a.y === b.y && a.z === b.z);\n}\n
 
 In lib/rapydscript/compiler.js, search for "function ρσ_not_equals" (two places)
 and insert the following string just before "if (a === b)"
-if (a instanceof vec) {\n if (!(b instanceof vec)) return true;\nreturn (a.x !== b.x || a.y !== b.y || a.z !== b.z);\n}\n
+	if (a instanceof vec) {\n if (!(b instanceof vec)) return true;\nreturn (a.x !== b.x || a.y !== b.y || a.z !== b.z);\n}\n
     
 In lib/rapydscript/runtime.js, search for "function ρσ_equals"
 and insert the following code just before "if (a === b)"
@@ -98,6 +85,17 @@ and insert the following code just before "if (a === b)"
     	return (a.x !== b.x || a.y !== b.y || a.z !== b.z);
     }
 
+Also, you need to change .pop to .pypop in the two RapydScript-NG files (GScompiler.js converts all occurrences of .pop to .pypop).
+In lib/rapydscript/compiler.js:
+	Search for "ans.pop = ρσ_list_pop;" and change ans.pop to ans.pypop in two places.
+	Search for "ρσ_set.prototype.pop" and change pop to pypop in two places.
+	Search for "ρσ_dict.prototype.pop" and change pop to pypop in two places.
+In lib/rapydscript/runtime.js:
+	Search for "ans.pop = ρσ_list_pop" and change ans.pop to ans.pypop.
+	Search for "ρσ_set.prototype.pop" and change pop to pypop.
+	Search for "ρσ_dict.prototype.pop" and change pop to pypop.
+===========================================================================================
+
 OPERATOR OVERLOADING
 For operator overloading, the source for lib/compiling/papercomp.js is at https://github.com/paperjs/paper.js,
 at src/core/PaperScript.js; compare with papercomp.js, which was modified by Bruce Sherwood for greater speed.
@@ -763,8 +761,9 @@ where compile() was called, in untrusted/run.js.
         program = program.replace(/\.delete/g, ".remove")
 
         function pop_replace(m, p1, p2) {
-        	if (p2.length === 0) return m
-        	else return '.py'+m.slice(1)
+        	// if (p2.length === 0) return m // pop()
+        	// else return '.py'+m.slice(1)  // pop(n)
+			return '.py'+m.slice(1)
 		}
 
 		const vp_primitives = ["arrow", "box", "compound", "cone", "curve", "cylinder", "ellipsoid", "extrusion",
@@ -783,12 +782,17 @@ where compile() was called, in untrusted/run.js.
         		compile_rapydscript(program)
 			} else {// handle Python imports
 				var prog
-				// if pop(), leave as is to work ok with both lists and sets, but if pop(N), which is only found with lists, use pypop(N)
+				// If pop(), leave as is to work ok with both lists and sets (but not dicts),
+				// but if pop(N), which is found with lists but not sets, use pypop(N).
+				// A difficulty is that pop with Python-like dictionaries has the form pop(attribute),
+				// which should return the value of that attribute.
 				program = program.replace(/(\.pop\s*\(\s*)([^)]*)/g, pop_replace)
+
 				program = program.replace(/\.sort\s*\(/g, '.pysort(')  // Make sort equivalent to pysort (RapydScript python-like sort)
 				prog = "def __main__():\n  version = "+version+"\n"
-				// The following turned out to slow all calculations down by about a factor of 5 and so was abandoned:
-				//prog += "  from __python__ import dict_literals, overload_getitem\n" // so that dictionaries behave like Python dictionaries
+
+				prog += "  from __python__ import dict_literals, overload_getitem\n" // so that dictionaries behave like Python dictionaries
+				
 				prog += "  window.__GSlang = 'vpython'\n" // WebGLRenderer needs to know at run time what models to create
 				// let hasvec = (VPython_names.indexOf('vec') >= 0)
 				// let hasvector = (VPython_names.indexOf('vector') >= 0)
@@ -870,7 +874,7 @@ where compile() was called, in untrusted/run.js.
 		program = program.replace(/\* _GSpow_ \*/g, '**') // restore x**n
 
 		// handle operator overloading
-		var start = program.indexOf("async function __main__()")
+		start = program.indexOf("async function __main__()")
 		var prog = program.slice(start)
 		prog = papercompile(prog)
 		prog = program.slice(0,start)+prog
@@ -887,7 +891,8 @@ where compile() was called, in untrusted/run.js.
 		'shapes', 'helix', 'ring', 'compound', 'vertex', 'triangle', 'quad', 'label', 
 		'distant_light', 'local_light', 'attach_trail', 'attach_arrow', 'text', 'extrusion',
 		'wtext', 'winput', 'radio', 'checkbox', 'button', 'slider', 'menu', 'input', 'js_generator', 'yield',
-		'mag', 'mag2', 'norm', 'hat', 'dot', 'cross', 'proj', 'diff_angle', 'abs', 'filter',
+		'clear', 'copy', 'get', 'items', 'keys', 'values', 'pypop', 'popitem', 'fromkeys', 'update', 'setdefault',
+		'mag', 'mag2', 'norm', 'hat', 'dot', 'cross', 'proj', 'diff_angle', 'abs', 'filter', 'set',
 		'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2', 'exp', 'log', 'pow', 'sqrt', 
 		'ceil', 'floor', 'sign', 'round', 'max', 'min', 'random', "factorial", "combin"]
 
@@ -946,6 +951,7 @@ where compile() was called, in untrusted/run.js.
 					start += m.index+name.length+1
 					continue
 				}
+				
 				// If this is a class, delete the call to __init__ (we will insert this call after creating the class instance)
 				if (options.lang == 'vpython' && !period && classes.indexOf(name) >= 0) {
 					start += m.index+name.length+1
@@ -991,6 +997,10 @@ where compile() was called, in untrusted/run.js.
 				}
 
 				let pstart = ptr+1 // start of ....f()
+				if (prog.slice(pstart, pstart+11) == 's.jsset.add') { // this is a set
+					start += m.index+name.length+1
+					continue
+				}
 				let prefix = ''
 				if (period) { 
 					// paths and shapes are lists which need to be converted to RapydScript lists to have methods such as insert
@@ -1067,7 +1077,8 @@ where compile() was called, in untrusted/run.js.
 				let no_await2 = ['remove', 'select', 'append_to_title', 'append_to_caption', 'bind', 'unbind', 'call', 'append',
 								'rgb_to_hsv', 'hsv_to_rgb', 'mag', 'mag2', 'norm', 'hat', 'rotate', 'random', 'pow', 'equals',
 								'format', 'trigger', 'follow', 'defineProperties', 'textures', 'bumpmaps', 'slice', 'plot',
-								'pop', 'pypop', 'insert', 'find', 'extend', 'copy', 'count', 'reverse', 'pysort',
+								'pypop', 'insert', 'find', 'extend', 'copy', 'count', 'reverse', 'pysort', 'set',
+								'clear', 'copy', 'get', 'items', 'keys', 'values', 'popitem', 'fromkeys', 'update', 'setdefault',
 							    'npoints', 'unshift', 'splice', 'modify', 'clear', 'shift', 'point', 'slice']
 
 				// If not a user function, nor pause/waitfor/rate/sleep/read_local_file/get_library,
@@ -1177,10 +1188,11 @@ where compile() was called, in untrusted/run.js.
 
 		// Delete the string inserts of function-like elements of strings:
 		program = program.replace(new RegExp(string_insert, 'g'), '(')
+
+		let s = "scene = canvas();\n"
+		let sc = program.indexOf(s) + s.length
 
 		if (loadfonts) { // if text object is in user program
-        	let s = "scene = canvas();\n"
-            let sc = program.indexOf(s) + s.length
         	s = "    fontloading();\n    await waitforfonts();\n"  // wait for font files
             program = program.slice(0,sc)+s+program.slice(sc,program.length)
 		}
@@ -1189,8 +1201,6 @@ where compile() was called, in untrusted/run.js.
 		// and it looks like Chrome will also start doing this. So starting with version 3.2, we insert the
 		// input function into the user's program:
 		if (program.indexOf('input') >= 0) { // if user code invokes input(), insert the function:
-        	let s = "scene = canvas();\n"
-            let sc = program.indexOf(s) + s.length
 			s = "\n    function input(arg) {\n"
 			s += "    	arg = arg || {}\n"
 			s += "    	if (arg.prompt !== undefined && arg.prompt != '') return prompt(arg.prompt)\n"
@@ -1200,6 +1210,9 @@ where compile() was called, in untrusted/run.js.
             program = program.slice(0,sc)+s+program.slice(sc,program.length)
 		}
 
+		// 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])
 		// console.log('fcts', fcts)
@@ -1208,8 +1221,8 @@ where compile() was called, in untrusted/run.js.
 		// console.log('classinstances', classinstances)
 		// console.log('classmethods', classmethods)
 		// console.log('============================================================================')
-		// var i = program.search('async function __main__')
 		// var i = program.search('"2";')
+		// var i = program.search('async function __main__')
 		// console.log(program.slice(i))
 		// console.log(program)
 		return program

GlowScriptOffline/glowscript_libraries/RSrun.3.2.min.js

@@ -134,31 +134,39 @@
     }
 
     function convert(arg) {
+        let s
         if (arg instanceof vec) { arg = arg.toString()
         } else if (arg === null) { arg = "null"
         } else if (arg === undefined) { arg = "undefined"
         } else if (toType(arg) == "object") { // object literal; should use recursion. like array.toString() in this file
-        	/* Not using Python dictionaries; too expensive
-    		if (arg.jsmap !== undefined) {
-    			var temp = {}
+            let zerojsmap = false
+        	if (arg.jsmap !== undefined) { // dictionary
+                zerojsmap = (arg.jsmap.size == 0)
+    			let temp = {}
     			for (var [key,value] of arg.jsmap) temp[key] = value
     			arg = temp
-    		}
-    		*/
-        	var s = "{"
-        	for (var a in arg) s += a + ":" + arg[a] + ", "
-        	arg = s.slice(0,-2) + "}"
+                if (zerojsmap) arg = "{}"
+                else {
+                    s = "{"
+                    for (let a in arg) s += a + ":" + arg[a] + ", "
+                    arg = s.slice(0,-2) + "}"
+                }
+            }
+        } else if (toType(arg) == 'map') {
+            s = 'dict_keys([' // or dict_items or dict_values
+            for (const k of arg) s += "'"+k + "', "
+            arg = s.slice(0,-2)+'])'
         } else if (toType(arg) == "number") { // poptions.digits default value is 6
-            var period, char, end
+            let period, char, end
             if (arg === 0) return 0
-            var d = poptions.digits
-            var output = []
-            var val = Math.abs(arg)
+            let d = poptions.digits
+            let output = []
+            let val = Math.abs(arg)
             if (val < 1e-2) arg = arg.toExponential(d-1)
             else if (val < 1) arg = arg.toPrecision(d)
             else if (val >= 1e4) arg = arg.toExponential(d-1)
             else { // range from 1 to 10000
-            	var f = 0
+            	let f = 0
             	if (d == 2 && val < 10) {
             		f = 1
             	} else if (d == 3) {
@@ -176,7 +184,7 @@
             	}
             	arg = arg.toFixed(f)
             }
-            var period = arg.indexOf('.')
+            period = arg.indexOf('.')
             if (period >= 0) {
                 end = arg.indexOf('e')
                 if (end < 0) end = arg.length

GlowScriptOffline/glowscript_libraries/compiler.3.2.min.js

@@ -201,6 +201,7 @@
         this.up = this.up            // set up attribute vector
         this.__triggered = undefined // set to event by trigger (or null, if waitfor textures)
         this.__waitfor_bound = undefined // associated with waitfor and pause
+        this.__radio_buttons = {}
         this.__id = __id
         __id++
     }