easycoder 251104.1__py2.py3-none-any.whl → 251105.1__py2.py3-none-any.whl

easycoder/ec_handler.py

@@ -66,6 +66,7 @@ class Handler:
 	def conditionHandler(self, name):
 		return getattr(self, f'c_{name}')
 
+	@staticmethod
 	def isJson(value):
 		try:
 			json.loads(value)

easycoder/ec_keyboard.py

@@ -29,7 +29,7 @@ class Keyboard(Handler):
         self.dialog = dialog
         
 #        dialog.setWindowTitle('')
-        dialog.setWindowFlags(Qt.FramelessWindowHint)
+        dialog.setWindowFlags(Qt.WindowType.FramelessWindowHint)
         dialog.setModal(True)
         dialog.setFixedWidth(500)
         dialog.setStyleSheet('background-color: white;border:1px solid black;')
@@ -38,7 +38,7 @@ class Keyboard(Handler):
         shadow = QGraphicsDropShadowEffect(dialog)
         shadow.setBlurRadius(40)
         shadow.setOffset(0, 4)
-        shadow.setColor(Qt.black)
+        shadow.setColor(Qt.GlobalColor.black)
         dialog.setGraphicsEffect(shadow)
 
         # Add the keyboard
@@ -186,43 +186,43 @@ class VirtualKeyboard(QStackedWidget):
 
         # Row 2: qwertyuiop
         row2 = KeyboardRow([
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in 'qwertyuiop'],
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row2)
 
         # Row 3: asdfghjkl with horizontal stretches
         row3 = KeyboardRow([
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in 'asdfghjkl'],
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row3)
 
         # Row 4: Shift, ZXC..., Backspace
         row4 = KeyboardRow([
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickShift, None, 'img/up.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in 'zxcvbnm'],
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickBack, None, 'img/back.png'),
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row4)
 
         # Row 5: Numbers, Space, Enter
         row5 = KeyboardRow([
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickNumbers, None, 'img/numbers.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, ","),
             KeyboardButton(self.buttonHeight * 5, self.buttonHeight, self.onClickSpace, None, 'keyboard/space.png'),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, "."),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickEnter, None, 'img/enter.png'),
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row5)
 
@@ -243,43 +243,43 @@ class VirtualKeyboard(QStackedWidget):
 
         # Row 2: Uppercase QWERTY
         row2 = KeyboardRow([
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in 'QWERTYUIOP'],
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row2)
 
         # Row 3: Uppercase ASDFGHJKL with horizontal stretches
         row3 = KeyboardRow([
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in 'ASDFGHJKL'],
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row3)
 
         # Row 4: Shift, Uppercase ZXC..., Backspace
         row4 = KeyboardRow([
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickShift, None, 'img/up.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in 'ZXCVBNM'],
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickBack, None, 'img/back.png'),
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row4)
 
         # Row 5: Numbers, Space, Enter
         row5 = KeyboardRow([
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickNumbers, None, 'img/numbers.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, ","),
             KeyboardButton(self.buttonHeight * 5, self.buttonHeight, self.onClickSpace, None, 'img/space.png'),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, "."),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickEnter, None, 'img/enter.png'),
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row5)
 
