v250216.1

Author: graham-trott

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

@@ -9,4 +9,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250210.1"
+__version__ = "250216.1"

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

@@ -13,7 +13,6 @@ def __init__(self, program):
 		self.tokens = self.script.tokens
 		self.symbols = self.program.symbols
 		self.code = self.program.code
-		self.warnings = []
 		self.program.compiler = self
 		self.addCommand = self.program.add
 		self.compileConstant = self.value.compileConstant
@@ -107,11 +106,10 @@ def showWarnings(self):
 	def getSymbolRecord(self):
 		token = self.getToken()
 		symbol = self.symbols[token]
-		if symbol != None:
-			symbolRecord = self.code[symbol]
-			symbolRecord['used'] = True
-			return symbolRecord
-		return None
+		if symbol == None: return None
+		symbolRecord = self.code[symbol]
+		symbolRecord['used'] = True
+		return symbolRecord
 
 	def compileLabel(self, command):
 		return self.compileSymbol(command, self.getToken(), False)
@@ -144,6 +142,7 @@ def compileSymbol(self, command, name, valueHolder):
 
 	# Compile the current token
 	def compileToken(self):
+		self.warnings = []
 		token = self.getToken()
 #		print(f'Compile {token}')
 		if not token:

dist/easycoder-250210.1.tar.gz renamed to dist/easycoder-250216.1.tar.gz

@@ -9,6 +9,7 @@ def __init__(self, compiler):
 		self.tokenIs = compiler.tokenIs
 		self.rewindTo = compiler.rewindTo
 		self.program = compiler.program
+		self.negate = False
 
 	def compileCondition(self):
 		mark = self.getIndex()

easycoder/__init__.py

@@ -696,22 +696,28 @@ def k_load(self, command):
                 self.program.importPlugin(f'{source}:{clazz}')
                 return True
         elif self.isSymbol():
-            command['target'] = self.getToken()
-            if self.nextIs('from'):
-                command['file'] = self.nextValue()
-                self.add(command)
-                return True
+            symbolRecord = self.getSymbolRecord()
+            if symbolRecord['valueHolder']:
+                command['target'] = symbolRecord['name']
+                if self.nextIs('from'):
+                    command['file'] = self.nextValue()
+                    self.add(command)
+                    return True
+        else:
+            FatalError(self.program.compiler, f'I don\'t understand \'{self.getToken()}\'')
         return False
 
     def r_load(self, command):
         target = self.getVariable(command['target'])
-        file = self.getRuntimeValue(command['file'])
+        filename = self.getRuntimeValue(command['file'])
+        try:
+            with open(filename) as f: content = f.read()
+        except:
+            RuntimeError(self.program, f'File \'{filename}\' not found')
         try:
-            with open(file, 'r') as f:
-                content = f.read()
+            if filename.endswith('.json'): content = json.loads(content)
         except:
-            content=None
-        if content != None and file.endswith('.json'): content = json.loads(content)
+            RuntimeError(self.program, 'Bad or null JSON string')
         value = {}
         value['type'] = 'text'
         value['content'] = content
@@ -1219,10 +1225,9 @@ def k_save(self, command):
 
     def r_save(self, command):
         content = self.getRuntimeValue(command['content'])
-        file = self.getRuntimeValue(command['file'])
-        if file.endswith('.json'): content = json.dumps(content)
-        with open(file, 'w') as f:
-            f.write(content)
+        filename = self.getRuntimeValue(command['file'])
+        if filename.endswith('.json'): content = json.dumps(content)
+        with open(filename, 'w') as f: f.write(content)
         return self.nextPC()
 
     # Send a message to a module
@@ -1691,6 +1696,7 @@ def compileValue(self):
             value['name'] = token
             symbolRecord = self.getSymbolRecord()
             keyword = symbolRecord['keyword']
+
             if keyword == 'module':
                 value['type'] = 'module'
                 return value
@@ -2375,6 +2381,7 @@ def v_weekday(self, v):
     # Compile a condition
     def compileCondition(self):
         condition = Condition()
+
         if self.getToken() == 'not':
             condition.type = 'not'
             condition.value = self.nextValue()
@@ -2406,6 +2413,18 @@ def compileCondition(self):
                 return condition
             return None
 
+        if token == 'does':
+            self.nextToken()
+            if self.nextIs('not'):
+                if self.nextIs('have'):
+                    if self.nextToken() == 'property':
+                        prop = self.nextValue()
+                        condition.type = 'hasProperty'
+                        condition.property = prop
+                        condition.negate = not condition.negate
+                        return condition
+            return None
+
         if token in ['starts', 'ends']:
             self.nextToken()
             if self.nextToken() == 'with':
@@ -2498,7 +2517,7 @@ def c_hasProperty(self, condition):
             hasProp = True
         except:
             hasProp = False
-        return hasProp
+        return not hasProp if condition.negate else hasProp
 
     def c_includes(self, condition):
         value1 = self.getRuntimeValue(condition.value1)
@@ -2543,4 +2562,3 @@ def c_starts(self, condition):
     def c_string(self, condition):
         comparison = type(self.getRuntimeValue(condition.value1)) is str
         return not comparison if condition.negate else comparison
-# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

easycoder/ec_compiler.py

@@ -149,17 +149,19 @@ def doValue(self, value):
 		elif valType == 'symbol':
 			name = value['name']
 			symbolRecord = self.getSymbolRecord(name)
-			if symbolRecord['value'] == [None]:
-				RuntimeWarning(self, f'Variable "{name}" has no value')
-				return None
-			handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
-			result = handler(symbolRecord)
+			if symbolRecord['valueHolder']:
+				handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
+				result = handler(symbolRecord)
+			else:
+				# Call the given domain to handle a value
+				domain = self.domainIndex[value['domain']]
+				handler = domain.valueHandler(value['type'])
+				if handler: result = handler(value)
 		else:
 			# Call the given domain to handle a value
 			domain = self.domainIndex[value['domain']]
 			handler = domain.valueHandler(value['type'])
-			if handler:
-				result = handler(value)
+			if handler: result = handler(value)
 
 		return result