easycoder 250301.3__py2.py3-none-any.whl → 250317.1__py2.py3-none-any.whl

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/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/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/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:

{easycoder-250301.3.dist-info → easycoder-250317.1.dist-info}/METADATA

@@ -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.dist-info → easycoder-250317.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
 easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
-easycoder/__init__.py,sha256=X5CzPPW9v279AOqSadtoiU-YzpDe-LWqAY7QuU1rGDw,262
+easycoder/__init__.py,sha256=i9vOIAO-m1MSvrt7lGPHDpUA4-z5gjSIOB-XDmhZzww,262
 easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
 easycoder/ec_compiler.py,sha256=rtxFEWnhW0550MtWEDvYHOw9cYkeTcR0oG3t-kmgnBk,4795
 easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
 easycoder/ec_core.py,sha256=u4v023v26kjXU-_B46IpMeM8Lb2mUSLnpzmAs2Z83mI,88454
-easycoder/ec_graphics.py,sha256=N3Iy9IRLxgvgvwPrYZ_YYwrHzQOeloTuKB6md_U82XM,14407
+easycoder/ec_graphics.py,sha256=sOQlSDpMMjwilLzGkC57-iHdaRqIUWl1SJxc0NbLs1M,14377
 easycoder/ec_gutils.py,sha256=yqu4RRQ6VdRkC5B2ADBYsXzgNu76dLnekd9aUjdEgPw,6399
-easycoder/ec_handler.py,sha256=IJvxcrJJSR53d6DS_8H5qPHKhp9y5-GV4WXAjhZxu_o,2250
-easycoder/ec_program.py,sha256=BDwU7aGHiaw6WdbQvVFDhGVaHsvwQ1CWa4wb5MPmOe8,10013
+easycoder/ec_handler.py,sha256=K7nBuQTH8l0k8hX1o2b4KhTnhZHGdf2fkEuX4FJXJs8,2277
+easycoder/ec_program.py,sha256=Ms-GOtd22TjqvxXkNtfNer725WgQmZiHXlNHLlwMGvs,10103
 easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250301.3.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250301.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250301.3.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-easycoder-250301.3.dist-info/METADATA,sha256=2X-1Y-jLNyx-7-cpEMgt7v5_X-Ytl_6157zwHhavdU8,6155
-easycoder-250301.3.dist-info/RECORD,,
+easycoder-250317.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250317.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250317.1.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+easycoder-250317.1.dist-info/METADATA,sha256=zDaRKetMg3ZGC3NoKWh5k1GK0LWI2O1DgjbZ_JHiaKY,6155
+easycoder-250317.1.dist-info/RECORD,,