250425.1

Author: graham-trott

config.ecs

@@ -9,4 +9,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250424.3"
+__version__ = "250425.1"

dist/easycoder-250424.3-py2.py3-none-any.whl

@@ -87,6 +87,9 @@ def isSymbol(self):
 	def nextIsSymbol(self):
 		self.next()
 		return self.isSymbol()
+	
+	def skip(self, token):
+		if self.peek() == token: self.nextToken()
 
 	def rewindTo(self, index):
 		self.index = index
@@ -114,10 +117,10 @@ def getSymbolRecord(self):
 	def compileLabel(self, command):
 		return self.compileSymbol(command, self.getToken(), False)
 
-	def compileVariable(self, command, hasValue = False):
-		return self.compileSymbol(command, self.nextToken(), hasValue)
+	def compileVariable(self, command, hasValue = False, extra=None):
+		return self.compileSymbol(command, self.nextToken(), hasValue, extra)
 
-	def compileSymbol(self, command, name, hasValue):
+	def compileSymbol(self, command, name, hasValue, extra=None):
 		try:
 			v = self.symbols[name]
 		except:
@@ -137,6 +140,7 @@ def compileSymbol(self, command, name, hasValue):
 		command['debug'] = False
 		command['import'] = None
 		command['locked'] = False
+		command['extra'] = extra
 		self.addCommand(command)
 		return True
 
@@ -164,7 +168,7 @@ def compileToken(self):
 					self.rewindTo(mark)
 			else:
 				self.rewindTo(mark)
-		FatalError(self, f'No handler found for "{token}"')
+		FatalError(self, f'Unable to compile "{token}" (in this context)')
 
 	# Compile a single command
 	def compileOne(self):

dist/easycoder-250425.1-py2.py3-none-any.whl

@@ -14,6 +14,9 @@ def __init__(self, compiler):
 
     def getName(self):
         return 'core'
+    
+    def noSymbolWarning(self):
+        self.warning(f'Symbol "{self.getToken()}" not found')
 
     #############################################################################
     # Keyword handlers
@@ -1379,6 +1382,33 @@ def r_set(self, command):
             self.putSymbolValue(targetVariable, val)
             return self.nextPC()
 
+    # Shuffle a list
+    def k_shuffle(self, command):
+        if self.nextIsSymbol():
+            symbolRecord = self.getSymbolRecord()
+            if symbolRecord['hasValue']:
+                command['target'] = self.getToken()
+                self.add(command)
+                return True
+            self.warning(f'Core.negate: Variable "{symbolRecord["name"]}" does not hold a value')
+        return False
+
+    def r_shuffle(self, command):
+        symbolRecord = self.getVariable(command['target'])
+        if not symbolRecord['hasValue']:
+            RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
+            return None
+        value = self.getSymbolValue(symbolRecord)
+        if value == None:
+            RuntimeError(self.program, f'{symbolRecord["name"]} has not been initialised')
+        content = value['content']
+        if isinstance(content, list):
+            random.shuffle(content)
+            value['content'] = content
+            self.putSymbolValue(symbolRecord, value)
+            return self.nextPC()
+        RuntimeError(self.program, f'{symbolRecord["name"]} is not a list')
+
     # Split a string into a variable with several elements
     # split {variable} on {value}
     def k_split(self, command):
@@ -1400,6 +1430,7 @@ def k_split(self, command):
                         command['on'] = self.nextValue()
                 self.add(command)
                 return True
+        else: self.noSymbolWarning()
         return False
 
     def r_split(self, command):
@@ -1419,33 +1450,6 @@ def r_split(self, command):
 
         return self.nextPC()
 
-    # Shuffle a list
-    def k_shuffle(self, command):
-        if self.nextIsSymbol():
-            symbolRecord = self.getSymbolRecord()
-            if symbolRecord['hasValue']:
-                command['target'] = self.getToken()
-                self.add(command)
-                return True
-            self.warning(f'Core.negate: Variable "{symbolRecord["name"]}" does not hold a value')
-        return False
-
-    def r_shuffle(self, command):
-        symbolRecord = self.getVariable(command['target'])
-        if not symbolRecord['hasValue']:
-            RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
-            return None
-        value = self.getSymbolValue(symbolRecord)
-        if value == None:
-            RuntimeError(self.program, f'{symbolRecord["name"]} has not been initialised')
-        content = value['content']
-        if isinstance(content, list):
-            random.shuffle(content)
-            value['content'] = content
-            self.putSymbolValue(symbolRecord, value)
-            return self.nextPC()
-        RuntimeError(self.program, f'{symbolRecord["name"]} is not a list')
-
     # Declare a stack variable
     def k_stack(self, command):
         return self.compileVariable(command)

dist/easycoder-250424.3.tar.gz renamed to dist/easycoder-250425.1.tar.gz

@@ -7,6 +7,7 @@ def __init__(self, compiler):
 		self.program = compiler.program
 		self.getToken = compiler.getToken
 		self.nextToken = compiler.nextToken
+		self.skip = compiler.skip
 		self.peek = compiler.peek
 		self.getValue = compiler.getValue
 		self.nextValue = compiler.nextValue