easycoder 250504.1__py2.py3-none-any.whl → 250505.3__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__ = "250504.1"
+__version__ = "250505.3"

easycoder/ec_core.py

@@ -260,24 +260,27 @@ class Core(Handler):
     # Delete a file or a property
     # delete {filename}
     # delete property {value} of {variable}
+    # delete element {name} of {variable}
     def k_delete(self, command):
         token = self.nextToken( )
+        command['type'] = token
         if token == 'file':
-            command['type'] = 'file'
             command['filename'] = self.nextValue()
             self.add(command)
             return True
-        elif token == 'property':
-            command['key'] = self.nextValue();
-            if self.nextIs('of'):
-                command['type'] = 'property'
-                command['var'] = self.nextToken()
-                self.add(command)
-                return True
-            else:
-                self.warning(f'Core.delete: "of" expected; got {self.getToken()}')
+        elif token in ['property', 'element']:
+            command['key'] = self.nextValue()
+            self.skip('of')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['hasValue']:
+                    command['var'] = record['name']
+                    self.add(command)
+                    return True
+                FatalError(self.compiler, f'Variable {record['name']} does not hold a value')
+            self.warning(f'Core.delete: variable expected; got {self.getToken()}')
         else:
-            self.warning(f'Core.delete: "file" or "property" expected; got {token}')
+            self.warning(f'Core.delete: "file", "property" or "element" expected; got {token}')
         return False
 
     def r_delete(self, command):
@@ -295,6 +298,14 @@ class Core(Handler):
             content.pop(key, None)
             value['content'] = content
             self.putSymbolValue(symbolRecord, value)
+        elif type == 'element':
+            key = self.getRuntimeValue(command['key'])
+            symbolRecord = self.getVariable(command['var'])
+            value = self.getSymbolValue(symbolRecord)
+            content = value['content']
+            content.remove(key)
+            value['content'] = content
+            self.putSymbolValue(symbolRecord, value)
         return self.nextPC()
 
     # Arithmetic division
@@ -921,7 +932,7 @@ class Core(Handler):
                     command['from'] = self.getToken()
                     self.add(command)
                     return True
-        return False;
+        return False
 
     def r_pop(self, command):
         symbolRecord = self.getVariable(command['target'])
@@ -929,7 +940,7 @@ class Core(Handler):
             RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
         stackRecord = self.getVariable(command['from'])
         stack = self.getSymbolValue(stackRecord)
-        v = stack.pop();
+        v = stack.pop()
         self.putSymbolValue(stackRecord, stack)
         value = {}
         value['type'] = 'int' if type(v) == int else 'text'
@@ -1725,7 +1736,6 @@ class Core(Handler):
         symbolRecord = self.getVariable(command['target'])
         if not symbolRecord['hasValue']:
             RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
-            return None
         value = self.getSymbolValue(symbolRecord)
         if value == None:
             RuntimeError(self.program, f'{symbolRecord["name"]} has not been initialised')
@@ -2479,13 +2489,20 @@ class Core(Handler):
         if token == 'does':
             self.nextToken()
             if self.nextIs('not'):
-                if self.nextIs('have'):
+                token = self.nextToken()
+                if token == 'have':
                     if self.nextToken() == 'property':
                         prop = self.nextValue()
                         condition.type = 'hasProperty'
                         condition.property = prop
                         condition.negate = not condition.negate
                         return condition
+                elif token == 'include':
+                    value = self.nextValue()
+                    condition.type = 'includes'
+                    condition.value2 = value
+                    condition.negate = not condition.negate
+                    return condition
             return None
 
         if token in ['starts', 'ends']:
@@ -2586,7 +2603,8 @@ class Core(Handler):
     def c_includes(self, condition):
         value1 = self.getRuntimeValue(condition.value1)
         value2 = self.getRuntimeValue(condition.value2)
-        return value2 in value1
+        includes = value2 in value1
+        return not includes if condition.negate else includes
 
     def c_is(self, condition):
         comparison = self.program.compare(condition.value1, condition.value2)

easycoder/ec_pyside.py

@@ -297,7 +297,7 @@ class Graphics(Handler):
         if self.peek() == 'size':
             self.nextToken()
             size = self.nextValue()
