easycoder 250518.1__tar.gz → 250522.1__tar.gz

{easycoder-250518.1 → easycoder-250522.1}/PKG-INFO

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

{easycoder-250518.1 → easycoder-250522.1}/easycoder/__init__.py

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

{easycoder-250518.1 → easycoder-250522.1}/easycoder/ec_compiler.py

@@ -16,6 +16,7 @@ class Compiler:
 		self.program.compiler = self
 		self.addCommand = self.program.add
 		self.compileConstant = self.value.compileConstant
+		self.debugCompile = False
 
 	def getPC(self):
 		return len(self.program.code)
@@ -174,7 +175,7 @@ class Compiler:
 					self.rewindTo(mark)
 			else:
 				self.rewindTo(mark)
-		FatalError(self, f'Unable to compile this "{token}" command. Perhaps a syntax error?')
+		FatalError(self, f'Unable to compile this "{token}" command')
 
 	# Compile a single command
 	def compileOne(self):
@@ -196,7 +197,7 @@ class Compiler:
 		while True:
 			token = self.tokens[self.index]
 			keyword = token.token
-#			line = self.script.lines[token.lino]
+			if self.debugCompile: print(self.script.lines[token.lino])
 #			print(f'{keyword} - {line}')
 #			if keyword != 'else':
 			if self.compileOne() == True:

{easycoder-250518.1 → easycoder-250522.1}/easycoder/ec_core.py

@@ -202,7 +202,11 @@ class Core(Handler):
     # Debug the script
     def k_debug(self, command):
         token = self.peek()
-        if token in ['step', 'stop', 'program', 'custom']:
+        if token == 'compile':
+            self.compiler.debugCompile = True
+            self.nextToken()
+            return True
+        elif token in ['step', 'stop', 'program', 'custom']:
             command['mode'] = token
             self.nextToken()
         elif token == 'stack':
@@ -222,7 +226,9 @@ class Core(Handler):
         return True
 
     def r_debug(self, command):
-        if command['mode'] == 'step':
+        if command['mode'] == 'compile':
+            self.program.debugStep = True
+        elif command['mode'] == 'step':
             self.program.debugStep = True
         elif command['mode'] == 'stop':
             self.program.debugStep = False
@@ -1455,6 +1461,7 @@ class Core(Handler):
         content = value['content'].split(self.getRuntimeValue(command['on']))
         elements = len(content)
         target['elements'] = elements
+        target['index'] = 0
         target['value'] = [None] * elements
 
         for index, item in enumerate(content):

{easycoder-250518.1 → easycoder-250522.1}/easycoder/ec_pyside.py

@@ -39,6 +39,7 @@ class Graphics(Handler):
 
     def __init__(self, compiler):
         Handler.__init__(self, compiler)
+        self.blocked = False
 
     def getName(self):
         return 'graphics'
@@ -83,15 +84,18 @@ class Graphics(Handler):
         elif self.isSymbol():
             record = self.getSymbolRecord()
             if record['extra'] == 'gui':
-                if self.peek() == 'to':
-                    # (2)
-                    record = self.getSymbolRecord()
-                    command['widget'] = record['name']
-                    self.nextToken()
-                    return addToLayout()
-                return False
+                if record['keyword'] in ['layout', 'groupbox', 'label', 'pushbutton', 'checkbox', 'lineinput', 'listbox', 'combobox']:
+                    if self.peek() == 'to':
+                        # (2)
+                        record = self.getSymbolRecord()
+                        command['widget'] = record['name']
+                        self.nextToken()
+                        return addToLayout()
+                else: return False
         # (1)
-        command['value'] = self.getValue()
+        value = self.getValue()
+        if value == None: return False
+        command['value'] = value
         self.skip('to')
         if self.nextIsSymbol():
             record = self.getSymbolRecord()
@@ -705,10 +709,12 @@ class Graphics(Handler):
 
     # set [the] width/height [of] {widget} [to] {value}
     # set [the] layout of {window} to {layout}
+    # set [the] spacing of {layout} to {value}
     # set [the] text [of] {label}/{button}/{lineinput} [to] {text}
     # set [the] color [of] {label}/{button}/{lineinput} [to] {color}
     # set [the] state [of] {checkbox} [to] {color}
     # set {listbox} to {list}
+    # set blocked true/false
     def k_set(self, command):
         self.skip('the')
         token = self.nextToken()
@@ -735,6 +741,16 @@ class Graphics(Handler):
                         command['layout'] = record['name']
                         self.add(command)
                         return True
+        elif token == 'spacing':
+            self.skip('of')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'layout':
+                    command['name'] = record['name']
+                    self.skip('to')
+                    command['value'] = self.nextValue()
+                    self.add(command)
+                    return True
         elif token == 'text':
             self.skip('of')
             if self.nextIsSymbol():
@@ -776,6 +792,9 @@ class Graphics(Handler):
                     command['value'] = self.nextValue()
                     self.add(command)
                     return True
+        elif token == 'blocked':
+            self.blocked = True if self.nextToken() == 'true' else False
+            return True
         elif self.isSymbol():
             record = self.getSymbolRecord()
             if record['keyword'] == 'listbox':
