easycoder 250611.1__tar.gz → 250611.3__tar.gz

{easycoder-250611.1 → easycoder-250611.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250611.1
+Version: 250611.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>

{easycoder-250611.1 → easycoder-250611.3}/easycoder/__init__.py

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

{easycoder-250611.1 → easycoder-250611.3}/easycoder/ec_core.py

@@ -1262,20 +1262,40 @@ class Core(Handler):
     # Save a value to a file
     def k_save(self, command):
         command['content'] = self.nextValue()
-        if self.nextIs('to'):
-            if self.nextIsSymbol():
-                record = self.getSymbolRecord()
-                if record['keyword'] == 'ssh':
-                    command['ssh'] = record['name']
-                    command['path'] = self.nextValue()
-                    self.add(command)
-                    return True
-            command['file'] = self.getValue()
-            self.add(command)
-            return True
+        self.skip('to')
+        if self.nextIsSymbol():
+            record = self.getSymbolRecord()
+            if record['keyword'] == 'ssh':
+                command['ssh'] = record['name']
+                command['path'] = self.nextValue()
+                self.add(command)
+            else:
+                command['file'] = self.getValue()
+            command['or'] = None
+            save = self.getPC()
+            self.addCommand(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.addCommand(cmd)
+                # Process the 'or'
+                self.getCommandAt(save)['or'] = self.getPC()
+                self.compileOne()
+                # Fixup the skip
+                self.getCommandAt(skip)['goto'] = self.getPC()
+                return True
         return False
 
     def r_save(self, command):
+        errorReason = None
         content = self.getRuntimeValue(command['content'])
         if 'ssh' in command:
             ssh = self.getVariable(command['ssh'])
@@ -1284,14 +1304,21 @@ class Core(Handler):
             try:
                 with sftp.open(path, 'w') as remote_file: remote_file.write(content.encode())
             except:
-                RuntimeError(self.program, 'Unable to write to {path}')
+                errorReason = 'Unable to write to {path}'
         else:
             filename = self.getRuntimeValue(command['file'])
             if filename.endswith('.json'): content = json.dumps(content)
             try:
                 with open(filename, 'w') as f: f.write(content)
             except:
-                RuntimeError(self.program, f'Unable to write to {filename}')
+                errorReason = f'Unable to write to {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}')
         return self.nextPC()
 
     # Send a message to a module