@@ -296,43 +296,43 @@ class VirtualKeyboard(QStackedWidget):
 
         # Row 1: Numbers
         row1 = KeyboardRow([
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in '1234567890'],
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row1)
 
         # Row 2: Symbols
         row2 = KeyboardRow([
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in '@#£&_-()=%'],
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row2)
 
         # Row 3: Symbols with horizontal stretches
         row3 = KeyboardRow([
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickSymbols, None, 'img/symbols.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in '"*\'/:!?+'],
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickBack, None, 'img/back.png'),
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(20, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row3)
 
         # Row 4: Numbers, Space, Enter
         row4 = KeyboardRow([
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickLetters, None, 'img/letters.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, ","),
             KeyboardButton(self.buttonHeight * 5.2, self.buttonHeight, self.onClickSpace, None, 'keyboard/space.png'),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, "."),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickEnter, None, 'img/enter.png'),
-            QSpacerItem(10, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(10, 40, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row4)
 
@@ -349,43 +349,43 @@ class VirtualKeyboard(QStackedWidget):
 
         # Row 1: Extended symbols
         row1 = KeyboardRow([
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in '$€¥¢©®µ~¿¡'],
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row1)
 
         # Row 2: Additional symbols
         row2 = KeyboardRow([
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in '¼½¾[]{}<>^'],
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row2)
 
         # Row 3: Symbols with horizontal stretches
         row3 = KeyboardRow([
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickNumbers, None, 'img/numbers.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in '`;÷\\∣|¬±'],
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickBack, None, 'img/back.png'),
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row3)
 
         # Row 4: Numbers, Space, Enter
         row4 = KeyboardRow([
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum),
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickLetters, None, 'img/letters.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, ","),
             KeyboardButton(self.buttonHeight * 3, self.buttonHeight, self.onClickSpace, None, 'img/space.png'),
-            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
+            QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Minimum),
             *[KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, char) for char in '✕§¶°'],
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickEnter, None, 'img/enter.png'),
-            QSpacerItem(0, 0, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
         ])
         rowList.append(row4)
 

easycoder/ec_program.py

@@ -19,11 +19,17 @@ class Program:
 	def __init__(self, argv):
 		global queue
 		print(f'EasyCoder version {version("easycoder")}')
+		print(argv)
 		if len(argv) == 0:
 			print('No script supplied')
 			exit()
 		if argv in ['-v', '--version']: return
-		scriptName = argv
+		if argv[0:6] == 'debug ':
+			scriptName = argv[6:]
+			self.debugging = True
+		else:
+			scriptName = argv
+			self.debugging = False
 
 		f = open(scriptName, 'r')
 		source = f.read()
@@ -47,16 +53,20 @@ class Program:
 		self.useClass(Core)
 		self.externalControl = False
 		self.ticker = 0
+		self.usingGraphics = False
+		self.debugger = None
 		self.running = True
 
 	# This is called at 10msec intervals by the GUI code
 	def flushCB(self):
 		self.ticker += 1
+		# if self.ticker % 1000 == 0: print(f'GUI Tick {self.ticker}')
 		flush()
 
 	def start(self, parent=None, module = None, exports=[]):
 		self.parent = parent
 		self.exports = exports
+		if self.debugging: self.useGraphics()
 		if module != None:
 			module['child'] = self
 		startCompile = time.time()
@@ -85,6 +95,16 @@ class Program:
 					time.sleep(0.01)
 				else:
 					break
+	
+	# Use the graphics module
+	def useGraphics(self):
+		if not self.usingGraphics:
+			print('Loading graphics module')
+			from .ec_pyside import Graphics
+			self.graphics = Graphics
+			self.useClass(Graphics)
+			self.usingGraphics = True
+		return True
 
 	# Import a plugin
 	def importPlugin(self, source):
@@ -147,8 +167,9 @@ class Program:
 			name = value['name']
 			symbolRecord = self.getSymbolRecord(name)
 			# if symbolRecord['hasValue']:
-			handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
-			result = handler(symbolRecord)
+			if symbolRecord:
+				handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
+				result = handler(symbolRecord)
 		# 	else:
 		# 		# Call the given domain to handle a value
 		# 		# domain = self.domainIndex[value['domain']]
@@ -181,7 +202,10 @@ class Program:
 		return None
 
 	def getValue(self, value):
-		return self.evaluate(value).content
+		result = self.evaluate(value)
+		if result:
+			return result.get('content')  # type: ignore[union-attr]
+		return None
 
 	def getRuntimeValue(self, value):
 		if value is None:
@@ -287,9 +311,9 @@ class Program:
 		return
 
 	def releaseParent(self):
-		if self.parent.waiting and self.parent.program.running:
-			self.parent.waiting = False
-			self.parent.program.run(self.parent.pc)
+		if self.parent and self.parent.waiting and self.parent.program.running:  # type: ignore[union-attr]
+			self.parent.waiting = False  # type: ignore[union-attr]
+			self.parent.program.run(self.parent.pc)  # type: ignore[union-attr]
 
 	# Flush the queue
 	def flush(self, pc):
@@ -321,6 +345,8 @@ class Program:
 						break
 					elif self.pc == None or self.pc == 0 or self.pc >= len(self.code):
 						break
+					elif self.debugger != None and not self.debugger.continueExecution():
+						break
 
 	# Run the script at a given PC value
 	def run(self, pc):
@@ -378,9 +404,9 @@ class Program:
 		if type(v2) == int:
 			if type(v1) != int:
 				v2 = f'{v2}'
-		if v1 > v2:
+		if v1 > v2:  # type: ignore[operator]
 			return 1
-		if v1 < v2:
+		if v1 < v2:  # type: ignore[operator]
 			return -1
 		return 0
 
@@ -395,8 +421,16 @@ class Program:
 
 # This is the program launcher
 def Main():
+	print(sys.argv)
 	if (len(sys.argv) > 1):
-		Program(sys.argv[1]).start()
+		# Check if 'debug' is the first argument
+		if sys.argv[1] == 'debug' and len(sys.argv) > 2:
+			# Create program with debug flag
+			program = Program(sys.argv[2])
+			program.debugging = True
+			program.start()
+		else:
+			Program(sys.argv[1]).start()
 	else:
 		Program('-v')