easycoder 250204.1__tar.gz → 250205.1__tar.gz

{easycoder-250204.1 → easycoder-250205.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easycoder
-Version: 250204.1
+Version: 250205.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-250204.1 → easycoder-250205.1}/easycoder/README.md

@@ -1,6 +1,6 @@
 # EasyCode source code
 These are the Python files that comprise **_EasyCoder_**.
 
-**_EasyCoder_** has a small number of third-party dependencies. A minor one is `pytz`, which handles timezones. The biggest one by far is `kivy`, a comprehensive Python graphics library.
+**_EasyCoder_** has a small number of third-party dependencies. A minor one is `pytz`, which handles timezones. The biggest one by far is `PySimpleGUI`, a comprehensive Python graphics library.
 
-If an **_EasyCoder_** script filename ends with `.ecs` it's a command-line script. If it ends with `.ecg` it's a script for a graphical application and will cause `kivy` to be imported. Obviously this will only work on a GUI-based system, whereas command-line scripts will run anywhere there is Python.
+If an **_EasyCoder_** script filename ends with `.ecs` it's a command-line script. If it ends with `.ecg` it's a script for a graphical application and will cause `PySimpleGUI` to be imported. Obviously this will only work on a GUI-based system, whereas command-line scripts will run anywhere there is Python.

{easycoder-250204.1 → easycoder-250205.1}/easycoder/__init__.py

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

{easycoder-250204.1 → easycoder-250205.1}/easycoder/ec_core.py

@@ -484,6 +484,7 @@ class Core(Handler):
         except:
             pass
         RuntimeError(self.program, f'There is no label "{label}"')
+        return None
 
     def r_gotoPC(self, command):
         return command['goto']
@@ -498,14 +499,12 @@ class Core(Handler):
 
     def r_gosub(self, command):
         label = command['gosub'] + ':'
-        try:
-            address = self.symbols[label]
-            if address != None:
-                self.stack.append(self.nextPC())
-                return address
-        except:
-            pass
-        RuntimeError(self.program, f'There is no label "{label}"')
+        address = self.symbols[label]
+        if address != None:
+            self.stack.append(self.nextPC())
+            return address
+        RuntimeError(self.program, f'There is no label "{label + ":"}"')
+        return None
 
     # if <condition> <action> [else <action>]
     def k_if(self, command):
@@ -1005,8 +1004,10 @@ class Core(Handler):
         lino = str(code['lino'] + 1)
         while len(lino) < 5: lino = f' {lino}'
         if value == None: value = '<empty>'
-        if 'log' in command: print(f'{datetime.now().time()}:{lino}-> {value}')
-        else: print(value)
+        if 'log' in command:
+            print(f'{datetime.now().time()}:{lino}-> {value}')
+        else:
+            print(value)
         return self.nextPC()
 
     # Push a value onto a stack
@@ -1817,10 +1818,12 @@ class Core(Handler):
             return None
 
         if token == 'value':
-            value['type'] = 'valueOf'
             if self.nextIs('of'):
-                value['content'] = self.nextValue()
-                return value
+                v = self.nextValue()
+                if v !=None:
+                    value['type'] = 'valueOf'
+                    value['content'] = v
+                    return value
             return None
 
         if token == 'length':
@@ -1989,10 +1992,6 @@ class Core(Handler):
         value['type'] = 'text'
         if self.encoding == 'utf-8':
             value['content'] = content.decode('utf-8')
-        elif self.encoding == 'hex':
-            b = content.encode('utf-8')
-            mb = binascii.unhexlify(b)
-            value['content'] = mb.decode('utf-8')
         elif self.encoding == 'base64':
             base64_bytes = content.encode('ascii')
             message_bytes = base64.b64decode(base64_bytes)
@@ -2036,10 +2035,6 @@ class Core(Handler):
         value['type'] = 'text'
         if self.encoding == 'utf-8':
             value['content'] = content.encode('utf-8')
-        elif self.encoding == 'hex':
-            b = content.encode('utf-8')
-            mb = binascii.hexlify(b)
-            value['content'] = mb.decode('utf-8')
         elif self.encoding == 'base64':
             data_bytes = content.encode('ascii')
             base64_bytes = base64.b64encode(data_bytes)
@@ -2405,11 +2400,22 @@ class Core(Handler):
             if self.nextToken() == 'with':
                 condition.value2 = self.nextValue()
                 return condition
+            return None
 
         if token == 'includes':
             condition.value2 = self.nextValue()
             return condition
 
+        if token == 'does':
+            self.nextToken()
+            if self.nextIs('not'):
+                if self.nextIs('include'):
+                    condition.value2 = self.nextValue()
+                    condition.type = 'includes'
+                    condition.negate = True
+                    return condition
+            return None
+
         if token == 'is':
             token = self.nextToken()
             if self.peek() == 'not':
@@ -2497,7 +2503,8 @@ class Core(Handler):
     def c_includes(self, condition):
         value1 = self.getRuntimeValue(condition.value1)
         value2 = self.getRuntimeValue(condition.value2)
-        return value2 in value1
+        test = value2 in value1
+        return not test if condition.negate else test
 
     def c_is(self, condition):
         comparison = self.program.compare(condition.value1, condition.value2)

{easycoder-250204.1 → easycoder-250205.1}/easycoder/ec_graphics.py

@@ -1,4 +1,5 @@
-from .ec_classes import FatalError, RuntimeError, Handler
+from .ec_classes import FatalError, RuntimeError
+from .ec_handler import Handler
 from .ec_gutils import GUtils
 import PySimpleGUI as psg
 import json