-        else: size = 10
+        else: size = self.compileConstant(10)
         command['size'] = size
         self.add(command)
         return True
@@ -714,6 +714,7 @@ class Graphics(Handler):
     # set [the] width/height [of] {widget} [to] {value}
     # set [the] text [of] {label}/{button}/{lineinput} [to] {text}
     # set [the] color [of] {label}/{button}/{lineinput} [to] {color}
+    # set [the] state [of] {checkbox} [to] {color}
     # set {listbox} to {list}
     def k_set(self, command):
         self.skip('the')
@@ -739,6 +740,16 @@ class Graphics(Handler):
                     command['value'] = self.nextValue()
                     self.add(command)
                     return True
+        elif token == 'state':
+            self.skip('of')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'checkbox':
+                    command['name'] = record['name']
+                    self.skip('to')
+                    command['value'] = self.nextValue()
+                    self.add(command)
+                    return True
         elif token == 'color':
             self.skip('of')
             if self.nextIsSymbol():
@@ -786,6 +797,10 @@ class Graphics(Handler):
             widget.setText(text)
             if record['keyword'] == 'pushbutton':
                 widget.setAccessibleName(text)
+        elif what == 'state':
+            widget = self.getVariable(command['name'])['widget']
+            state = self.getRuntimeValue(command['value'])
+            widget.setChecked(state)
         elif what == 'color':
             widget = self.getVariable(command['name'])['widget']
             color = self.getRuntimeValue(command['value'])
@@ -797,6 +812,7 @@ class Graphics(Handler):
         elif what == 'listbox':
             widget = self.getVariable(command['name'])['widget']
             value = self.getRuntimeValue(command['value'])
+            widget.clear()
             widget.addItems(value)
         return self.nextPC()
 
@@ -889,36 +905,35 @@ class Graphics(Handler):
         value['domain'] = self.getName()
         token = self.getToken()
         if self.isSymbol():
-            value['name'] = token
-            value['type'] = 'symbol'
-            return value
-
-        if self.tokenIs('the'):
-            self.nextToken()
-        token = self.getToken()
-
-        if token == 'count':
-            self.skip('of')
-            if self.nextIsSymbol():
+            if self.getSymbolRecord()['extra'] == 'gui':
+                value['name'] = token
                 value['type'] = 'symbol'
-                record = self.getSymbolRecord()
-                keyword = record['keyword']
-                if keyword in ['combobox', 'listbox']:
-                    value['type'] = 'count'
-                    value['name'] = record['name']
-                    return value
-        
-        if token == 'current':
-            self.skip('item')
-            self.skip('in')
-            if self.nextIsSymbol():
-                value['type'] = 'symbol'
-                record = self.getSymbolRecord()
-                keyword = record['keyword']
-                if keyword == 'listbox':
-                    value['type'] = 'current'
-                    value['name'] = record['name']
-                    return value
+                return value
+
+        else:
+            if self.tokenIs('the'): token = self.nextToken()
+            if token == 'count':
+                self.skip('of')
+                if self.nextIsSymbol():
+                    value['type'] = 'symbol'
+                    record = self.getSymbolRecord()
+                    keyword = record['keyword']
+                    if keyword in ['combobox', 'listbox']:
+                        value['type'] = 'count'
+                        value['name'] = record['name']
+                        return value
+            
+            elif token == 'current':
+                self.skip('item')
+                self.skip('in')
+                if self.nextIsSymbol():
+                    value['type'] = 'symbol'
+                    record = self.getSymbolRecord()
+                    keyword = record['keyword']
+                    if keyword == 'listbox':
+                        value['type'] = 'current'
+                        value['name'] = record['name']
+                        return value
 
         return None
 
@@ -959,6 +974,13 @@ class Graphics(Handler):
             v['type'] = 'text'
             v['content'] = content
             return v
+        elif keyword == 'checkbox':
+            checkbox = symbolRecord['widget']
+            content = checkbox.isChecked()
+            v = {}
+            v['type'] = 'boolean'
+            v['content'] = content
+            return v
         return None
 
     def v_count(self, v):

