Bug fixes

Author: graham-trott

py/ec.py

@@ -3,6 +3,7 @@
 import sys
 from ec_program import Program
 from ec_core import Core
+from ec_graphics import Graphics
 from ec_p100 import P100
 
 class EasyCoder:
@@ -17,7 +18,7 @@ def __init__(self):
 		source = f.read()
 		f.close()
 
-	Program(source, [Core, P100])
+	Program(source, [Core, Graphics, P100])
 
 if __name__ == '__main__':
     EasyCoder()

py/ec_compiler.py

@@ -17,13 +17,13 @@ def __init__(self, program):
 		self.warnings = []
 		self.program.compiler = self
 		self.addCommand = self.program.add
-	
+
 	def getPC(self):
 		return len(self.program.code)
-	
+
 	def getIndex(self):
 		return self.index
-	
+
 	# Move the index along
 	def next(self):
 		self.index += 1
@@ -33,47 +33,47 @@ def getToken(self):
 		if self.index >= len(self.tokens):
 			FatalError(self, 'Premature end of script')
 		return self.tokens[self.index].token
-	
+
 	# Get the next token
 	def nextToken(self):
 		self.index += 1
 		return self.getToken()
-	
+
 	def peek(self):
 		try:
 			return self.tokens[self.index + 1].token
 		except:
 			return None
-	
+
 	# Get a value
 	def getValue(self):
 		return self.value.compileValue()
-	
+
 	# Get the next value
 	def nextValue(self):
 		self.index += 1
 		return self.value.compileValue()
-	
+
 	# Get a constant
 	def getConstant(self, token):
 		self.index += 1
 		return self.value.compileConstant(token)
-	
+
 	# Get a condition
 	def getCondition(self):
 		return self.condition.compileCondition()
-	
+
 	# Get the next condition
 	def nextCondition(self):
 		self.index += 1
 		return self.condition.compileCondition()
-	
+
 	def tokenIs(self, value):
 		return self.getToken() == value
-	
+
 	def nextIs(self, value):
 		return self.nextToken() == value
-		
+
 	def getCommandAt(self, pc):
 		return self.program.code[pc]
 
@@ -91,15 +91,15 @@ def nextIsSymbol(self):
 
 	def rewindTo(self, index):
 		self.index = index
-	
+
 	def getLino(self):
 		if self.index >= len(self.tokens):
 			return 0
 		return self.tokens[self.index].lino
-	
+
 	def warning(self, message):
 		self.warnings.append(message)
-	
+
 	def showWarnings(self):
 		for warning in self.warnings:
 			print(f'Line {self.getLino() + 1}: {warning}')
@@ -112,20 +112,24 @@ def getSymbolRecord(self):
 			symbolRecord['used'] = True
 			return symbolRecord
 		return None
-	
+
 	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 compileSymbol(self, command, name, valueHolder):
-		if hasattr(self.symbols, name):
-			FatalError(self, f'{self.code[self.pc].lino}: Duplicate symbol name "{name}"')
+		try:
+			v = self.symbols[name]
+		except:
+			v = None
+		if v:
+			FatalError(self, f'Duplicate symbol name "{name}"')
 			return False
 		self.symbols[name] = self.getPC()
 		command['type'] = 'symbol'
-		command['isValueHolder'] = valueHolder
+		command['valueHolder'] = valueHolder
 		command['name'] = name
 		command['elements'] = 1
 		command['index'] = 0
@@ -138,7 +142,7 @@ def compileSymbol(self, command, name, valueHolder):
 	# Compile the current token
 	def compileToken(self):
 		token = self.getToken()
-		# print(token)
+		# print(f'Compile {token}')
 		if not token:
 			return False
 		mark = self.getIndex()