refactor preprocessor

Author: MESYETI

source/app.d

@@ -117,8 +117,11 @@ int main(string[] args) {
 	compiler.backend.org    = org;
 	compiler.backend.orgSet = orgSet;
 	compiler.includeDirs    = includeDirs;
-	
-	nodes = Preprocessor(nodes, includeDirs, included, compiler.backend.GetVersions());
+
+	auto preproc        = new Preprocessor();
+	preproc.includeDirs = includeDirs;
+	preproc.versions    = compiler.backend.GetVersions();
+	nodes               = preproc.Run(nodes);
 
 	if (optimise) {
 		auto optimiser  = new Optimiser();

source/preprocessor.d

@@ -10,58 +10,62 @@ import callisto.error;
 import callisto.parser;
 import callisto.language;
 
-Node[] Preprocessor(
-	Node[] nodes, string[] includeDirs, ref string[] included, string[] versions
-) {
-	Node[] ret;
+class Preprocessor {
+	string[] includeDirs;
+	string[] included;
+	string[] versions;
 
-	foreach (ref inode ; nodes) {
-		switch (inode.type) {
-			case NodeType.Include: {
-				auto node = cast(IncludeNode) inode;
-				auto path = format("%s/%s", dirName(node.error.file), node.path);
+	Node[] Run(Node[] nodes) {
+		Node[] ret;
 
-				if (!exists(path)) {
-					bool found;
-					
-					foreach (ref ipath ; includeDirs) {
-						path = format("%s/%s", ipath, node.path);
+		foreach (ref inode ; nodes) {
+			switch (inode.type) {
+				case NodeType.Include: {
+					auto node = cast(IncludeNode) inode;
+					auto path = format("%s/%s", dirName(node.error.file), node.path);
 
-						if (exists(path)) {
-							found = true;
-							break;
+					if (!exists(path)) {
+						bool found;
+						
+						foreach (ref ipath ; includeDirs) {
+							path = format("%s/%s", ipath, node.path);
+
+							if (exists(path)) {
+								found = true;
+								break;
+							}
 						}
-					}
 
-					if (!found) {
-						ErrorBegin(node.error);
-						stderr.writefln("Can't find file '%s'", node.path);
-						exit(1);
+						if (!found) {
+							ErrorBegin(node.error);
+							stderr.writefln("Can't find file '%s'", node.path);
+							exit(1);
+						}
 					}
-				}
 
-				if (included.canFind(path)) {
-					continue;
-				}
+					if (included.canFind(path)) {
+						continue;
+					}
 
-				included ~= path;
+					included ~= path;
 
-				ret ~= Preprocessor(ParseFile(path), includeDirs, included, versions);
-				break;
-			}
-			case NodeType.Version: {
-				auto node = cast(VersionNode) inode;
+					ret ~= Run(ParseFile(path));
+					break;
+				}
+				case NodeType.Version: {
+					auto node = cast(VersionNode) inode;
 
-				if (versions.canFind(node.ver)) {
-					ret ~= node.block;
+					if (versions.canFind(node.ver)) {
+						ret ~= node.block;
+					}
+					break;
+				}
+				default: {
+					ret ~= inode;
 				}
-				break;
-			}
-			default: {
-				ret ~= inode;
 			}
 		}
-	}
 
-	return ret;
+		return ret;
+	}
 }