@@ -797,11 +816,13 @@ class Graphics(Handler):
             widget.setFixedWidth(self.getRuntimeValue(command['value']))
         elif what == 'layout':
             window = self.getVariable(command['name'])['window']
-            layout = self.getVariable(command['layout'])
             content = self.getVariable(command['layout'])['widget']
             container = QWidget()
             container.setLayout(content)
             window.setCentralWidget(container)
+        elif what == 'spacing':
+            layout = self.getVariable(command['name'])['widget']
+            layout.setSpacing(self.getRuntimeValue(command['value']))
         elif what == 'text':
             record = self.getVariable(command['name'])
             widget = self.getVariable(command['name'])['widget']
@@ -891,14 +912,14 @@ class Graphics(Handler):
     def r_start(self, command):
         def on_last_window_closed():
             self.program.kill()
-        def resume():
+        def init():
             self.program.flush(self.nextPC())
         def flush():
-            self.program.flushCB()
+            if not self.blocked: self.program.flushCB()
         timer = QTimer()
         timer.timeout.connect(flush)
         timer.start(10)
-        QTimer.singleShot(500, resume)
+        QTimer.singleShot(500, init)
         self.app.lastWindowClosed.connect(on_last_window_closed)
         self.app.exec()
 

{easycoder-250518.1 → easycoder-250522.1}/testrc.py

@@ -1,3 +1,5 @@
+#!/bin/python3
+
 from easycoder import Program
 
 Program('../../rbr/rbrconf.ecs').start()

easycoder-250518.1/ui.py

@@ -1,84 +0,0 @@
-from PySide6.QtWidgets import (
-    QApplication, QMainWindow, QVBoxLayout, QLabel, QPushButton, QWidget, QHBoxLayout, QSpacerItem, QSizePolicy
-)
-from PySide6.QtGui import QPixmap, QFont, QPalette, QBrush
-from PySide6.QtCore import Qt
-import sys
-
-class MainWindow(QMainWindow):
-    def __init__(self):
-        super().__init__()
-        self.setWindowTitle("Custom UI")
-        self.setFixedSize(600, 1024)  # Set the window size to 600x1024
-
-        # Set the background image
-        palette = QPalette()
-        background_pixmap = QPixmap("/home/graham/dev/rbr/ui/main/backdrop.jpg")
-        palette.setBrush(QPalette.Window, QBrush(background_pixmap))
-        self.setPalette(palette)
-
-        # Main layout
-        main_widget = QWidget()
-        main_layout = QVBoxLayout(main_widget)
-        main_layout.setSpacing(10)  # Set spacing between rows to 10
-
-        # Create 5 rows
-        for _ in range(5):
-            row = self.create_row()
-            main_layout.addWidget(row)
-
-        # Add a stretch below the last row
-        main_layout.addSpacerItem(QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding))
-
-        self.setCentralWidget(main_widget)
-
-    def create_row(self):
-        """Create a single row with the specified elements."""
-        row_widget = QWidget()
-        row_widget.setFixedHeight(1024 // 12)  # Each row is 1/12 the height of the window
-        row_widget.setStyleSheet("background-color: #ffffcc; border: 2px solid gray;")  # Set background and border
-
-        row_layout = QHBoxLayout(row_widget)
-        row_layout.setContentsMargins(10, 0, 10, 0)  # Add margins for spacing
-        row_layout.setSpacing(10)  # Add spacing between elements
-
-        # Icon 1: Clock
-        clock_icon = QLabel()
-        clock_pixmap = QPixmap("/home/graham/dev/rbr/ui/main/clock.png").scaled(1024 // 12 * 3 // 4, 1024 // 12 * 3 // 4, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-        clock_icon.setPixmap(clock_pixmap)
-        clock_icon.setStyleSheet("border-left: none; border-right: none;")
-
-        # Name label
-        name_label = QLabel("Room Name")
-        name_label.setAlignment(Qt.AlignVCenter | Qt.AlignLeft)
-        name_label.setStyleSheet("background-color: transparent; border: none;")  # Transparent background
-        font = QFont()
-        font.setPointSize(16)  # Adjust font size to fit at least 20 characters
-        font.setBold(True)  # Make the font bold
-        name_label.setFont(font)
-
-        # Button with white text and blue background
-        button = QPushButton("20.0°C")
-        button.setStyleSheet("color: white; background-color: blue; border: none;")
-        button.setFixedSize(80, 40)  # Adjust button size
-        button.setFont(font)  # Use the same font as the label
-
-        # Icon 2: Edit
-        edit_icon = QLabel()
-        edit_pixmap = QPixmap("/home/graham/dev/rbr/ui/main/edit.png").scaled(1024 // 12 * 3 // 4, 1024 // 12 * 3 // 4, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-        edit_icon.setPixmap(edit_pixmap)
-        edit_icon.setStyleSheet("border-left: none; border-right: none;")
-
-        # Add elements to the row layout
-        row_layout.addWidget(clock_icon)
-        row_layout.addWidget(name_label, 1)  # Expand the name label to use all spare space
-        row_layout.addWidget(button)
-        row_layout.addWidget(edit_icon)
-
-        return row_widget
-
-if __name__ == "__main__":
-    app = QApplication(sys.argv)
-    window = MainWindow()
-    window.show()
-    sys.exit(app.exec())