fix the merge

Author: MESYETI

source/app.d

@@ -208,6 +208,8 @@ int main(string[] args) {
 		nodes = optimiser.res;
 	}
 
+	compiler.versions = preproc.versions;
+	
 	try {
 		compiler.Compile(nodes);
 	}

source/compiler.d

@@ -61,6 +61,7 @@ class Compiler {
 	string[]        includeDirs;
 	string[]        included;
 	string          outFile;
+	string[]        versions;
 
 	this() {
 
@@ -144,12 +145,22 @@ class Compiler {
 				break;
 			}
 			case NodeType.Let: backend.CompileLet(cast(LetNode) inode); break;
+			case NodeType.Requires: {
+				auto node = cast(RequiresNode) inode;
+
+				if (!versions.canFind(node.ver)) {
+					backend.Error(node.error, "Version '%s' required");
+				}
+				break;
+			}
 			case NodeType.Array:  backend.CompileArray(cast(ArrayNode) inode); break;
 			case NodeType.String: backend.CompileString(cast(StringNode) inode); break;
 			case NodeType.Struct: backend.CompileStruct(cast(StructNode) inode); break;
 			case NodeType.Const:  backend.CompileConst(cast(ConstNode) inode); break;
 			case NodeType.Enum:   backend.CompileEnum(cast(EnumNode) inode); break;
-			default: assert(0);
+			default: {
+				backend.Error(inode.error, "Unimplemented node '%s'", inode.type);
+			}
 		}
 	}
 

source/parser.d

@@ -197,6 +197,10 @@ class LetNode : Node {
 		type  = NodeType.Let;
 		error = perror;
 	}
+
+	override string toString() => array?
+		format("let array %d %s %s", arraySize, varType, name) :
+		format("let %s %s", varType, name);
 }
 
 class EnableNode : Node {
@@ -206,6 +210,8 @@ class EnableNode : Node {
 		type  = NodeType.Enable;
 		error = perror;
 	}
+
+	override string toString() => format("enable %s", ver);
 }
 
 class RequiresNode : Node {
@@ -215,6 +221,8 @@ class RequiresNode : Node {
 		type  = NodeType.Requires;
 		error = perror;
 	}
+
+	override string toString() => format("requires %s", ver);
 }
 
 class VersionNode : Node {
@@ -225,6 +233,16 @@ class VersionNode : Node {
 		type  = NodeType.Version;
 		error = perror;
 	}
+
+	override string toString() {
+		string ret = format("version %s\n", ver);
+
+		foreach (ref node ; block) {
+			ret ~= format("    %s\n", node);
+		}
+
+		return ret ~ "end";
+	}
 }
 
 class ArrayNode : Node {
@@ -236,6 +254,16 @@ class ArrayNode : Node {
 		type  = NodeType.Array;
 		error = perror;
 	}
+
+	override string toString() {
+		string ret = constant? "c[" : "[";
+
+		foreach (ref node ; elements) {
+			ret ~= node.toString() ~ ' ';
+		}
+
+		return ret ~ ']';
+	}
 }
 
 class StringNode : Node {
@@ -246,6 +274,8 @@ class StringNode : Node {
 		type  = NodeType.String;
 		error = perror;
 	}
+
+	override string toString() => format("%s\"%s\"", constant? "c" : "", value);
 }
 
 class StructNode : Node {
@@ -257,6 +287,16 @@ class StructNode : Node {
 		type  = NodeType.Struct;
 		error = perror;
 	}
+
+	override string toString() {
+		string ret = format("struct %s\n", name);
+
+		foreach (i, ref name ; names) {
+			ret ~= format("%s %s\n", types[i], name);
+		}
+
+		return ret ~ "end";
+	}
 }
 
 class ConstNode : Node {
@@ -267,6 +307,8 @@ class ConstNode : Node {
 		type  = NodeType.Const;
 		error = perror;
 	}
+
+	override string toString() => format("const %s %d", name, value);
 }
 
 class EnumNode : Node {

source/preprocessor.d

@@ -68,7 +68,8 @@ class Preprocessor {
 					auto node = cast(VersionNode) inode;
 
 					if (versions.canFind(node.ver)) {
-						ret ~= node.block;
+						//ret ~= node.block;
+						ret ~= Run(node.block);
 					}
 					break;
 				}
@@ -80,14 +81,6 @@ class Preprocessor {
 					}
 					break;
 				}
-				case NodeType.Requires: {
-					auto node = cast(RequiresNode) inode;
-
-					if (!versions.canFind(node.ver)) {
-						Error(node.error, "Version '%s' required", node.ver);
-					}
-					break;
-				}
 				default: {
 					ret ~= inode;
 				}