easycoder 250422.3__tar.gz → 250423.2__tar.gz

{easycoder-250422.3 → easycoder-250423.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250422.3
+Version: 250423.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>

{easycoder-250422.3 → easycoder-250423.2}/config.ecs

@@ -24,7 +24,8 @@
     pushbutton UpdateSlaveButton
     pushbutton DeleteFileButton
     pushbutton ExitButton
-    pushbutton SelectSystemButton
+    pushbutton AddSystemButton
+    pushbutton RemoveSystemButton
     pushbutton SaveHostButton
     pushbutton RelayOffButton
     pushbutton RelayOnButton
@@ -38,8 +39,13 @@
     lineinput DHT22PinInput
     lineinput PathInput
     listbox SlaveList
+    combobox SystemsCombo
     checkbox LEDInvertCheckbox
     checkbox RelayInvertCheckbox
+    dialog Dialog
+    messagebox MessageBox
+    variable Name
+    variable Value
 
 !    debug step
 
@@ -48,6 +54,8 @@
     create Window title `RBR-Now configurator` size 700 500
     create MainPanel type QHBoxLayout
 
+    ! Do the left-hand panel
+
     create LeftPanel type QVBoxLayout
     add LeftPanel to MainPanel
     create ResetConfigButton text `Reset config`
@@ -84,20 +92,26 @@
     add ExitButton to LeftPanel
     on click ExitButton go to Exit
 
+    ! Now do the right-hand panel
+
     create RightPanel type QVBoxLayout
     add stretch RightPanel to MainPanel
 
     ! Create the system name group
-    create Group title `System name`
+    create Group title `Systems`
     set the height of Group to 50
     add Group to RightPanel
     create Layout type QHBoxLayout
     add Layout to Group
-    create Label text `(none)`
-    add stretch Label to Layout
-    create SelectSystemButton text `Select system`
-    on click SelectSystemButton go to SelectSystem
-    add SelectSystemButton to Layout
+    create SystemsCombo
+    add stretch SystemsCombo to Layout
+    create AddSystemButton text `Add`
+    on click AddSystemButton go to AddSystem
+    add AddSystemButton to Layout
+    create RemoveSystemButton text `Remove`
+    disable RemoveSystemButton
+    on click RemoveSystemButton go to RemoveSystem
+    add RemoveSystemButton to Layout
     
     ! Create the host access group
     create Group title `Host`
@@ -209,7 +223,7 @@
     on click SaveWidgetDataButton go to SaveWidgetData
     add SaveWidgetDataButton to Layout
 
-    create StatusLabel text `<font color="#00ff00">OK</font>`
+    create StatusLabel text `<font color="#008000">OK</font>`
     add StatusLabel to RightPanel
     
     add stretch to RightPanel
@@ -217,7 +231,13 @@
     show MainPanel in Window
 
     start graphics
-    log `Graphics running`
+
+PopulateForm:
+    log `Populate the form`
+    add `System 1` to SystemsCombo
+    add `System 2` to SystemsCombo
+    add `System 3` to SystemsCombo
+    if the count of SystemsCombo is not 0 enable RemoveSystemButton
     stop
 
 ResetConfigFile:
@@ -249,12 +269,26 @@ DeleteSlave:
     stop
 
 Exit:
-    log `Exit the configuator`
+    log `Exit the configurator`
     close Window
     exit
 
-SelectSystem:
-    log `Select the system`
+AddSystem:
+    log `Add a system`
+    create Dialog title `Select system`
+    show Dialog
+    stop
+
+RemoveSystem:
+    put SystemsCombo into Name
+    log `Remove ` cat Name cat `?`
+    create MessageBox on Window
+        style question
+        title `Remove system`
+        message `Are you sure you want to remove ` cat Name cat `?`
+    show MessageBox giving Value
+    if Value is `Yes` remove current item from SystemsCombo
+    if the count of SystemsCombo is 0 disable RemoveSystemButton
     stop
 
 SaveHostInfo:

{easycoder-250422.3 → easycoder-250423.2}/easycoder/__init__.py

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

{easycoder-250422.3 → easycoder-250423.2}/easycoder/ec_compiler.py

@@ -114,10 +114,10 @@ class Compiler:
 	def compileLabel(self, command):
 		return self.compileSymbol(command, self.getToken(), False)
 
-	def compileVariable(self, command, valueHolder = False):
-		return self.compileSymbol(command, self.nextToken(), valueHolder)
+	def compileVariable(self, command, hasValue = False):
+		return self.compileSymbol(command, self.nextToken(), hasValue)
 
-	def compileSymbol(self, command, name, valueHolder):
+	def compileSymbol(self, command, name, hasValue):
 		try:
 			v = self.symbols[name]
 		except:
@@ -128,7 +128,7 @@ class Compiler:
 		self.symbols[name] = self.getPC()
 		command['program'] = self.program
 		command['type'] = 'symbol'
-		command['valueHolder'] = valueHolder
+		command['hasValue'] = hasValue
 		command['name'] = name
 		command['elements'] = 1
 		command['index'] = 0

{easycoder-250422.3 → easycoder-250423.2}/easycoder/ec_core.py

@@ -26,7 +26,7 @@ class Core(Handler):
         if self.nextToken() == 'to':
             if self.nextIsSymbol():
                 symbolRecord = self.getSymbolRecord()
-                if symbolRecord['valueHolder']:
+                if symbolRecord['hasValue']:
                     if self.peek() == 'giving':
                         # This variable must be treated as a second value
                         command['value2'] = self.getValue()
@@ -57,7 +57,7 @@ class Core(Handler):
         except:
             value2 = None
         target = self.getVariable(command['target'])
-        if not target['valueHolder']:
+        if not target['hasValue']:
             self.variableDoesNotHoldAValueError(target['name'])
         targetValue = self.getSymbolValue(target)
         if targetValue == None:
@@ -87,7 +87,7 @@ class Core(Handler):
         if self.nextIs('to'):
             if self.nextIsSymbol():
                 symbolRecord = self.getSymbolRecord()
-                if symbolRecord['valueHolder']:
+                if symbolRecord['hasValue']:
                     command['target'] = symbolRecord['name']
                     self.add(command)
                     return True
@@ -149,7 +149,7 @@ class Core(Handler):
     def k_clear(self, command):
         if self.nextIsSymbol():
             target = self.getSymbolRecord()
-            if target['valueHolder']:
+            if target['hasValue']:
                 command['target'] = target['name']
                 self.add(command)
                 return True
@@ -245,7 +245,7 @@ class Core(Handler):
     def k_decrement(self, command):
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 command['target'] = self.getToken()
                 self.add(command)
                 return True
@@ -325,7 +325,7 @@ class Core(Handler):
         except:
             value2 = None
         target = self.getVariable(command['target'])
-        if not target['valueHolder']:
+        if not target['hasValue']:
             self.variableDoesNotHoldAValueError(target['name'])
             return None
         value = self.getSymbolValue(target)
@@ -400,7 +400,7 @@ class Core(Handler):
     def k_get(self, command):
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 command['target'] = self.getToken()
             else:
                 FatalError(self.compiler, f'Variable "{symbolRecord["name"]}" does not hold a value')
@@ -610,7 +610,7 @@ class Core(Handler):
     def k_increment(self, command):
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 command['target'] = self.getToken()
                 self.add(command)
                 return True
@@ -701,7 +701,7 @@ class Core(Handler):
                 return True
         elif self.isSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 command['target'] = symbolRecord['name']
                 if self.nextIs('from'):
                     command['file'] = self.nextValue()
@@ -785,7 +785,7 @@ class Core(Handler):
         except:
             value2 = None
         target = self.getVariable(command['target'])
-        if not target['valueHolder']:
+        if not target['hasValue']:
             self.variableDoesNotHoldAValueError(target['name'])
             return None
         value = self.getSymbolValue(target)
@@ -810,7 +810,7 @@ class Core(Handler):
     def k_negate(self, command):
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 command['target'] = self.getToken()
                 self.add(command)
                 return True
@@ -819,7 +819,7 @@ class Core(Handler):
 
     def r_negate(self, command):
         symbolRecord = self.getVariable(command['target'])
-        if not symbolRecord['valueHolder']:
+        if not symbolRecord['hasValue']:
             RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
             return None
         value = self.getSymbolValue(symbolRecord)
@@ -921,7 +921,7 @@ class Core(Handler):
 
     def r_pop(self, command):
         symbolRecord = self.getVariable(command['target'])
-        if not symbolRecord['valueHolder']:
+        if not symbolRecord['hasValue']:
             RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
         stackRecord = self.getVariable(command['from'])
         stack = self.getSymbolValue(stackRecord)
@@ -1060,7 +1060,7 @@ class Core(Handler):
             if self.nextIsSymbol():
                 symbolRecord = self.getSymbolRecord()
                 command['target'] = symbolRecord['name']
-                if 'valueholder' in symbolRecord and symbolRecord['valueHolder'] == False:
+                if 'hasValue' in symbolRecord and symbolRecord['hasValue'] == False:
                     FatalError(self.compiler, f'Symbol {symbolRecord["name"]} is not a value holder')
                 else:
                     self.add(command)
@@ -1074,7 +1074,7 @@ class Core(Handler):
         if value == None:
             return -1
         symbolRecord = self.getVariable(command['target'])
-        if not symbolRecord['valueHolder']:
+        if not symbolRecord['hasValue']:
             RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
             return -1
         self.putSymbolValue(symbolRecord, value)
@@ -1090,7 +1090,7 @@ class Core(Handler):
             command['line'] = False
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 if self.peek() == 'from':
                     self.nextToken()
                     if self.nextIsSymbol():
@@ -1259,7 +1259,7 @@ class Core(Handler):
     def k_set(self, command):
         if self.nextIsSymbol():
             target = self.getSymbolRecord()
-            if target['valueHolder']:
+            if target['hasValue']:
                 command['type'] = 'set'
                 command['target'] = target['name']
                 self.add(command)
@@ -1384,7 +1384,7 @@ class Core(Handler):
     def k_split(self, command):
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 command['target'] = symbolRecord['name']
                 value = {}
                 value['type'] = 'text'
@@ -1423,7 +1423,7 @@ class Core(Handler):
     def k_shuffle(self, command):
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 command['target'] = self.getToken()
                 self.add(command)
                 return True
@@ -1432,7 +1432,7 @@ class Core(Handler):
 
     def r_shuffle(self, command):
         symbolRecord = self.getVariable(command['target'])
-        if not symbolRecord['valueHolder']:
+        if not symbolRecord['hasValue']:
             RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
             return None
         value = self.getSymbolValue(symbolRecord)
@@ -1495,7 +1495,7 @@ class Core(Handler):
         if self.nextToken() == 'from':
             if self.nextIsSymbol():
                 symbolRecord = self.getSymbolRecord()
-                if symbolRecord['valueHolder']:
+                if symbolRecord['hasValue']:
                     if self.peek() == 'giving':
                         # This variable must be treated as a second value
                         command['value2'] = self.getValue()
@@ -1530,7 +1530,7 @@ class Core(Handler):
         except:
             value2 = None
         target = self.getVariable(command['target'])
-        if not target['valueHolder']:
+        if not target['hasValue']:
             self.variableDoesNotHoldAValueError(target['name'])
             return None
         value = self.getSymbolValue(target)
@@ -1552,7 +1552,7 @@ class Core(Handler):
     def k_toggle(self, command):
         if self.nextIsSymbol():
             target = self.getSymbolRecord()
-            if target['valueHolder']:
+            if target['hasValue']:
                 command['target'] = target['name']
                 self.add(command)
                 return True
@@ -1712,7 +1712,7 @@ class Core(Handler):
 
     def incdec(self, command, mode):
         symbolRecord = self.getVariable(command['target'])
-        if not symbolRecord['valueHolder']:
+        if not symbolRecord['hasValue']:
             RuntimeError(self.program, f'{symbolRecord["name"]} does not hold a value')
             return None
         value = self.getSymbolValue(symbolRecord)
@@ -1781,7 +1781,7 @@ class Core(Handler):
             if self.nextToken() == 'of':
                 if self.nextIsSymbol():
                     symbolRecord = self.getSymbolRecord()
-                    if symbolRecord['valueHolder']:
+                    if symbolRecord['hasValue']:
                         value['target'] = symbolRecord['name']
                         return value
                 self.warning(f'Core.compileValue: Token \'{self.getToken()}\' does not hold a value')
@@ -1792,7 +1792,7 @@ class Core(Handler):
             if self.nextToken() == 'of':
                 if self.nextIsSymbol():
                     symbolRecord = self.getSymbolRecord()
-                    if symbolRecord['valueHolder']:
+                    if symbolRecord['hasValue']:
                         value['target'] = symbolRecord['name']
                         return value
                     FatalError(self.compiler, 'Variable does not hold a value')
@@ -1838,8 +1838,9 @@ class Core(Handler):
         if token == 'count':
             if self.nextIs('of'):
                 if self.nextIsSymbol():
-                    value['name'] = self.getToken()
-                    return value
+                    if self.getSymbolRecord()['hasValue']:
+                        value['name'] = self.getToken()
+                        return value
             return None
 
         if token == 'index':

{easycoder-250422.3 → easycoder-250423.2}/easycoder/ec_graphics.py

@@ -165,11 +165,11 @@ class Graphics(Handler):
     def k_get(self, command):
         if self.nextIsSymbol():
             symbolRecord = self.getSymbolRecord()
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 command['target'] = self.getToken()
             else:
                 FatalError(self.compiler, f'Variable "{symbolRecord["name"]}" does not hold a value')
-            if symbolRecord['valueHolder']:
+            if symbolRecord['hasValue']:
                 if self.nextIs('from'):
                     if self.nextIs('popup'):
                         command['ptype'] = self.nextToken()

{easycoder-250422.3 → easycoder-250423.2}/easycoder/ec_program.py

@@ -149,7 +149,7 @@ class Program:
 		elif valType == 'symbol':
 			name = value['name']
 			symbolRecord = self.getSymbolRecord(name)
-			if symbolRecord['valueHolder']:
+			if symbolRecord['hasValue']:
 				handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
 				result = handler(symbolRecord)
 			else: