AST, Parsed, and misc improvements

Author: jaredlll08

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

@@ -40,6 +40,15 @@ public ParsedFile(CompilingPackage pkg, SourceFile file) {
 		this.file = file;
 	}
 
+	public ParsedFile(CompilingPackage pkg, SourceFile file, List<ParsedImport> imports, List<ParsedDefinition> definitions, List<ParsedStatement> statements) {
+		this.pkg = pkg;
+		this.file = file;
+		this.imports.addAll(imports);
+		this.definitions.addAll(definitions);
+		this.statements.addAll(statements);
+	}
+
+
 	public static SemanticModule compileSyntaxToSemantic(
 			SemanticModule[] dependencies,
 			CompilingPackage modulePackage,

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedFunction.java

@@ -27,7 +27,7 @@ public class ParsedFunction extends ParsedDefinition {
 	private final ParsedFunctionBody body;
 	private final String name;
 
-	private ParsedFunction(CodePosition position, Modifiers modifiers, ParsedAnnotation[] annotations, String name, ParsedFunctionHeader header, ParsedFunctionBody body) {
+	public ParsedFunction(CodePosition position, Modifiers modifiers, ParsedAnnotation[] annotations, String name, ParsedFunctionHeader header, ParsedFunctionBody body) {
 		super(position, modifiers, annotations);
 
 		this.header = header;

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionFloat.java

@@ -24,6 +24,12 @@ public ParsedExpressionFloat(CodePosition position, String value) {
 		suffix = value.substring(split);
 	}
 
+	public ParsedExpressionFloat(CodePosition position, double value, String suffix) {
+		super(position);
+		this.value = value;
+		this.suffix = suffix;
+	}
+
 	private static boolean isLetter(char c) {
 		return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_';
 	}

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionInt.java

@@ -30,7 +30,7 @@ public ParsedExpressionInt(CodePosition position, String value) {
 		suffix = value.substring(split);
 	}
 
-	private ParsedExpressionInt(CodePosition position, boolean negative, long value, String suffix) {
+	public ParsedExpressionInt(CodePosition position, boolean negative, long value, String suffix) {
 		super(position);
 
 		this.negative = negative;

Parser/src/main/java/org/openzen/zenscript/parser/statements/ParsedStatement.java

@@ -129,7 +129,7 @@ public static ParsedStatement parse(ZSTokenParser parser, ParsedAnnotation[] ann
 				parser.required(T_SEMICOLON, "; expected");
 
 				WhitespaceInfo whitespace = parser.collectWhitespaceInfo(ws, isFirst);
-				return new ParsedStatementVar(position, annotations, whitespace, name, type, initializer, start.getType() == K_VAL);
+				return new ParsedStatementVar(position.until(parser.getPosition()), annotations, whitespace, name, type, initializer, start.getType() == K_VAL);
 			}
 			case K_IF: {
 				parser.next();

Parser/src/main/java/org/openzen/zenscript/tree/Definition.java

@@ -149,9 +149,11 @@ static void parseEnum(TreeParser p, TreeParser.MarkClosed modifiers) {
 			if (p.at(T_SEMICOLON)) {
 				p.eat(T_SEMICOLON);
 				p.whitespace();
+				TreeParser.MarkOpened membersOpen = p.open();
 				while (!p.eat(T_ACLOSE)) {
 					DefinitionMembers.parse(p);
 				}
+				p.close(membersOpen, TreeKind.MEMBERS);
 				p.whitespace();
 			} else {
 				p.expect(T_ACLOSE);
@@ -290,7 +292,7 @@ static void parseVariant(TreeParser p, TreeParser.MarkClosed modifiers) {
 				p.expect(T_ACLOSE);
 				p.whitespace();
 			}
-			p.close(defMembersOpen, TreeKind.MEMBERS);
+			p.close(defMembersOpen, TreeKind.VARIANTS);
 		} else {
 			p.recover("expected '{'", DEFINITION_RECOVERY_SET);
 		}

Parser/src/main/java/org/openzen/zenscript/tree/DefinitionMembers.java

@@ -228,13 +228,11 @@ static void parseField(TreeParser p, Modifiers.ModifierClose close) {
 			}
 
 			if (p.at(T_ASSIGN)) {
-				TreeParser.MarkOpened assignOpen = p.open();
 				p.expect(T_ASSIGN);
 				p.whitespace();
 				if (Expression.parse(p) == null) {
 					p.recover("expected expression", FIELD_RECOVERY);
 				}
-				p.close(assignOpen, TreeKind.EXPR_ASSIGN);
 			}
 
 

Parser/src/main/java/org/openzen/zenscript/tree/Expression.java

@@ -477,7 +477,8 @@ static TreeParser.MarkClosed parsePostfix(TreeParser p, ParseOptions options) {
 							p.whitespace();
 							markClosed = p.close(postfixOpen, TreeKind.EXPR_MEMBER);
 						} else {
-							markClosed = p.close(postfixOpen, TreeKind.ERROR);
+							markClosed = p.close(postfixOpen, TreeKind.EXPR_MEMBER);
+							p.error("Expected a name");
 						}
 						break;
 					}
@@ -613,7 +614,7 @@ static TreeParser.MarkClosed parsePrimary(TreeParser p, ParseOptions options) {
 					primaryOpen = p.open();
 					p.expect(T_DOLLAR);
 					p.whitespace();
-					close = p.close(primaryOpen, TreeKind.EXPR_OUTER);
+					close = p.close(primaryOpen, TreeKind.EXPR_DOLLAR);
 					p.whitespace();
 					return close;
 				case T_SQOPEN:
@@ -648,12 +649,12 @@ static TreeParser.MarkClosed parsePrimary(TreeParser p, ParseOptions options) {
 						parse(p);
 						if (p.eat(T_COLON)) {
 							p.whitespace();
-							p.close(keyOrValOpen, TreeKind.EXPR_MAP_KEY);
+							p.close(keyOrValOpen, TreeKind.MAP_KEY);
 							TreeParser.MarkOpened valOpen = p.open();
 							parse(p);
-							p.close(valOpen, TreeKind.EXPR_MAP_VALUE);
+							p.close(valOpen, TreeKind.MAP_VALUE);
 						} else {
-							p.close(keyOrValOpen, TreeKind.EXPR_MAP_VALUE);
+							p.close(keyOrValOpen, TreeKind.MAP_VALUE);
 						}
 						if (!p.eat(T_COMMA)) {
 							p.expect(T_ACLOSE);
@@ -742,7 +743,7 @@ static TreeParser.MarkClosed parsePrimary(TreeParser p, ParseOptions options) {
 							parse(p, ParseOptions.NO_LAMBDAS);
 						}
 						p.whitespace();
-						p.close(keyOpen, TreeKind.EXPR_MATCH_KEY);
+						p.close(keyOpen, TreeKind.MATCH_KEY);
 
 						p.expect(T_LAMBDA);
 						p.whitespace();

Parser/src/main/java/org/openzen/zenscript/tree/FunctionHeader.java

@@ -40,7 +40,7 @@ static void parse(TreeParser p, ZSTokenSet recovery) {
 				} while (p.eat(ZSTokenType.T_COMMA));
 				p.expect(ZSTokenType.T_BRCLOSE);
 			}
-			p.close(paramListOpen, TreeKind.PARAM_LIST);
+			p.close(paramListOpen, TreeKind.PARAMS);
 			p.whitespace();
 
 			//TODO this error recovery is pretty rough

Parser/src/main/java/org/openzen/zenscript/tree/Generics.java

@@ -55,7 +55,7 @@ static void parseTypeArguments(TreeParser p) {
 			}
 			subParser.expect(T_GREATER);
 			subParser.whitespace();
-			subParser.close(open, TreeKind.TYPE_PARAMS);
+			subParser.close(open, TreeKind.TYPE_ARGS);
 			p.mergeIn(subParser);
 
 		}