easycoder 250209.1__tar.gz → 250211.1__tar.gz

{easycoder-250209.1 → easycoder-250211.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easycoder
-Version: 250209.1
+Version: 250211.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-250209.1 → easycoder-250211.1}/easycoder/__init__.py

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

{easycoder-250209.1 → easycoder-250211.1}/easycoder/ec_core.py

@@ -696,22 +696,21 @@ class Core(Handler):
                 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
         return False
 
     def r_load(self, command):
         target = self.getVariable(command['target'])
         file = self.getRuntimeValue(command['file'])
-        try:
-            with open(file, 'r') as f:
-                content = f.read()
-        except:
-            content=None
-        if content != None and file.endswith('.json'): content = json.loads(content)
+        f = open(file, 'r')
+        content = f.read()
+        f.close()
         value = {}
         value['type'] = 'text'
         value['content'] = content
@@ -1220,9 +1219,9 @@ class Core(Handler):
     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)
+        f = open(file, 'w')
+        f.write(content)
+        f.close()
         return self.nextPC()
 
     # Send a message to a module
@@ -1691,6 +1690,7 @@ class Core(Handler):
             value['name'] = token
             symbolRecord = self.getSymbolRecord()
             keyword = symbolRecord['keyword']
+
             if keyword == 'module':
                 value['type'] = 'module'
                 return value
@@ -1999,6 +1999,10 @@ class Core(Handler):
             base64_bytes = content.encode('ascii')
             message_bytes = base64.b64decode(base64_bytes)
             value['content'] = message_bytes.decode('ascii')
+        elif self.encoding == 'hex':
+            hex_bytes = content.encode('utf-8')
+            message_bytes = binascii.unhexlify(hex_bytes)
+            value['content'] = message_bytes.decode('utf-8')
         else:
             value = v
         return value
@@ -2042,6 +2046,10 @@ class Core(Handler):
             data_bytes = content.encode('ascii')
             base64_bytes = base64.b64encode(data_bytes)
             value['content'] = base64_bytes.decode('ascii')
+        elif self.encoding == 'hex':
+            data_bytes = content.encode('utf-8')
+            hex_bytes = binascii.hexlify(data_bytes)
+            value['content'] = hex_bytes.decode('utf-8')
         else:
             value = v
         return value

{easycoder-250209.1 → easycoder-250211.1}/easycoder/ec_program.py

@@ -149,17 +149,19 @@ class Program:
 		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
 

easycoder-250211.1/scripts/test.ecs

@@ -0,0 +1,14 @@
+!	A test script
+
+	script Test
+
+	variable File
+	variable Segment
+
+	set the encoding to `hex`
+	load File from `/data/Projects/rbr/roombyroom/Controller/home/orangepi/firmware/NOW/config.py`
+	put left 200 of File into Segment
+	print Segment
+	put encode Segment into Segment
+	print Segment
+	exit

easycoder-250209.1/scripts/test.ecs

@@ -1,12 +0,0 @@
-!	A test script
-
-	script Test
-
-	variable M
-	put 0 into M
-	while true
-	begin
-		print M
-		increment M
-		wait 5
-	end