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

easycoder/ec_border.py

@@ -9,34 +9,38 @@ class Border(QWidget):
 
     def __init__(self):
         super().__init__()
-        self.size = 40
-        self.setFixedHeight(self.size)
+        self._size = 40
+        self.setFixedHeight(self._size)
         self._drag_active = False
         self._drag_start_pos = None
+        self._tick: QPixmap = QPixmap()
+        self._close_icon: QPixmap = QPixmap()
 
     def paintEvent(self, event):
         painter = QPainter(self)
-        painter.setRenderHint(QPainter.Antialiasing)
+        painter.setRenderHint(QPainter.RenderHint.Antialiasing)
         # Draw the tick icon
-        self.tick = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/tick.png').scaled(self.size, self.size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        self._tick = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/icons/tick.png').scaled(
+            self._size, self._size, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation)
         x = 0
         y = 0
-        painter.drawPixmap(x, y, self.tick)
+        painter.drawPixmap(x, y, self._tick)
         # Draw the close icon
-        self.close = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/close.png').scaled(self.size, self.size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-        x = self.width() - self.close.width()
+        self._close_icon = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/icons/close.png').scaled(
+            self._size, self._size, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.SmoothTransformation)
+        x = self.width() - self._close_icon.width()
         y = 0
-        painter.drawPixmap(x, y, self.close)
+        painter.drawPixmap(x, y, self._close_icon)
 
     def mousePressEvent(self, event):
         # Tick icon
         x = 0
         y = 0
-        tickRect = self.tick.rect().translated(x, y)
+        tickRect = self._tick.rect().translated(x, y)
         # Close icon
-        x = self.width() - self.close.width()
+        x = self.width() - self._close_icon.width()
         y = 0
-        closeRect = self.close.rect().translated(x, y)
+        closeRect = self._close_icon.rect().translated(x, y)
         if tickRect.contains(event.pos()):
             self.tickClicked.emit()
         if closeRect.contains(event.pos()):

easycoder/ec_classes.py

@@ -1,6 +1,7 @@
-import sys
+import sys, paramiko
+from typing import Optional, Any
 
-class FatalError:
+class FatalError(BaseException):
 	def __init__(self, compiler, message):
 		compiler.showWarnings()
 		lino = compiler.tokens[compiler.index].lino
@@ -12,7 +13,7 @@ class NoValueError(FatalError):
 	def __init__(self, compiler, record):
 		super().__init__(compiler, f'Variable {record["name"]} does not hold a value')
 
-class AssertionError:
+class RuntimeAssertionError:
 	def __init__(self, program, msg=None):
 		code = program.code[program.pc]
 		lino = code['lino']
@@ -22,7 +23,7 @@ class AssertionError:
 		print(message)
 		sys.exit()
 
-class RuntimeError:
+class RuntimeError(BaseException):
 	def __init__(self, program, message):
 		if program == None:
 			sys.exit(f'Runtime Error: {message}')
@@ -56,6 +57,283 @@ class Token:
 	def __init__(self, lino, token):
 		self.lino = lino
 		self.token = token
-	
-class Object():
-    pass
+
+###############################################################################
+# This is the set of generic EasyCoder objects (values and variables)
+
+###############################################################################
+# A multipurpose value object. Holds a single value, with domain and type information
+class ECValue():
+    def __init__(self, domain: Optional[str] = None, type: Optional[str] = None, 
+                 content: Any = None, name: Optional[str] = None):
+        object.__setattr__(self, 'domain', domain)
+        object.__setattr__(self, 'type', type)
+        object.__setattr__(self, 'content', content)
+        object.__setattr__(self, 'name', name)
+        object.__setattr__(self, 'properties', {})
+        object.__setattr__(self, 'locked', False)
+        object.__setattr__(self, '_attrs', {})  # Store dynamic attributes
+    
+    def __setattr__(self, name: str, value: Any) -> None:
+        """Allow setting any attribute dynamically."""
+        if name in ('domain', 'type', 'content', 'name', 'properties', 'locked', '_attrs'):
+            object.__setattr__(self, name, value)
+        else:
+            # Store dynamic attributes in _attrs dict
+            self._attrs[name] = value
+    
+    def __getattr__(self, name: str) -> Any:
+        """Retrieve dynamic attributes or return None if not found."""
+        if name == '_attrs':
+            return object.__getattribute__(self, '_attrs')
+        return self._attrs.get(name)
+    
+    def setDomain(self, domain):
+        self.domain = domain
+    
+    def getDomain(self):
+        return self.domain
+    
+    def setType(self, type):
+        self.type = type
+    
+    def getType(self):
+        return self.type
+    
+    def setContent(self, content):
+        self.content = content
+    
+    def getContent(self):
+        return self.content 
+    
+    def setValue(self, type=None, content=None):
+        self.type = type
+        self.content = content
+
+    def setProperty(self, key, value):
+        self.properties[key] = value
+
+    def getProperty(self, key):
+        return self.properties.get(key, None)
+    
+    def setName(self, name):
+        self.name = name
+    
+    def getName(self):
+        return self.name
+    
+    def lock(self):
+        self.locked = True
+    
+    def isLocked(self):
+        return self.locked
+
+###############################################################################
+# The base class for all EasyCoder variable types
+class ECObject():
+    def __init__(self):
+        self.locked: bool = False
+        self.elements: int = 0
+        self.index: Optional[int] = None
+        self.values: Optional[list] = None
+        self.name: Optional[str] = None
+
+    # Set the index for the variable
+    def setIndex(self, index: int) -> None:
+        self.index = index
+    
+    # Get the index for the variable
+    def getIndex(self):
+        return self.index
+    
+    # Lock the variable
+    def setLocked(self):
+        self.locked = True
+    
+    # Check if the variable is locked
+    def isLocked(self):
+        return self.locked
+
+    # Set the value at the current index
+    def setValue(self, value):
+        if self.values is None:
+            self.index = 0
+            self.elements = 1
+            self.values = [None]
+        if isinstance(value, ECValue): value.setName(self.name)
+        self.values[self.index] = value # type: ignore
+
+    # Get the value at the current index
+    def getValue(self):
+        if self.values is None: return None
+        return self.values[self.index] # type: ignore
+    
+    # Get all the values
+    def getValues(self):
+        return self.values
+
+    # Set the number of elements in the variable
+    def setElements(self, elements):
+        if self.elements == 0:
+            self.values = [None] * elements
+            self.elements = elements
+            self.index = 0
+        if elements == self.elements:
+            pass
+        elif elements > self.elements:
+            self.values.extend([None] * (elements - self.elements)) # pyright: ignore[reportOptionalMemberAccess]
+        else:
+            del self.values[elements:] # pyright: ignore[reportOptionalSubscript]
+            self.index = 0
+        self.elements = elements
+    
+    # Get the number of elements in the variable
+    def getElements(self):
+        return self.elements
+    
+    # Check if the object has a runtime value. Default is False
+    def hasRuntimeValue(self):
+        return False
+    
+    # Check if the object is mutable. Default is False
+    def isMutable(self):
+        return False
+    
+    # Check if the object is clearable
+    def isClearable(self):
+         return False
+
+    # Get the content of the value at the current index
+    def getContent(self):
+        if not self.hasRuntimeValue(): return None
+        v = self.getValue()
+        if v is None: return None
+        return v.getContent()
+    
+    # Get the type of the value at the current index
+    def getType(self):
+        if not self.hasRuntimeValue(): return None
+        v = self.getValue()
+        if v is None: return None
+        return v.getType()
+
+    # Check if the object is empty. Default is True
+    def isEmpty(self):
+        return True
+    
+    # Set the name of the object
+    def setName(self, name):
+        self.name = name
+    
+    # Get the name of the object
+    def getName(self):
+        return self.name
+    
+    # Check if the object can have properties
+    def hasProperties(self):
+        return False
+
+###############################################################################
+# A generic variable object that can hold a mutable value
+class ECVariable(ECObject):
+    def __init__(self):
+        super().__init__()
+        self.properties = {}
+
+    # Set the content of the value at the current index
+    def setContent(self, content):
+        if self.values is None:
+            self.index = 0
+            self.elements = 1
+            self.values = [None]
+        self.values[self.index] = content # type: ignore
+
+    # Set the value to a given ECValue
+    def setValue(self, value):
+        if self.values is None:
+            self.index = 0
+            self.elements = 1
+            self.values = [None]
+        if self.index >= self.elements: raise RuntimeError(None, 'Index out of range') # type: ignore
+        self.values[self.index] = value # type: ignore
+    
+    # Report if the object is clearable
+    def isClearable(self):
+         return True
+    
+    # This object has a runtime value
+    def hasRuntimeValue(self):
+        return True
+    
+    # This object is mutable.
+    def isMutable(self):
+        return True
+
+    # Reset the object to empty state
+    def reset(self):
+        self.setValue(ECValue())
+    
+    # Check if the object can have properties
+    def hasProperties(self):
+        return True
+    
+    # Set a specific property on the object
+    def setProperty(self, name, value):
+        self.properties[name] = value
+    
+    # Check if the object has a specific property
+    def hasProperty(self, name):
+        return name in self.properties
+    
+    # Get a specific property
+    def getProperty(self, name):
+        return self.properties[name]
+
+###############################################################################
+# A file variable
+class ECFile(ECObject):
+    def __init__(self):
+        super().__init__()
+
+###############################################################################
+# An SSH variable
+class ECSSH(ECObject):
+    def __init__(self):
+        super().__init__()
+
+    # Set up the SSH connection
+    def setup(self, host=None, user=None, password=None):
+        ssh = paramiko.SSHClient()
+        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        try:
+            ssh.connect(host, username=user, password=password, timeout=10) # type: ignore
+            self.setValue(ssh)
+            self.sftp = ssh.open_sftp()
+            return True
+        except:
+            return False
+    
+    # Get the SFTP client
+    def getSFTP(self):
+        return self.sftp
+
+###############################################################################
+# A stack variable
+class ECStack(ECObject):
+
+    def __init__(self):
+        super().__init__()
+        self.values: Optional[list[list[Any]]] = None  # List of stacks, each holding any type
+    
+    def push(self, item: Any) -> None:
+        if self.values is None:
+            self.index = 0
+            self.elements = 1
+            self.values = [[]]
+        assert self.index is not None  # Type narrowing: index is always set when values exists
+        self.values[self.index].append(item)
+    
+    def pop(self) -> Any:
+        if self.values is None or self.index is None or self.values[self.index] is None or len(self.values[self.index]) == 0:
+            return None
+        return self.values[self.index].pop()

