easycoder 250723.4__py2.py3-none-any.whl → 250724.2__py2.py3-none-any.whl

easycoder/__init__.py

@@ -11,4 +11,4 @@ from .ec_pyside import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250723.4"
+__version__ = "250724.2"

easycoder/ec_core.py

@@ -17,6 +17,26 @@ class Core(Handler):
     
     def noSymbolWarning(self):
         self.warning(f'Symbol "{self.getToken()}" not found')
+    
+    def processOr(self, command, orHere):
+        self.add(command)
+        if self.peek() == 'or':
+            self.nextToken()
+            self.nextToken()
+            # Add a 'goto' to skip the 'or'
+            cmd = {}
+            cmd['lino'] = command['lino']
+            cmd['domain'] = 'core'
+            cmd['keyword'] = 'gotoPC'
+            cmd['goto'] = 0
+            cmd['debug'] = False
+            skip = self.getPC()
+            self.add(cmd)
+            # Process the 'or'
+            self.getCommandAt(orHere)['or'] = self.getPC()
+            self.compileOne()
+            # Fixup the skip
+            self.getCommandAt(skip)['goto'] = self.getPC()
 
     #############################################################################
     # Keyword handlers
@@ -453,24 +473,7 @@ class Core(Handler):
                         timeout['type'] = 'int'
                         timeout['content'] = 5
                         command['timeout'] = timeout
-                    self.add(command)
-                    if self.peek() == 'or':
-                        self.nextToken()
-                        self.nextToken()
-                        # Add a 'goto' to skip the 'or'
-                        cmd = {}
-                        cmd['lino'] = command['lino']
-                        cmd['domain'] = 'core'
-                        cmd['keyword'] = 'gotoPC'
-                        cmd['goto'] = 0
-                        cmd['debug'] = False
-                        skip = self.getPC()
-                        self.add(cmd)
-                        # Process the 'or'
-                        self.getCommandAt(get)['or'] = self.getPC()
-                        self.compileOne()
-                        # Fixup the skip
-                        self.getCommandAt(skip)['goto'] = self.getPC()
+                    self.processOr(command, get)
                     return True
         return False
 
@@ -751,24 +754,7 @@ class Core(Handler):
                         command['file'] = self.getValue()
                     command['or'] = None
                     load = self.getPC()
-                    self.add(command)
-                    if self.peek() == 'or':
-                        self.nextToken()
-                        self.nextToken()
-                        # Add a 'goto' to skip the 'or'
-                        cmd = {}
-                        cmd['lino'] = command['lino']
-                        cmd['domain'] = 'core'
-                        cmd['keyword'] = 'gotoPC'
-                        cmd['goto'] = 0
-                        cmd['debug'] = False
-                        skip = self.getPC()
-                        self.add(cmd)
-                        # Process the 'or'
-                        self.getCommandAt(load)['or'] = self.getPC()
-                        self.compileOne()
-                        # Fixup the skip
-                        self.getCommandAt(skip)['goto'] = self.getPC()
+                    self.processOr(command, load)
                     return True
         else:
             FatalError(self.compiler, f'I don\'t understand \'{self.getToken()}\'')
@@ -1023,24 +1009,7 @@ class Core(Handler):
             command['result'] = None
         command['or'] = None
         post = self.getPC()
-        self.add(command)
-        if self.peek() == 'or':
-            self.nextToken()
-            self.nextToken()
-            # Add a 'goto' to skip the 'or'
-            cmd = {}
-            cmd['lino'] = command['lino']
-            cmd['domain'] = 'core'
-            cmd['keyword'] = 'gotoPC'
-            cmd['goto'] = 0
-            cmd['debug'] = False
-            skip = self.getPC()
-            self.add(cmd)
-            # Process the 'or'
-            self.getCommandAt(post)['or'] = self.getPC()
-            self.compileOne()
-            # Fixup the skip
-            self.getCommandAt(skip)['goto'] = self.getPC()
+        self.processOr(command, post)
         return True
 
     def r_post(self, command):
@@ -1137,7 +1106,8 @@ class Core(Handler):
                     if 'hasValue' in symbolRecord and symbolRecord['hasValue'] == False:
                         FatalError(self.compiler, f'Symbol {symbolRecord["name"]} is not a value holder')
                     else:
-                        self.add(command)
+                        command['or'] = None
+                        self.processOr(command, self.getPC())
                         return True
                 else:
                     FatalError(self.compiler, f'Symbol {self.getToken()} is not a variable')
@@ -1146,7 +1116,10 @@ class Core(Handler):
     def r_put(self, command):
         value = self.evaluate(command['value'])
         if value == None:
-            return -1
+            if command['or'] != None:
+                return command['or']
+            else:
+                RuntimeError(self.program, f'Error: could not compute value')
         symbolRecord = self.getVariable(command['target'])
         if not symbolRecord['hasValue']:
             NoValueRuntimeError(self.program, symbolRecord)
