Register expansions after adding imports

Author: jaredlll08

Parser/src/main/java/org/openzen/zenscript/parser/ParsedFile.java

@@ -91,16 +91,6 @@ public static SemanticModule compileSyntaxToSemantic(
 
 		ZSPackage rootPackage = registry.collectPackages();
 
-		for (ParsedFile file : files) {
-			for (ParsedDefinition definition : file.definitions) {
-				if (definition.isExpansion()) {
-					definition.registerCompiling(definitions, expansions, definitionCompilers.get(file));
-				}
-			}
-		}
-
-		definitions = sortTopologically(definitions);
-
 		for (ParsedFile file : files) {
 			ParsedFileCompiler fileCompiler = definitionCompilers.get(file);
 			for (ParsedImport import_ : file.imports) {
@@ -114,6 +104,16 @@ public static SemanticModule compileSyntaxToSemantic(
 			}
 		}
 
+		for (ParsedFile file : files) {
+			for (ParsedDefinition definition : file.definitions) {
+				if (definition.isExpansion()) {
+					definition.registerCompiling(definitions, expansions, definitionCompilers.get(file));
+				}
+			}
+		}
+
+		definitions = sortTopologically(definitions);
+
 		for (CompilingExpansion expansion : expansions) {
 			context.addExpansion(expansion.getCompiling());
 		}