easycoder/ec_compiler.py

@@ -1,3 +1,4 @@
+import sys
 from .ec_classes import FatalError
 from .ec_value import Value
 from .ec_condition import Condition
@@ -84,7 +85,9 @@ class Compiler:
 		return self.program.code[pc]
 
 	# Add a command to the code list
-	def addCommand(self, command):
+	def addCommand(self, command, debug=True):
+		command['debug'] = debug
+		command['bp'] = False
 		self.code.append(command)
 
 	# Test if the current token is a symbol
@@ -131,16 +134,16 @@ class Compiler:
 			print(warning)
 
 	# Get the symbol record for the current token (assumes it is a symbol name)
-	def getSymbolRecord(self):
-		token = self.getToken()
-		if not token in self.symbols:
-			FatalError(self, f'Undefined symbol name "{token}"')
+	def getSymbolRecord(self, name=None):
+		if name == None: name = self.getToken()
+		if not name in self.symbols:
+			FatalError(self, f'Undefined symbol name "{name}"')
 			return None
-		symbol = self.symbols[token]
+		symbol = self.symbols[name]
 		if symbol == None: return None
-		symbolRecord = self.code[symbol]
-		symbolRecord['used'] = True
-		return symbolRecord
+		record = self.code[symbol]
+		record['used'] = True
+		return record
 
 	# Add a value type
 	def addValueType(self):
@@ -149,40 +152,56 @@ class Compiler:
 	# Test if a given value is in the value types list
 	def hasValue(self, type):
 		return type in self.valueTypes
-
-	# Compile a program label (a symbol ending with ':')
-	def compileLabel(self, command):
-		return self.compileSymbol(command, self.getToken())
+	
+	# Instantiate an object of the given class name
+	def instantiate(self, classname):
+		# Search through all loaded modules for the class
+		items = sys.modules.items()
+		for module_name, module in items:
+			if module is None:
+				continue
+			try:
+				if hasattr(module, classname):
+					cls = getattr(module, classname)
+					# Verify it's actually a class
+					if isinstance(cls, type):
+						# Attempt to instantiate
+						try:
+							return cls()
+						except TypeError as ex:
+							raise FatalError(self, f"Object instantiation error: {ex}")
+			except Exception:
+				continue
+		return None
 
 	# Compile a variable
-	def compileVariable(self, command, extra=None):
-		return self.compileSymbol(command, self.nextToken(), extra)
+	def compileVariable(self, command, classname):
+		return self.compileSymbol(command, self.nextToken(), classname)
 
 	# Compile a symbol
-	def compileSymbol(self, command, name, extra=None):
+	def compileSymbol(self, command, name, classname):
 		try:
-			v = self.symbols[name]
-		except:
-			v = None
-		if v:
-			FatalError(self, f'Duplicate symbol name "{name}"')
-			return False
-		self.symbols[name] = self.getCodeSize()
-		command['program'] = self.program
-		command['type'] = 'symbol'
+			self.symbols[name]
+			raise FatalError(self, f'Duplicate symbol name "{name}"')
+		except: pass
 		command['name'] = name
-		command['elements'] = 1
-		command['index'] = 0
-		command['value'] = [None]
+		command['classname'] = classname
+		command['program'] = self.program
 		command['used'] = False
-		command['debug'] = False
-		command['import'] = None
-		command['locked'] = False
-		command['extra'] = extra
-		if 'keyword' in command: command['hasValue'] = self.hasValue(command['keyword'])
-		self.addCommand(command)
+		self.symbols[name] = self.getCodeSize()
+		if classname != ':':
+			object = self.instantiate(classname)
+			command['object'] = object
+			if object != None:
+				command['type'] = 'symbol'
+				object.setName(name) # type: ignore
+		self.addCommand(command, False)
 		return True
 
+	# Compile a program label (a symbol ending with ':')
+	def compileLabel(self, command):
+		return self.compileSymbol(command, self.getToken(), ':')
+
 	# Compile the current token
 	def compileToken(self):
 		self.warnings = []
@@ -191,8 +210,8 @@ class Compiler:
 		if not token:
 			return False
 		if len(self.code) == 0:
-			if self.program.parent == None and hasattr(self.program, 'usingGraphics'):
-				cmd = {'domain': 'graphics', 'keyword': 'init', 'debug': False}
+			if self.program.parent == None and self.program.graphics:
+				cmd = {'domain': 'graphics', 'keyword': 'init'}
 				self.code.append(cmd)
 		mark = self.getIndex()
 		for domain in self.program.getDomains():
@@ -202,8 +221,6 @@ class Compiler:
 				command['domain'] = domain.getName()
 				command['lino'] = self.tokens[self.index].lino
 				command['keyword'] = token
-				command['type'] = None
-				command['debug'] = True
 				result = handler(command)
 				if result:
 					return result
@@ -233,7 +250,7 @@ class Compiler:
 		while True:
 			token = self.tokens[self.index]
 #			keyword = token.token
-			if self.debugCompile: print(self.script.lines[token.lino])
+			if self.debugCompile: print(f'{token.lino + 1}: {self.script.lines[token.lino]}')
 #			if keyword != 'else':
 			if self.compileOne() == True:
 				if self.index == len(self.tokens) - 1:

easycoder/ec_condition.py

@@ -16,7 +16,7 @@ class Condition:
 		for domain in self.compiler.program.getDomains():
 			condition = domain.compileCondition()
 			if condition != None:
-				condition.domain= domain.getName()
+				condition.domain = domain.getName()
 				return condition
 			self.rewindTo(mark)
 		return None