easycoder 250422.3__py2.py3-none-any.whl → 250423.2__py2.py3-none-any.whl

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/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/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/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/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:

easycoder/ec_pyside6.py

@@ -28,7 +28,9 @@ from PySide6.QtWidgets import (
     QGroupBox,
     QWidget,
     QSpacerItem,
-    QSizePolicy
+    QSizePolicy,
+    QDialog,
+    QMessageBox
 )
 
 class Graphics(Handler):
@@ -42,7 +44,7 @@ class Graphics(Handler):
         Handler.__init__(self, compiler)
 
     def getName(self):
-        return 'pyside6'
+        return 'graphics'
 
     def closeEvent(self):
         print('window closed')
@@ -50,54 +52,84 @@ class Graphics(Handler):
     #############################################################################
     # Keyword handlers
 
-    # Add a widget to a layout
-    # add [stretch] {widget} to {layout}
-    # add stretch to {layout}
+    # (1) add {value} to {widget}
+    # (2) add {widget} to {layout}
+    # (3) add stretch {widget} to {layout}
+    # (4) add stretch to {layout}
     def k_add(self, command):
+        def addToLayout():
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                command['layout'] = record['name']
+                self.add(command)
+                return True
+            return False
+
         command['stretch'] = False
         if self.nextIs('stretch'):
-            if self.peek() == 'to':
+            # It's either (3) or (4)
+            self.nextToken()
+            if self.tokenIs('to'):
+                # (4)
                 command['widget'] = 'stretch'
-            elif self.nextIsSymbol():
+                return addToLayout()
+            # (3)
+            if self.isSymbol():
                 record = self.getSymbolRecord()
                 command['widget'] = record['name']
                 command['stretch'] = True
-            else: return False
+                if self.nextIs('to'):
+                    return addToLayout()
+            return False
+
+        # Here it's either (1) or (2)
         elif self.isSymbol():
-            record = self.getSymbolRecord()
-            command['widget'] = record['name']
-        else: return False
-        if self.nextIs('to'):
-            if self.nextIsSymbol():
+            if self.peek() == 'to':
+                # (2)
                 record = self.getSymbolRecord()
-                command['layout'] = record['name']
-                self.add(command)
-                return True
+                command['widget'] = record['name']
+                self.nextToken()
+                return addToLayout()
+        else:
+            # (1)
+            command['value'] = self.getValue()
+            if self.nextIs('to'):
+                if self.nextIsSymbol():
+                    record = self.getSymbolRecord()
+                    command['widget'] = record['name']
+                    self.add(command)
+                    return True
         return False
     
     def r_add(self, command):
-        layoutRecord = self.getVariable(command['layout'])
-        widget = command['widget']
-        if widget == 'stretch':
-            layoutRecord['widget'].addStretch()
+        if 'value' in command:
+            value = self.getRuntimeValue(command['value'])
+            widget = self.getVariable(command['widget'])
+            if widget['keyword'] == 'combobox':
+                widget['widget'].addItem(value)
         else:
-            widgetRecord = self.getVariable(widget)
             layoutRecord = self.getVariable(command['layout'])
-            widget = widgetRecord['widget']
-            layout = layoutRecord['widget']
-            stretch = command['stretch']
-            if widgetRecord['keyword'] == 'layout':
-                if layoutRecord['keyword'] == 'groupbox':
-                    if widgetRecord['keyword'] == 'layout':
-                        layout.setLayout(widget)
+            widget = command['widget']
+            if widget == 'stretch':
+                layoutRecord['widget'].addStretch()
+            else:
+                widgetRecord = self.getVariable(widget)
+                layoutRecord = self.getVariable(command['layout'])
+                widget = widgetRecord['widget']
+                layout = layoutRecord['widget']
+                stretch = command['stretch']
+                if widgetRecord['keyword'] == 'layout':
+                    if layoutRecord['keyword'] == 'groupbox':
+                        if widgetRecord['keyword'] == 'layout':
+                            layout.setLayout(widget)
+                        else:
+                            RuntimeError(self.program, 'Can only add a layout to a groupbox')
                     else:
-                        RuntimeError(self.program, 'Can only add a layout to a groupbox')
+                        if stretch: layout.addLayout(widget, stretch=1)
+                        else: layout.addLayout(widget)
                 else:
-                    if stretch: layout.addLayout(widget, stretch=1)
-                    else: layout.addLayout(widget)
-            else:
-                if stretch: layout.addWidget(widget, stretch=1)
-                else: layout.addWidget(widget)
+                    if stretch: layout.addWidget(widget, stretch=1)
+                    else: layout.addWidget(widget)
         return self.nextPC()
 
     # Declare a checkbox variable
@@ -121,25 +153,36 @@ class Graphics(Handler):
         self.getVariable(command['name'])['window'].close()
         return self.nextPC()
 
+    # Declare a combobox variable
+    def k_combobox(self, command):
+        return self.compileVariable(command, False)
+
+    def r_combobox(self, command):
+        return self.nextPC()
+
     # Create a window
     def k_createWindow(self, command):
         command['title'] = 'Default'
-        command['x'] = self.compileConstant(100)
-        command['y'] = self.compileConstant(100)
-        command['w'] = self.compileConstant(640)
-        command['h'] = self.compileConstant(480)
+        x = None
+        y = None
+        w = 640
+        h = 480
         while True:
             token = self.peek()
             if token in ['title', 'at', 'size']:
                 self.nextToken()
                 if token == 'title': command['title'] = self.nextValue()
                 elif token == 'at':
-                    command['x'] = self.nextValue()
-                    command['y'] = self.nextValue()
+                    x = self.nextValue()
+                    y = self.nextValue()
                 elif token == 'size':
                     command['w'] = self.nextValue()
                     command['h'] = self.nextValue()
             else: break
+        command['w'] = self.compileConstant(w)
+        command['h'] = self.compileConstant(h)
+        command['x'] = x
+        command['y'] = y
         self.add(command)
         return True
 
@@ -212,6 +255,44 @@ class Graphics(Handler):
         self.add(command)
         return True
 
+    def k_createComboBox(self, command):
+        self.add(command)
+        return True
+
+    def k_createDialog(self, command):
+        if self.peek() == 'title':
+            self.nextToken()
+            title = self.nextValue()
+        else: title = ''
+        command['title'] = title
+        self.add(command)
+        return True
+
+    def k_createMessageBox(self, command):
+        if self.nextIs('on'):
+            if self.nextIsSymbol():
+                command['window'] = self.getSymbolRecord()['name']
+                style = 'question'
+                title = ''
+                message = ''
+                while True:
+                    if self.peek() == 'style':
+                        self.nextToken()
+                        style = self.nextToken()
+                    elif self.peek() == 'title':
+                        self.nextToken()
+                        title = self.nextValue()
+                    elif self.peek() == 'message':
+                        self.nextToken()
+                        message = self.nextValue()
+                    else: break
+                command['style'] = style
+                command['title'] = title
+                command['message'] = message
+                self.add(command)
+                return True
+        return False
+
     def k_create(self, command):
         if self.nextIsSymbol():
             record = self.getSymbolRecord()
@@ -225,15 +306,22 @@ class Graphics(Handler):
             elif keyword == 'checkbox': return self.k_createCheckBox(command)
             elif keyword == 'lineinput': return self.k_createLineEdit(command)
             elif keyword == 'listbox': return self.k_createListWidget(command)
+            elif keyword == 'combobox': return self.k_createComboBox(command)
+            elif keyword == 'dialog': return self.k_createDialog(command)
+            elif keyword == 'messagebox': return self.k_createMessageBox(command)
         return False
     
     def r_createWindow(self, command, record):
         window = self.MainWindow()
         window.setWindowTitle(self.getRuntimeValue(command['title']))
-        x = self.getRuntimeValue(command['x'])
-        y = self.getRuntimeValue(command['y'])
         w = self.getRuntimeValue(command['w'])
         h = self.getRuntimeValue(command['h'])
+        x = command['x']
+        y = command['y']
+        if x == None: x = (self.screenWidth - w) / 2
+        else: x = self.getRuntimeValue(x)
+        if y == None: y = (self.screenHeight - h) / 2
+        else: y = self.getRuntimeValue(x)
         window.setGeometry(x, y, w, h)
         record['window'] = window
         return self.nextPC()
@@ -292,6 +380,26 @@ class Graphics(Handler):
     def r_createListWidget(self, command, record):
         record['widget'] = QListWidget()
         return self.nextPC()
+    
+    def r_createComboBox(self, command, record):
+        record['widget'] = QComboBox()
+        return self.nextPC()
+    
+    def r_createDialog(self, command, record):
+        dialog = QDialog()
+        dialog.setWindowTitle(self.getRuntimeValue(command['title']))
+        record['dialog'] = dialog
+        return self.nextPC()
+    
+    # Creates a message box but doesn'r run it
+    def r_createMessageBox(self, command, record):
+        data = {}
+        data['window'] = command['window']
+        data['style'] = command['style']
+        data['title'] = self.getRuntimeValue(command['title'])
+        data['message'] = self.getRuntimeValue(command['message'])
+        record['data'] = data
+        return self.nextPC()
 
     def r_create(self, command):
         record = self.getVariable(command['name'])
@@ -304,8 +412,42 @@ class Graphics(Handler):
         elif keyword == 'checkbox': return self.r_createCheckBox(command, record)
         elif keyword == 'lineinput': return self.r_createLineEdit(command, record)
         elif keyword == 'listbox': return self.r_createListWidget(command, record)
+        elif keyword == 'combobox': return self.r_createComboBox(command, record)
+        elif keyword == 'dialog': return self.r_createDialog(command, record)
+        elif keyword == 'messagebox': return self.r_createMessageBox(command, record)
         return None
 
+    # Declare a dialog variable
+    def k_dialog(self, command):
+        return self.compileVariable(command, False)
+
+    def r_dialog(self, command):
+        return self.nextPC()
+
+    # Disable a widget
+    def k_disable(self, command):
+        if self.nextIsSymbol():
+            command['name'] = self.getSymbolRecord()['name']
+            self.add(command)
+            return True
+        return False
+    
+    def r_disable(self, command):
+        self.getVariable(command['name'])['widget'].setEnabled(False)
+        return self.nextPC()
+
+    # Enable a widget
+    def k_enable(self, command):
+        if self.nextIsSymbol():
+            command['name'] = self.getSymbolRecord()['name']
+            self.add(command)
+            return True
+        return False
+    
+    def r_enable(self, command):
+        self.getVariable(command['name'])['widget'].setEnabled(True)
+        return self.nextPC()
+
     # Create a group box
     def k_groupbox(self, command):
         return self.compileVariable(command, False)
@@ -322,6 +464,10 @@ class Graphics(Handler):
     
     def r_init(self, command):
         self.app = QApplication(sys.argv)
+        screen = QApplication.screens()[0].size().toTuple()
+        self.screenWidth = screen[0]
+        self.screenHeight = screen[1]
+        print(f'Screen: {self.screenWidth}x{self.screenHeight}')
         return self.nextPC()
 
     # Declare a label variable
@@ -352,6 +498,13 @@ class Graphics(Handler):
     def r_listbox(self, command):
         return self.nextPC()
 
+    # Declare a messagebox variable
+    def k_messagebox(self, command):
+        return self.compileVariable(command, False)
+
+    def r_messagebox(self, command):
+        return self.nextPC()
+
     # Handle events
     def k_on(self, command):
         if self.nextIs('click'):
@@ -396,19 +549,33 @@ class Graphics(Handler):
     def r_pushbutton(self, command):
         return self.nextPC()
 
-    # Clean exit
-    def on_last_window_closed(self):
-        print("Last window closed! Performing cleanup...")
-        self.program.kill()
+    # remove current item from {combobox}
+    def k_remove(self, command):
+        command['variant'] = None
+        if self.nextIs('current'):
+            if self.nextIs('item'):
+                if self.nextIs('from'):
+                    if self.nextIsSymbol():
+                        record = self.getSymbolRecord()
+                        if record['keyword'] == 'combobox':
+                            command['variant'] = 'current'
+                            command['name'] = record['name']
+                            self.addCommand(command)
+                            return True
+        return False
+        
+    def r_remove(self, command):
+        variant = command['variant']
+        record = self.getVariable(command['name'])
+        if record['keyword'] == 'combobox' and variant == 'current':
+            widget = record['widget']
+            widget.removeItem(widget.currentIndex())
+        return self.nextPC()
 
     # This is called every 10ms to keep the main application running
     def flush(self):
         self.program.flushCB()
 
-    # Resume execution at the line following 'start graphics'
-    def resume(self):
-        self.program.flush(self.nextPC())
-
     # Set something
     def k_set(self, command):
         token = self.nextToken()
@@ -434,12 +601,14 @@ class Graphics(Handler):
             groupbox.setFixedHeight(self.getRuntimeValue(command['value']))
         return self.nextPC()
 
-    # Show a window with a specified layout
+    # Show something
     # show {name} in {window}}
+    # show {dialog}/{messagebox}
     def k_show(self, command):
         if self.nextIsSymbol():
             record = self.getSymbolRecord()
-            if record['keyword'] == 'layout':
+            keyword = record['keyword']
+            if keyword == 'layout':
                 command['layout'] = record['name']
                 if self.nextIs('in'):
                     if self.nextIsSymbol():
@@ -448,16 +617,54 @@ class Graphics(Handler):
                             command['window'] = record['name']
                             self.add(command)
                             return True
+            elif keyword == 'dialog':
+                command['dialog'] = record['name']
+                self.add(command)
+                return True
+            elif keyword == 'messagebox':
+                command['messagebox'] = record['name']
+                if self.nextIs('giving'):
+                    if self.nextIsSymbol():
+                        command['result'] = self.getSymbolRecord()['name']
+                        self.add(command)
+                        return True
         return False
         
     def r_show(self, command):
-        layoutRecord = self.getVariable(command['layout'])
-        windowRecord = self.getVariable(command['window'])
-        window = windowRecord['window']
-        container = QWidget()
-        container.setLayout(layoutRecord['widget'])
-        window.setCentralWidget(container)
-        window.show()
+        if 'dialog' in command:
+            dialog = self.getVariable(command['dialog'])['dialog']
+            b1 = QPushButton("ok",dialog)
+            b1.move(50,50)
+            dialog.setWindowModality(Qt.ApplicationModal)
+            dialog.exec_()
+        elif 'messagebox' in command:
+            data = self.getVariable(command['messagebox'])['data']
+            symbolRecord = self.getVariable(command['result'])
+            window = self.getVariable(data['window'])['window']
+            style = data['style']
+            title = data['title']
+            message = data['message']
+            if style == 'question':
+                button = QMessageBox.question(window, title, message)
+                if button == QMessageBox.Yes: result = 'Yes'
+                else: result = 'No'
+            elif style == 'warning':
+                button = QMessageBox.warning(window, title, message)
+                if button == QMessageBox.Ok: result = 'OK'
+                else: result = ''
+            else: result = 'Cancel'
+            v = {}
+            v['type'] = 'text'
+            v['content'] = result
+            self.putSymbolValue(symbolRecord, v)
+        else:
+            layoutRecord = self.getVariable(command['layout'])
+            windowRecord = self.getVariable(command['window'])
+            window = windowRecord['window']
+            container = QWidget()
+            container.setLayout(layoutRecord['widget'])
+            window.setCentralWidget(container)
+            window.show()
         return self.nextPC()
 
     # Start the graphics
@@ -468,11 +675,16 @@ class Graphics(Handler):
         return False
         
     def r_start(self, command):
+        def on_last_window_closed():
+            print("Performing cleanup...")
+            self.program.kill()
+        def resume():
+            self.program.flush(self.nextPC())
         timer = QTimer()
         timer.timeout.connect(self.flush)
         timer.start(10)
-        QTimer.singleShot(500, self.resume)
-        self.app.lastWindowClosed.connect(self.on_last_window_closed)
+        QTimer.singleShot(500, resume)
+        self.app.lastWindowClosed.connect(on_last_window_closed)
         self.app.exec()
 
     # Declare a window variable
@@ -486,12 +698,27 @@ class Graphics(Handler):
     # Compile a value in this domain
     def compileValue(self):
         value = {}
-        value['domain'] = 'rbr'
+        value['domain'] = self.getName()
+        token = self.getToken()
+        if self.isSymbol():
+            value['name'] = token
+            value['type'] = 'symbol'
+            return value
+
         if self.tokenIs('the'):
             self.nextToken()
         token = self.getToken()
-        if token == 'xxxxx':
-            return value
+
+        if token == 'count':
+            if self.nextIs('of'):
+                if self.nextIsSymbol():
+                    value['type'] = 'symbol'
+                    record = self.getSymbolRecord()
+                    keyword = record['keyword']
+                    if keyword == 'combobox':
+                        value['type'] = 'count'
+                        value['name'] = record['name']
+                        return value
 
         return None
 
@@ -503,8 +730,26 @@ class Graphics(Handler):
     #############################################################################
     # Value handlers
 
-    def v_xxxxx(self, v):
+    # This is used by the expression evaluator to get the value of a symbol
+    def v_symbol(self, symbolRecord):
+        symbolRecord = self.getVariable(symbolRecord['name'])
+        keyword = symbolRecord['keyword']
+        if keyword == 'combobox':
+            combobox = symbolRecord['widget']
+            v = {}
+            v['type'] = 'text'
+            v['content'] = combobox.currentText()
+            return v
+        return None
+
+    def v_count(self, v):
+        record = self.getVariable(v['name'])
+        keyword = record['keyword']
+        widget = record['widget']
+        if keyword == 'combobox': content = widget.count()
         value = {}
+        value['type'] = 'int'
+        value['content'] = content
         return value
 
     #############################################################################

{easycoder-250422.3.dist-info → easycoder-250423.2.dist-info}/METADATA

@@ -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-250423.2.dist-info/RECORD

@@ -0,0 +1,18 @@
+easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
+easycoder/__init__.py,sha256=rXpc2iuRmzM8KsgUZWefLoHMii_uABr61154GK0iZ_0,262
+easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
+easycoder/ec_compiler.py,sha256=WN4DMTU66kzOAwOGJe3KDoXj2nPvq19ACegQ-RSMglo,4780
+easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
+easycoder/ec_core.py,sha256=X66TBECPnp-82lEcCpaiJuXSy4Ex519iBK2BM-wGHaQ,90611
+easycoder/ec_graphics.py,sha256=WXxKMB4GJSmxvk-FVbOTyufiUx4TYIzyDoB1PCAO3JY,16067
+easycoder/ec_gutils.py,sha256=yqu4RRQ6VdRkC5B2ADBYsXzgNu76dLnekd9aUjdEgPw,6399
+easycoder/ec_handler.py,sha256=K7nBuQTH8l0k8hX1o2b4KhTnhZHGdf2fkEuX4FJXJs8,2277
+easycoder/ec_program.py,sha256=ZCcvI36iq9HG4o8rFwFxzVElzZ7PEeNOPMr8eqwz8ns,10010
+easycoder/ec_pyside6.py,sha256=0Z-uWrCq7Uz_C6WjN-9E0TDI-IHny14-j5sTc1a3LLg,26627
+easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
+easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
+easycoder-250423.2.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250423.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250423.2.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+easycoder-250423.2.dist-info/METADATA,sha256=XZhRQ-0z-KpgImt8Nvyk46I6V_lZ1M2aet5VoR8hHYs,5617
+easycoder-250423.2.dist-info/RECORD,,

easycoder-250422.3.dist-info/RECORD

@@ -1,18 +0,0 @@
-easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
-easycoder/__init__.py,sha256=HAdBM4aowyailw2NexqgELS6KF9_8A6QEnCYy1FghmY,262
-easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
-easycoder/ec_compiler.py,sha256=rtxFEWnhW0550MtWEDvYHOw9cYkeTcR0oG3t-kmgnBk,4795
-easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
-easycoder/ec_core.py,sha256=-nSX_KA_VBximHI1GIuXA-FhsqcyTNp9-HFrv6Dy64M,90625
-easycoder/ec_graphics.py,sha256=ScGLNxW_sxu0WyoO-Od-9MM0bhpVvf-vGa5UmoHYRCA,16073
-easycoder/ec_gutils.py,sha256=yqu4RRQ6VdRkC5B2ADBYsXzgNu76dLnekd9aUjdEgPw,6399
-easycoder/ec_handler.py,sha256=K7nBuQTH8l0k8hX1o2b4KhTnhZHGdf2fkEuX4FJXJs8,2277
-easycoder/ec_program.py,sha256=BDwU7aGHiaw6WdbQvVFDhGVaHsvwQ1CWa4wb5MPmOe8,10013
-easycoder/ec_pyside6.py,sha256=OOj7ikQbGQqi1wZ8VaNcX0yZUrN0KkVzZGPGbKlyGDo,17583
-easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
-easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250422.3.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250422.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250422.3.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-easycoder-250422.3.dist-info/METADATA,sha256=40jnSopPCKhQMtl0N_9Hka9LT7CVXI-TV0q0DeyIQ0A,5617
-easycoder-250422.3.dist-info/RECORD,,