250807.1

Author: graham-trott

dist/easycoder-250805.1-py2.py3-none-any.whl renamed to dist/easycoder-250807.1-py2.py3-none-any.whl

@@ -11,4 +11,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250805.1"
+__version__ = "250807.1"

dist/easycoder-250805.1.tar.gz renamed to dist/easycoder-250807.1.tar.gz

@@ -593,39 +593,29 @@ def r_if(self, command):
             self.program.pc += 1
         return self.program.pc
 
+    # Import one or more variables
     def k_import(self, command):
-        if self.peek() == 'plugin':
-            # Import a plugin
+        imports = []
+        while True:
+            keyword = self.nextToken()
+            name = self.nextToken()
+            item = [keyword, name]
+            imports.append(item)
+            self.symbols[name] = self.getPC()
+            variable = {}
+            variable['domain'] = None
+            variable['name'] = name
+            variable['keyword'] = keyword
+            variable['import'] = None
+            variable['used'] = False
+            variable['hasValue'] = True if keyword == 'variable' else False
+            self.add(variable)
+            if self.peek() != 'and':
+                break
             self.nextToken()
-            clazz = self.nextToken()
-            if self.nextIs('from'):
-                source = self.nextToken()
-                self.program.importPlugin(f'{source}:{clazz}')
-                return True
-            return False
-        else:
-            # Import one or more variables
-            imports = []
-            while True:
-                keyword = self.nextToken()
-                name = self.nextToken()
-                item = [keyword, name]
-                imports.append(item)
-                self.symbols[name] = self.getPC()
-                variable = {}
-                variable['domain'] = None
-                variable['name'] = name
-                variable['keyword'] = keyword
-                variable['import'] = None
-                variable['used'] = False
-                variable['hasValue'] = True if keyword == 'variable' else False
-                self.add(variable)
-                if self.peek() != 'and':
-                    break
-                self.nextToken()
-            command['imports'] = json.dumps(imports)
-            self.add(command)
-            return True
+        command['imports'] = json.dumps(imports)
+        self.add(command)
+        return True
 
     def r_import(self, command):
         exports = self.program.exports
@@ -1763,8 +1753,16 @@ def r_unlock(self, command):
 
     # Use a plugin module
     def k_use(self, command):
-        self.skip('plugin')
-        if self.nextIs('graphics'):
+        if self.peek() == 'plugin':
+            # Import a plugin
+            self.nextToken()
+            clazz = self.nextToken()
+            if self.nextIs('from'):
+                source = self.nextToken()
+                self.program.importPlugin(f'{source}:{clazz}')
+                return True
+            return False
+        elif self.nextIs('graphics'):
             print('Loading graphics module')
             from .ec_pyside import Graphics
             self.program.graphics = Graphics
@@ -2476,7 +2474,7 @@ def v_random(self, v):
         limit = self.getRuntimeValue(v['content'])
         value = {}
         value['type'] = 'int'
-        value['content'] = randrange(0, limit)
+        value['content'] = random.randrange(0, limit)
         return value
 
     def v_right(self, v):

easycoder/__init__.py

@@ -22,6 +22,7 @@ def __init__(self, argv):
 		if len(argv) == 0:
 			print('No script supplied')
 			exit()
+		if argv in ['-v', '--version']: return
 		scriptName = argv
 
 		f = open(scriptName, 'r')
@@ -47,6 +48,7 @@ def __init__(self, argv):
 		self.externalControl = False
 		self.ticker = 0
 		self.running = True
+		self.start()
 
 	# This is called at 10msec intervals by the GUI code
 	def flushCB(self):
@@ -388,9 +390,9 @@ def handleMessage(self, message):
 # This is the program launcher
 def Main():
 	if (len(sys.argv) > 1):
-		Program(sys.argv[1]).start()
+		Program(sys.argv[1])
 	else:
-		print('Syntax: easycoder <scriptname> [plugins]')
+		Program('-v')
 
 if __name__ == '__main__':
     Main()

easycoder/ec_core.py

@@ -4,4 +4,4 @@
 from easycoder import Program
 
 os.chdir('../../rbr/')
-Program('rbrconf.ecs').start()
+Program('rbrconf.ecs')

easycoder/ec_program.py

@@ -4,4 +4,4 @@
 from easycoder import Program
 
 os.chdir('../../rbr/roombyroom/Controller/ui')
-Program('rbr_ui.ecs').start()
+Program('rbr_ui.ecs')