{easycoder-250504.1.dist-info → easycoder-250505.3.dist-info}/METADATA

@@ -1,12 +1,11 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: easycoder
-Version: 250504.1
+Version: 250505.3
 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: pyside6
 Project-URL: Home, https://github.com/easycoder/easycoder-py
@@ -14,7 +13,7 @@ Project-URL: Home, https://github.com/easycoder/easycoder-py
 # Introduction
 **_EasyCoder_** is a high-level English-like domain-specific scripting language (DSL) suited for prototyping and rapid testing of ideas. It operates on the command line and a graphics module is under construction. The language is written in Python and it acts as a fairly thin wrapper around standard Python functions, giving fast compilation and good runtime performance for general applications.
 
-**_EasyCoder_** is well suited to building command-line or graphical applications for expressing random logic such as operating procedures and rules, or controlling physical systems, primarily wifi devices. It is particularly easy to construct and issue REST commands to local or remote web servers.
+**_EasyCoder_** is well suited to building command-line or graphical applications for expressing random logic such as operating procedures and rules, or controlling physical systems, particularly those using wifi devices. It is easy to construct and issue REST commands to local or remote web servers.
 
 For more advanced applications, **_EasyCoder_** is designed to be extensible, by enabling extra language syntax to be added via plugin-in modules. Once these are installed they act as seamless extensions to the basic syntax provided. **_EasyCoder_** derives its power from the use of rich and comprehensive language rather than a complex system of frameworks such as those commonly used in modern programming. This makes it very easy to learn as our brains are wired to operate that way. Having said that, the needs of most control systems are usually served by a fairly modest number of keywords and syntactic variants.
 <hr>

{easycoder-250504.1.dist-info → easycoder-250505.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
 easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
-easycoder/__init__.py,sha256=EGnBVcP5HZKaL9fLqsey2v6VejGMeqhyENBsyHElMgw,262
+easycoder/__init__.py,sha256=c8tAQyiYf2jD3A5tSYSTllTS3Wdbn3PXTZXOm_VHKv8,262
 easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
 easycoder/ec_compiler.py,sha256=vNOAKIK2pX_cW4mcxwCe0OR16iqeZqvZQ6JCgQ5MqtU,5062
 easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
-easycoder/ec_core.py,sha256=4mFDsTS0Cd_Z0li8Oad_EMT783weuSm3S1IlWSoXIMY,91286
+easycoder/ec_core.py,sha256=U5PIYmQNhA3QF2tlQ8luX83Aqio8sdqzXZCGI1hiSeY,92221
 easycoder/ec_graphics.py,sha256=WXxKMB4GJSmxvk-FVbOTyufiUx4TYIzyDoB1PCAO3JY,16067
 easycoder/ec_gutils.py,sha256=yqu4RRQ6VdRkC5B2ADBYsXzgNu76dLnekd9aUjdEgPw,6399
 easycoder/ec_handler.py,sha256=zPDZ_hqdgNnkCd8B5HmSLkqsGgf4aDmqcUBOPHgo47U,2305
 easycoder/ec_program.py,sha256=CxGYl1slYXNOYFxiSMc-BuXL_QztYuBfCXltPCtw1U4,10011
-easycoder/ec_pyside.py,sha256=6GIZpnmIj9LissJopfqcSvc1i1qbl4h56PQsJXOu9XU,36005
+easycoder/ec_pyside.py,sha256=gXAinTNQ-NC-TrSfEXGVY4Fmcy5uV_jDAoN_IsdNtiI,37080
 easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250504.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250504.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250504.1.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
-easycoder-250504.1.dist-info/METADATA,sha256=WFCQMbyGyIaudwFDHkiXLAfz4VtOkx2OBuPAV-NAelo,6825
-easycoder-250504.1.dist-info/RECORD,,
+easycoder-250505.3.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250505.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250505.3.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+easycoder-250505.3.dist-info/METADATA,sha256=Oc8nm1uq23c2Q1ZObOZ6sERoIwbFHbBHeMzIL_bPDUY,6805
+easycoder-250505.3.dist-info/RECORD,,

{easycoder-250504.1.dist-info → easycoder-250505.3.dist-info}/WHEEL

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