easycoder 250301.3__tar.gz → 250317.1__tar.gz

{easycoder-250301.3 → easycoder-250317.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250301.3
+Version: 250317.1
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>

{easycoder-250301.3 → easycoder-250317.1}/easycoder/__init__.py

@@ -9,4 +9,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250301.3"
+__version__ = "250317.1"

{easycoder-250301.3 → easycoder-250317.1}/easycoder/ec_graphics.py

@@ -151,9 +151,8 @@ class Graphics(Handler):
             window = psg.Window(title, layout, finalize=True)
             record['window'] = window
             record['eventHandlers'] = {}
-            self.program.windowRecord = record
             self.program.run(self.nextPC())
-            self.mainLoop()
+            self.mainLoop(record)
             return 0
 
     def k_frame(self, command):
@@ -266,7 +265,8 @@ class Graphics(Handler):
     def r_set(self, command):
         property = self.getRuntimeValue(command['property'])
         key = self.getRuntimeValue(command['key'])
-        window = self.program.windowRecord['window']
+        windowRecord = self.getVariable(command['window'])
+        window = windowRecord['window']
         value = self.getRuntimeValue(command['value'])
         self.utils.updateProperty(window[key], property, value)
         return self.nextPC()
@@ -374,8 +374,7 @@ class Graphics(Handler):
 
     #############################################################################
     # The main loop
-    def mainLoop(self):
-        windowRecord = self.program.windowRecord
+    def mainLoop(self, windowRecord):
         window = windowRecord['window']
         eventHandlers = windowRecord['eventHandlers']
         while True:

{easycoder-250301.3 → easycoder-250317.1}/easycoder/ec_handler.py

@@ -3,6 +3,7 @@ import json
 class Handler:
 
 	def __init__(self, compiler):
+		self.compiler = compiler
 		self.program = compiler.program
 		self.getToken = compiler.getToken
 		self.nextToken = compiler.nextToken

{easycoder-250301.3 → easycoder-250317.1}/easycoder/ec_program.py

@@ -375,6 +375,9 @@ class Program:
 		if type(v2) == int:
 			if type(v1) != int:
 				v2 = f'{v2}'
+		if type(v1) == dict and type(v2) == dict:
+			v1 = json.dumps(v1)
+			v2 = json.dumps(v2)
 		if v1 > v2:
 			return 1
 		if v1 < v2: