easycoder 250611.4__tar.gz → 250611.6__tar.gz

{easycoder-250611.4 → easycoder-250611.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250611.4
+Version: 250611.6
 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-250611.4 → easycoder-250611.6}/easycoder/__init__.py

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

{easycoder-250611.4 → easycoder-250611.6}/easycoder/ec_core.py

@@ -732,17 +732,37 @@ class Core(Handler):
                         if record['keyword'] == 'ssh':
                             command['ssh'] = record['name']
                             command['path'] = self.nextValue()
-                            self.add(command)
-                            return True
-
-                    command['file'] = self.getValue()
+                        else:
+                            command['file'] = self.getValue()
+                    else:
+                        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()
                     return True
         else:
             FatalError(self.compiler, f'I don\'t understand \'{self.getToken()}\'')
         return False
 
     def r_load(self, command):
+        errorReason = None
         target = self.getVariable(command['target'])
         if 'ssh' in command:
             ssh = self.getVariable(command['ssh'])
@@ -751,17 +771,24 @@ class Core(Handler):
             try:
                 with sftp.open(path, 'r') as remote_file: content = remote_file.read().decode()
             except:
-                RuntimeError(self.program, f'Unable to read from {path}')
+                errorReason = f'Unable to read from {path}'
         else:
             filename = self.getRuntimeValue(command['file'])
             try:
                 with open(filename) as f: content = f.read()
+                try:
+                    if filename.endswith('.json'): content = json.loads(content)
+                except:
+                    errorReason = 'Bad or null JSON string'
             except:
-                RuntimeError(self.program, f'Unable to read from {filename}')
-            try:
-                if filename.endswith('.json'): content = json.loads(content)
-            except:
-                RuntimeError(self.program, 'Bad or null JSON string')
+                errorReason = f'Unable to read from {filename}'
+
+        if errorReason:
+            if command['or'] != None:
+                print(f'Exception "{errorReason}": Running the "or" clause')
+                return command['or']
+            else:
+                RuntimeError(self.program, f'Error: {errorReason}')
         value = {}
         value['type'] = 'text'
         value['content'] = content
@@ -1293,8 +1320,7 @@ class Core(Handler):
             self.compileOne()
             # Fixup the skip
             self.getCommandAt(skip)['goto'] = self.getPC()
-            return True
-        return False
+        return True
 
     def r_save(self, command):
         errorReason = None
@@ -1303,8 +1329,9 @@ class Core(Handler):
             ssh = self.getVariable(command['ssh'])
             path = self.getRuntimeValue(command['path'])
             sftp = ssh['sftp']
+            if path.endswith('.json'): content = json.dumps(content)
             try:
-                with sftp.open(path, 'w') as remote_file: remote_file.write(content.encode())
+                with sftp.open(path, 'w') as remote_file: remote_file.write(content)
             except:
                 errorReason = 'Unable to write to {path}'
         else: