easycoder 260116.1__tar.gz → 260119.1__tar.gz

{easycoder-260116.1 → easycoder-260119.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 260116.1
+Version: 260119.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-260116.1 → easycoder-260119.1}/easycoder/__init__.py

@@ -15,4 +15,4 @@ from .ec_psutil import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "260116.1"
+__version__ = "260119.1"

{easycoder-260116.1 → easycoder-260119.1}/easycoder/ec_classes.py

@@ -312,6 +312,16 @@ class ECValueHolder(ECObject):
     # Reset the object to empty state
     def reset(self):
         self.setValue(ECValue(content=None))
+    
+    def textify(self):
+        v = self.getValue()
+        if v is None:
+            return ""
+        elif isinstance(v, str):
+            return json.dumps(v)
+        elif isinstance(v, ECValue):
+            return v.getContent()
+        return v
 
 ###############################################################################
 # A string or int variable
@@ -351,7 +361,7 @@ class ECDictionary(ECValueHolder):
             if types_equal(varType, str):
                 try:
                     if content in ('', {}, None): content = {}
-                    else: content = json.loads(content)
+                    elif content[0] in ('{', '['): content = json.loads(content) # type: ignore
                 except:
                     raise RuntimeError(None, 'ECDictionary string value is not valid JSON') # type: ignore
         elif varType == None:
@@ -387,7 +397,10 @@ class ECDictionary(ECValueHolder):
         content = self.getValue()
         if content is None:
             return None
-        return content.get(key, None)
+        if key in content:
+             return content[key]
+        else:
+             return None
 
     # Delete an entry from the dictionary
     def deleteEntry(self, key):

{easycoder-260116.1 → easycoder-260119.1}/easycoder/ec_core.py

@@ -166,12 +166,32 @@ class Core(Handler):
             return self.compileFromHere(['end'])
 
     # clear {variable}
+    # clear entry {name} of {dictionary}
+    # clear item {index} of {list}
     def k_clear(self, command):
         token = self.nextToken()
         if token == 'breakpoint':
             command['breakpoint'] = True
             self.add(command)
             return True
+        elif token == 'entry':
+            command['key'] = self.nextValue()
+            self.skip('of')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                self.checkObjectType(self.getObject(record), ECDictionary)
+                command['target'] = record['name']
+                self.add(command)
+                return True
+        elif token == 'item':
+            command['index'] = self.nextValue()
+            self.skip('of')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                self.checkObjectType(self.getObject(record), ECList)
+                command['target'] = record['name']
+                self.add(command)
+                return True
         elif self.isSymbol():
             record = self.getSymbolRecord()
             command['target'] = record['name']
@@ -187,6 +207,14 @@ class Core(Handler):
     def r_clear(self, command):
         if 'breakpoint' in command:
             self.program.breakpoint = False
+        elif 'key' in command:
+            key = self.textify(command['key'])
+            record = self.getVariable(command['target'])
+            self.getObject(record).setEntry(key, ECValue(type=bool, content=False))
+        elif 'index' in command:
+            index = self.textify(command['index'])
+            record = self.getVariable(command['target'])
+            self.getObject(record).setItem(index, ECValue(type=bool, content=False))
         else:
             target = self.getVariable(command['target'])
             if target['keyword'] == 'ssh':
@@ -1373,8 +1401,9 @@ class Core(Handler):
         return self.nextPC()
 
     # Set a value
-    # set {variable}
-    # set {variable} to {value}
+    # set {variable} [to {value}]
+    # set entry {key} of {dictionary} [to {value}]
+    # set item {index} of {list} [to {value}]
     # set {ssh} host {host} user {user} password {password}
     # set the items/elements in/of {variable} to {value}
     # set item/entry/property of {variable} to {value}
@@ -1405,14 +1434,15 @@ class Core(Handler):
                 command['type'] = 'ssh'
                 self.add(command)
                 return True
-            elif isinstance(self.getObject(record), ECVariable):
+            elif isinstance(self.getObject(record), (ECVariable, ECDictionary, ECList)):
                 if self.peek() == 'to':
                     self.nextToken()
                     value = self.nextValue()
                     command['type'] = 'setValue'
                     command['value'] = value
-                else:
+                elif isinstance(self.getObject(record), ECVariable):
                     command['type'] = 'set'
+                else: return False
                 self.add(command)
                 return True
             return False
@@ -1447,12 +1477,23 @@ class Core(Handler):
                     record = self.getSymbolRecord()
                     if token == 'entry':
                         self.checkObjectType(self.getObject(record), ECDictionary)
+                    elif token == 'item':
+                        self.checkObjectType(self.getObject(record), ECList)
                     command['target'] = record['name']
-                    if self.nextIs('to'):
-                        value = self.nextValue()
-                        if value == None:
-                            FatalError(self.compiler, 'Unable to get a value')
-                        command['value'] = value
+                    if self.peek() == 'to':
+                        self.nextToken()
+                        if self.nextIsSymbol():
+                            record = self.getSymbolRecord()
+                            command['name'] = record['name']
+                        else:
+                            value = self.getValue()
+                            if value == None:
+                                FatalError(self.compiler, 'Unable to get a value')
+                            command['value'] = value
+                        self.add(command)
+                        return True
+                    else: # Set True
+                        command['value'] = ECValue(type=bool, content=True)
                         self.add(command)
                         return True
 
@@ -1499,6 +1540,18 @@ class Core(Handler):
             object.setElements(elements)
             return self.nextPC()
 
+        elif cmdType == 'entry':
+            key = self.textify(command['key'])
+            if 'name' in command:
+                value = self.textify(self.getVariable(command['name']))
+            elif 'value' in command:
+                value = self.textify(command['value'])
+            record = self.getVariable(command['target'])
+            self.checkObjectType(self.getObject(record), ECDictionary)
+            variable = self.getObject(record)
+            variable.setEntry(key, value)
+            return self.nextPC()
+
         elif cmdType == 'item':
             index = self.textify(command['index'])
             value = self.textify(command['value'])
@@ -1517,15 +1570,6 @@ class Core(Handler):
             os.chdir(path)
             return self.nextPC()
 
-        elif cmdType == 'entry':
-            key = self.textify(command['key'])
-            value = self.textify(command['value'])
-            record = self.getVariable(command['target'])
-            self.checkObjectType(self.getObject(record), ECDictionary)
-            variable = self.getObject(record)
-            variable.setEntry(key, value)
-            return self.nextPC()
-
         elif cmdType == 'property':
             key = self.textify(command['key'])
             value = self.evaluate(command['value'])

{easycoder-260116.1 → easycoder-260119.1}/easycoder/ec_gclasses.py

@@ -75,6 +75,13 @@ class ECLabel(ECTextWidget):
     # This is a core class
     def isCoreClass(self):
         return True
+    
+    def getContent(self):
+        return self.getValue().text() # type: ignore
+    
+    # Get the text of the widget
+    def textify(self):
+        return self.getContent()
 
 ###############################################################################
 # A pushbutton variable
@@ -100,7 +107,7 @@ class ECCheckBox(ECCoreWidget):
     def getContent(self):
         v = self.getValue()
         if v is None: return None
-        return v.getContent().isChecked() # type: ignore
+        return v.isChecked() # type: ignore
 
 ###############################################################################
 # A line input widget
@@ -120,15 +127,13 @@ class ECLineInput(ECTextWidget):
 
     # Get the content of the value at the current index
     def getContent(self):
-        v = self.getValue()
-        if v is None: return None
-        return v
+        value = self.getValue()
+        if value is None: return None
+        return value.text()
     
     # Get the text of the widget
-    def getText(self):
-        content = self.getContent()
-        if content is None: return None
-        return content.text() # type: ignore
+    def textify(self):
+        return self.getContent()
     
 ###############################################################################
 # A multiline widget
@@ -152,9 +157,13 @@ class ECMultiline(ECTextWidget):
 
     # Get the content of the value at the current index
     def getContent(self):
-        v = self.getValue()
-        if v is None: return None
-        return v.getContent().text()
+        value = self.getValue()
+        if value is None: return None
+        return value.toPlainText()
+    
+    # Get the text of the widget
+    def textify(self):
+        return self.getContent()
 
 ###############################################################################
 # A listbox variable

{easycoder-260116.1 → easycoder-260119.1}/easycoder/ec_graphics.py

@@ -1627,7 +1627,7 @@ class Graphics(Handler):
             v = ECValue(domain=self.getName(), type=str, content=content)
             return v
         elif self.isObjectType(record, ECCheckBox):
-            checkbox =self.getInnerObject(record)
+            checkbox = self.getInnerObject(record)
             content = checkbox.isChecked()  # type: ignore
             v = ECValue(domain=self.getName(), type=bool, content=content)
             return v