easycoder 250611.3__tar.gz → 250611.5__tar.gz

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

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

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

{easycoder-250611.3 → easycoder-250611.5}/easycoder/ec_compiler.py

@@ -14,7 +14,6 @@ class Compiler:
 		self.symbols = self.program.symbols
 		self.code = self.program.code
 		self.program.compiler = self
-		self.addCommand = self.program.add
 		self.compileConstant = self.value.compileConstant
 		self.debugCompile = False
 
@@ -77,6 +76,10 @@ class Compiler:
 	def getCommandAt(self, pc):
 		return self.program.code[pc]
 
+	# Add a command to the code list
+	def add(self, command):
+		self.code.append(command)
+
 	def isSymbol(self):
 		token=self.getToken()
 		try:
@@ -148,7 +151,7 @@ class Compiler:
 		command['import'] = None
 		command['locked'] = False
 		command['extra'] = extra
-		self.addCommand(command)
+		self.add(command)
 		return True
 
 	# Compile the current token

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

@@ -126,7 +126,7 @@ class Core(Handler):
             command['with'] = self.nextValue()
         else:
             command['with'] = None
-        self.addCommand(command)
+        self.add(command)
         return True
 
     def r_assert(self, command):
@@ -143,7 +143,7 @@ class Core(Handler):
             cmd['keyword'] = 'end'
             cmd['debug'] = True
             cmd['lino'] = command['lino']
-            self.addCommand(cmd)
+            self.add(cmd)
             return self.nextPC()
         else:
             return self.compileFromHere(['end'])
@@ -441,7 +441,7 @@ class Core(Handler):
                         timeout['type'] = 'int'
                         timeout['content'] = 5
                         command['timeout'] = timeout
-                    self.addCommand(command)
+                    self.add(command)
                     if self.peek() == 'or':
                         self.nextToken()
                         self.nextToken()
@@ -453,7 +453,7 @@ class Core(Handler):
                         cmd['goto'] = 0
                         cmd['debug'] = False
                         skip = self.getPC()
-                        self.addCommand(cmd)
+                        self.add(cmd)
                         # Process the 'or'
                         self.getCommandAt(get)['or'] = self.getPC()
                         self.compileOne()
@@ -535,7 +535,7 @@ class Core(Handler):
     # if <condition> <action> [else <action>]
     def k_if(self, command):
         command['condition'] = self.nextCondition()
-        self.addCommand(command)
+        self.add(command)
         self.nextToken()
         pcElse = self.getPC()
         cmd = {}
@@ -544,7 +544,7 @@ class Core(Handler):
         cmd['keyword'] = 'gotoPC'
         cmd['goto'] = 0
         cmd['debug'] = False
-        self.addCommand(cmd)
+        self.add(cmd)
         # Get the 'then' code
         self.compileOne()
         if self.peek() == 'else':
@@ -557,7 +557,7 @@ class Core(Handler):
             cmd['keyword'] = 'gotoPC'
             cmd['goto'] = 0
             cmd['debug'] = False
-            self.addCommand(cmd)
+            self.add(cmd)
             # Fixup the link to the 'else' branch
             self.getCommandAt(pcElse)['goto'] = self.getPC()
             # Process the 'else' branch
@@ -603,7 +603,7 @@ class Core(Handler):
                 variable['keyword'] = keyword
                 variable['import'] = None
                 variable['used'] = False
-                self.addCommand(variable)
+                self.add(variable)
                 if self.peek() != 'and':
                     break
                 self.nextToken()
@@ -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
@@ -888,7 +915,7 @@ class Core(Handler):
             cmd['keyword'] = 'gotoPC'
             cmd['goto'] = 0
             cmd['debug'] = False
-            self.addCommand(cmd)
+            self.add(cmd)
             # Add the action and a 'stop'
             self.compileOne()
             cmd = {}
@@ -896,7 +923,7 @@ class Core(Handler):
             cmd['lino'] = command['lino']
             cmd['keyword'] = 'stop'
             cmd['debug'] = False
-            self.addCommand(cmd)
+            self.add(cmd)
             # Fixup the link
             command['goto'] = self.getPC()
             return True
@@ -990,7 +1017,7 @@ class Core(Handler):
             command['result'] = None
         command['or'] = None
         post = self.getPC()
-        self.addCommand(command)
+        self.add(command)
         if self.peek() == 'or':
             self.nextToken()
             self.nextToken()
@@ -1002,7 +1029,7 @@ class Core(Handler):
             cmd['goto'] = 0
             cmd['debug'] = False
             skip = self.getPC()
-            self.addCommand(cmd)
+            self.add(cmd)
             # Process the 'or'
             self.getCommandAt(post)['or'] = self.getPC()
             self.compileOne()
