easycoder 250104.1__tar.gz → 250105.1__tar.gz

{easycoder-250104.1 → easycoder-250105.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250104.1
+Version: 250105.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-250104.1 → easycoder-250105.1}/doc/core/keywords/run.md

@@ -1,13 +1,13 @@
 # run
 
 ## Syntax:
-`run {module} as {name} [with {export} [and {export}...]]`
+`run {name} {module} as [with {export} [and {export}...]]`
 
 ## Example:
 ``run Hello as `hello.ecs` with Name and Surname` ``
 
 ## Description:
-Run a second script, optionally passing it variables it can use. Changes to these variables will be seen by the parent script (but see [lock](lock.md)). See also [release](release.md).
+Run a second script, optionally passing it variables it can use. Changes to these variables will be seen by the parent script (but see [lock](lock.md)). See also [module](module.md), [release](release.md), [send](send.md)and [on](on.md).
 
 Next: [multiply](multiply.md)  
 Prev: [lock](lock.md)

{easycoder-250104.1 → easycoder-250105.1}/easycoder/__init__.py

@@ -10,4 +10,4 @@ from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250104.1"
+__version__ = "250105.1"

{easycoder-250104.1 → easycoder-250105.1}/easycoder/ec_core.py

@@ -552,27 +552,37 @@ class Core(Handler):
             self.program.pc += 1
         return self.program.pc
 
-    # Import one or more variables
     def k_import(self, command):
-        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
-            self.addCommand(variable)
-            if self.peek() != 'and':
-                break
+        if self.peek() == 'plugin':
+            # Import a plugin
             self.nextToken()
-        command['imports'] = json.dumps(imports)
-        self.add(command)
-        return True
+            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
+                self.addCommand(variable)
+                if self.peek() != 'and':
+                    break
+                self.nextToken()
+            command['imports'] = json.dumps(imports)
+            self.add(command)
+            return True
 
     def r_import(self, command):
         exports = self.program.exports
@@ -694,11 +704,8 @@ class Core(Handler):
         return False
 
     def r_load(self, command):
-        print(command)
         target = self.getVariable(command['target'])
-        print(target)
         file = self.getRuntimeValue(command['file'])
-        print(file)
         f = open(file, 'r')
         content = f.read()
         f.close()
@@ -810,6 +817,36 @@ class Core(Handler):
     def r_object(self, command):
         return self.nextPC()
 
+    # on message {action}
+    def k_on(self, command):
+        if self.nextIs('message'):
+            self.nextToken()
+            command['goto'] = 0
+            self.add(command)
+            cmd = {}
+            cmd['domain'] = 'core'
+            cmd['lino'] = command['lino']
+            cmd['keyword'] = 'gotoPC'
+            cmd['goto'] = 0
+            cmd['debug'] = False
+            self.addCommand(cmd)
+            # Add the action and a 'stop'
+            self.compileOne()
+            cmd = {}
+            cmd['domain'] = 'core'
+            cmd['lino'] = command['lino']
+            cmd['keyword'] = 'stop'
+            cmd['debug'] = False
+            self.addCommand(cmd)
+            # Fixup the link
+            command['goto'] = self.getPC()
+            return True
+        return False
+
+    def r_on(self, command):
+        self.program.onMessage(self.nextPC()+1)
+        return command['goto']
+
     # Open a file
     # open {file} for reading/writing/appending
     def k_open(self, command):
@@ -1002,13 +1039,13 @@ class Core(Handler):
             if self.nextIsSymbol():
                 symbolRecord = self.getSymbolRecord()
                 command['target'] = symbolRecord['name']
-                if symbolRecord['valueHolder']:
+                if 'valueholder' in symbolRecord and symbolRecord['valueHolder'] == False:
+                    FatalError(self.program.compiler, f'Symbol {symbolRecord["name"]} is not a value holder')
+                else:
                     self.add(command)
                     return True
-                else:
-                    FatalError(self.program.compiler, f'Symbol {symbolRecord["name"]} is not a value holder')
             else:
-                FatalError(self.program.compiler, f'No such variable: "{self.getToken()}"')
+                FatalError(self.program.compiler, f'Symbol {self.getToken()} is not a variable')
         return False
 
     def r_put(self, command):
@@ -1111,12 +1148,16 @@ class Core(Handler):
 
     # Compile and run a script
     def k_run(self, command):
-        if self.nextIsSymbol():
-            record = self.getSymbolRecord()
-            if record['keyword'] == 'module':
-                command['target'] = record['name']
-                if self.nextIs('as'):
-                    command['path'] = self.nextValue()
+        try:
+            command['path'] = self.nextValue()
+        except Exception as e:
+            self.warning(f'Core.run: Path expected')
+            return False
+        if self.nextIs('as'):
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'module':
+                    command['module'] = record['name']
                     exports = []
                     if self.nextIs('with'):
                         while True:
@@ -1132,18 +1173,18 @@ class Core(Handler):
         return False
 
     def r_run(self, command):
-        target = self.getVariable(command['target'])
+        module = self.getVariable(command['module'])
         path = self.getRuntimeValue(command['path'])
         exports = json.loads(command['exports'])
         for n in range(0, len(exports)):
             exports[n] = self.getVariable(exports[n])
-        target['path'] = path
+        module['path'] = path
         parent = Object()
         parent.program = self.program
         parent.pc = self.nextPC()
         parent.waiting = True
         p = self.program.__class__
-        p(path).start(parent, exports)
+        p(path).start(parent, module, exports)
         return 0
 
     # Provide a name for the script
@@ -1168,6 +1209,24 @@ class Core(Handler):
         f.close()
         return self.nextPC()
 
+    # Send a message to a module
+    def k_send(self, command):
+        command['message'] = self.nextValue()
+        if self.nextIs('to'):
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'module':
+                    command['module'] = record['name']
+                    self.add(command)
+                    return True
+        return False
+
+    def r_send(self, command):
+        message = self.getRuntimeValue(command['message'])
+        module = self.getVariable(command['module'])
+        module['child'].handleMessage(message)
+        return self.nextPC()
+
     # Set a value
     # set {variable}
     # set the elements of {variable} to {value}
@@ -1791,7 +1850,6 @@ class Core(Handler):
                     return value
 
         if token == 'message':
-            self.nextToken()
             return value
 
         if token == 'timestamp':
@@ -2097,6 +2155,12 @@ class Core(Handler):
         value['content'] = megabytes
         return value
 
+    def v_message(self, v):
+        value = {}
+        value['type'] = 'text'
+        value['content'] = self.program.message
+        return value
+
     def v_modification(self, v):
         fileName = self.getRuntimeValue(v['fileName'])
         ts = int(os.stat(fileName).st_mtime)

{easycoder-250104.1 → easycoder-250105.1}/easycoder/ec_graphics.py

@@ -176,7 +176,7 @@ class Graphics(Handler):
                 self.windowSpec = Object()
                 self.windowSpec.title = command['title']['content']
                 self.windowSpec.flush = flush
-                self.windowSpec.finish = self.program.finish
+                self.windowSpec.kill = self.program.kill
                 self.windowSpec.pos = (self.getRuntimeValue(command['pos'][0]), self.getRuntimeValue(command['pos'][1]))
                 self.windowSpec.size = (self.getRuntimeValue(command['size'][0]), self.getRuntimeValue(command['size'][1]))
                 self.windowSpec.fill = (self.getRuntimeValue(command['fill'][0])/255, self.getRuntimeValue(command['fill'][1])/255, self.getRuntimeValue(command['fill'][2])/255)

{easycoder-250104.1 → easycoder-250105.1}/easycoder/ec_program.py

@@ -7,8 +7,6 @@ from .ec_core import Core
 import importlib
 from importlib.metadata import version
 
-queue = deque()
-
 # Flush the queue
 def flush():
 	global queue
@@ -19,6 +17,7 @@ def flush():
 class Program:
 
 	def __init__(self, argv):
+		global queue
 		print(f'EasyCoder version {version("easycoder")}')
 		if len(argv) == 0:
 			print('No script supplied')
@@ -32,6 +31,7 @@ class Program:
 		f = open(scriptName, 'r')
 		source = f.read()
 		f.close()
+		queue = deque()
 		self.argv = argv
 		self.domains = []
 		self.domainIndex = {}
@@ -48,11 +48,13 @@ class Program:
 		self.condition = self.compiler.condition
 		self.processClasses()
 		self.externalControl = False
-		self.finished = False
+		self.running = True
 
-	def start(self, parent=None, exports=[]):
+	def start(self, parent=None, module = None, exports=[]):
 		self.parent = parent
 		self.exports = exports
+		if module != None:
+			module['child'] = self
 		startCompile = time.time()
 		self.tokenise(self.script)
 		if self.compiler.compileFrom(0, []):
@@ -70,7 +72,15 @@ class Program:
 				self.run(0)
 		else:
 			self.compiler.showWarnings()
-			return
+
+		# If this is the main script and there's no graphics, run a main loop
+		if parent == None and self.externalControl == False:
+			while True:
+				if self.running == True:
+					flush()
+					time.sleep(0.1)
+				else:
+					break
 
 	# Import a plugin
 	def importPlugin(self, source):
@@ -140,7 +150,7 @@ class Program:
 			name = value['name']
 			symbolRecord = self.getSymbolRecord(name)
 			if symbolRecord['value'] == [None]:
-				RuntimeWarning(self.compiler.program, f'Variable "{name}" has no value')
+				RuntimeWarning(self.program, f'Variable "{name}" has no value')
 				return None
 			handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
 			result = handler(symbolRecord)
@@ -277,7 +287,6 @@ class Program:
 	# Flush the queue
 	def flush(self, pc):
 		global queue
-		self.running = True
 		self.pc = pc
 		while True:
 			command = self.code[self.pc]
@@ -299,26 +308,23 @@ class Program:
 					# Deal with 'exit'
 					if self.pc == -1:
 						queue = deque()
-						self.running = False
 						if self.parent != None:
 							self.releaseParent()
-							sys.exit()
+						else:
+							self.running = False
+							break
 					elif self.pc == None or self.pc == 0 or self.pc >= len(self.code):
 						break
 
 	# Run the script
 	def run(self, pc):
 		global queue
-		length = len(queue)
 		item = Object()
 		item.program = self
 		item.pc = pc
 		queue.append(item)
-		if not self.externalControl:
-			if length == 0:
-				return flush()
 	
-	def finish(self):
+	def kill(self):
 		self.running = False
 
 	def setExternalControl(self):
@@ -368,6 +374,15 @@ class Program:
 		if v1 < v2:
 			return -1
 		return 0
+	
+	# Set up a message handler
+	def onMessage(self, pc):
+		self.onMessagePC = pc
+
+	# Handle a message from our parent program
+	def handleMessage(self, message):
+		self.message = message
+		self.run(self.onMessagePC)
 
 # This is the program launcher
 def Main():

{easycoder-250104.1 → easycoder-250105.1}/easycoder/ec_renderer.py

@@ -225,6 +225,7 @@ class Renderer(App):
     
     def request_close(self):
         print('close window')
+        self.kill()
         Window.close()
     
     def flushQueue(self, dt):
@@ -238,6 +239,7 @@ class Renderer(App):
         self.ui = UI()
         self.title = spec.title
         self.flush = spec.flush
+        self.kill = spec.kill
         Window.size = spec.size
         Window.left = spec.pos[0]
         Window.top = spec.pos[1]

{easycoder-250104.1 → easycoder-250105.1}/easycoder/ec_value.py

@@ -51,7 +51,7 @@ class Value:
 			if item != None:
 				return item
 			self.compiler.rewindTo(mark)
-		FatalError(self.compiler, f'I don\'t understand \'{token}\'')
+		self.compiler.warning(f'I don\'t understand \'{token}\'')
 		return None
 
 	def compileValue(self):

{easycoder-250104.1 → easycoder-250105.1}/scripts/benchmark.ecs

@@ -60,3 +60,4 @@
 	put now into Finish
 	take Start from Finish giving N
 	print N cat ` seconds`
+	exit

{easycoder-250104.1 → easycoder-250105.1}/scripts/fizzbuzz.ecs

@@ -12,3 +12,4 @@ begin
   else if Number modulo 15 is 0 print `FizzBuzz`
   else print Number
 end
+exit

{easycoder-250104.1 → easycoder-250105.1}/scripts/hello.ecs

@@ -1 +1,2 @@
 print `Hello, world!`
+exit

{easycoder-250104.1 → easycoder-250105.1}/scripts/points.ecs

@@ -2,7 +2,7 @@
 
     script Points
     
-    import Points from plugins/example.py
+    import plugin Points from plugins/example.py
     
     point Point1
     point Point2
@@ -14,3 +14,4 @@
     put the distance between Point1 and Point2 into Distance
     assert Distance is 250 with `Distance is ` cat Distance cat `: should be 250`
     print `The distance is ` cat Distance cat ` units`
+    exit

{easycoder-250104.1 → easycoder-250105.1}/scripts/tests.ecs

@@ -189,6 +189,8 @@ Loop1:
     print Data
     print the index of 5 in Data
 
+	wait 2
+	print `All done!`
 	exit
 
 Print: