easycoder 250622.1__tar.gz → 250622.2__tar.gz

{easycoder-250622.1 → easycoder-250622.2}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: easycoder
-Version: 250622.1
+Version: 250622.2
 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>
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
-License-File: LICENSE
 Requires-Dist: pytz
 Requires-Dist: requests
 Requires-Dist: psutil

{easycoder-250622.1 → easycoder-250622.2}/easycoder/__init__.py

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

{easycoder-250622.1 → easycoder-250622.2}/easycoder/ec_classes.py

@@ -10,7 +10,7 @@ class FatalError:
 
 class NoValueError(FatalError):
 	def __init__(self, compiler, record):
-		super().__init__(compiler, 'Variable {record["name"]} does not hold a value')
+		super().__init__(compiler, f'Variable {record["name"]} does not hold a value')
 
 class AssertionError:
 	def __init__(self, program, msg=None):

{easycoder-250622.1 → easycoder-250622.2}/easycoder/ec_compiler.py

@@ -16,6 +16,7 @@ class Compiler:
 		self.program.compiler = self
 		self.compileConstant = self.value.compileConstant
 		self.debugCompile = False
+		self.valueTypes = {}
 
 	def getPC(self):
 		return len(self.program.code)
@@ -124,13 +125,19 @@ class Compiler:
 		symbolRecord['used'] = True
 		return symbolRecord
 
+	def addValueType(self):
+		self.valueTypes[self.getToken()] = True
+
+	def hasValue(self, type):
+		return type in self.valueTypes
+
 	def compileLabel(self, command):
-		return self.compileSymbol(command, self.getToken(), False)
+		return self.compileSymbol(command, self.getToken())
 
-	def compileVariable(self, command, hasValue = False, extra=None):
-		return self.compileSymbol(command, self.nextToken(), hasValue, extra)
+	def compileVariable(self, command, extra=None):
+		return self.compileSymbol(command, self.nextToken(), extra)
 
-	def compileSymbol(self, command, name, hasValue, extra=None):
+	def compileSymbol(self, command, name, extra=None):
 		try:
 			v = self.symbols[name]
 		except:
@@ -141,7 +148,6 @@ class Compiler:
 		self.symbols[name] = self.getPC()
 		command['program'] = self.program
 		command['type'] = 'symbol'
-		command['hasValue'] = hasValue
 		command['name'] = name
 		command['elements'] = 1
 		command['index'] = 0
@@ -151,6 +157,7 @@ class Compiler:
 		command['import'] = None
 		command['locked'] = False
 		command['extra'] = extra
+		if 'keyword' in command: command['hasValue'] = self.hasValue(command['keyword'])
 		self.add(command)
 		return True
 

{easycoder-250622.1 → easycoder-250622.2}/easycoder/ec_core.py

@@ -287,7 +287,6 @@ class Core(Handler):
         if type == 'file':
             filename = self.getRuntimeValue(command['filename'])
             if os.path.isfile(filename):
-                print('Deleting',filename)
                 os.remove(filename)
         elif type == 'property':
             key = self.getRuntimeValue(command['key'])
@@ -408,7 +407,7 @@ class Core(Handler):
 
     # Declare a file variable
     def k_file(self, command):
-        return self.compileVariable(command, False)
+        return self.compileVariable(command)
 
     def r_file(self, command):
         return self.nextPC()
@@ -617,6 +616,7 @@ class Core(Handler):
                 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
@@ -1621,7 +1621,7 @@ class Core(Handler):
         return self.nextPC()
 
     def k_ssh(self, command):
-        return self.compileVariable(command, False)
+        return self.compileVariable(command)
 
     def r_ssh(self, command):
         return self.nextPC()
@@ -1807,7 +1807,8 @@ class Core(Handler):
 
     # Declare a general-purpose variable
     def k_variable(self, command):
-        return self.compileVariable(command, True)
+        self.compiler.addValueType()
+        return self.compileVariable(command)
 
     def r_variable(self, command):
         return self.nextPC()

{easycoder-250622.1 → easycoder-250622.2}/easycoder/ec_pyside.py

@@ -166,7 +166,7 @@ class Graphics(Handler):
 
     # Declare a checkbox variable
     def k_checkbox(self, command):
-        return self.compileVariable(command, False, 'gui')
+        return self.compileVariable(command, 'gui')
 
     def r_checkbox(self, command):
         return self.nextPC()
@@ -201,7 +201,7 @@ class Graphics(Handler):
 
     # Declare a combobox variable
     def k_combobox(self, command):
-        return self.compileVariable(command, False, 'gui')
+        return self.compileVariable(command, 'gui')
 
     def r_combobox(self, command):
         return self.nextPC()
@@ -501,7 +501,7 @@ class Graphics(Handler):
 
     # Declare a dialog variable
     def k_dialog(self, command):
-        return self.compileVariable(command, False)
+        return self.compileVariable(command)
 
     def r_dialog(self, command):
         return self.nextPC()
@@ -532,7 +532,7 @@ class Graphics(Handler):
 
     # Create a group box
     def k_groupbox(self, command):
-        return self.compileVariable(command, False, 'gui')
+        return self.compileVariable(command, 'gui')
 
     def r_groupbox(self, command):
         return self.nextPC()
@@ -554,35 +554,35 @@ class Graphics(Handler):
 
     # Declare a label variable
     def k_label(self, command):
-        return self.compileVariable(command, False, 'gui')
+        return self.compileVariable(command, 'gui')
 
     def r_label(self, command):
         return self.nextPC()
 
     # Declare a layout variable
     def k_layout(self, command):
-        return self.compileVariable(command, False, 'gui')
+        return self.compileVariable(command, 'gui')
 
     def r_layout(self, command):
         return self.nextPC()
 
     # Declare a line input variable
     def k_lineinput(self, command):
-        return self.compileVariable(command, False, 'gui')
+        return self.compileVariable(command, 'gui')
 
     def r_lineinput(self, command):
         return self.nextPC()
 
     # Declare a listbox input variable
     def k_listbox(self, command):
-        return self.compileVariable(command, False, 'gui')
+        return self.compileVariable(command, 'gui')
 
     def r_listbox(self, command):
         return self.nextPC()
 
     # Declare a messagebox variable
     def k_messagebox(self, command):
-        return self.compileVariable(command, False)
+        return self.compileVariable(command)
 
     def r_messagebox(self, command):
         return self.nextPC()
@@ -675,7 +675,7 @@ class Graphics(Handler):
 
     # Declare a pushbutton variable
     def k_pushbutton(self, command):
-        return self.compileVariable(command, False, 'gui')
+        return self.compileVariable(command, 'gui')
 
     def r_pushbutton(self, command):
         return self.nextPC()
@@ -977,7 +977,7 @@ class Graphics(Handler):
 
     # Declare a window variable
     def k_window(self, command):
-        return self.compileVariable(command, False)
+        return self.compileVariable(command)
 
     def r_window(self, command):
         return self.nextPC()