easycoder 250205.1__tar.gz → 250209.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easycoder
-Version: 250205.1
+Version: 250209.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-250205.1 → easycoder-250209.1}/easycoder/__init__.py

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

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

@@ -706,9 +706,12 @@ class Core(Handler):
     def r_load(self, command):
         target = self.getVariable(command['target'])
         file = self.getRuntimeValue(command['file'])
-        f = open(file, 'r')
-        content = f.read()
-        f.close()
+        try:
+            with open(file, 'r') as f:
+                content = f.read()
+        except:
+            content=None
+        if content != None and file.endswith('.json'): content = json.loads(content)
         value = {}
         value['type'] = 'text'
         value['content'] = content
@@ -1217,9 +1220,9 @@ class Core(Handler):
     def r_save(self, command):
         content = self.getRuntimeValue(command['content'])
         file = self.getRuntimeValue(command['file'])
-        f = open(file, 'w')
-        f.write(content)
-        f.close()
+        if file.endswith('.json'): content = json.dumps(content)
+        with open(file, 'w') as f:
+            f.write(content)
         return self.nextPC()
 
     # Send a message to a module
@@ -2400,22 +2403,11 @@ 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':
@@ -2503,8 +2495,7 @@ class Core(Handler):
     def c_includes(self, condition):
         value1 = self.getRuntimeValue(condition.value1)
         value2 = self.getRuntimeValue(condition.value2)
-        test = value2 in value1
-        return not test if condition.negate else test
+        return value2 in value1
 
     def c_is(self, condition):
         comparison = self.program.compare(condition.value1, condition.value2)

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

@@ -29,7 +29,7 @@ class Graphics(Handler):
                 command['name'] = name
                 command['type'] = token
                 if self.peek() == 'to':
-                    command['args'] = []
+                    command['args'] = name
                 else:
                     command['args'] = self.utils.getArgs(self)
         else:
@@ -45,28 +45,37 @@ class Graphics(Handler):
         return False
 
     def r_add(self, command):
+        def create(type, layout, args2, target):
+            args = self.utils.getDefaultArgs(type)
+            for n in range(0, len(args2)):
+                try:
+                    self.utils.decode(self, args, args2[n])
+                except Exception as e:
+                    RuntimeError(self.program, e)
+            item = self.utils.createWidget(type, layout, args)
+            target['layout'].append(item)
+
         target = self.getVariable(command['target'])
         type = command['type']
         args = command['args']
-        param= None
         if not 'layout' in target:
             target['layout'] = []
-        if args[0] == '{':
+        if len(args) > 0 and args[0] == '{':
+            args = json.loads(self.getRuntimeValue(json.loads(args)))
             if type in ['Column', 'Frame', 'Tab']:
                 record = self.getVariable(command['name'])
-                param = record['layout']
-            layout = json.loads(self.getRuntimeValue(json.loads(args)))
-            default = self.utils.getDefaultArgs(type)
-            for n in range(0, len(layout)):
-                try:
-                    args = self.utils.decode(self, default, layout[n])
-                except Exception as e:
-                    RuntimeError(self.program, e)
-            item = self.utils.createWidget(type, param, args)
-            target['layout'].append(item)
+                layout = record['layout']
+                create(type, layout, args, target)
+            else:
+                create(type, None, args, target)
         else:
-            v = self.getVariable(args)
-            target['layout'].append(v['layout'])
+            if type in ['Column', 'Frame', 'Tab']:
+                record = self.getVariable(command['name'])
+                layout = record['layout']
+                create(type, layout, args, target)
+            else:
+               v = self.getVariable(args)
+               target['layout'].append(v['layout'])
         return self.nextPC()
 
     def k_close(self, command):

{easycoder-250205.1 → easycoder-250209.1}/easycoder/ec_gutils.py

@@ -44,8 +44,6 @@ class GUtils:
             if value != None: value = value['content']
             else: raise Exception('Variable has no value')
             args[key] = value
-            return args
-        return None
 
     # Reduce the event properties to a list of strings
     def getEventProperties(self, window, values):
@@ -59,14 +57,14 @@ class GUtils:
             values[key] = v
 
     # Create a widget
-    def createWidget(self, type, param, args):
-        if type == 'Button': return self.createButton(param, args)
-        elif type == 'Checkbox': return self.createCheckbox(param, args)
-        elif type == 'Column': return self.createColumn(param, args)
-        elif type == 'Input': return self.createInput(param, args)
-        elif type == 'Listbox': return self.createListbox(param, args)
-        elif type == 'Multiline': return self.createMultiline(param, args)
-        elif type == 'Text': return self.createText(param, args)
+    def createWidget(self, type, layout, args):
+        if type == 'Button': return self.createButton(layout, args)
+        elif type == 'Checkbox': return self.createCheckbox(layout, args)
+        elif type == 'Column': return self.createColumn(layout, args)
+        elif type == 'Input': return self.createInput(layout, args)
+        elif type == 'Listbox': return self.createListbox(layout, args)
+        elif type == 'Multiline': return self.createMultiline(layout, args)
+        elif type == 'Text': return self.createText(layout, args)
         else: return None
 
     # Get the current value of a widget
@@ -97,6 +95,13 @@ class GUtils:
         elif property == 'values':
             element.update(values=value)
 
+    def getPad(self, args):
+        pad = args['pad']
+        if pad == (None, None):
+            return pad
+        pad = pad.split()
+        return (pad[0], pad[1])
+
     def getSize(self, args):
         size = args['size']
         if size == (None, None):
@@ -109,7 +114,7 @@ class GUtils:
         args['disabled'] = False
         args['size'] = (None, None)
 
-    def createButton(self, param, args):
+    def createButton(self, layout, args):
         return psg.Button(button_text=args['button_text'], disabled=args['disabled'], size=self.getSize(args))
 
     def getDefaultCheckbox(self, args):
@@ -118,39 +123,40 @@ class GUtils:
         args['size'] = (None, None)
         args['expand_x'] = False
 
-    def createCheckbox(self, param, args):
+    def createCheckbox(self, layout, args):
         return psg.Checkbox(args['text'], key=args['key'], expand_x=args['expand_x'], size=self.getSize(args))
 
     def getDefaultColumn(self, args):
         args['expand_x'] = False
-        args['pad'] = (0, 0)
+        args['pad'] = (None, None)
 
-    def createColumn(self, param, args):
-        return psg.Column(param, expand_x=args['expand_x'], pad=args['pad'])
+    def createColumn(self, layout, args):
+        return psg.Column(layout, expand_x=args['expand_x'], pad=self.getPad(args))
 
     def getDefaultInput(self, args):
         args['default_text'] = ''
         args['key'] = None
         args['size'] = (None, None)
 
-    def createInput(self, param, args):
+    def createInput(self, layout, args):
         return psg.Input(default_text=args['default_text'], key=args['key'], size=self.getSize(args))
 
     def getDefaultListbox(self, args):
         args['list'] = []
         args['key'] = [None]
         args['size'] = '10 2'
+        args['pad'] = (None, None)
         args['select_mode'] = None
 
-    def createListbox(self, param, args):
-        return psg.Listbox([], key=args['key'], size=self.getSize(args))
+    def createListbox(self, layout, args):
+        return psg.Listbox([], key=args['key'], pad=self.getPad(args), size=self.getSize(args))
 
     def getDefaultMultiline(self, args):
         args['default_text'] = ''
         args['key'] = None
         args['size'] = (None, None)
 
-    def createMultiline(self, param, args):
+    def createMultiline(self, layout, args):
         return psg.Multiline(default_text=args['default_text'], key=args['key'], size=self.getSize(args))
 
     def getDefaultText(self, args):
@@ -159,6 +165,6 @@ class GUtils:
         args['size'] = (None, None)
         args['expand_x'] = False
 
-    def createText(self, param, args):
+    def createText(self, layouts, args):
         return psg.Text(text=args['text'], expand_x=args['expand_x'], key=args['key'], size=self.getSize(args))