@@ -1303,24 +1276,7 @@ class Core(Handler):
             command['file'] = self.getValue()
         command['or'] = None
         save = self.getPC()
-        self.add(command)
-        if self.peek() == 'or':
-            self.nextToken()
-            self.nextToken()
-            # Add a 'goto' to skip the 'or'
-            cmd = {}
-            cmd['lino'] = command['lino']
-            cmd['domain'] = 'core'
-            cmd['keyword'] = 'gotoPC'
-            cmd['goto'] = 0
-            cmd['debug'] = False
-            skip = self.getPC()
-            self.add(cmd)
-            # Process the 'or'
-            self.getCommandAt(save)['or'] = self.getPC()
-            self.compileOne()
-            # Fixup the skip
-            self.getCommandAt(skip)['goto'] = self.getPC()
+        self.processOr(command, save)
         return True
 
     def r_save(self, command):
@@ -2396,7 +2352,7 @@ class Core(Handler):
         try:
             value['content'] = json.loads(item)
         except:
-            RuntimeError(self.program, 'Cannot encode value')
+            value = None
         return value
 
     def v_keys(self, v):

easycoder/ec_keyboard.py

@@ -52,9 +52,12 @@ class Keyboard(Handler):
             if icon_rect.contains(event.pos()):
                 self.iconClicked.emit()
             elif self._bar_rect().contains(event.pos()):
-                self._drag_active = True
-                self._drag_start_pos = event.globalPosition().toPoint()
-                self._dialog_start_pos = self.window().pos()
+                if hasattr(self.window().windowHandle(), 'startSystemMove'):
+                    self.window().windowHandle().startSystemMove()
+                else:
+                    self._drag_active = True
+                    self._drag_start_pos = event.globalPosition().toPoint()
+                    self._dialog_start_pos = self.window().pos()
             else:
                 super().mousePressEvent(event)
 

{easycoder-250723.4.dist-info → easycoder-250724.2.dist-info}/METADATA

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: easycoder
-Version: 250723.4
+Version: 250724.2
 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>
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
+License-File: LICENSE
 Requires-Dist: pytz
 Requires-Dist: requests
 Requires-Dist: psutil

{easycoder-250723.4.dist-info → easycoder-250724.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
-easycoder/__init__.py,sha256=kuHZrjcpfrsKv9HmpPu7wGiC-7X8n58sed54Mp_iDpQ,314
+easycoder/__init__.py,sha256=j2BQW6jHjAJh7T5w18SvotjXXljIV-2dc9iIo-g-UsE,314
 easycoder/close.png,sha256=3B9ueRNtEu9E4QNmZhdyC4VL6uqKvGmdfeFxIV9aO_Y,9847
 easycoder/ec_classes.py,sha256=PWPaJuTfaWD4-tgT-2WWOgeFV_jXxlxyKCxvXyylCUU,1824
 easycoder/ec_compiler.py,sha256=9byLqJZgMHAyFFyD8eGhY77oTsY1GY1aVcVrU4JAbd4,5287
 easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
-easycoder/ec_core.py,sha256=U1iOw0FKqAAvSShiDyFmBc9LlPyDRxzvgXlioSEK-KI,99679
+easycoder/ec_core.py,sha256=JHcxmD2xq4Fy35CVkOWJOikKO31eV22EwiRwqxg-ILs,97786
 easycoder/ec_handler.py,sha256=ohf3xUuWw_Qb5SZnulGtDhvCb11kvWtYfgbQTiOXpIY,2261
-easycoder/ec_keyboard.py,sha256=6BFH3JuWq5gtkZd6x1Xi6I7SY19648VWJig54zztre4,19493
+easycoder/ec_keyboard.py,sha256=gxRUe4xPCkGImKC8zTlbVOJwCXtBsBKGo7ExZi4Vczc,19671
 easycoder/ec_program.py,sha256=SHg8NV9g-DclSWz8pQzgAiElreoYrI1FR1NrZS4_hIA,9968
 easycoder/ec_pyside.py,sha256=15-brpZnAZTkR111KYllbo7k3qbbqr4Umww_ngzhsmk,42243
 easycoder/ec_timestamp.py,sha256=myQnnF-mT31_1dpQKv2VEAu4BCcbypvMdzq7_DUi1xc,277
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250723.4.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250723.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250723.4.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-easycoder-250723.4.dist-info/METADATA,sha256=calLHfxDl3CH9DOgxzvct872pUb5tOKklO1MgLIy3fQ,6875
-easycoder-250723.4.dist-info/RECORD,,
+easycoder-250724.2.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250724.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250724.2.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+easycoder-250724.2.dist-info/METADATA,sha256=H4nBcI6JX0WV11O2AlNKCMM176uF86zCG0VClnR8rJ0,6897
+easycoder-250724.2.dist-info/RECORD,,

{easycoder-250723.4.dist-info → easycoder-250724.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: flit 3.10.1
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any