Made some objects non-global

Author: KOLANICH

Coco/CharClass.py

@@ -36,7 +36,7 @@ class CharClass(object):
 
 	charSetSize = 256  # must be a multiple of 16
 
-	def __init__(self, name: str, s: Union[Set[int], Set[Union[int, str]]]) -> None:
+	def __init__(self, name: str, s: Union[Set[int], Set[Union[int, str]]], trace: Trace) -> None:
 		assert isinstance(name, str)
 		assert isinstance(s, set)
 		if name == "#":
@@ -45,6 +45,7 @@ def __init__(self, name: str, s: Union[Set[int], Set[Union[int, str]]]) -> None:
 		self.n = len(__class__.classes)  # class number
 		self.name = name  # class name
 		self.set = s  # set representing the class
+		self.trace = trace
 		self.__class__.classes.append(self)
 
 	@staticmethod
@@ -81,11 +82,11 @@ def Ch(ch):
 	@staticmethod
 	def WriteClasses():
 		for c in __class__.classes:
-			Trace.Write(str(c.name), -10)
-			Trace.Write(": ")
+			self.trace.Write(str(c.name), -10)
+			self.trace.Write(": ")
 			c.WriteSet()
-			Trace.WriteLine()
-		Trace.WriteLine()
+			self.trace.WriteLine()
+		self.trace.WriteLine()
 
 	def WriteSet(self):
 		s = self.set.copy()
@@ -105,6 +106,6 @@ def WriteSet(self):
 			while i < mx and (i in s):
 				i += 1
 			if j < (i - 1):
-				Trace.Write(str(self.__class__.Ch(j)) + ".." + str(self.__class__.Ch(i - 1)) + " ")
+				self.trace.Write(str(self.__class__.Ch(j)) + ".." + str(self.__class__.Ch(i - 1)) + " ")
 			else:
-				Trace.Write(str(self.__class__.Ch(j) + " "))
+				self.trace.Write(str(self.__class__.Ch(j) + " "))

Coco/CodeGenerator.py

@@ -13,24 +13,23 @@ class CodeGenerator(object):
 	ls = "\n"
 	indent_unit = "\t"
 
-	sourceDir = None
-	outputDir = None
-	frameDir = None
-
-	def __init__(self) -> None:
+	def __init__(self, sourceDir, outputDir, frameDir) -> None:
 		self._frameFile = None
 		self._outputFile = None
+		self.sourceDir = sourceDir
+		self.outputDir = outputDir
+		self.frameDir = frameDir
 
 	def openFiles(self, frameFileName: str, sourceFileName: str, outputFileName: str, backup: bool = False) -> None:
 		if isinstance(frameFileName, str):
 			frameFileName = [frameFileName]
 
 		self._frameFile = None
 		for frameName in frameFileName:
-			fr = self.__class__.sourceDir / frameName
+			fr = self.sourceDir / frameName
 			if not fr.is_file():
-				if self.__class__.frameDir is not None:
-					fr = self.__class__.frameDir / frameName
+				if self.frameDir is not None:
+					fr = self.frameDir / frameName
 			try:
 				self._frameFile = fr.open("rt", encoding="utf-8")
 				break
@@ -41,7 +40,7 @@ def openFiles(self, frameFileName: str, sourceFileName: str, outputFileName: str
 			raise RuntimeError("-- Compiler Error: Cannot open " + frameFileName[0])
 
 		try:
-			fn = self.__class__.outputDir / outputFileName
+			fn = self.outputDir / outputFileName
 			if backup and fn.is_file():
 				backup = fn.parent / (fn.name + ".old")
 				if backup.is_file():