@@ -1271,28 +1298,29 @@ class Core(Handler):
                 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
+        else:
+            command['file'] = self.getValue()
+        command['or'] = None
+        save = 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(save)['or'] = self.getPC()
+            self.compileOne()
+            # Fixup the skip
+            self.getCommandAt(skip)['goto'] = self.getPC()
+        return True
 
     def r_save(self, command):
         errorReason = None
@@ -1792,7 +1820,7 @@ class Core(Handler):
         # token = self.getToken()
         command['condition'] = code
         test = self.getPC()
-        self.addCommand(command)
+        self.add(command)
         # Set up a goto for when the test fails
         fail = self.getPC()
         cmd = {}
@@ -1801,7 +1829,7 @@ class Core(Handler):
         cmd['keyword'] = 'gotoPC'
         cmd['goto'] = 0
         cmd['debug'] = False
-        self.addCommand(cmd)
+        self.add(cmd)
         # Do the body of the while
         self.nextToken()
         if self.compileOne() == False:
@@ -1813,7 +1841,7 @@ class Core(Handler):
         cmd['keyword'] = 'gotoPC'
         cmd['goto'] = test
         cmd['debug'] = False
-        self.addCommand(cmd)
+        self.add(cmd)
         # Fixup the 'goto' on completion
         self.getCommandAt(fail)['goto'] = self.getPC()
         return True

{easycoder-250611.3 → easycoder-250611.5}/easycoder/ec_handler.py

@@ -23,14 +23,13 @@ class Handler:
 		self.rewindTo = compiler.rewindTo
 		self.warning = compiler.warning
 		self.getPC = compiler.getPC
-		self.addCommand = compiler.addCommand
+		self.add = compiler.add
 		self.getCommandAt = compiler.getCommandAt
 		self.compileOne = compiler.compileOne
 		self.compileFromHere = compiler.compileFromHere
 		self.compileConstant = compiler.compileConstant
 
 		self.code = self.program.code
-		self.add = self.program.add
 		self.evaluate = self.program.evaluate
 		self.getVariable = self.program.getSymbolRecord
 		self.getRuntimeValue = self.program.getRuntimeValue

{easycoder-250611.3 → easycoder-250611.5}/easycoder/ec_program.py

@@ -116,10 +116,6 @@ class Program:
 	def getDomains(self):
 		return self.domains
 
-	# Add a command to the code list
-	def add(self, command):
-		self.code.append(command)
-
 	def getSymbolRecord(self, name):
 		try:
 			target = self.code[self.symbols[name]]

{easycoder-250611.3 → easycoder-250611.5}/easycoder/ec_pyside.py

@@ -603,7 +603,7 @@ class Graphics(Handler):
             cmd['keyword'] = 'gotoPC'
             cmd['goto'] = 0
             cmd['debug'] = False
-            self.addCommand(cmd)
+            self.add(cmd)
             # This is the click handler
             self.compileOne()
             cmd = {}
@@ -611,7 +611,7 @@ class Graphics(Handler):
             cmd['lino'] = command['lino']
             cmd['keyword'] = 'stop'
             cmd['debug'] = False
-            self.addCommand(cmd)
+            self.add(cmd)
             # Fixup the goto
             self.getCommandAt(pcNext)['goto'] = self.getPC()
 
@@ -634,7 +634,7 @@ class Graphics(Handler):
         elif token == 'tick':
             command['tick'] = True
             command['runOnTick'] = self.getPC() + 2
-            self.addCommand(command)
+            self.add(command)
             self.nextToken()
             # Step over the on tick action
             pcNext = self.getPC()
@@ -644,7 +644,7 @@ class Graphics(Handler):
             cmd['keyword'] = 'gotoPC'
             cmd['goto'] = 0
             cmd['debug'] = False
-            self.addCommand(cmd)
+            self.add(cmd)
             # This is the on tick handler
             self.compileOne()
             cmd = {}
@@ -652,7 +652,7 @@ class Graphics(Handler):
             cmd['lino'] = command['lino']
             cmd['keyword'] = 'stop'
             cmd['debug'] = False
-            self.addCommand(cmd)
+            self.add(cmd)
             # Fixup the goto
             self.getCommandAt(pcNext)['goto'] = self.getPC()
             return True
@@ -692,12 +692,12 @@ class Graphics(Handler):
             if record['keyword'] == 'combobox':
                 command['variant'] = 'current'
                 command['name'] = record['name']
-                self.addCommand(command)
+                self.add(command)
                 return True
             elif record['keyword'] == 'listbox':
                 command['variant'] = 'current'
                 command['name'] = record['name']
-                self.addCommand(command)
+                self.add(command)
                 return True
         return False