easycoder 241218.1__py2.py3-none-any.whl → 241231.1__py2.py3-none-any.whl

easycoder/ec_program.py

@@ -11,23 +11,18 @@ class Program:
 
 	def __init__(self, argv):
 		print(f'EasyCoder version {version("easycoder")}')
-		scriptName = None
 		if len(argv) == 0:
 			print('No script supplied')
 			exit()
 		self.classes=[Core]
-		for n in range(len(argv)):
-			arg = argv[n]
-			if arg == '-g':
-				from .ec_graphics import Graphics
-				self.classes.append(Graphics)
-			else:
-				scriptName = arg
+		scriptName = argv[0]
+		if scriptName.endswith('.ecg'):
+			from .ec_graphics import Graphics
+			self.classes.append(Graphics)
 
 		f = open(scriptName, 'r')
 		source = f.read()
 		f.close()
-		self.argv = argv
 		self.domains = []
 		self.domainIndex = {}
 		self.name = '<anon>'
@@ -43,6 +38,8 @@ class Program:
 		self.condition = self.compiler.condition
 		self.processClasses()
 		self.queue = deque()
+		self.externalControl = False
+		self.quit = False
 
 	def start(self):
 		startCompile = time.time()
@@ -203,57 +200,72 @@ class Program:
 
 	# Tokenise the script
 	def tokenise(self, script):
-		index = 0
-		lino = 0
-		for line in script.lines:
+		token = ''
+		literal = False
+		for lino in range(0, len(script.lines)):
+			line = script.lines[lino]
 			length = len(line)
-			token = ''
-			inSpace = True
+			if length == 0:
+				continue
+			# Look for the first non-space
 			n = 0
-			while n < length:
+			while n < length and line[n].isspace():
+				n += 1
+			# The whole line may be empty
+			if n == length:
+				if literal:
+					token += '\n'
+				continue
+			# If in an unfinished literal, the first char must be a backtick to continue adding to it
+			if literal:
+				if line[n] != '`':
+					# Close the current token
+					if len(token) > 0:
+						script.tokens.append(Token(lino, token))
+						token = ''
+						literal = False
+				n += 1
+			for n in range(n, length):
 				c = line[n]
-				if len(c.strip()) == 0:
-					if (inSpace):
-						n += 1
+				# Test if we are in a literal
+				if not literal:
+					if c.isspace():
+						if len(token) > 0:
+							script.tokens.append(Token(lino, token))
+							token = ''
 						continue
-					script.tokens.append(Token(lino, token))
-					index += 1
-					token = ''
-					inSpace = True
-					n += 1
-					continue
-				inSpace = False
+					elif c == '!':
+						break
+				# Test for the start or end of a literal
 				if c == '`':
-					m = n
-					n += 1
-					while n < len(line) - 1:
-						if line[n] == '`':
-							break
-						n += 1
-					# n += 1
-					token = line[m:n+1]
-				elif c == '!':
-					break
+					if literal:
+						token += c
+						literal = False
+					else:
+						token += c
+						literal = True
+						m = n
+						continue
 				else:
 					token += c
-				n += 1
 			if len(token) > 0:
-				script.tokens.append(Token(lino, token))
-				index += 1
-			lino += 1
+				if literal:
+					token += '\n'
+				else:
+					script.tokens.append(Token(lino, token))
+					token = ''
 		return
+	
+	def finish(self):
+		self.quit = True
 
-	# Run the script
-	def run(self, pc):
-		# print(f'Run from {pc}')
-		length = len(self.queue)
-		self.queue.append(pc)
-		if length > 0:
-			return
-
+	# Flush the queue
+	def flush(self):
 		while len(self.queue):
 			self.pc = self.queue.popleft()
 			while True:
+				if self.quit:
+					return
 				command = self.code[self.pc]
 				domainName = command['domain']
 				if domainName == None:
@@ -272,11 +284,20 @@ class Program:
 						self.pc = handler(command)
 						try:
 							if self.pc == 0 or self.pc >= len(self.code):
-								return 0
+								break
 						except:
-							return 0
-				if self.pc < 0:
-					return -1
+							break
+
+	def setExternalControl(self):
+		self.externalControl = True
+
+	# Run the script
+	def run(self, pc):
+		length = len(self.queue)
+		self.queue.append(pc)
+		if not self.externalControl:
+			if length == 0:
+				return self.flush()
 
 	def nonNumericValueError(self):
 		FatalError(self.compiler, 'Non-numeric value')
@@ -322,10 +343,3 @@ class Program:
 		if v1 < v2:
 			return -1
 		return 0
-
-# This is the program launcher
-def Main():
-	if (len(sys.argv) > 1):
-		Program(sys.argv[1:]).start()
-	else:
-		print('Syntax: easycoder <scriptname> [plugins]')