diff --git a/.gitignore b/.gitignore index cb648af..5d19a24 100644 --- a/.gitignore +++ b/.gitignore @@ -77,10 +77,10 @@ fabric.properties .idea/caches/build_file_checksums.ser /target -src/main/resources/logs/RaupenLog.log +src/main/resources/logs/miniCompilerLog.log src/main/resources/output/CompilerInput.class src/test/resources/output/javac/CompilerInput$Test.class src/test/resources/output/javac/CompilerInput.class -src/test/resources/output/raupenpiler/CompilerInput.class -src/test/resources/output/raupenpiler/CompilerInput$Test.class +src/test/resources/output/miniCompiler/CompilerInput.class +src/test/resources/output/miniCompiler/CompilerInput$Test.class .idea/inspectionProfiles/Project_Default.xml diff --git a/.lib/Kurzdokumentation.md b/.lib/Kurzdokumentation.md new file mode 100644 index 0000000..b298cf9 --- /dev/null +++ b/.lib/Kurzdokumentation.md @@ -0,0 +1,58 @@ +# Kurzdokumentation + +## Aufgabenverteilung + +### Maximilian Stahl und Jannik Rombach: +- **Scanner** +- **Parser** +- **AST** +- **AstBuilder** + - **Modul: ast** + - Alle + - **Modul: parser** + - Alle + - **Modul: visitor** + - Alle + - **Testmodul: parser** + - AstBuildertest.java + - Helper.java + - **Testfiles: singleFeatureTests** + - Alle + +### Johannes Ehlert: +- **Semantische Analyse** + - **Modul: semantic** + - **Modul: typecheck** + - **Testmodul: parser** + - AstBuildertest.java + - **Testfiles: typedAstFeatureTests** + - Großteil + - **Testfiles: typedAstExceptionsTests** + - Großteil + +### David Große: +- **Bytecodegenerator** + - **Modul: bytecode** + - Alle + +### Lucas Janker: +- **Tests** + - **Modul: main** + - Alle + - **Testmodul: main** + - Alle + - **Testmodul: parser** + - ScannerTest.java + - ParserTest.java + - **Testmodul: semantic** + - **Testfiles: combinedFeatureTests** + - Alle + - **Testfiles: failureTests** + - Alle + - **Testfiles: Alle** + - Refactoring + - **Ordnerstrukturen** + - Großteil + - **Build** + - **Makefile** + - **Dokumentation** \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..88331ea --- /dev/null +++ b/Makefile @@ -0,0 +1,37 @@ +### IntelliJs play buttons do not work. Run in "src/test" folder with "make" command to run all +### Or run only parts with "make compile-javac", "make clean" etc. + +all: compile-javac compile-miniCompiler + +compile-javac: + #javac -d src/test/resources/output/javac src/test/resources/input/CompilerInput.java + +compile-miniCompiler: + cd ../.. ; mvn -DskipTests install + cd ../.. ; mvn exec:java -DgenJar=true -DgenClass=true -Dexec.mainClass="main.Main" -Dexec.args="'src/main/resources/input/CompilerInput.java' 'src/main/resources/output'" + # cp src/main/resources/output/CompilerInput.class src/test/resources/output/miniCompiler + +test-miniCompiler: + # move the compiled class to the test/main folder + mv src/main/resources/output/CompilerInput.class src/test/java/main/ + # compile the test class + javac src/test/java/main/EndToEndTester.java + # run the test class + java -cp src/test/java/main EndToEndTester + +clean: + # clean main output folders + rm -f src/main/resources/output/*.class + rm -f src/main/resources/output/*.jar + # clean resources output folders + rm -f src/test/resources/output/javac/*.class + rm -f src/test/resources/output/miniCompiler/*.class + rm -f src/test/resources/output/miniCompiler/*.jar + # clean logs + rm -f src/main/resources/logs/* + # clean test/java/main folders from .class files for End-to-End tests + rm -f src/test/java/main/*.class + # clean javac output from every folder + rm -f src/test/resources/input/*/*.class + # clean test results from maven surefire plugin + rm -f ../../target/surefire-reports/*.txt diff --git a/Parser_Dokumentation.pdf b/Parser_Dokumentation.pdf new file mode 100644 index 0000000..bcd6ebc Binary files /dev/null and b/Parser_Dokumentation.pdf differ diff --git a/README.md b/README.md new file mode 100644 index 0000000..65ffb7a --- /dev/null +++ b/README.md @@ -0,0 +1,133 @@ +# "Nicht Haskel 2.0" Java Compiler + +Realisation of a subset of the Java Standard Compiler in the course Compiler Construction of the 4th semester Computer Science at the Duale Hochschule Stuttgart (Horb). + +This project aims to provide a simplified version of the Java compiler, focusing on key language features and demonstrating the principles of compiler construction. + +## Realised Java syntax + +- **Data types**: `int`, `boolean`, `char` +- **Access modifier**: `public`, `protected`, `private` +- **Operators**: `=` `+` `-` `*` `%` `/` `>` `<` `>=` `<=` `==` `!=` `!` `&&` `||` `++` `--` +- **Keywords**: `class`, `this`, `while`, `do`, `if`, `else`, `for`, `return`, `new`, `switch`, `case`, `break`, `default`, `:` +- **Statements**: + - `if` ... `if else` ... `else`; + - `while` ... ; + - `do` ... `while`; + - `for`; +- **Comments**: + - Single line: `// comment` + - Multi-line: `/* comment */` +- **Further functions**: + - All methods are overloadable + - High maintainability and expandability through implementation of the visitor pattern + - Logging Input and Outputs + - Error Handling in the Semantic Check + +## Project Structure + +```plain +src/ +└── main/ + ├── java/ + │ ├── ast/ -> Defining the structure of the AST + │ ├── bytecode/ -> Generate Java bytecode + │ ├── main/ -> Running the compiler + │ ├── parser/ + │ │ ├── astBuilder/ -> Builder creating the AST + │ │ ├── generated/ -> Antlr generated grammar + │ │ └── grammar/ -> Antlr grammar + │ ├── semantic/ -> Running the semantic check + │ └── visitor/ -> Visitor interface + └── resources/ +test/ +└── java/ + │ ├── main/ -> Running E2E tests + │ ├── parser/ -> Performs tests on the parser + │ ├── semantic/ -> Performs tests on the semantic check + └── resources/ -> Ressources for running the Tests +``` + +## Class-Diagramm AST + +![AST Diagramm](ast.png) + +## Distribution of the realisation + +### i22030 & i22035 +Ausführliche Beschreibung der Parser Umsetzung: ![Parserumsetzung](Parser_Dokumentation.pdf) +Parser: +- Grammar -> (src/main/java/parser/grammar) +- Scanner +- Parser +- Abstract Syntax Tree (AST) -> (src/main/java/ast) +- AstBuilder -> (src/main/java/parser/astBuilder) + +Parser tests: +- ParserTests -> (src/test/java/parser) +- TestCases -> (src/test/resources/input/singeFeatureTests) + +Other: +- Documentation -> (README.md) +- Ast Class-Diagramm -> (ast.png) +- PowerPoint + +### i22005 +Semantic check: +- Set all types and check whether types have been used correctly +- Contexts -> (src/main/java/semantic/context) +- Exceptions Handling -> (src/main/java/semantic/exceptions) + +Semantic Tests: +- Typing and Type checking -> (src/test/java/semantic/EndToTypedAstTest) +- Exception and feature test -> (src/test/resources/input/typedAstExceptionsTests) + +### i22007 +Bytecode generation: +- Complete bytecode generation -> (src/mein/java/bytecode) + +### i22011 +Tests and execution: +- Makefile +- Running Compiler -> (src/main/main) +- Running E2E tests -> (src/test/main) +- Typing and Type checking -> (src/test/java/semantic/EndToTypedAstTest) + + +## Used Tools + +- [Maven 4.0](https://maven.apache.org/index.html) + - Used for automating the build process and managing dependencies. +- [ANTLR4 v.13.1](https://www.antlr.org/) + - Used to parse the input Java code into the Abstract Syntax Tree. + +## How to run the compiler +### Possibilities +### 1. Start miniCompiler using make: +Make needs to be installed +```bash +cd .\src\test\ ; make clean compile-miniCompiler +``` + +### 2. Start miniCompiler using jar: +If you do not have the .jar, download it [here](https://gitea.hb.dhbw-stuttgart.de/i22005/NichtHaskell2.0/src/branch/Endabgabe/src) or compile it using mvn package or make first +``` +java.exe -DgenJar=bool -DgenClass=bool -jar path_to_jar\jarName.jar 'path_to_input_file.java' 'path_to_output_directory' +``` + +Example (jar needs to be in the target directory) +```bash + java.exe -DgenJar=true -DgenClass=true -jar .\target\JavaCompiler-1.0-jar-with-dependencies.jar 'src/main/resources/input/CompilerInput.java' 'src/main/resources/output' +``` + +- set DgenJar true, to generate the jar, false for no jar + +``` + DgenJar=true +``` + +- set DgenClass true, to generate class files, false for no class files + +``` + DgenClass=true + ``` diff --git a/ast.png b/ast.png new file mode 100644 index 0000000..fd3f2d9 Binary files /dev/null and b/ast.png differ diff --git a/pom.xml b/pom.xml index e32826e..84326da 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,25 @@ org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.11.0-M2 + test + + + org.junit.platform + junit-platform-suite-engine + 1.11.0-M2 + test + + + org.junit.jupiter + junit-jupiter-api + 5.11.0-M2 + test + + + junit + junit + 4.13.1 test @@ -44,12 +62,6 @@ 3.26.0 test - - org.mockito - mockito-core - 5.11.0 - test - @@ -59,6 +71,11 @@ org.apache.maven.plugins maven-surefire-plugin 3.0.0-M5 + + + **/*Test.java + + maven-assembly-plugin diff --git a/src/main/java/ast/ASTNode.java b/src/main/java/ast/ASTNode.java index 1b666e2..8ebf41d 100644 --- a/src/main/java/ast/ASTNode.java +++ b/src/main/java/ast/ASTNode.java @@ -1,20 +1,6 @@ package ast; -import bytecode.visitor.ClassVisitor; -import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; - public interface ASTNode { - - //Todo: @BruderJohn & @i22007 Interface anwenden + geeignetetn Methodename. - - /* - Typecheck: - public TypeCheckResult acceptType(SemanticVisitor visitor); - - Bytecode: - public void accepByteCode(ClassVisitor classVisitor); - */ } diff --git a/src/main/java/ast/ClassNode.java b/src/main/java/ast/ClassNode.java index 61134ab..4ea826e 100644 --- a/src/main/java/ast/ClassNode.java +++ b/src/main/java/ast/ClassNode.java @@ -1,11 +1,11 @@ package ast; import ast.type.AccessModifierNode; -import ast.members.ConstructorNode; import ast.members.MemberNode; import ast.members.MethodNode; +import bytecode.visitor.ClassVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; import java.util.ArrayList; @@ -16,11 +16,11 @@ public class ClassNode implements ASTNode, Visitable { public String identifier; public List members = new ArrayList<>(); - public ClassNode(){ + public ClassNode() { } - public ClassNode(String accessType, String identifier){ + public ClassNode(String accessType, String identifier) { this.accessType = new AccessModifierNode(accessType); this.identifier = identifier; } @@ -29,7 +29,7 @@ public class ClassNode implements ASTNode, Visitable { members.add(member); } - public List getMethods(){ + public List getMethods() { List methods = new ArrayList<>(); for (MemberNode member : members) { if (member instanceof MethodNode methodNode) { @@ -44,4 +44,9 @@ public class ClassNode implements ASTNode, Visitable { return visitor.analyze(this); } + @Override + public void accept(ClassVisitor classVisitor) { + classVisitor.visit(this); + } + } diff --git a/src/main/java/ast/ProgramNode.java b/src/main/java/ast/ProgramNode.java index f8ad19a..ed7eee9 100644 --- a/src/main/java/ast/ProgramNode.java +++ b/src/main/java/ast/ProgramNode.java @@ -2,7 +2,7 @@ package ast; import bytecode.visitor.ProgramVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; import java.util.ArrayList; diff --git a/src/main/java/ast/expressions/binaryexpressions/BinaryNode.java b/src/main/java/ast/expressions/binaryexpressions/BinaryNode.java index 40b474a..82a7021 100644 --- a/src/main/java/ast/expressions/binaryexpressions/BinaryNode.java +++ b/src/main/java/ast/expressions/binaryexpressions/BinaryNode.java @@ -4,12 +4,12 @@ import ast.expressions.IExpressionNode; import ast.type.type.*; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; public class BinaryNode implements IExpressionNode, Visitable { - private ITypeNode typeNode; + public ITypeNode typeNode; @Override public TypeCheckResult accept(SemanticVisitor visitor) { diff --git a/src/main/java/ast/expressions/binaryexpressions/CalculationNode.java b/src/main/java/ast/expressions/binaryexpressions/CalculationNode.java index 78c059d..3c6617f 100644 --- a/src/main/java/ast/expressions/binaryexpressions/CalculationNode.java +++ b/src/main/java/ast/expressions/binaryexpressions/CalculationNode.java @@ -1,15 +1,13 @@ package ast.expressions.binaryexpressions; -import ast.type.type.*; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class CalculationNode extends BinaryNode { public CalculationNode calculationExpression; public EnumLineOperator operator; public DotNode dotExpression; - private ITypeNode typeNode; public CalculationNode(CalculationNode calculationExpression, String operator, DotNode dotExpression) { this.calculationExpression = calculationExpression; @@ -21,11 +19,13 @@ public class CalculationNode extends BinaryNode { this.dotExpression = dotExpression; } - private void setOperator(String operator) { - if(operator.equals("+")) { - this.operator = EnumLineOperator.PLUS; - } else if(operator.equals("-")) { - this.operator = EnumLineOperator.MINUS; + public void setOperator(String operator) { + if (operator != null) { + if (operator.equals("+")) { + this.operator = EnumLineOperator.PLUS; + } else if (operator.equals("-")) { + this.operator = EnumLineOperator.MINUS; + } } } @@ -40,4 +40,4 @@ public class CalculationNode extends BinaryNode { methodVisitor.visit(this); } -} +} \ No newline at end of file diff --git a/src/main/java/ast/expressions/binaryexpressions/DotNode.java b/src/main/java/ast/expressions/binaryexpressions/DotNode.java index 20b6513..518f004 100644 --- a/src/main/java/ast/expressions/binaryexpressions/DotNode.java +++ b/src/main/java/ast/expressions/binaryexpressions/DotNode.java @@ -1,32 +1,29 @@ package ast.expressions.binaryexpressions; -import ast.type.type.*; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class DotNode extends BinaryNode { public DotNode dotExpression; public EnumDotOperator operator; - public DotSubstractionNode dotSubstractionExpression; + public DotSubtractionNode dotSubtractionExpression; - public DotNode(DotNode dotExpression, String operator, DotSubstractionNode dotSubstractionExpression) { + public DotNode(DotNode dotExpression, String operator, DotSubtractionNode dotSubtractionExpression) { this.dotExpression = dotExpression; setOperator(operator); - this.dotSubstractionExpression = dotSubstractionExpression; + this.dotSubtractionExpression = dotSubtractionExpression; } - public DotNode(DotSubstractionNode dotSubstractionExpression) { - this.dotSubstractionExpression = dotSubstractionExpression; + public DotNode(DotSubtractionNode dotSubtractionExpression) { + this.dotSubtractionExpression = dotSubtractionExpression; } - private void setOperator(String operator) { - if(operator.equals("*")) { - this.operator = EnumDotOperator.MULT; - } else if(operator.equals("/")) { - this.operator = EnumDotOperator.DIV; - } else if(operator.equals("%")) { - this.operator = EnumDotOperator.MOD; + public void setOperator(String operator) { + switch (operator) { + case "*" -> this.operator = EnumDotOperator.MULT; + case "/" -> this.operator = EnumDotOperator.DIV; + case "%" -> this.operator = EnumDotOperator.MOD; } } diff --git a/src/main/java/ast/expressions/binaryexpressions/DotSubstractionNode.java b/src/main/java/ast/expressions/binaryexpressions/DotSubtractionNode.java similarity index 70% rename from src/main/java/ast/expressions/binaryexpressions/DotSubstractionNode.java rename to src/main/java/ast/expressions/binaryexpressions/DotSubtractionNode.java index a93d1c4..e2c64b5 100644 --- a/src/main/java/ast/expressions/binaryexpressions/DotSubstractionNode.java +++ b/src/main/java/ast/expressions/binaryexpressions/DotSubtractionNode.java @@ -1,45 +1,44 @@ -package ast.expressions.binaryexpressions; - -import ast.expressions.unaryexpressions.MemberAccessNode; -import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode; -import ast.type.type.*; -import ast.type.ValueNode; -import bytecode.visitor.MethodVisitor; -import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; - -public class DotSubstractionNode extends BinaryNode { - public ValueNode value; - public String identifier; - public MemberAccessNode memberAccess; - public MethodCallNode methodCall; - public CalculationNode calculationExpression; - - public DotSubstractionNode(ValueNode value) { - this.value = value; - } - - public DotSubstractionNode(String identifier) { - this.identifier = identifier; - } - - public DotSubstractionNode(MemberAccessNode memberAccess) { - this.memberAccess = memberAccess; - } - - public DotSubstractionNode(MethodCallNode methodCall, CalculationNode calculationExpression) { - this.methodCall = methodCall; - this.calculationExpression = calculationExpression; - } - - @Override - public TypeCheckResult accept(SemanticVisitor visitor) { - return visitor.analyze(this); - } - - @Override - public void accept(MethodVisitor methodVisitor) { - methodVisitor.visit(this); - } - -} +package ast.expressions.binaryexpressions; + +import ast.expressions.unaryexpressions.MemberAccessNode; +import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode; +import ast.type.ValueNode; +import bytecode.visitor.MethodVisitor; +import semantic.SemanticVisitor; +import semantic.TypeCheckResult; + +public class DotSubtractionNode extends BinaryNode { + public ValueNode value; + public String identifier; + public MemberAccessNode memberAccess; + public MethodCallNode methodCall; + public CalculationNode calculationExpression; + + public DotSubtractionNode(ValueNode value) { + this.value = value; + } + + public DotSubtractionNode(String identifier) { + this.identifier = identifier; + } + + public DotSubtractionNode(MemberAccessNode memberAccess) { + this.memberAccess = memberAccess; + } + + public DotSubtractionNode(MethodCallNode methodCall, CalculationNode calculationExpression) { + this.methodCall = methodCall; + this.calculationExpression = calculationExpression; + } + + @Override + public TypeCheckResult accept(SemanticVisitor visitor) { + return visitor.analyze(this); + } + + @Override + public void accept(MethodVisitor methodVisitor) { + methodVisitor.visit(this); + } + +} diff --git a/src/main/java/ast/expressions/binaryexpressions/NonCalculationNode.java b/src/main/java/ast/expressions/binaryexpressions/NonCalculationNode.java index c44a103..ae63b01 100644 --- a/src/main/java/ast/expressions/binaryexpressions/NonCalculationNode.java +++ b/src/main/java/ast/expressions/binaryexpressions/NonCalculationNode.java @@ -2,10 +2,9 @@ package ast.expressions.binaryexpressions; import ast.expressions.IExpressionNode; import ast.expressions.unaryexpressions.UnaryNode; -import ast.type.type.*; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class NonCalculationNode extends BinaryNode { public UnaryNode unaryExpression; @@ -18,23 +17,16 @@ public class NonCalculationNode extends BinaryNode { this.expression = expression; } - private void setOperator(String operator) { - if(operator.equals("&&")) { - this.operator = EnumNonCalculationOperator.AND; - } else if(operator.equals("||")) { - this.operator = EnumNonCalculationOperator.OR; - } else if(operator.equals(">")) { - this.operator = EnumNonCalculationOperator.GREATER; - } else if(operator.equals("<")) { - this.operator = EnumNonCalculationOperator.LESS; - } else if(operator.equals(">=")) { - this.operator = EnumNonCalculationOperator.GREATER_EQUAL; - } else if(operator.equals("<=")) { - this.operator = EnumNonCalculationOperator.LESS_EQUAL; - } else if(operator.equals("==")) { - this.operator = EnumNonCalculationOperator.EQUAL; - } else if(operator.equals("!=")) { - this.operator = EnumNonCalculationOperator.NOT_EQUAL; + public void setOperator(String operator) { + switch (operator) { + case "&&" -> this.operator = EnumNonCalculationOperator.AND; + case "||" -> this.operator = EnumNonCalculationOperator.OR; + case ">" -> this.operator = EnumNonCalculationOperator.GREATER; + case "<" -> this.operator = EnumNonCalculationOperator.LESS; + case ">=" -> this.operator = EnumNonCalculationOperator.GREATER_EQUAL; + case "<=" -> this.operator = EnumNonCalculationOperator.LESS_EQUAL; + case "==" -> this.operator = EnumNonCalculationOperator.EQUAL; + case "!=" -> this.operator = EnumNonCalculationOperator.NOT_EQUAL; } } diff --git a/src/main/java/ast/expressions/unaryexpressions/MemberAccessNode.java b/src/main/java/ast/expressions/unaryexpressions/MemberAccessNode.java index ca688db..01f220f 100644 --- a/src/main/java/ast/expressions/unaryexpressions/MemberAccessNode.java +++ b/src/main/java/ast/expressions/unaryexpressions/MemberAccessNode.java @@ -1,10 +1,11 @@ package ast.expressions.unaryexpressions; import ast.ASTNode; -import bytecode.visitor.MethodVisitor; import ast.type.type.ITypeNode; +import bytecode.visitor.MethodVisitor; + import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; import java.util.ArrayList; @@ -27,7 +28,7 @@ public class MemberAccessNode implements ASTNode, Visitable { public void accept(MethodVisitor methodVisitor) { methodVisitor.visit(this); } - + public TypeCheckResult accept(SemanticVisitor visitor) { return visitor.analyze(this); } @@ -40,4 +41,5 @@ public class MemberAccessNode implements ASTNode, Visitable { this.typeNode = typeNode; } + } diff --git a/src/main/java/ast/expressions/unaryexpressions/NotNode.java b/src/main/java/ast/expressions/unaryexpressions/NotNode.java index e0c31a3..eb651ff 100644 --- a/src/main/java/ast/expressions/unaryexpressions/NotNode.java +++ b/src/main/java/ast/expressions/unaryexpressions/NotNode.java @@ -1,13 +1,12 @@ package ast.expressions.unaryexpressions; -import ast.ASTNode; import ast.expressions.IExpressionNode; +import ast.type.type.ITypeNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; -import visitor.Visitable; +import semantic.TypeCheckResult; -public class NotNode implements ASTNode, Visitable { +public class NotNode implements IExpressionNode { public IExpressionNode expression; public NotNode(IExpressionNode expression) { @@ -24,4 +23,13 @@ public class NotNode implements ASTNode, Visitable { return null; } -} + @Override + public ITypeNode getType() { + return expression.getType(); + } + + @Override + public void setType(ITypeNode type) { + this.expression.setType(type); + } +} \ No newline at end of file diff --git a/src/main/java/ast/expressions/unaryexpressions/UnaryNode.java b/src/main/java/ast/expressions/unaryexpressions/UnaryNode.java index 21374fa..cd4dd38 100644 --- a/src/main/java/ast/expressions/unaryexpressions/UnaryNode.java +++ b/src/main/java/ast/expressions/unaryexpressions/UnaryNode.java @@ -6,7 +6,7 @@ import ast.type.type.*; import ast.type.ValueNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import java.util.Objects; @@ -18,10 +18,10 @@ public class UnaryNode implements IExpressionNode { public NotNode notExpression; public IStatementNode statement; public IExpressionNode expression; - private ITypeNode type; + public ITypeNode type; public UnaryNode(String value) { - if(Objects.equals(value, "this")) { + if (Objects.equals(value, "this")) { this.thisExp = "this"; } else { this.identifier = value; diff --git a/src/main/java/ast/literal/BooleanLiteralNode.java b/src/main/java/ast/literal/BooleanLiteralNode.java deleted file mode 100644 index 4657df7..0000000 --- a/src/main/java/ast/literal/BooleanLiteralNode.java +++ /dev/null @@ -1,11 +0,0 @@ -package ast.literal; - -public class BooleanLiteralNode { - private String value; - - public BooleanLiteralNode(String value) {this.value = value;} - - public String getValue() { - return value; - } -} diff --git a/src/main/java/ast/literal/CharLiteralNode.java b/src/main/java/ast/literal/CharLiteralNode.java deleted file mode 100644 index c77c073..0000000 --- a/src/main/java/ast/literal/CharLiteralNode.java +++ /dev/null @@ -1,11 +0,0 @@ -package ast.literal; - -public class CharLiteralNode { - public String value; - - public CharLiteralNode(String value) {this.value = value;} - - public String getValue() { - return value; - } -} diff --git a/src/main/java/ast/literal/LiteralNode.java b/src/main/java/ast/literal/LiteralNode.java deleted file mode 100644 index e18ab7b..0000000 --- a/src/main/java/ast/literal/LiteralNode.java +++ /dev/null @@ -1,30 +0,0 @@ -package ast.literal; -import ast.expressions.IExpressionNode; -import ast.type.type.ITypeNode; -import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; - -public class LiteralNode implements IExpressionNode { - - public String value; - private ITypeNode type; - - public LiteralNode(String value, ITypeNode type) { - this.value = value; - this.type = type; - } - - public ITypeNode getType() { - return type; - } - - public void setType(ITypeNode type) { - this.type = type; - } - - - @Override - public TypeCheckResult accept(SemanticVisitor visitor) { - return null; - } -} \ No newline at end of file diff --git a/src/main/java/ast/members/ConstructorNode.java b/src/main/java/ast/members/ConstructorNode.java index 2ff9f94..4cfe5e8 100644 --- a/src/main/java/ast/members/ConstructorNode.java +++ b/src/main/java/ast/members/ConstructorNode.java @@ -11,13 +11,8 @@ import java.util.List; import java.util.Objects; public class ConstructorNode extends MethodNode implements Visitable { - public AccessModifierNode accessType; - public String identifier; - public List parameters = new ArrayList<>(); - public BlockNode block; - public ConstructorNode(String accessType, String identifier, BlockNode block) { - this.accessType = new AccessModifierNode(accessType); + this.accesModifier = new AccessModifierNode(accessType); this.identifier = identifier; this.block = block; } @@ -32,8 +27,7 @@ public class ConstructorNode extends MethodNode implements Visitable { } public boolean isSame(MethodNode methodNode) { - if (!(Objects.equals(this.identifier, methodNode.getIdentifier())) - || getParameters().size() != methodNode.getParameters().size()) { + if (!(Objects.equals(this.identifier, methodNode.getIdentifier())) || getParameters().size() != methodNode.getParameters().size()) { return false; } diff --git a/src/main/java/ast/members/FieldNode.java b/src/main/java/ast/members/FieldNode.java index edf434c..e223b25 100644 --- a/src/main/java/ast/members/FieldNode.java +++ b/src/main/java/ast/members/FieldNode.java @@ -3,9 +3,8 @@ package ast.members; import ast.type.AccessModifierNode; import ast.type.type.ITypeNode; import bytecode.visitor.ClassVisitor; -import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; public class FieldNode implements MemberNode, Visitable { @@ -13,7 +12,7 @@ public class FieldNode implements MemberNode, Visitable { public ITypeNode type; public String identifier; - public FieldNode(AccessModifierNode accessTypeNode, ITypeNode type, String name){ + public FieldNode(AccessModifierNode accessTypeNode, ITypeNode type, String name) { this.accessTypeNode = accessTypeNode; this.type = type; this.identifier = name; diff --git a/src/main/java/ast/members/MainMethodNode.java b/src/main/java/ast/members/MainMethodNode.java index 314a6d0..dc87afa 100644 --- a/src/main/java/ast/members/MainMethodNode.java +++ b/src/main/java/ast/members/MainMethodNode.java @@ -5,7 +5,6 @@ import bytecode.visitor.MethodVisitor; import visitor.Visitable; public class MainMethodNode extends MethodNode implements Visitable { - public BlockNode block; public MainMethodNode(BlockNode block) { this.block = block; diff --git a/src/main/java/ast/members/MemberNode.java b/src/main/java/ast/members/MemberNode.java index 1319c03..6f8bcc8 100644 --- a/src/main/java/ast/members/MemberNode.java +++ b/src/main/java/ast/members/MemberNode.java @@ -10,7 +10,8 @@ import ast.ASTNode; @JsonSubTypes({ @JsonSubTypes.Type(value = MethodNode.class, name = "Method"), - @JsonSubTypes.Type(value = FieldNode.class, name = "Field") } + @JsonSubTypes.Type(value = FieldNode.class, name = "Field")} ) -public interface MemberNode extends ASTNode {} +public interface MemberNode extends ASTNode { +} diff --git a/src/main/java/ast/members/MethodNode.java b/src/main/java/ast/members/MethodNode.java index 46a654d..316f77c 100644 --- a/src/main/java/ast/members/MethodNode.java +++ b/src/main/java/ast/members/MethodNode.java @@ -6,7 +6,7 @@ import ast.type.AccessModifierNode; import ast.type.type.*; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; import java.util.ArrayList; @@ -15,16 +15,16 @@ import java.util.Objects; public class MethodNode implements MemberNode, Visitable { public AccessModifierNode accesModifier; - private ITypeNode type; + public ITypeNode type; public Boolean voidType; - private String identifier; + public String identifier; public List parameters = new ArrayList<>(); public BlockNode block; public MethodNode() { } - public MethodNode(String accessModifier, ITypeNode type, Boolean voidType, String identifier, BlockNode block){ + public MethodNode(String accessModifier, ITypeNode type, Boolean voidType, String identifier, BlockNode block) { this.accesModifier = new AccessModifierNode(accessModifier); this.type = type; this.voidType = voidType; @@ -40,7 +40,7 @@ public class MethodNode implements MemberNode, Visitable { return parameters; } - public boolean isSame(MethodNode methodNode){ + public boolean isSame(MethodNode methodNode) { if (!(Objects.equals(this.identifier, methodNode.getIdentifier())) || type.equals(methodNode.type) || getParameters().size() != methodNode.getParameters().size()) { return false; diff --git a/src/main/java/ast/parameters/ParameterNode.java b/src/main/java/ast/parameters/ParameterNode.java index f3ec9bd..d3a0713 100644 --- a/src/main/java/ast/parameters/ParameterNode.java +++ b/src/main/java/ast/parameters/ParameterNode.java @@ -3,7 +3,7 @@ package ast.parameters; import ast.ASTNode; import ast.type.type.*; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; public class ParameterNode implements ASTNode, Visitable { diff --git a/src/main/java/ast/statement/BlockStatementNode.java b/src/main/java/ast/statement/BlockStatementNode.java deleted file mode 100644 index 6005d1a..0000000 --- a/src/main/java/ast/statement/BlockStatementNode.java +++ /dev/null @@ -1,11 +0,0 @@ -package ast.statement; - -import ast.statements.IStatementNode; - -import java.util.List; - -public class BlockStatementNode { - List statements; - - public BlockStatementNode(List statements) {this.statements = statements;} -} diff --git a/src/main/java/ast/statementexpressions/AssignNode.java b/src/main/java/ast/statementexpressions/AssignNode.java index c620abd..c181e04 100644 --- a/src/main/java/ast/statementexpressions/AssignNode.java +++ b/src/main/java/ast/statementexpressions/AssignNode.java @@ -3,7 +3,7 @@ package ast.statementexpressions; import ast.expressions.IExpressionNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class AssignNode implements IStatementExpressionNode { public AssignableNode assignable; diff --git a/src/main/java/ast/statementexpressions/AssignableNode.java b/src/main/java/ast/statementexpressions/AssignableNode.java index 83568d8..6b66fe0 100644 --- a/src/main/java/ast/statementexpressions/AssignableNode.java +++ b/src/main/java/ast/statementexpressions/AssignableNode.java @@ -2,12 +2,13 @@ package ast.statementexpressions; import ast.expressions.unaryexpressions.MemberAccessNode; import ast.type.type.ITypeNode; +import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class AssignableNode implements IStatementExpressionNode { public String identifier; - private ITypeNode typeNode; + public ITypeNode typeNode; public MemberAccessNode memberAccess; @@ -24,10 +25,6 @@ public class AssignableNode implements IStatementExpressionNode { return visitor.analyze(this); } - public ITypeNode getTypeNode() { - return typeNode; - } - public void setTypeNode(ITypeNode typeNode) { this.typeNode = typeNode; } diff --git a/src/main/java/ast/statementexpressions/IStatementExpressionNode.java b/src/main/java/ast/statementexpressions/IStatementExpressionNode.java index 7458848..0a56216 100644 --- a/src/main/java/ast/statementexpressions/IStatementExpressionNode.java +++ b/src/main/java/ast/statementexpressions/IStatementExpressionNode.java @@ -2,4 +2,5 @@ package ast.statementexpressions; import ast.statements.IStatementNode; -public interface IStatementExpressionNode extends IStatementNode {} +public interface IStatementExpressionNode extends IStatementNode { +} diff --git a/src/main/java/ast/statementexpressions/NewDeclarationNode.java b/src/main/java/ast/statementexpressions/NewDeclarationNode.java index 0964a6c..c822ace 100644 --- a/src/main/java/ast/statementexpressions/NewDeclarationNode.java +++ b/src/main/java/ast/statementexpressions/NewDeclarationNode.java @@ -3,7 +3,7 @@ package ast.statementexpressions; import ast.expressions.IExpressionNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ast/statementexpressions/crementexpressions/DecrementNode.java b/src/main/java/ast/statementexpressions/crementexpressions/DecrementNode.java index 97a359f..3af44e2 100644 --- a/src/main/java/ast/statementexpressions/crementexpressions/DecrementNode.java +++ b/src/main/java/ast/statementexpressions/crementexpressions/DecrementNode.java @@ -4,10 +4,10 @@ import ast.statementexpressions.AssignableNode; import ast.statementexpressions.IStatementExpressionNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; -public class DecrementNode implements IStatementExpressionNode { +public class DecrementNode implements IStatementExpressionNode, Visitable { public CrementType crementType; public AssignableNode assignableExpression; @@ -25,5 +25,4 @@ public class DecrementNode implements IStatementExpressionNode { public void accept(MethodVisitor methodVisitor) { methodVisitor.visit(this); } - } diff --git a/src/main/java/ast/statementexpressions/crementexpressions/IncrementNode.java b/src/main/java/ast/statementexpressions/crementexpressions/IncrementNode.java index 105f11f..3735e47 100644 --- a/src/main/java/ast/statementexpressions/crementexpressions/IncrementNode.java +++ b/src/main/java/ast/statementexpressions/crementexpressions/IncrementNode.java @@ -4,9 +4,10 @@ import ast.statementexpressions.AssignableNode; import ast.statementexpressions.IStatementExpressionNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import visitor.Visitable; +import semantic.TypeCheckResult; -public class IncrementNode implements IStatementExpressionNode { +public class IncrementNode implements IStatementExpressionNode, Visitable { public CrementType crementType; public AssignableNode assignableExpression; @@ -24,5 +25,4 @@ public class IncrementNode implements IStatementExpressionNode { public void accept(MethodVisitor methodVisitor) { methodVisitor.visit(this); } - } diff --git a/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/ChainedMethodNode.java b/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/ChainedMethodNode.java index ae01b85..9b54c35 100644 --- a/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/ChainedMethodNode.java +++ b/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/ChainedMethodNode.java @@ -4,7 +4,7 @@ import ast.ASTNode; import ast.expressions.IExpressionNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; import java.util.ArrayList; @@ -22,11 +22,6 @@ public class ChainedMethodNode implements ASTNode, Visitable { expressions.add(expression); } - @Override - public void accept(MethodVisitor methodVisitor) { - methodVisitor.visit(this); - } - @Override public TypeCheckResult accept(SemanticVisitor visitor) { return null; diff --git a/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/MethodCallNode.java b/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/MethodCallNode.java index e88b38b..82f113c 100644 --- a/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/MethodCallNode.java +++ b/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/MethodCallNode.java @@ -2,15 +2,17 @@ package ast.statementexpressions.methodcallstatementnexpressions; import ast.expressions.IExpressionNode; import ast.statements.IStatementNode; +import ast.type.type.ITypeNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import java.util.ArrayList; import java.util.List; public class MethodCallNode implements IStatementNode { public TargetNode target; + public ITypeNode type; public List chainedMethods = new ArrayList<>(); public String identifier; public List parameters = new ArrayList<>(); diff --git a/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/TargetNode.java b/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/TargetNode.java index d343dbe..6e3dc2b 100644 --- a/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/TargetNode.java +++ b/src/main/java/ast/statementexpressions/methodcallstatementnexpressions/TargetNode.java @@ -3,9 +3,8 @@ package ast.statementexpressions.methodcallstatementnexpressions; import ast.ASTNode; import ast.expressions.unaryexpressions.MemberAccessNode; import ast.statementexpressions.NewDeclarationNode; -import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; public class TargetNode implements ASTNode, Visitable { @@ -30,11 +29,6 @@ public class TargetNode implements ASTNode, Visitable { this.identifier = identifier; } - @Override - public void accept(MethodVisitor methodVisitor) { - methodVisitor.visit(this); - } - public TypeCheckResult accept(SemanticVisitor visitor) { return visitor.analyze(this); } diff --git a/src/main/java/ast/statements/BlockNode.java b/src/main/java/ast/statements/BlockNode.java index 7a5a2ea..fbd9927 100644 --- a/src/main/java/ast/statements/BlockNode.java +++ b/src/main/java/ast/statements/BlockNode.java @@ -1,8 +1,8 @@ package ast.statements; -import ast.ASTNode; +import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; import java.util.ArrayList; @@ -11,7 +11,8 @@ import java.util.List; public class BlockNode implements IStatementNode, Visitable { public List statements = new ArrayList<>(); - public BlockNode() {} + public BlockNode() { + } public void addStatement(IStatementNode statement) { statements.add(statement); @@ -22,4 +23,9 @@ public class BlockNode implements IStatementNode, Visitable { return visitor.analyze(this); } + @Override + public void accept(MethodVisitor methodVisitor) { + methodVisitor.visit(this); + } + } diff --git a/src/main/java/ast/statements/BlockStatementNode.java b/src/main/java/ast/statements/BlockStatementNode.java deleted file mode 100644 index 8a01783..0000000 --- a/src/main/java/ast/statements/BlockStatementNode.java +++ /dev/null @@ -1,10 +0,0 @@ -package ast.statements; - - -import java.util.List; - -public class BlockStatementNode { - List statements; - - public BlockStatementNode(List statements) {this.statements = statements;} -} diff --git a/src/main/java/ast/statements/ElseNode.java b/src/main/java/ast/statements/ElseNode.java index 96e579e..c7a1018 100644 --- a/src/main/java/ast/statements/ElseNode.java +++ b/src/main/java/ast/statements/ElseNode.java @@ -1,7 +1,8 @@ package ast.statements; +import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class ElseNode implements IStatementNode { public BlockNode block; diff --git a/src/main/java/ast/statements/IfElseNode.java b/src/main/java/ast/statements/IfElseNode.java index 7126bed..95f21b9 100644 --- a/src/main/java/ast/statements/IfElseNode.java +++ b/src/main/java/ast/statements/IfElseNode.java @@ -1,7 +1,8 @@ package ast.statements; +import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import java.util.ArrayList; import java.util.List; @@ -20,6 +21,11 @@ public class IfElseNode implements IStatementNode { elseIfStatements.add(elseIfStament); } + @Override + public void accept(MethodVisitor methodVisitor) { + methodVisitor.visit(this); + } + @Override public TypeCheckResult accept(SemanticVisitor visitor) { return visitor.analyze(this); diff --git a/src/main/java/ast/statements/IfNode.java b/src/main/java/ast/statements/IfNode.java index 30e4e13..59ac7ca 100644 --- a/src/main/java/ast/statements/IfNode.java +++ b/src/main/java/ast/statements/IfNode.java @@ -2,7 +2,7 @@ package ast.statements; import ast.expressions.IExpressionNode; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class IfNode implements IStatementNode { public IExpressionNode expression; diff --git a/src/main/java/ast/statements/LocalVariableDeclarationNode.java b/src/main/java/ast/statements/LocalVariableDeclarationNode.java index 726ea24..032503f 100644 --- a/src/main/java/ast/statements/LocalVariableDeclarationNode.java +++ b/src/main/java/ast/statements/LocalVariableDeclarationNode.java @@ -4,7 +4,7 @@ import ast.expressions.IExpressionNode; import ast.type.type.*; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class LocalVariableDeclarationNode implements IStatementNode { public ITypeNode type; diff --git a/src/main/java/ast/statements/ReturnNode.java b/src/main/java/ast/statements/ReturnNode.java index fed9c44..485e0eb 100644 --- a/src/main/java/ast/statements/ReturnNode.java +++ b/src/main/java/ast/statements/ReturnNode.java @@ -3,14 +3,14 @@ package ast.statements; import ast.expressions.IExpressionNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class ReturnNode implements IStatementNode { public IExpressionNode expression; public Boolean voidReturn = false; public ReturnNode(IExpressionNode expression) { - if(expression != null) { + if (expression != null) { this.expression = expression; } else { voidReturn = true; diff --git a/src/main/java/ast/statements/WhileNode.java b/src/main/java/ast/statements/WhileNode.java index 6ac7f1f..da51510 100644 --- a/src/main/java/ast/statements/WhileNode.java +++ b/src/main/java/ast/statements/WhileNode.java @@ -1,8 +1,9 @@ package ast.statements; import ast.expressions.IExpressionNode; +import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public class WhileNode implements IStatementNode { public IExpressionNode expression; @@ -14,10 +15,14 @@ public class WhileNode implements IStatementNode { } public void test() { - return; } + @Override + public void accept(MethodVisitor methodVisitor) { + methodVisitor.visit(this); + } + @Override public TypeCheckResult accept(SemanticVisitor visitor) { return visitor.analyze(this); diff --git a/src/main/java/ast/type/AccessModifierNode.java b/src/main/java/ast/type/AccessModifierNode.java index 45f9172..abb054a 100644 --- a/src/main/java/ast/type/AccessModifierNode.java +++ b/src/main/java/ast/type/AccessModifierNode.java @@ -8,7 +8,7 @@ public class AccessModifierNode { } private void setModifier(String accessType) { - switch(accessType) { + switch (accessType) { case "public": this.accessType = EnumAccessModifierNode.PUBLIC; break; diff --git a/src/main/java/ast/type/ValueNode.java b/src/main/java/ast/type/ValueNode.java index bf00e90..abf9c38 100644 --- a/src/main/java/ast/type/ValueNode.java +++ b/src/main/java/ast/type/ValueNode.java @@ -3,7 +3,7 @@ package ast.type; import ast.ASTNode; import bytecode.visitor.MethodVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; import visitor.Visitable; public class ValueNode implements ASTNode, Visitable { diff --git a/src/main/java/ast/type/type/BaseType.java b/src/main/java/ast/type/type/BaseType.java index 0563b64..8a5f21a 100644 --- a/src/main/java/ast/type/type/BaseType.java +++ b/src/main/java/ast/type/type/BaseType.java @@ -2,7 +2,7 @@ package ast.type.type; public class BaseType implements ITypeNode { - private TypeEnum typeEnum; + public final TypeEnum typeEnum; public BaseType(TypeEnum typeEnum) { this.typeEnum = typeEnum; @@ -21,8 +21,6 @@ public class BaseType implements ITypeNode { if (getClass() != obj.getClass()) return false; BaseType other = (BaseType) obj; - if (typeEnum != other.typeEnum) - return false; - return true; + return typeEnum == other.typeEnum; } } diff --git a/src/main/java/ast/type/type/ITypeNode.java b/src/main/java/ast/type/type/ITypeNode.java index e449e3c..098c3c2 100644 --- a/src/main/java/ast/type/type/ITypeNode.java +++ b/src/main/java/ast/type/type/ITypeNode.java @@ -1,5 +1,4 @@ package ast.type.type; public interface ITypeNode { - } diff --git a/src/main/java/ast/type/type/ReferenceType.java b/src/main/java/ast/type/type/ReferenceType.java index 2292046..bc54190 100644 --- a/src/main/java/ast/type/type/ReferenceType.java +++ b/src/main/java/ast/type/type/ReferenceType.java @@ -1,8 +1,8 @@ package ast.type.type; -public class ReferenceType implements ITypeNode{ +public class ReferenceType implements ITypeNode { - private String identifier; + public final String identifier; public ReferenceType(String identifier) { this.identifier = identifier; @@ -22,11 +22,8 @@ public class ReferenceType implements ITypeNode{ return false; ReferenceType other = (ReferenceType) obj; if (identifier == null) { - if (other.identifier != null) - return false; - } else if (!identifier.equals(other.identifier)) - return false; - return true; + return other.identifier == null; + } else return identifier.equals(other.identifier); } diff --git a/src/main/java/ast/type/type/TypeEnum.java b/src/main/java/ast/type/type/TypeEnum.java index d46fac3..8c146c8 100644 --- a/src/main/java/ast/type/type/TypeEnum.java +++ b/src/main/java/ast/type/type/TypeEnum.java @@ -4,6 +4,6 @@ public enum TypeEnum { VOID, INT, CHAR, - BOOL; - + BOOL, + NULL } diff --git a/src/main/java/bytecode/ByteCodeGenerator.java b/src/main/java/bytecode/ByteCodeGenerator.java index 280bda1..9978ec7 100644 --- a/src/main/java/bytecode/ByteCodeGenerator.java +++ b/src/main/java/bytecode/ByteCodeGenerator.java @@ -17,50 +17,61 @@ public class ByteCodeGenerator implements ProgramVisitor { private JarOutputStream jarOutputStream; private ByteArrayOutputStream byteArrayOutputStream; - private String outputDirectory; + private final String outputDirectory; + private final boolean generateJar; + private final boolean generateClassFiles; - public ByteCodeGenerator(String outputDirectory) { + public ByteCodeGenerator(String outputDirectory, boolean generateJar, boolean generateClassFiles) { this.outputDirectory = outputDirectory; + this.generateJar = generateJar; + this.generateClassFiles = generateClassFiles; } @Override public void visit(ProgramNode programNode) { - byteArrayOutputStream = new ByteArrayOutputStream(); - try { - Manifest manifest = new Manifest(); - manifest.getMainAttributes().putValue("Manifest-Version", "1.0"); - boolean foundMainClass = false; - for (ClassNode classNode : programNode.classes) { - if (foundMainClass) { - break; - } - for (MemberNode memberNode : classNode.members) { - if (memberNode instanceof MainMethodNode) { - manifest.getMainAttributes().putValue("Main-Class", classNode.identifier); - foundMainClass = true; + if(generateJar) { + byteArrayOutputStream = new ByteArrayOutputStream(); + try { + Manifest manifest = new Manifest(); + manifest.getMainAttributes().putValue("Manifest-Version", "1.0"); + boolean foundMainClass = false; + for (ClassNode classNode : programNode.classes) { + if (foundMainClass) { break; } + for (MemberNode memberNode : classNode.members) { + if (memberNode instanceof MainMethodNode) { + manifest.getMainAttributes().putValue("Main-Class", classNode.identifier); + foundMainClass = true; + break; + } + } } + + + jarOutputStream = new JarOutputStream(byteArrayOutputStream, manifest); + } catch (IOException e) { + throw new RuntimeException(e); } + for (ClassNode classDeclarationNode : programNode.classes) { + ClassCodeGen classCodeGen = new ClassCodeGen(jarOutputStream, outputDirectory, generateJar, generateClassFiles); + classDeclarationNode.accept(classCodeGen); + } - jarOutputStream = new JarOutputStream(byteArrayOutputStream, manifest); - } catch (IOException e) { - throw new RuntimeException(e); + try { + jarOutputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + + saveJarFile(byteArrayOutputStream.toByteArray(), "output.jar"); + } else { + for (ClassNode classDeclarationNode : programNode.classes) { + ClassCodeGen classCodeGen = new ClassCodeGen(jarOutputStream, outputDirectory, generateJar, generateClassFiles); + classDeclarationNode.accept(classCodeGen); + } } - - for (ClassNode classDeclarationNode : programNode.classes) { - ClassCodeGen classCodeGen = new ClassCodeGen(jarOutputStream, outputDirectory); - classDeclarationNode.accept(classCodeGen); - } - - try { - jarOutputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - - saveJarFile(byteArrayOutputStream.toByteArray(), "output.jar"); } private void saveJarFile(byte[] jarBytes, String jarFileName) { diff --git a/src/main/java/bytecode/ClassCodeGen.java b/src/main/java/bytecode/ClassCodeGen.java index 84c8b92..93c5dff 100644 --- a/src/main/java/bytecode/ClassCodeGen.java +++ b/src/main/java/bytecode/ClassCodeGen.java @@ -19,15 +19,19 @@ import java.util.jar.JarOutputStream; public class ClassCodeGen implements ClassVisitor { - private Mapper mapper; + private final Mapper mapper; private ClassWriter classWriter; - private JarOutputStream jarOutputStream; - private String outputDirectory; + private final JarOutputStream jarOutputStream; + private final String outputDirectory; + private final boolean generateJar; + private final boolean generateClassFiles; - public ClassCodeGen(JarOutputStream jarOutputStream, String outputDirectory) { - mapper = new Mapper(); + public ClassCodeGen(JarOutputStream jarOutputStream, String outputDirectory, boolean generateJar, boolean generateClassFiles) { + this.mapper = new Mapper(); this.jarOutputStream = jarOutputStream; this.outputDirectory = outputDirectory; + this.generateJar = generateJar; + this.generateClassFiles = generateClassFiles; } @Override @@ -45,9 +49,12 @@ public class ClassCodeGen implements ClassVisitor { } } - classWriter.visitEnd(); - printIntoClassFile(classWriter.toByteArray(), classNode.identifier, outputDirectory); - writeToJar(classWriter.toByteArray(), classNode.identifier); + if (generateJar) { + writeToJar(classWriter.toByteArray(), classNode.identifier); + } + if (generateClassFiles) { + printIntoClassFile(classWriter.toByteArray(), classNode.identifier, outputDirectory); + } classWriter.visitEnd(); } diff --git a/src/main/java/bytecode/Mapper.java b/src/main/java/bytecode/Mapper.java index b8170d2..0ddd1af 100644 --- a/src/main/java/bytecode/Mapper.java +++ b/src/main/java/bytecode/Mapper.java @@ -3,6 +3,7 @@ package bytecode; import ast.parameters.ParameterNode; import ast.type.*; import ast.type.type.BaseType; +import ast.type.type.ITypeNode; import ast.type.type.ReferenceType; import ast.type.type.TypeEnum; import org.objectweb.asm.Opcodes; @@ -24,18 +25,22 @@ public class Mapper { return 0; } - public String generateMethodDescriptor(BaseType type, List parameters) { + public String generateMethodDescriptor(ITypeNode type, List parameters) { String descriptor = "("; for (ParameterNode parameterNode : parameters) { - descriptor += getTypeChar((BaseType) parameterNode.type); + if(parameterNode.type instanceof BaseType) { + descriptor += getTypeChar((BaseType) parameterNode.type); + } else { + ReferenceType referenceType = (ReferenceType) parameterNode.type; + descriptor += "L" + referenceType.getIdentifier() + ";"; + } } descriptor += ")"; - descriptor += getTypeChar(type); - return descriptor; - } - - public String generateMethodDescriptor(ReferenceType type, List parameters) { - String descriptor = "()V"; + if(type instanceof BaseType) { + descriptor += getTypeChar((BaseType) type); + } else if(type instanceof ReferenceType) { + descriptor += "L" + ((ReferenceType) type).getIdentifier() +";"; + } return descriptor; } diff --git a/src/main/java/bytecode/MethodCodeGen.java b/src/main/java/bytecode/MethodCodeGen.java index a1776c6..6506d8f 100644 --- a/src/main/java/bytecode/MethodCodeGen.java +++ b/src/main/java/bytecode/MethodCodeGen.java @@ -1,5 +1,6 @@ package bytecode; +import ast.expressions.IExpressionNode; import ast.expressions.binaryexpressions.*; import ast.expressions.unaryexpressions.MemberAccessNode; import ast.expressions.unaryexpressions.NotNode; @@ -9,15 +10,18 @@ import ast.members.MainMethodNode; import ast.members.MethodNode; import ast.parameters.ParameterNode; import ast.statementexpressions.AssignNode; +import ast.statementexpressions.AssignableNode; import ast.statementexpressions.NewDeclarationNode; +import ast.statementexpressions.crementexpressions.CrementType; import ast.statementexpressions.crementexpressions.DecrementNode; import ast.statementexpressions.crementexpressions.IncrementNode; -import ast.statementexpressions.methodcallstatementnexpressions.ChainedMethodNode; import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode; -import ast.statementexpressions.methodcallstatementnexpressions.TargetNode; import ast.statements.*; +import ast.type.AccessModifierNode; +import ast.type.EnumAccessModifierNode; import ast.type.ValueNode; import ast.type.type.BaseType; +import ast.type.type.ReferenceType; import ast.type.type.TypeEnum; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; @@ -32,16 +36,16 @@ import static org.objectweb.asm.Opcodes.*; public class MethodCodeGen implements bytecode.visitor.MethodVisitor { - private ClassWriter classWriter; - private Mapper mapper; + private final ClassWriter classWriter; + private final Mapper mapper; private MethodVisitor methodVisitor; - private List localVaribales; + private final List localVariables; public MethodCodeGen(ClassWriter classWriter) { this.classWriter = classWriter; mapper = new Mapper(); - localVaribales = new ArrayList<>(); + localVariables = new ArrayList<>(); } @@ -50,17 +54,17 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { @Override public void visit(ConstructorNode constructorNode) { methodVisitor = - classWriter.visitMethod(mapper.mapAccessTypeToOpcode(constructorNode.accessType), + classWriter.visitMethod(mapper.mapAccessTypeToOpcode(constructorNode.accesModifier), "", mapper.generateMethodDescriptor(new BaseType(TypeEnum.VOID), constructorNode.parameters), null, null); methodVisitor.visitCode(); - localVaribales.add("this"); + localVariables.add("this"); // Add all method parameters to localVariables for (ParameterNode parameterNode : constructorNode.parameters) { - localVaribales.add(parameterNode.identifier); + localVariables.add(parameterNode.identifier); } methodVisitor.visitVarInsn(ALOAD, 0); @@ -77,15 +81,17 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { @Override public void visit(MainMethodNode mainMethodNode) { - methodVisitor = classWriter.visitMethod(mapper.mapAccessTypeToOpcode(mainMethodNode.accesModifier), - mainMethodNode.getIdentifier(), + AccessModifierNode accessModifierNode = new AccessModifierNode(""); + accessModifierNode.accessType = EnumAccessModifierNode.PUBLIC_STATIC; + methodVisitor = classWriter.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, + "main", "([Ljava/lang/String;)V", null, null); methodVisitor.visitCode(); - localVaribales.add("this"); - localVaribales.add("args"); + localVariables.add("this"); + localVariables.add("args"); // Visit all statements for (IStatementNode statementNode : mainMethodNode.block.statements) { @@ -100,15 +106,15 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { public void visit(MethodNode methodNode) { methodVisitor = classWriter.visitMethod(mapper.mapAccessTypeToOpcode(methodNode.accesModifier), methodNode.getIdentifier(), - mapper.generateMethodDescriptor((BaseType) methodNode.getType(), methodNode.parameters), + mapper.generateMethodDescriptor(methodNode.getType(), methodNode.parameters), null, null); methodVisitor.visitCode(); - localVaribales.add("this"); + localVariables.add("this"); // Add all method parameters to localVariables for (ParameterNode parameterNode : methodNode.parameters) { - localVaribales.add(parameterNode.identifier); + localVariables.add(parameterNode.identifier); } // Visit all statements @@ -130,47 +136,59 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { @Override public void visit(CalculationNode calculationNode) { - calculationNode.dotExpression.accept(this); - calculationNode.calculationExpression.accept(this); - switch (calculationNode.operator) { - case PLUS: - methodVisitor.visitInsn(IADD); - break; - case MINUS: - methodVisitor.visitInsn(ISUB); - break; + if (calculationNode.calculationExpression != null) { + calculationNode.calculationExpression.accept(this); + } + if (calculationNode.dotExpression != null) { + calculationNode.dotExpression.accept(this); + } + if (calculationNode.operator != null) { + switch (calculationNode.operator) { + case PLUS: + methodVisitor.visitInsn(IADD); + break; + case MINUS: + methodVisitor.visitInsn(ISUB); + break; + } } } @Override public void visit(DotNode dotNode) { - dotNode.dotExpression.accept(this); - dotNode.dotSubstractionExpression.accept(this); - switch (dotNode.operator) { - case DIV: - methodVisitor.visitInsn(IDIV); - break; - case MULT: - methodVisitor.visitInsn(IMUL); - break; - case MOD: - methodVisitor.visitInsn(IREM); - break; + if (dotNode.dotExpression != null) { + dotNode.dotExpression.accept(this); + } + if (dotNode.dotSubtractionExpression != null) { + dotNode.dotSubtractionExpression.accept(this); + } + if (dotNode.operator != null) { + switch (dotNode.operator) { + case DIV: + methodVisitor.visitInsn(IDIV); + break; + case MULT: + methodVisitor.visitInsn(IMUL); + break; + case MOD: + methodVisitor.visitInsn(IREM); + break; + } } } @Override - public void visit(DotSubstractionNode dotSubstractionNode) { - if (dotSubstractionNode.value != null) { - dotSubstractionNode.value.accept(this); - } else if (dotSubstractionNode.identifier != null) { - methodVisitor.visitVarInsn(ILOAD, localVaribales.indexOf(dotSubstractionNode.identifier)); - } else if (dotSubstractionNode.memberAccess != null) { - dotSubstractionNode.memberAccess.accept(this); - } else if (dotSubstractionNode.methodCall != null) { - dotSubstractionNode.methodCall.accept(this); - } else if (dotSubstractionNode.calculationExpression != null) { - dotSubstractionNode.calculationExpression.accept(this); + public void visit(DotSubtractionNode dotSubtractionNode) { + if (dotSubtractionNode.value != null) { + dotSubtractionNode.value.accept(this); + } else if (dotSubtractionNode.identifier != null) { + methodVisitor.visitVarInsn(ILOAD, localVariables.indexOf(dotSubtractionNode.identifier)); + } else if (dotSubtractionNode.memberAccess != null) { + dotSubtractionNode.memberAccess.accept(this); + } else if (dotSubtractionNode.methodCall != null) { + dotSubtractionNode.methodCall.accept(this); + } else if (dotSubtractionNode.calculationExpression != null) { + dotSubtractionNode.calculationExpression.accept(this); } } @@ -224,7 +242,7 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { nonCalculationNode.unaryExpression.accept(this); nonCalculationNode.expression.accept(this); if (nonCalculationNode.unaryExpression.getType() instanceof BaseType && nonCalculationNode.expression.getType() instanceof BaseType) { - methodVisitor.visitJumpInsn(IF_ACMPEQ, labelFalse); + methodVisitor.visitJumpInsn(IF_ICMPEQ, labelFalse); } else { methodVisitor.visitJumpInsn(IF_ACMPEQ, labelFalse); } @@ -248,8 +266,18 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { @Override public void visit(MemberAccessNode memberAccessNode) { - if (memberAccessNode.thisExpr) { - //methodVisitor.visitFieldInsn(PUTFIELD); + // Only used to get, not to put + int localVarIndex = localVariables.indexOf("memberAccessNode.identifier"); // TODO + if (localVarIndex >= 0) { // local var object + methodVisitor.visitVarInsn(ALOAD, localVarIndex); + } else { // this field + methodVisitor.visitVarInsn(ALOAD, 0); + } + + if (memberAccessNode.getTypeNode() instanceof BaseType) { + methodVisitor.visitFieldInsn(GETFIELD, memberAccessNode.identifiers.get(0), memberAccessNode.identifiers.get(1), mapper.getTypeChar((BaseType) memberAccessNode.getTypeNode())); + } else if (memberAccessNode.getTypeNode() instanceof ReferenceType) { + methodVisitor.visitFieldInsn(GETFIELD, memberAccessNode.identifiers.get(0), memberAccessNode.identifiers.get(1), "L" + ((ReferenceType) memberAccessNode.getTypeNode()).getIdentifier() + ";"); } } @@ -275,18 +303,41 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { @Override public void visit(UnaryNode unaryNode) { - + if (unaryNode.thisExp != null) { + methodVisitor.visitVarInsn(ALOAD, 0); // this + } else if (unaryNode.memberAccess != null) { + unaryNode.memberAccess.setTypeNode(unaryNode.getType()); + unaryNode.memberAccess.accept(this); + } else if (unaryNode.value != null) { + unaryNode.value.accept(this); + } else if (unaryNode.notExpression != null) { + unaryNode.notExpression.accept(this); + } else if (unaryNode.statement != null) { + unaryNode.statement.accept(this); + } else if (unaryNode.expression != null) { + unaryNode.expression.accept(this); + } else if (unaryNode.identifier != null) { + methodVisitor.visitVarInsn(ILOAD, localVariables.indexOf(unaryNode.identifier)); + } } // Statements + @Override + public void visit(BlockNode blockNode) { + for (IStatementNode statementNode : blockNode.statements) { + statementNode.accept(this); + } + } + @Override public void visit(IfElseNode ifElseNode) { Label elseLabel = new Label(); + Label endLabel = new Label(); Label[] elseIfLabels = new Label[ifElseNode.elseIfStatements.size()]; - for(int i = 0; i < ifElseNode.elseIfStatements.size(); i++) { + for (int i = 0; i < ifElseNode.elseIfStatements.size(); i++) { elseIfLabels[i] = new Label(); } @@ -298,17 +349,17 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { // else if statements methodVisitor.visitJumpInsn(IFEQ, elseIfLabels[0]); } + ifElseNode.ifStatement.block.accept(this); // accept if block - Label endLabel = new Label(); methodVisitor.visitJumpInsn(GOTO, endLabel); - for(int i = 0; i < ifElseNode.elseIfStatements.size(); i++) { + for (int i = 0; i < ifElseNode.elseIfStatements.size(); i++) { methodVisitor.visitLabel(elseIfLabels[i]); ifElseNode.elseIfStatements.get(i).expression.accept(this); - if(i + 1 < elseIfLabels.length) { + if (i + 1 < elseIfLabels.length) { // at least one more else if - methodVisitor.visitJumpInsn(IFEQ, elseIfLabels[i+1]); + methodVisitor.visitJumpInsn(IFEQ, elseIfLabels[i + 1]); } else { methodVisitor.visitJumpInsn(IFEQ, elseLabel); } @@ -316,9 +367,11 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { methodVisitor.visitJumpInsn(GOTO, endLabel); } - if(ifElseNode.elseStatement != null) { + if (ifElseNode.elseStatement != null) { methodVisitor.visitLabel(elseLabel); ifElseNode.elseStatement.block.accept(this); + } else { + methodVisitor.visitLabel(elseLabel); } methodVisitor.visitLabel(endLabel); @@ -326,29 +379,261 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { @Override public void visit(LocalVariableDeclarationNode localVariableDeclarationNode) { - // Process expression - localVariableDeclarationNode.expression.accept(this); - // Store result of expression in variable - methodVisitor.visitVarInsn(ISTORE, localVaribales.indexOf(localVariableDeclarationNode.identifier)); + if (localVariableDeclarationNode.expression != null) { + // Process expression + localVariableDeclarationNode.expression.accept(this); + + if (localVariableDeclarationNode.expression instanceof UnaryNode) { + UnaryNode unaryNode = (UnaryNode) localVariableDeclarationNode.expression; + if (unaryNode.statement instanceof IncrementNode) { + IncrementNode incrementNode = (IncrementNode) unaryNode.statement; + incrementNode.assignableExpression.typeNode = unaryNode.type; + loadIncrement(incrementNode); + } else if (unaryNode.statement instanceof DecrementNode) { + DecrementNode decrementNode = (DecrementNode) unaryNode.statement; + decrementNode.assignableExpression.typeNode = unaryNode.type; + loadDecrement(decrementNode); + } + } + + // add local var to list if not in list + if (!localVariables.contains(localVariableDeclarationNode.identifier)) { + localVariables.add(localVariableDeclarationNode.identifier); + } + if (localVariableDeclarationNode.type instanceof BaseType) { + methodVisitor.visitVarInsn(ISTORE, localVariables.indexOf(localVariableDeclarationNode.identifier)); + } else if (localVariableDeclarationNode.type instanceof ReferenceType) { + methodVisitor.visitVarInsn(ASTORE, localVariables.indexOf(localVariableDeclarationNode.identifier)); + } + } else { + // Local var declaration + if (!localVariables.contains(localVariableDeclarationNode.identifier)) { + localVariables.add(localVariableDeclarationNode.identifier); + } + } } @Override public void visit(AssignNode assignNode) { - // Process expression - assignNode.expression.accept(this); - // Store result of expression in variable - if (assignNode.assignable.memberAccess.thisExpr) { - // Global var - // /methodVisitor.visitFieldInsn(PUTFIELD, identifierExpressionNode.name, identifierExpressionNode1.name, mapper.getTypeChar(((BaseTypeNode) type).enumType)); + if (assignNode.assignable.memberAccess != null) { // this / object + assignNode.assignable.memberAccess.setTypeNode(assignNode.assignable.typeNode); + if (assignNode.expression instanceof UnaryNode) { + UnaryNode unaryNode = (UnaryNode) assignNode.expression; + if (unaryNode.statement instanceof IncrementNode) { + IncrementNode incrementNode = (IncrementNode) unaryNode.statement; + if (incrementNode.crementType.equals(CrementType.PREFIX)) { // ++i + incrementNode.accept(this); // crement + fieldOrObjectVarCrementAssign(assignNode); // assign + } else { // i++ + fieldOrObjectVarCrementAssign(assignNode); // assign + incrementNode.accept(this); // crement + } + } else if (unaryNode.statement instanceof DecrementNode) { + DecrementNode decrementNode = (DecrementNode) unaryNode.statement; + if (decrementNode.crementType.equals(CrementType.PREFIX)) { + decrementNode.accept(this); // crement + fieldOrObjectVarCrementAssign(assignNode); // assign + } else { + fieldOrObjectVarCrementAssign(assignNode); // assign + decrementNode.accept(this); // crement + } + } + } else { + assignFieldOrObjectVar(assignNode); + } + } else { // local var + if (assignNode.expression instanceof UnaryNode) { + UnaryNode unaryNode = (UnaryNode) assignNode.expression; + if (unaryNode.statement instanceof IncrementNode || unaryNode.statement instanceof DecrementNode) { + localVarCrementAssign(assignNode); + } + } else { + assignNode.expression.accept(this); + assignLocalVar(assignNode); + } + } + } + + private void loadIncrement(IncrementNode incrementNode) { + AssignableNode assignableNode = incrementNode.assignableExpression; + if (assignableNode.memberAccess != null) { + assignableNode.memberAccess.accept(this); } else { - // Local var - methodVisitor.visitVarInsn(ISTORE, localVaribales.indexOf(assignNode.assignable.identifier)); + if (assignableNode.typeNode instanceof BaseType) { + methodVisitor.visitVarInsn(ILOAD, localVariables.indexOf(assignableNode.identifier)); + } else if (assignableNode.typeNode instanceof ReferenceType) { + methodVisitor.visitVarInsn(ALOAD, localVariables.indexOf(assignableNode.identifier)); + } + } + } + + private void loadDecrement(DecrementNode decrementNode) { + AssignableNode assignableNode = decrementNode.assignableExpression; + if (assignableNode.memberAccess != null) { + assignableNode.memberAccess.accept(this); + } else { + if (assignableNode.typeNode instanceof BaseType) { + methodVisitor.visitVarInsn(ILOAD, localVariables.indexOf(assignableNode.identifier)); + } else if (assignableNode.typeNode instanceof ReferenceType) { + methodVisitor.visitVarInsn(ALOAD, localVariables.indexOf(assignableNode.identifier)); + } + } + } + + private void assignLocalVar(AssignNode assignNode) { + if (!localVariables.contains(assignNode.assignable.identifier)) { + localVariables.add(assignNode.assignable.identifier); + } + + if (assignNode.expression.getType() instanceof BaseType) { + methodVisitor.visitVarInsn(ISTORE, localVariables.indexOf(assignNode.assignable.identifier)); + } else if (assignNode.expression.getType() instanceof ReferenceType) { + methodVisitor.visitVarInsn(ASTORE, localVariables.indexOf(assignNode.assignable.identifier)); + } + } + + private void assignFieldOrObjectVar(AssignNode assignNode) { + int localVarIndex = localVariables.indexOf(assignNode.assignable.identifier); + if (localVarIndex >= 0) { // object + methodVisitor.visitVarInsn(ALOAD, localVarIndex); + } else if (assignNode.assignable.memberAccess.thisExpr) { // this + methodVisitor.visitVarInsn(ALOAD, 0); + } else { + localVariables.add(assignNode.assignable.identifier); + } + + assignNode.expression.accept(this); + + if (assignNode.expression.getType() instanceof BaseType) { + methodVisitor.visitFieldInsn(PUTFIELD, assignNode.assignable.memberAccess.identifiers.get(0), assignNode.assignable.memberAccess.identifiers.get(1), mapper.getTypeChar((BaseType) assignNode.expression.getType())); + } else if (assignNode.expression.getType() instanceof ReferenceType) { + ReferenceType referenceType = (ReferenceType) assignNode.expression.getType(); + methodVisitor.visitFieldInsn(PUTFIELD, assignNode.assignable.memberAccess.identifiers.get(0), assignNode.assignable.memberAccess.identifiers.get(1), "L" + referenceType.getIdentifier() + ";"); + } + } + + private void localVarCrementAssign(AssignNode assignNode) { + UnaryNode unaryNode = (UnaryNode) assignNode.expression; + if (unaryNode.statement instanceof IncrementNode) { + IncrementNode incrementNode = (IncrementNode) unaryNode.statement; + if (incrementNode.crementType.equals(CrementType.PREFIX)) { // ++i + incrementNode.accept(this); + incrementNode.assignableExpression.typeNode = unaryNode.getType(); + loadIncrement(incrementNode); + assignLocalVar(assignNode); + } else { // i++ + incrementNode.assignableExpression.typeNode = unaryNode.getType(); + loadIncrement(incrementNode); + assignLocalVar(assignNode); + incrementNode.accept(this); + } + } else if (unaryNode.statement instanceof DecrementNode) { + DecrementNode decrementNode = (DecrementNode) unaryNode.statement; + if (decrementNode.crementType.equals(CrementType.PREFIX)) { + decrementNode.accept(this); + decrementNode.assignableExpression.typeNode = unaryNode.getType(); + loadDecrement(decrementNode); + assignLocalVar(assignNode); + } else { + decrementNode.assignableExpression.typeNode = unaryNode.getType(); + loadDecrement(decrementNode); + assignLocalVar(assignNode); + decrementNode.accept(this); + } + } + } + + private void fieldOrObjectVarCrementAssign(AssignNode assignNode) { + int localVarIndex = localVariables.indexOf(assignNode.assignable.identifier); + if (localVarIndex >= 0) { // object + methodVisitor.visitVarInsn(ALOAD, localVarIndex); + } else if (assignNode.assignable.memberAccess.thisExpr) { // field + methodVisitor.visitVarInsn(ALOAD, 0); + } else { + localVariables.add(assignNode.assignable.identifier); + } + + UnaryNode unaryNode = (UnaryNode) assignNode.expression; + if (unaryNode.statement instanceof IncrementNode) { + IncrementNode incrementNode = (IncrementNode) unaryNode.statement; + incrementNode.assignableExpression.typeNode = unaryNode.getType(); + loadIncrement((incrementNode)); + } else if (unaryNode.statement instanceof DecrementNode) { + DecrementNode decrementNode = (DecrementNode) unaryNode.statement; + decrementNode.assignableExpression.typeNode = unaryNode.getType(); + loadDecrement(decrementNode); + } + + if (assignNode.expression.getType() instanceof BaseType) { + methodVisitor.visitFieldInsn(PUTFIELD, assignNode.assignable.memberAccess.identifiers.get(0), assignNode.assignable.memberAccess.identifiers.get(1), mapper.getTypeChar((BaseType) assignNode.expression.getType())); + } else if (assignNode.expression.getType() instanceof ReferenceType) { + ReferenceType referenceType = (ReferenceType) assignNode.expression.getType(); + methodVisitor.visitFieldInsn(PUTFIELD, assignNode.assignable.memberAccess.identifiers.get(0), assignNode.assignable.memberAccess.identifiers.get(1), "L" + referenceType.getIdentifier() + ";"); + } + } + + @Override + public void visit(IncrementNode incrementNode) { + if (incrementNode.assignableExpression.memberAccess != null) { // Object var / field + int localVarIndex = localVariables.indexOf(incrementNode.assignableExpression.identifier); + if (localVarIndex >= 0) { // object + methodVisitor.visitVarInsn(ALOAD, localVarIndex); + } else { // this + methodVisitor.visitVarInsn(ALOAD, 0); + } + if (incrementNode.assignableExpression.memberAccess.getTypeNode() instanceof BaseType) { + methodVisitor.visitFieldInsn(GETFIELD, incrementNode.assignableExpression.memberAccess.identifiers.get(0), incrementNode.assignableExpression.memberAccess.identifiers.get(1), mapper.getTypeChar((BaseType) incrementNode.assignableExpression.memberAccess.getTypeNode())); + } else if (incrementNode.assignableExpression.memberAccess.getTypeNode() instanceof ReferenceType) { + methodVisitor.visitFieldInsn(GETFIELD, incrementNode.assignableExpression.memberAccess.identifiers.get(0), incrementNode.assignableExpression.memberAccess.identifiers.get(1), "L" + (((ReferenceType) incrementNode.assignableExpression.memberAccess.getTypeNode()).getIdentifier() + ";")); + } + methodVisitor.visitInsn(ICONST_1); + methodVisitor.visitInsn(IADD); + if (incrementNode.assignableExpression.memberAccess.getTypeNode() instanceof BaseType) { + methodVisitor.visitFieldInsn(PUTFIELD, incrementNode.assignableExpression.memberAccess.identifiers.get(0), incrementNode.assignableExpression.memberAccess.identifiers.get(1), mapper.getTypeChar((BaseType) incrementNode.assignableExpression.memberAccess.getTypeNode())); + } else if (incrementNode.assignableExpression.memberAccess.getTypeNode() instanceof ReferenceType) { + methodVisitor.visitFieldInsn(PUTFIELD, incrementNode.assignableExpression.memberAccess.identifiers.get(0), incrementNode.assignableExpression.memberAccess.identifiers.get(1), "L" + (((ReferenceType) incrementNode.assignableExpression.memberAccess.getTypeNode()).getIdentifier() + ";")); + } + } else { // local var + methodVisitor.visitIincInsn(localVariables.indexOf(incrementNode.assignableExpression.identifier), 1); + } + } + + @Override + public void visit(DecrementNode decrementNode) { + if (decrementNode.assignableExpression.memberAccess != null) { // Object var / field + int localVarIndex = localVariables.indexOf(decrementNode.assignableExpression.identifier); + if (localVarIndex >= 0) { // object + methodVisitor.visitVarInsn(ALOAD, localVarIndex); + } else { // this + methodVisitor.visitVarInsn(ALOAD, 0); + } + if (decrementNode.assignableExpression.memberAccess.getTypeNode() instanceof BaseType) { + methodVisitor.visitFieldInsn(GETFIELD, decrementNode.assignableExpression.memberAccess.identifiers.get(0), decrementNode.assignableExpression.memberAccess.identifiers.get(1), mapper.getTypeChar((BaseType) decrementNode.assignableExpression.memberAccess.getTypeNode())); + } else if (decrementNode.assignableExpression.memberAccess.getTypeNode() instanceof ReferenceType) { + methodVisitor.visitFieldInsn(GETFIELD, decrementNode.assignableExpression.memberAccess.identifiers.get(0), decrementNode.assignableExpression.memberAccess.identifiers.get(1), "L" + (((ReferenceType) decrementNode.assignableExpression.memberAccess.getTypeNode()).getIdentifier() + ";")); + } + methodVisitor.visitInsn(ICONST_1); + methodVisitor.visitInsn(ISUB); + if (decrementNode.assignableExpression.memberAccess.getTypeNode() instanceof BaseType) { + methodVisitor.visitFieldInsn(PUTFIELD, decrementNode.assignableExpression.memberAccess.identifiers.get(0), decrementNode.assignableExpression.memberAccess.identifiers.get(1), mapper.getTypeChar((BaseType) decrementNode.assignableExpression.memberAccess.getTypeNode())); + } else if (decrementNode.assignableExpression.memberAccess.getTypeNode() instanceof ReferenceType) { + methodVisitor.visitFieldInsn(PUTFIELD, decrementNode.assignableExpression.memberAccess.identifiers.get(0), decrementNode.assignableExpression.memberAccess.identifiers.get(1), "L" + (((ReferenceType) decrementNode.assignableExpression.memberAccess.getTypeNode()).getIdentifier() + ";")); + } + } else { // local var + methodVisitor.visitIincInsn(localVariables.indexOf(decrementNode.assignableExpression.identifier), -1); } } @Override public void visit(NewDeclarationNode newDeclarationNode) { - + methodVisitor.visitTypeInsn(NEW, newDeclarationNode.identifier); + methodVisitor.visitInsn(DUP); + List parameterNodes = new ArrayList<>(); + for (IExpressionNode expressionNode : newDeclarationNode.expressions) { + expressionNode.accept(this); + parameterNodes.add(new ParameterNode(expressionNode.getType(), "")); + } + methodVisitor.visitMethodInsn(INVOKESPECIAL, newDeclarationNode.identifier, "", mapper.generateMethodDescriptor(new BaseType(TypeEnum.VOID), parameterNodes), false); } @Override @@ -394,8 +679,27 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { } else { // Return something // Process expression returnNode.expression.accept(this); + + if (returnNode.expression instanceof UnaryNode) { + UnaryNode unaryNode = (UnaryNode) returnNode.expression; + if (unaryNode.statement instanceof IncrementNode) { + IncrementNode incrementNode = (IncrementNode) unaryNode.statement; + incrementNode.assignableExpression.typeNode = unaryNode.getType(); + loadIncrement(incrementNode); + } + if (unaryNode.statement instanceof DecrementNode) { + DecrementNode decrementNode = (DecrementNode) unaryNode.statement; + decrementNode.assignableExpression.typeNode = unaryNode.getType(); + loadDecrement(decrementNode); + } + } + // Return result of expression - methodVisitor.visitInsn(IRETURN); + if (returnNode.expression.getType() instanceof BaseType) { + methodVisitor.visitInsn(IRETURN); + } else if (returnNode.expression.getType() instanceof ReferenceType) { + methodVisitor.visitInsn(ARETURN); + } } } @@ -416,61 +720,25 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor { methodVisitor.visitLabel(endOfLoopLabel); } - @Override - public void visit(DecrementNode decrementNode) { - switch (decrementNode.crementType) { - case PREFIX: // --i - if (decrementNode.assignableExpression.memberAccess == null) { // local Var - methodVisitor.visitIincInsn(localVaribales.indexOf(decrementNode.assignableExpression.identifier), -1); - } else { // Field or var from other object - - } - break; - case SUFFIX: // i-- - if (decrementNode.assignableExpression.memberAccess == null) { // local Var - methodVisitor.visitIincInsn(localVaribales.indexOf(decrementNode.assignableExpression.identifier), -1); - } else { // Field or var from other object - - } - break; - } - } - - @Override - public void visit(IncrementNode incrementNode) { - switch (incrementNode.crementType) { - case PREFIX: // ++i - if (incrementNode.assignableExpression.memberAccess == null) { // local Var - methodVisitor.visitIincInsn(localVaribales.indexOf(incrementNode.assignableExpression.identifier), 1); - methodVisitor.visitVarInsn(ISTORE, localVaribales.indexOf(incrementNode.assignableExpression.identifier)); - - } else { // Field or var from other object - - } - break; - case SUFFIX: // i++ - if (incrementNode.assignableExpression.memberAccess == null) { // local Var - methodVisitor.visitVarInsn(ISTORE, localVaribales.indexOf(incrementNode.assignableExpression.identifier)); - methodVisitor.visitIincInsn(localVaribales.indexOf(incrementNode.assignableExpression.identifier), 1); - } else { // Field or var from other object - - } - break; - } - } - - @Override - public void visit(ChainedMethodNode chainedMethodNode) { - - } - @Override public void visit(MethodCallNode methodCallNode) { - - } - - @Override - public void visit(TargetNode targetNode) { - + List parameterNodes = new ArrayList<>(); + int localVarIndex = -1; + if (methodCallNode.target.memberAccess.identifiers.size() > 1) { + localVarIndex = localVariables.indexOf(methodCallNode.target.memberAccess.identifiers.get(1)); + } + if (localVarIndex >= 0) { // local var object + methodVisitor.visitVarInsn(ALOAD, localVarIndex); + } else { // this field + methodVisitor.visitVarInsn(ALOAD, 0); + } + for (IExpressionNode expressionNode : methodCallNode.parameters) { + expressionNode.accept(this); + parameterNodes.add(new ParameterNode(expressionNode.getType(), "")); + } + if(methodCallNode.type == null) { + methodCallNode.type = new BaseType(TypeEnum.INT); + } + methodVisitor.visitMethodInsn(INVOKEVIRTUAL, methodCallNode.target.memberAccess.identifiers.get(0), methodCallNode.identifier, mapper.generateMethodDescriptor(methodCallNode.type, parameterNodes), false); } } diff --git a/src/main/java/bytecode/visitor/ClassVisitor.java b/src/main/java/bytecode/visitor/ClassVisitor.java index af6af4b..3b39422 100644 --- a/src/main/java/bytecode/visitor/ClassVisitor.java +++ b/src/main/java/bytecode/visitor/ClassVisitor.java @@ -5,6 +5,5 @@ import ast.members.FieldNode; public interface ClassVisitor { void visit(ClassNode classNode); - void visit(FieldNode fieldNode); } diff --git a/src/main/java/bytecode/visitor/MethodVisitor.java b/src/main/java/bytecode/visitor/MethodVisitor.java index 8baf220..e28b6ad 100644 --- a/src/main/java/bytecode/visitor/MethodVisitor.java +++ b/src/main/java/bytecode/visitor/MethodVisitor.java @@ -8,50 +8,58 @@ import ast.members.ConstructorNode; import ast.members.MainMethodNode; import ast.members.MethodNode; import ast.statementexpressions.AssignNode; -import ast.statementexpressions.AssignableNode; import ast.statementexpressions.NewDeclarationNode; import ast.statementexpressions.crementexpressions.DecrementNode; import ast.statementexpressions.crementexpressions.IncrementNode; import ast.statementexpressions.methodcallstatementnexpressions.ChainedMethodNode; import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode; -import ast.statementexpressions.methodcallstatementnexpressions.TargetNode; import ast.statements.*; import ast.type.ValueNode; public interface MethodVisitor { // members void visit(ConstructorNode constructorNode); + void visit(MethodNode methodNode); + void visit(MainMethodNode mainMethodNode); // Binary expressions void visit(BinaryNode binaryNode); + void visit(CalculationNode calculationNode); + void visit(DotNode dotNode); - void visit(DotSubstractionNode dotSubstractionNode); + + void visit(DotSubtractionNode dotSubtractionNode); + void visit(NonCalculationNode nonCalculationNode); // Unary expressions void visit(MemberAccessNode memberAccessNode); + void visit(NotNode notExpressionNode); + void visit(UnaryNode unaryExpressionNode); // statements + void visit(BlockNode blockNode); void visit(IfElseNode ifElseNode); + void visit(IncrementNode incrementNode); + void visit(DecrementNode decrementNode); + void visit(LocalVariableDeclarationNode localVariableDeclarationNode); + void visit(ReturnNode returnNode); + void visit(WhileNode whileNode); // statement expression - void visit(DecrementNode decrementNode); - void visit(IncrementNode incrementNode); - - void visit(ChainedMethodNode chainedMethodNode); void visit(MethodCallNode methodCallNode); - void visit(TargetNode targetNode); void visit(AssignNode assignNode); + void visit(NewDeclarationNode newDeclarationNode); // type diff --git a/src/main/java/bytecode/visitor/ProgramVisitor.java b/src/main/java/bytecode/visitor/ProgramVisitor.java index d569ec6..857a9e0 100644 --- a/src/main/java/bytecode/visitor/ProgramVisitor.java +++ b/src/main/java/bytecode/visitor/ProgramVisitor.java @@ -3,5 +3,5 @@ package bytecode.visitor; import ast.ProgramNode; public interface ProgramVisitor { - void visit(ProgramNode programNode); + void visit(ProgramNode programNode); } diff --git a/src/main/java/main/Main.java b/src/main/java/main/Main.java index c365050..eb78d8e 100644 --- a/src/main/java/main/Main.java +++ b/src/main/java/main/Main.java @@ -13,16 +13,16 @@ import org.antlr.v4.runtime.tree.ParseTree; import java.io.IOException; import java.nio.file.Paths; - +import java.util.Optional; /** - * Start Raupenpiler using make: + * Start miniCompiler using make: *

cd .\src\test\ - *

make clean compile-raupenpiler - *

Start Raupenpiler using jar: - *

java.exe -jar path_to_jar\JavaCompiler-1.0-jar-with-dependencies.jar 'path_to_input_file.java' 'path_to_output_directory' + *

make clean compile-miniCompiler + *

Start miniCompiler using jar: + *

java.exe -DgenJar=true_OR_false -DgenClass=true_OR_false -jar path_to_jar\JavaCompiler-1.0-jar-with-dependencies.jar 'path_to_input_file.java' 'path_to_output_directory' *

Example (jar needs to be in the target directory, compile with make or mvn package first): - * java.exe -jar .\target\JavaCompiler-1.0-jar-with-dependencies.jar 'src/main/resources/input/CompilerInput.java' 'src/main/resources/output' + * java.exe -DgenJar=true -DgenClass=true -jar .\target\JavaCompiler-1.0-jar-with-dependencies.jar 'src/main/resources/input/CompilerInput.java' 'src/main/resources/output' */ public class Main { public static void main(String[] args) throws Exception { @@ -39,16 +39,14 @@ public class Main { System.err.println("Error reading the file: " + e.getMessage()); } } - /* !!! Else Branch (main ohne args starten) ist nicht zur Verwendung vorgesehen, immer mit args starten !!! else { try { - CharStream codeCharStream = CharStreams.fromPath(Paths.get("src/main/resources/input/CompilerInput.java")); - compileFile(codeCharStream); + CharStream codeCharStream = CharStreams.fromPath(Paths.get("src/test/resources/input/finalTest/Car.java")); + compileFile(codeCharStream, "src/test/resources/input/finalTest"); } catch (IOException e) { System.err.println("Error reading the file: " + e.getMessage()); } } - */ } /** @@ -65,7 +63,7 @@ public class Main { */ static void compileFile(CharStream inputCharStream, String outputDirectoryPath) { // Initialize the logger - new RaupenLogger(); + new MiniCompilerLogger(); /* ------------------------- Scanner -> tokens ------------------------- */ // Use the SimpleJavaLexer to tokenize the input CharStream @@ -73,34 +71,46 @@ public class Main { CommonTokenStream tokenStream = new CommonTokenStream(lexer); tokenStream.fill(); // Log the tokens - RaupenLogger.logScanner(tokenStream); + MiniCompilerLogger.logScanner(tokenStream); /*------------------------- Parser -> Parsetree -------------------------*/ // Use the SimpleJavaParser to parse the tokens and generate a ParseTree SimpleJavaParser parser = new SimpleJavaParser(tokenStream); ParseTree parseTree = parser.program(); // parse the input // Log the ParseTree - RaupenLogger.logParser(parseTree, parser); + MiniCompilerLogger.logParser(parseTree, parser); /*------------------------- AST builder -> AST -------------------------*/ // Use the ASTBuilder to visit the ParseTree and generate an Abstract Syntax Tree (AST) ASTBuilder astBuilder = new ASTBuilder(); ASTNode abstractSyntaxTree = astBuilder.visit(parseTree); // Log the AST - RaupenLogger.logAST(abstractSyntaxTree); + MiniCompilerLogger.logAST(abstractSyntaxTree); /*------------------------- Semantic Analyzer -> typed AST -------------------------*/ // Use the SemanticAnalyzer to generate a typed AST - //ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); // Log the typed AST - RaupenLogger.logSemanticAnalyzer(abstractSyntaxTree); + MiniCompilerLogger.logSemanticAnalyzer(typedAst); + + if(SemanticAnalyzer.errors.isEmpty()){ + /*------------------------- Bytecode Generator -> Bytecode -------------------------*/ + // Use the ByteCodeGenerator to generate bytecode from the typed AST and output it to the specified directory + + final boolean genJar = Optional.ofNullable(System.getProperty("genJar")).map(String::toLowerCase).map(Boolean::parseBoolean).orElse(true); + final boolean genClass = Optional.ofNullable(System.getProperty("genClass")).map(String::toLowerCase).map(Boolean::parseBoolean).orElse(true); + + ByteCodeGenerator byteCodeGenerator = new ByteCodeGenerator(outputDirectoryPath, genJar, genClass); + assert typedAst != null; + byteCodeGenerator.visit((ProgramNode) typedAst); + // Log the bytecode generation + MiniCompilerLogger.logBytecodeGenerator(); + } else { + for(Exception exception : SemanticAnalyzer.errors){ + exception.printStackTrace(); + } + } + - /*------------------------- Bytecode Generator -> Bytecode -------------------------*/ - // Use the ByteCodeGenerator to generate bytecode from the typed AST and output it to the specified directory - ByteCodeGenerator byteCodeGenerator = new ByteCodeGenerator(outputDirectoryPath); - assert abstractSyntaxTree != null; - byteCodeGenerator.visit((ProgramNode) abstractSyntaxTree); - // Log the bytecode generation - RaupenLogger.logBytecodeGenerator(); } } \ No newline at end of file diff --git a/src/main/java/main/RaupenLogger.java b/src/main/java/main/MiniCompilerLogger.java similarity index 91% rename from src/main/java/main/RaupenLogger.java rename to src/main/java/main/MiniCompilerLogger.java index 90bc7e2..2a884e3 100644 --- a/src/main/java/main/RaupenLogger.java +++ b/src/main/java/main/MiniCompilerLogger.java @@ -29,11 +29,15 @@ import java.util.logging.*; * consoleHandler.setLevel(Level.OFF); * fileHandler.setLevel(Level.ALL); */ -public class RaupenLogger { - static Logger logger = Logger.getLogger("RaupenLogs"); - public RaupenLogger() { + + +public class MiniCompilerLogger { + + static Logger logger = Logger.getLogger("miniCompilerLogs"); + + public MiniCompilerLogger() { // ------------------------- Logging ------------------------- logger.setLevel(Level.ALL); logger.getParent().getHandlers()[0].setLevel(Level.ALL); @@ -66,14 +70,16 @@ public class RaupenLogger { logger.addHandler(consoleHandler); // Configure file handler - Handler fileHandler = new FileHandler("src/main/resources/logs/RaupenLog.log"); + Handler fileHandler = new FileHandler("src/main/resources/logs/miniCompiler.log"); // Toggle file logging on/off fileHandler.setLevel(Level.ALL); fileHandler.setFormatter(new CustomFormatter()); logger.addHandler(fileHandler); - } catch (SecurityException | IOException e) { + } catch (SecurityException e) { e.printStackTrace(); + } catch (IOException e) { + throw new RuntimeException(e); } } @@ -102,7 +108,7 @@ public class RaupenLogger { public static void logAST(ASTNode abstractSyntaxTree) { // Printing the AST logger.info("-------------------- AST builder -> AST --------------------"); - // logger.info("AST: " + ast.toString()); + logger.info("Abstract Syntax Tree generated, Startnode:"); logAST(abstractSyntaxTree, 0); logger.info("\n"); } @@ -110,14 +116,15 @@ public class RaupenLogger { public static void logSemanticAnalyzer(ASTNode typedAst) { // Printing the typed AST logger.info("-------------------- Semantic Analyzer -> typed AST --------------------"); - logAST(typedAst, 0); + // logAST(typedAst, 0); + logger.info("Typed Abstract Syntax Tree generated without errors"); logger.info("\n"); } public static void logBytecodeGenerator() { // Printing the bytecode logger.info("-------------------- Bytecode Generator -> Bytecode --------------------"); - logger.info("Bytecode generated"); + logger.info("Bytecode generated without errors"); logger.info("\n"); } @@ -164,7 +171,6 @@ public class RaupenLogger { } } - // TODO: Fix this method public static void logAST(ASTNode abstractSyntaxTree, int indent) { if (abstractSyntaxTree == null) { logger.severe("AST is null !!!"); @@ -172,9 +178,9 @@ public class RaupenLogger { } String indentString = " ".repeat(indent * 2); logger.info(indentString + abstractSyntaxTree.getClass()); - //for (ASTNode child : abstractSyntaxTree.getChildren()) { + // for (ASTNode child : abstractSyntaxTree.getChildren()) { // logAST(child, indent + 1); - // } + // } } } diff --git a/src/main/java/parser/astBuilder/ASTBuilder.java b/src/main/java/parser/astBuilder/ASTBuilder.java index db153db..8b19f21 100644 --- a/src/main/java/parser/astBuilder/ASTBuilder.java +++ b/src/main/java/parser/astBuilder/ASTBuilder.java @@ -3,10 +3,7 @@ package parser.astBuilder; import ast.*; import ast.expressions.IExpressionNode; -import ast.expressions.binaryexpressions.CalculationNode; -import ast.expressions.binaryexpressions.DotNode; -import ast.expressions.binaryexpressions.DotSubstractionNode; -import ast.expressions.binaryexpressions.NonCalculationNode; +import ast.expressions.binaryexpressions.*; import ast.expressions.unaryexpressions.MemberAccessNode; import ast.expressions.unaryexpressions.NotNode; import ast.expressions.unaryexpressions.UnaryNode; @@ -14,6 +11,7 @@ import ast.members.*; import ast.parameters.ParameterNode; import ast.statementexpressions.AssignNode; import ast.statementexpressions.AssignableNode; +import ast.statementexpressions.IStatementExpressionNode; import ast.statementexpressions.NewDeclarationNode; import ast.statementexpressions.crementexpressions.CrementType; import ast.statementexpressions.crementexpressions.DecrementNode; @@ -32,7 +30,18 @@ import parser.generated.*; import java.util.ArrayList; import java.util.List; +/** + * ASTBuilder is a visitor that converts the parse tree into an abstract syntax tree (AST). + */ public class ASTBuilder extends SimpleJavaBaseVisitor { + + /** + * Visits a program node and creates a ProgramNode. + * It iterates through all class declarations in the context and adds them to the ProgramNode. + * + * @param ctx the program context + * @return the AST node for the program + */ @Override public ASTNode visitProgram(SimpleJavaParser.ProgramContext ctx) { ProgramNode program = new ProgramNode(); @@ -42,6 +51,14 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return program; } + + /** + * Visits a class declaration and creates a ClassNode. + * It checks for an access modifier, processes member declarations, and ensures the class has a constructor. + * + * @param ctx the class declaration context + * @return the AST node for the class + */ @Override public ASTNode visitClassDeclaration(SimpleJavaParser.ClassDeclarationContext ctx) { ClassNode classNode; @@ -73,13 +90,20 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return classNode; } + /** + * Visits a constructor declaration and creates a ConstructorNode. + * It processes access modifiers, block statements, and parameters. + * + * @param ctx the constructor declaration context + * @return the AST node for the constructor + */ @Override public ASTNode visitConstructorDeclaration(SimpleJavaParser.ConstructorDeclarationContext ctx) { ConstructorNode constructorNode; if(ctx.AccessModifier() != null) { constructorNode = new ConstructorNode(ctx.AccessModifier().getText(), ctx.Identifier().getText(), (BlockNode) visit(ctx.blockStatement())); } else { - constructorNode = new ConstructorNode(null, ctx.Identifier().getText(), (BlockNode) visit(ctx.blockStatement())); + constructorNode = new ConstructorNode("public", ctx.Identifier().getText(), (BlockNode) visit(ctx.blockStatement())); } if(ctx.parameterList() != null) { for(SimpleJavaParser.ParameterContext parameter : ctx.parameterList().parameter()) { @@ -90,6 +114,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return constructorNode; } + /** + * Visits a method declaration and creates a MethodNode or MainMethodNode. + * It handles method types, access modifiers, block statements, and parameters. + * + * @param ctx the method declaration context + * @return the AST node for the method + */ @Override public ASTNode visitMethodDeclaration(SimpleJavaParser.MethodDeclarationContext ctx) { if(ctx.MainMethodDeclaration() != null) { @@ -139,6 +170,14 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { } } + + /** + * Visits a field declaration and creates a FieldNode. + * It handles access modifiers and types. + * + * @param ctx the field declaration context + * @return the AST node for the field + */ @Override public ASTNode visitFieldDeclaration(SimpleJavaParser.FieldDeclarationContext ctx) { if(ctx.AccessModifier() != null) { @@ -148,11 +187,25 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { } } + /** + * Visits a parameter and creates a ParameterNode. + * It handles the type and identifier of the parameter. + * + * @param ctx the parameter context + * @return the AST node for the parameter + */ @Override public ASTNode visitParameter(SimpleJavaParser.ParameterContext ctx) { return new ParameterNode(createTypeNode(ctx.type().getText()), ctx.Identifier().getText()); } + /** + * Visits a statement and creates the corresponding AST node. + * It determines the specific type of statement and processes it accordingly. + * + * @param ctx the statement context + * @return the AST node for the statement + */ @Override public ASTNode visitStatement(SimpleJavaParser.StatementContext ctx) { if(ctx.returnStatement() != null) { @@ -169,22 +222,50 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return visitForStatement(ctx.forStatement()); } else if(ctx.ifElseStatement() != null) { return visitIfElseStatement(ctx.ifElseStatement()); + } else if(ctx.switchStatement() != null) { + return visitSwitchStatement(ctx.switchStatement()); } else if(ctx.statementExpression() != null) { return visitStatementExpression(ctx.statementExpression()); } return null; } + /** + * Visits a return statement and creates a ReturnNode. + * It processes the expression in the return statement. + * + * @param ctx the return statement context + * @return the AST node for the return statement + */ @Override public ASTNode visitReturnStatement(SimpleJavaParser.ReturnStatementContext ctx) { return new ReturnNode((IExpressionNode) visit(ctx.expression())); } + /** + * Visits a return statement and creates a ReturnNode. + * It processes the expression in the return statement. + * + * @param ctx the return statement context + * @return the AST node for the return statement + */ @Override public ASTNode visitLocalVariableDeclaration(SimpleJavaParser.LocalVariableDeclarationContext ctx) { - return new LocalVariableDeclarationNode(createTypeNode(ctx.type().getText()), ctx.Identifier().getText(), ctx.Assign().getText(), (IExpressionNode) visit(ctx.expression())); + if(ctx.Assign() != null) { + return new LocalVariableDeclarationNode(createTypeNode(ctx.type().getText()), ctx.Identifier().getText(), ctx.Assign().getText(), (IExpressionNode) visit(ctx.expression())); + } else { + return new LocalVariableDeclarationNode(createTypeNode(ctx.type().getText()), ctx.Identifier().getText(), null, null); + } + } + /** + * Visits a block statement and creates a BlockNode. + * It processes all statements within the block. + * + * @param ctx the block statement context + * @return the AST node for the block statement + */ @Override public ASTNode visitBlockStatement(SimpleJavaParser.BlockStatementContext ctx) { BlockNode blockNode = new BlockNode(); @@ -194,11 +275,25 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return blockNode; } + /** + * Visits a while statement and creates a WhileNode. + * It processes the condition expression and the block statement. + * + * @param ctx the while statement context + * @return the AST node for the while statement + */ @Override public ASTNode visitWhileStatement(SimpleJavaParser.WhileStatementContext ctx) { return new WhileNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.blockStatement())); } + /** + * Visits a do-while statement and creates a BlockNode containing a WhileNode. + * It processes the condition expression and the block statement. + * + * @param ctx the do-while statement context + * @return the AST node for the do-while statement + */ @Override public ASTNode visitDoWhileStatement(SimpleJavaParser.DoWhileStatementContext ctx) { IExpressionNode condition = (IExpressionNode) visit(ctx.expression()); @@ -206,64 +301,85 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { WhileNode While = new WhileNode(condition, doBlock); BlockNode resultBlock = new BlockNode(); - resultBlock.addStatement((IStatementNode) doBlock); - resultBlock.addStatement((IStatementNode) While); + resultBlock.addStatement(doBlock); + resultBlock.addStatement(While); return resultBlock; } + /** + * Visits a for statement and creates a BlockNode that contains a WhileNode. + * It processes the initialization, condition, and increment parts of the for loop. + * + * @param ctx the for statement context + * @return the AST node for the for statement + */ @Override public ASTNode visitForStatement(SimpleJavaParser.ForStatementContext ctx) { - List statements = new ArrayList<>(); - //init + // Initialisierung int i = 0; - if(ctx.localVariableDeclaration() != null) { + if (ctx.localVariableDeclaration() != null) { statements.add((IStatementNode) visit(ctx.localVariableDeclaration())); - } else if(ctx.statementExpression(i) != null){ + } else if (ctx.statementExpression(i) != null) { statements.add((IStatementNode) visit(ctx.statementExpression(i))); i++; } - //condition + // Bedingung IExpressionNode condition = (IExpressionNode) visit(ctx.expression()); - //ink - IStatementNode crement = null; - if(ctx.statementExpression(i) != null){ - crement = (IStatementNode) visit(ctx.statementExpression(i)); + // Inkrement + IStatementExpressionNode crement = null; + if (ctx.statementExpression(i) != null) { + crement = (IStatementExpressionNode) visit(ctx.statementExpression(i)); } - BlockNode forBlock = new BlockNode(); + BlockNode forBlock = (BlockNode) visit(ctx.blockStatement()); - BlockNode forStatements = (BlockNode) visit(ctx.blockStatement()); - if(forStatements != null) { - forBlock.addStatement((IStatementNode) forStatements); + // While-Schleife + BlockNode whileBody = new BlockNode(); + + // Block Statements der For-Schleife in den While-Block kopieren + for (IStatementNode statement : forBlock.statements) { + whileBody.addStatement(statement); } - if(crement != null){ - BlockNode forCrement = new BlockNode(); - forCrement.addStatement((crement)); - forBlock.addStatement(forCrement); + // Post-Inkrement: Das Inkrement kommt nach dem Block + if (crement != null) { + whileBody.addStatement(crement); } - WhileNode While = new WhileNode(condition, forBlock); + // Bedingung der While-Schleife + WhileNode whileNode = new WhileNode(condition, whileBody); - statements.add(While); + statements.add(whileNode); BlockNode resultBlock = new BlockNode(); - for(IStatementNode statement : statements) { - resultBlock.addStatement((IStatementNode) statement); + for (IStatementNode statement : statements) { + resultBlock.addStatement(statement); } return resultBlock; } + /** + * Visits an if-else statement and creates an IfElseNode. + * It processes the if, else-if, and else parts of the statement. + * + * @param ctx the if-else statement context + * @return the AST node for the if-else statement + */ @Override public ASTNode visitIfElseStatement(SimpleJavaParser.IfElseStatementContext ctx) { - IfElseNode ifElseStatementNode = new IfElseNode((IfNode) visit(ctx.ifStatement()), - (ElseNode) visit(ctx.elseStatement())); + IfElseNode ifElseStatementNode; + if(ctx.elseStatement() != null) { + ifElseStatementNode = new IfElseNode((IfNode) visit(ctx.ifStatement()), + (ElseNode) visit(ctx.elseStatement())); + } else { + ifElseStatementNode = new IfElseNode((IfNode) visit(ctx.ifStatement()), null); + } for (SimpleJavaParser.ElseIfStatementContext elseIf : ctx.elseIfStatement()){ ifElseStatementNode.addElseIfStatement(((IfNode) visit(elseIf))); @@ -272,21 +388,49 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return ifElseStatementNode; } + /** + * Visits an if statement and creates an IfNode. + * It processes the condition expression and the block statement. + * + * @param ctx the if statement context + * @return the AST node for the if statement + */ @Override public ASTNode visitIfStatement(SimpleJavaParser.IfStatementContext ctx) { return new IfNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.blockStatement())); } + /** + * Visits an else-if statement and creates an IfNode. + * It processes the condition expression and the block statement. + * + * @param ctx the else-if statement context + * @return the AST node for the else-if statement + */ @Override public ASTNode visitElseIfStatement(SimpleJavaParser.ElseIfStatementContext ctx) { return new IfNode((IExpressionNode) visit(ctx.expression()), (BlockNode) visit(ctx.blockStatement())); } + /** + * Visits an else statement and creates an ElseNode. + * It processes the block statement of the else part. + * + * @param ctx the else statement context + * @return the AST node for the else statement + */ @Override public ASTNode visitElseStatement(SimpleJavaParser.ElseStatementContext ctx) { return new ElseNode((BlockNode) visit(ctx.blockStatement())); } + /** + * Visits a statement expression and creates the corresponding AST node. + * It handles assignments, new declarations, method calls, and increment/decrement expressions. + * + * @param ctx the statement expression context + * @return the AST node for the statement expression + */ @Override public ASTNode visitStatementExpression(SimpleJavaParser.StatementExpressionContext ctx) { if(ctx.assign() != null) { @@ -301,11 +445,75 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a switch statement and creates an IfElseNode representing the switch cases. + * It processes the switch expression, case statements, and default statement. + * + * @param ctx the switch statement context + * @return the AST node for the switch statement + */ + @Override + public ASTNode visitSwitchStatement(SimpleJavaParser.SwitchStatementContext ctx) { + UnaryNode switchExpression = (UnaryNode) visit(ctx.expression()); + + List ifNodes = new ArrayList<>(); + + for (SimpleJavaParser.CaseStatementContext caseCtx : ctx.caseStatement()) { + IExpressionNode caseExpression = (IExpressionNode) visit(caseCtx.value()); + + // Condition as NonCalculationNode -> Equals Expression + NonCalculationNode condition = new NonCalculationNode(switchExpression, "==", caseExpression); + + BlockNode caseBlock = new BlockNode(); + for (SimpleJavaParser.StatementContext stmtCtx : caseCtx.statement()) { + caseBlock.addStatement((IStatementNode) visit(stmtCtx)); + } + + // Each case as if + IfNode ifNode = new IfNode(condition, caseBlock); + ifNodes.add(ifNode); + } + + // Check if has Default + ElseNode defaulElseNode = null; + if (ctx.defaultStatement() != null) { + BlockNode defaultBlock = new BlockNode(); + for (SimpleJavaParser.StatementContext stmtCtx : ctx.defaultStatement().statement()) { + defaultBlock.addStatement((IStatementNode) visit(stmtCtx)); + } + // Default als letztes Else Statement + defaulElseNode = new ElseNode(defaultBlock); + } + + IfElseNode ifElseNode = new IfElseNode(ifNodes.getFirst(),defaulElseNode); + ifNodes.removeFirst(); + + for (IfNode ifNode : ifNodes){ + ifElseNode.addElseIfStatement(ifNode); + } + + return ifElseNode; + } + + /** + * Visits an assignment expression and creates an AssignNode. + * It handles the assignable expression and the assigned expression. + * + * @param ctx the assignment context + * @return the AST node for the assignment + */ @Override public ASTNode visitAssign(SimpleJavaParser.AssignContext ctx) { return new AssignNode((AssignableNode) visit(ctx.assignableExpression()), (IExpressionNode) visit(ctx.expression())); } + /** + * Visits a new declaration and creates a NewDeclarationNode. + * It processes the identifier and the argument list. + * + * @param ctx the new declaration context + * @return the AST node for the new declaration + */ @Override public ASTNode visitNewDeclaration(SimpleJavaParser.NewDeclarationContext ctx) { NewDeclarationNode newDeclarationNode = new NewDeclarationNode(ctx.Identifier().getText()); @@ -315,6 +523,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return newDeclarationNode; } + /** + * Visits a method call and creates a MethodCallNode. + * It processes the target, chained methods, and argument list. + * + * @param ctx the method call context + * @return the AST node for the method call + */ @Override public ASTNode visitMethodCall(SimpleJavaParser.MethodCallContext ctx) { MethodCallNode methodCallStatementExpressionNode; @@ -332,6 +547,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return methodCallStatementExpressionNode; } + /** + * Visits the target of a method call and creates a TargetNode. + * It handles various types of targets including 'this', member access, new declarations, and identifiers. + * + * @param ctx the target context + * @return the AST node for the target + */ @Override public ASTNode visitTarget(SimpleJavaParser.TargetContext ctx) { if(ctx.This() != null) { @@ -346,6 +568,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a chained method and creates a ChainedMethodNode. + * It processes the identifier and the argument list. + * + * @param ctx the chained method context + * @return the AST node for the chained method + */ @Override public ASTNode visitChainedMethod(SimpleJavaParser.ChainedMethodContext ctx) { ChainedMethodNode chainedMethodNode = new ChainedMethodNode(ctx.Identifier().getText()); @@ -355,6 +584,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return chainedMethodNode; } + /** + * Visits an increment or decrement expression and creates the corresponding AST node. + * It handles both prefix and suffix forms of increment and decrement. + * + * @param ctx the crement expression context + * @return the AST node for the crement expression + */ @Override public ASTNode visitCrementExpression(SimpleJavaParser.CrementExpressionContext ctx) { if(ctx.incrementExpression() != null) { @@ -365,6 +601,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits an increment expression and creates an IncrementNode. + * It handles both prefix and suffix forms. + * + * @param ctx the increment expression context + * @return the AST node for the increment expression + */ @Override public ASTNode visitIncrementExpression(SimpleJavaParser.IncrementExpressionContext ctx) { if(ctx.prefixIncrementExpression() != null) { @@ -375,16 +618,35 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a prefix increment expression and creates an IncrementNode. + * + * @param ctx the prefix increment expression context + * @return the AST node for the prefix increment expression + */ @Override public ASTNode visitPrefixIncrementExpression(SimpleJavaParser.PrefixIncrementExpressionContext ctx) { return new IncrementNode(CrementType.PREFIX, (AssignableNode) visit(ctx.assignableExpression())); } + /** + * Visits a suffix increment expression and creates an IncrementNode. + * + * @param ctx the suffix increment expression context + * @return the AST node for the suffix increment expression + */ @Override public ASTNode visitSuffixIncrementExpression(SimpleJavaParser.SuffixIncrementExpressionContext ctx) { return new IncrementNode(CrementType.SUFFIX, (AssignableNode) visit(ctx.assignableExpression())); } + /** + * Visits a decrement expression and creates a DecrementNode. + * It handles both prefix and suffix forms. + * + * @param ctx the decrement expression context + * @return the AST node for the decrement expression + */ @Override public ASTNode visitDecrementExpression(SimpleJavaParser.DecrementExpressionContext ctx) { if(ctx.prefixDecrementExpression() != null) { @@ -395,16 +657,35 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a prefix decrement expression and creates a DecrementNode. + * + * @param ctx the prefix decrement expression context + * @return the AST node for the prefix decrement expression + */ @Override public ASTNode visitPrefixDecrementExpression(SimpleJavaParser.PrefixDecrementExpressionContext ctx) { return new DecrementNode(CrementType.PREFIX, (AssignableNode) visit(ctx.assignableExpression())); } + /** + * Visits a suffix decrement expression and creates a DecrementNode. + * + * @param ctx the suffix decrement expression context + * @return the AST node for the suffix decrement expression + */ @Override public ASTNode visitSuffixDecrementExpression(SimpleJavaParser.SuffixDecrementExpressionContext ctx) { return new DecrementNode(CrementType.SUFFIX, (AssignableNode) visit(ctx.assignableExpression())); } + /** + * Visits an expression and creates the corresponding AST node. + * It handles both unary and binary expressions. + * + * @param ctx the expression context + * @return the AST node for the expression + */ @Override public ASTNode visitExpression(SimpleJavaParser.ExpressionContext ctx) { if(ctx.unaryExpression() != null) { @@ -415,6 +696,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a unary expression and creates a UnaryNode. + * It handles various forms of unary expressions including 'this', identifiers, member access, values, and more. + * + * @param ctx the unary expression context + * @return the AST node for the unary expression + */ @Override public ASTNode visitUnaryExpression(SimpleJavaParser.UnaryExpressionContext ctx) { if(ctx.This() != null) { @@ -435,6 +723,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a member access expression and creates a MemberAccessNode. + * It processes the 'this' keyword and identifiers for member access. + * + * @param ctx the member access context + * @return the AST node for the member access + */ @Override public ASTNode visitMemberAccess(SimpleJavaParser.MemberAccessContext ctx) { MemberAccessNode memberAccessNode; @@ -449,6 +744,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return memberAccessNode; } + /** + * Visits a value and creates a ValueNode. + * It handles integer, boolean, char, and null values. + * + * @param ctx the value context + * @return the AST node for the value + */ @Override public ASTNode visitValue(SimpleJavaParser.ValueContext ctx) { if(ctx.IntValue() != null) { @@ -463,12 +765,25 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a not expression and creates a NotNode. + * It processes the expression to which the 'not' operator is applied. + * + * @param ctx the not expression context + * @return the AST node for the not expression + */ @Override public ASTNode visitNotExpression(SimpleJavaParser.NotExpressionContext ctx) { return new NotNode((IExpressionNode) visitExpression(ctx.expression())); } - + /** + * Visits a binary expression and creates the corresponding AST node. + * It handles both calculation and non-calculation expressions. + * + * @param ctx the binary expression context + * @return the AST node for the binary expression + */ @Override public ASTNode visitBinaryExpression(SimpleJavaParser.BinaryExpressionContext ctx) { if(ctx.calculationExpression() != null) { @@ -479,6 +794,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a calculation expression and creates a CalculationNode. + * It handles line operators and dot expressions. + * + * @param ctx the calculation expression context + * @return the AST node for the calculation expression + */ @Override public ASTNode visitCalculationExpression(SimpleJavaParser.CalculationExpressionContext ctx) { if(ctx.calculationExpression() != null) { @@ -489,35 +811,69 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Visits a dot expression and creates a DotNode. + * It handles dot operators and dot subtraction expressions. + * + * @param ctx the dot expression context + * @return the AST node for the dot expression + */ @Override public ASTNode visitDotExpression(SimpleJavaParser.DotExpressionContext ctx) { if(ctx.dotExpression() != null) { - return new DotNode((DotNode) visit(ctx.dotExpression()), ctx.DotOperator().getText(), (DotSubstractionNode) visit(ctx.dotSubtractionExpression())); + return new DotNode((DotNode) visit(ctx.dotExpression()), ctx.DotOperator().getText(), (DotSubtractionNode) visit(ctx.dotSubtractionExpression())); } else if(ctx.dotSubtractionExpression() != null) { - return new DotNode((DotSubstractionNode) visit(ctx.dotSubtractionExpression())); + return new DotNode((DotSubtractionNode) visit(ctx.dotSubtractionExpression())); } return null; } + /** + * Visits a dot subtraction expression and creates a DotSubtractionNode. + * It handles integer values, identifiers, member access, and method calls. + * + * @param ctx the dot subtraction expression context + * @return the AST node for the dot subtraction expression + *//** + * Creates an ITypeNode based on the type identifier. + * It handles basic types and reference types. + * + * @param identifier the type identifier + * @return the type node + */ @Override public ASTNode visitDotSubtractionExpression(SimpleJavaParser.DotSubtractionExpressionContext ctx) { if(ctx.IntValue() != null) { - return new DotSubstractionNode(new ValueNode(EnumValueNode.INT_VALUE, ctx.IntValue().getText())); + return new DotSubtractionNode(new ValueNode(EnumValueNode.INT_VALUE, ctx.IntValue().getText())); } else if(ctx.Identifier() != null) { - return new DotSubstractionNode(ctx.Identifier().getText()); + return new DotSubtractionNode(ctx.Identifier().getText()); } else if(ctx.memberAccess() != null) { - return new DotSubstractionNode((MemberAccessNode) visit(ctx.memberAccess())); + return new DotSubtractionNode((MemberAccessNode) visit(ctx.memberAccess())); } else if(ctx.methodCall() != null && ctx.calculationExpression() != null) { - return new DotSubstractionNode((MethodCallNode) visit(ctx.methodCall()), (CalculationNode) visit(ctx.calculationExpression())); + return new DotSubtractionNode((MethodCallNode) visit(ctx.methodCall()), (CalculationNode) visit(ctx.calculationExpression())); } return null; } + /** + * Visits a non-calculation expression and creates a NonCalculationNode. + * It handles unary expressions combined with non-calculation operators. + * + * @param ctx the non-calculation expression context + * @return the AST node for the non-calculation expression + */ @Override public ASTNode visitNonCalculationExpression(SimpleJavaParser.NonCalculationExpressionContext ctx) { return new NonCalculationNode((UnaryNode) visit(ctx.unaryExpression()), ctx.nonCalculationOperator().getText(), (IExpressionNode) visit(ctx.expression())); } + /** + * Visits an assignable expression and creates an AssignableNode. + * It handles identifiers and member access. + * + * @param ctx the assignable expression context + * @return the AST node for the assignable expression + */ @Override public ASTNode visitAssignableExpression(SimpleJavaParser.AssignableExpressionContext ctx) { if(ctx.Identifier() != null) { @@ -528,6 +884,13 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { return null; } + /** + * Creates an ITypeNode based on the type identifier. + * It handles basic types and reference types. + * + * @param identifier the type identifier + * @return the type node + */ public ITypeNode createTypeNode(String identifier){ return switch (identifier) { case "int" -> new BaseType(TypeEnum.INT); @@ -537,6 +900,4 @@ public class ASTBuilder extends SimpleJavaBaseVisitor { default -> new ReferenceType(identifier); }; } - -} - +} \ No newline at end of file diff --git a/src/main/java/parser/generated/SimpleJava.interp b/src/main/java/parser/generated/SimpleJava.interp index aca42bf..047b13e 100644 --- a/src/main/java/parser/generated/SimpleJava.interp +++ b/src/main/java/parser/generated/SimpleJava.interp @@ -43,6 +43,10 @@ null 'for' 'return' 'new' +'switch' +'case' +'default' +':' null null null @@ -97,6 +101,10 @@ Else For Return New +Switch +Case +Default +Colon CharValue IntValue BooleanValue @@ -127,6 +135,9 @@ ifElseStatement ifStatement elseIfStatement elseStatement +switchStatement +caseStatement +defaultStatement statementExpression assign newDeclaration @@ -156,4 +167,4 @@ nonCalculationOperator atn: -[4, 1, 51, 419, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 1, 0, 4, 0, 94, 8, 0, 11, 0, 12, 0, 95, 1, 1, 3, 1, 99, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 105, 8, 1, 10, 1, 12, 1, 108, 9, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 3, 2, 115, 8, 2, 1, 3, 3, 3, 118, 8, 3, 1, 3, 1, 3, 1, 3, 3, 3, 123, 8, 3, 1, 3, 1, 3, 1, 3, 1, 4, 3, 4, 129, 8, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 3, 5, 138, 8, 5, 1, 5, 1, 5, 3, 5, 142, 8, 5, 1, 5, 1, 5, 1, 5, 3, 5, 147, 8, 5, 1, 5, 1, 5, 3, 5, 151, 8, 5, 1, 6, 1, 6, 1, 6, 5, 6, 156, 8, 6, 10, 6, 12, 6, 159, 9, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 5, 8, 167, 8, 8, 10, 8, 12, 8, 170, 9, 8, 3, 8, 172, 8, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 188, 8, 9, 1, 10, 1, 10, 5, 10, 192, 8, 10, 10, 10, 12, 10, 195, 9, 10, 1, 10, 1, 10, 1, 11, 1, 11, 3, 11, 201, 8, 11, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 207, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 227, 8, 15, 1, 15, 1, 15, 3, 15, 231, 8, 15, 1, 15, 1, 15, 3, 15, 235, 8, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 5, 16, 242, 8, 16, 10, 16, 12, 16, 245, 9, 16, 1, 16, 3, 16, 248, 8, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 3, 20, 270, 8, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 3, 23, 284, 8, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 3, 24, 296, 8, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 3, 26, 303, 8, 26, 1, 27, 1, 27, 3, 27, 307, 8, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 3, 30, 317, 8, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 3, 33, 327, 8, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 3, 34, 334, 8, 34, 1, 34, 1, 34, 4, 34, 338, 8, 34, 11, 34, 12, 34, 339, 1, 34, 3, 34, 343, 8, 34, 1, 35, 1, 35, 3, 35, 347, 8, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 5, 36, 355, 8, 36, 10, 36, 12, 36, 358, 9, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 5, 37, 366, 8, 37, 10, 37, 12, 37, 369, 9, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 3, 38, 379, 8, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 3, 40, 386, 8, 40, 1, 40, 5, 40, 389, 8, 40, 10, 40, 12, 40, 392, 9, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 3, 41, 403, 8, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 45, 0, 2, 72, 74, 46, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 0, 3, 2, 0, 4, 6, 48, 48, 1, 0, 44, 47, 1, 0, 11, 12, 430, 0, 93, 1, 0, 0, 0, 2, 98, 1, 0, 0, 0, 4, 114, 1, 0, 0, 0, 6, 117, 1, 0, 0, 0, 8, 128, 1, 0, 0, 0, 10, 150, 1, 0, 0, 0, 12, 152, 1, 0, 0, 0, 14, 160, 1, 0, 0, 0, 16, 171, 1, 0, 0, 0, 18, 187, 1, 0, 0, 0, 20, 189, 1, 0, 0, 0, 22, 198, 1, 0, 0, 0, 24, 202, 1, 0, 0, 0, 26, 208, 1, 0, 0, 0, 28, 214, 1, 0, 0, 0, 30, 222, 1, 0, 0, 0, 32, 239, 1, 0, 0, 0, 34, 249, 1, 0, 0, 0, 36, 255, 1, 0, 0, 0, 38, 262, 1, 0, 0, 0, 40, 269, 1, 0, 0, 0, 42, 271, 1, 0, 0, 0, 44, 275, 1, 0, 0, 0, 46, 283, 1, 0, 0, 0, 48, 295, 1, 0, 0, 0, 50, 297, 1, 0, 0, 0, 52, 302, 1, 0, 0, 0, 54, 306, 1, 0, 0, 0, 56, 308, 1, 0, 0, 0, 58, 311, 1, 0, 0, 0, 60, 316, 1, 0, 0, 0, 62, 318, 1, 0, 0, 0, 64, 321, 1, 0, 0, 0, 66, 326, 1, 0, 0, 0, 68, 342, 1, 0, 0, 0, 70, 346, 1, 0, 0, 0, 72, 348, 1, 0, 0, 0, 74, 359, 1, 0, 0, 0, 76, 378, 1, 0, 0, 0, 78, 380, 1, 0, 0, 0, 80, 385, 1, 0, 0, 0, 82, 402, 1, 0, 0, 0, 84, 406, 1, 0, 0, 0, 86, 412, 1, 0, 0, 0, 88, 414, 1, 0, 0, 0, 90, 416, 1, 0, 0, 0, 92, 94, 3, 2, 1, 0, 93, 92, 1, 0, 0, 0, 94, 95, 1, 0, 0, 0, 95, 93, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 1, 1, 0, 0, 0, 97, 99, 5, 7, 0, 0, 98, 97, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 100, 1, 0, 0, 0, 100, 101, 5, 35, 0, 0, 101, 102, 5, 48, 0, 0, 102, 106, 5, 31, 0, 0, 103, 105, 3, 4, 2, 0, 104, 103, 1, 0, 0, 0, 105, 108, 1, 0, 0, 0, 106, 104, 1, 0, 0, 0, 106, 107, 1, 0, 0, 0, 107, 109, 1, 0, 0, 0, 108, 106, 1, 0, 0, 0, 109, 110, 5, 32, 0, 0, 110, 3, 1, 0, 0, 0, 111, 115, 3, 6, 3, 0, 112, 115, 3, 8, 4, 0, 113, 115, 3, 10, 5, 0, 114, 111, 1, 0, 0, 0, 114, 112, 1, 0, 0, 0, 114, 113, 1, 0, 0, 0, 115, 5, 1, 0, 0, 0, 116, 118, 5, 7, 0, 0, 117, 116, 1, 0, 0, 0, 117, 118, 1, 0, 0, 0, 118, 119, 1, 0, 0, 0, 119, 120, 5, 48, 0, 0, 120, 122, 5, 29, 0, 0, 121, 123, 3, 12, 6, 0, 122, 121, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 125, 5, 30, 0, 0, 125, 126, 3, 20, 10, 0, 126, 7, 1, 0, 0, 0, 127, 129, 5, 7, 0, 0, 128, 127, 1, 0, 0, 0, 128, 129, 1, 0, 0, 0, 129, 130, 1, 0, 0, 0, 130, 131, 3, 86, 43, 0, 131, 132, 5, 48, 0, 0, 132, 133, 5, 33, 0, 0, 133, 9, 1, 0, 0, 0, 134, 135, 5, 8, 0, 0, 135, 151, 3, 20, 10, 0, 136, 138, 5, 7, 0, 0, 137, 136, 1, 0, 0, 0, 137, 138, 1, 0, 0, 0, 138, 141, 1, 0, 0, 0, 139, 142, 3, 86, 43, 0, 140, 142, 5, 3, 0, 0, 141, 139, 1, 0, 0, 0, 141, 140, 1, 0, 0, 0, 142, 143, 1, 0, 0, 0, 143, 144, 5, 48, 0, 0, 144, 146, 5, 29, 0, 0, 145, 147, 3, 12, 6, 0, 146, 145, 1, 0, 0, 0, 146, 147, 1, 0, 0, 0, 147, 148, 1, 0, 0, 0, 148, 149, 5, 30, 0, 0, 149, 151, 3, 20, 10, 0, 150, 134, 1, 0, 0, 0, 150, 137, 1, 0, 0, 0, 151, 11, 1, 0, 0, 0, 152, 157, 3, 14, 7, 0, 153, 154, 5, 34, 0, 0, 154, 156, 3, 14, 7, 0, 155, 153, 1, 0, 0, 0, 156, 159, 1, 0, 0, 0, 157, 155, 1, 0, 0, 0, 157, 158, 1, 0, 0, 0, 158, 13, 1, 0, 0, 0, 159, 157, 1, 0, 0, 0, 160, 161, 3, 86, 43, 0, 161, 162, 5, 48, 0, 0, 162, 15, 1, 0, 0, 0, 163, 168, 3, 46, 23, 0, 164, 165, 5, 34, 0, 0, 165, 167, 3, 46, 23, 0, 166, 164, 1, 0, 0, 0, 167, 170, 1, 0, 0, 0, 168, 166, 1, 0, 0, 0, 168, 169, 1, 0, 0, 0, 169, 172, 1, 0, 0, 0, 170, 168, 1, 0, 0, 0, 171, 163, 1, 0, 0, 0, 171, 172, 1, 0, 0, 0, 172, 17, 1, 0, 0, 0, 173, 174, 3, 22, 11, 0, 174, 175, 5, 33, 0, 0, 175, 188, 1, 0, 0, 0, 176, 177, 3, 24, 12, 0, 177, 178, 5, 33, 0, 0, 178, 188, 1, 0, 0, 0, 179, 188, 3, 20, 10, 0, 180, 188, 3, 26, 13, 0, 181, 188, 3, 28, 14, 0, 182, 188, 3, 30, 15, 0, 183, 188, 3, 32, 16, 0, 184, 185, 3, 40, 20, 0, 185, 186, 5, 33, 0, 0, 186, 188, 1, 0, 0, 0, 187, 173, 1, 0, 0, 0, 187, 176, 1, 0, 0, 0, 187, 179, 1, 0, 0, 0, 187, 180, 1, 0, 0, 0, 187, 181, 1, 0, 0, 0, 187, 182, 1, 0, 0, 0, 187, 183, 1, 0, 0, 0, 187, 184, 1, 0, 0, 0, 188, 19, 1, 0, 0, 0, 189, 193, 5, 31, 0, 0, 190, 192, 3, 18, 9, 0, 191, 190, 1, 0, 0, 0, 192, 195, 1, 0, 0, 0, 193, 191, 1, 0, 0, 0, 193, 194, 1, 0, 0, 0, 194, 196, 1, 0, 0, 0, 195, 193, 1, 0, 0, 0, 196, 197, 5, 32, 0, 0, 197, 21, 1, 0, 0, 0, 198, 200, 5, 42, 0, 0, 199, 201, 3, 46, 23, 0, 200, 199, 1, 0, 0, 0, 200, 201, 1, 0, 0, 0, 201, 23, 1, 0, 0, 0, 202, 203, 3, 86, 43, 0, 203, 206, 5, 48, 0, 0, 204, 205, 5, 13, 0, 0, 205, 207, 3, 46, 23, 0, 206, 204, 1, 0, 0, 0, 206, 207, 1, 0, 0, 0, 207, 25, 1, 0, 0, 0, 208, 209, 5, 37, 0, 0, 209, 210, 5, 29, 0, 0, 210, 211, 3, 46, 23, 0, 211, 212, 5, 30, 0, 0, 212, 213, 3, 20, 10, 0, 213, 27, 1, 0, 0, 0, 214, 215, 5, 38, 0, 0, 215, 216, 3, 20, 10, 0, 216, 217, 5, 37, 0, 0, 217, 218, 5, 29, 0, 0, 218, 219, 3, 46, 23, 0, 219, 220, 5, 30, 0, 0, 220, 221, 5, 33, 0, 0, 221, 29, 1, 0, 0, 0, 222, 223, 5, 41, 0, 0, 223, 226, 5, 29, 0, 0, 224, 227, 3, 40, 20, 0, 225, 227, 3, 24, 12, 0, 226, 224, 1, 0, 0, 0, 226, 225, 1, 0, 0, 0, 227, 228, 1, 0, 0, 0, 228, 230, 5, 33, 0, 0, 229, 231, 3, 46, 23, 0, 230, 229, 1, 0, 0, 0, 230, 231, 1, 0, 0, 0, 231, 232, 1, 0, 0, 0, 232, 234, 5, 33, 0, 0, 233, 235, 3, 40, 20, 0, 234, 233, 1, 0, 0, 0, 234, 235, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 237, 5, 30, 0, 0, 237, 238, 3, 20, 10, 0, 238, 31, 1, 0, 0, 0, 239, 243, 3, 34, 17, 0, 240, 242, 3, 36, 18, 0, 241, 240, 1, 0, 0, 0, 242, 245, 1, 0, 0, 0, 243, 241, 1, 0, 0, 0, 243, 244, 1, 0, 0, 0, 244, 247, 1, 0, 0, 0, 245, 243, 1, 0, 0, 0, 246, 248, 3, 38, 19, 0, 247, 246, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 33, 1, 0, 0, 0, 249, 250, 5, 39, 0, 0, 250, 251, 5, 29, 0, 0, 251, 252, 3, 46, 23, 0, 252, 253, 5, 30, 0, 0, 253, 254, 3, 20, 10, 0, 254, 35, 1, 0, 0, 0, 255, 256, 5, 40, 0, 0, 256, 257, 5, 39, 0, 0, 257, 258, 5, 29, 0, 0, 258, 259, 3, 46, 23, 0, 259, 260, 5, 30, 0, 0, 260, 261, 3, 20, 10, 0, 261, 37, 1, 0, 0, 0, 262, 263, 5, 40, 0, 0, 263, 264, 3, 20, 10, 0, 264, 39, 1, 0, 0, 0, 265, 270, 3, 42, 21, 0, 266, 270, 3, 44, 22, 0, 267, 270, 3, 80, 40, 0, 268, 270, 3, 52, 26, 0, 269, 265, 1, 0, 0, 0, 269, 266, 1, 0, 0, 0, 269, 267, 1, 0, 0, 0, 269, 268, 1, 0, 0, 0, 270, 41, 1, 0, 0, 0, 271, 272, 3, 66, 33, 0, 272, 273, 5, 13, 0, 0, 273, 274, 3, 46, 23, 0, 274, 43, 1, 0, 0, 0, 275, 276, 5, 43, 0, 0, 276, 277, 5, 48, 0, 0, 277, 278, 5, 29, 0, 0, 278, 279, 3, 16, 8, 0, 279, 280, 5, 30, 0, 0, 280, 45, 1, 0, 0, 0, 281, 284, 3, 48, 24, 0, 282, 284, 3, 70, 35, 0, 283, 281, 1, 0, 0, 0, 283, 282, 1, 0, 0, 0, 284, 47, 1, 0, 0, 0, 285, 296, 5, 36, 0, 0, 286, 296, 5, 48, 0, 0, 287, 296, 3, 68, 34, 0, 288, 296, 3, 88, 44, 0, 289, 296, 3, 50, 25, 0, 290, 296, 3, 40, 20, 0, 291, 292, 5, 29, 0, 0, 292, 293, 3, 46, 23, 0, 293, 294, 5, 30, 0, 0, 294, 296, 1, 0, 0, 0, 295, 285, 1, 0, 0, 0, 295, 286, 1, 0, 0, 0, 295, 287, 1, 0, 0, 0, 295, 288, 1, 0, 0, 0, 295, 289, 1, 0, 0, 0, 295, 290, 1, 0, 0, 0, 295, 291, 1, 0, 0, 0, 296, 49, 1, 0, 0, 0, 297, 298, 5, 25, 0, 0, 298, 299, 3, 46, 23, 0, 299, 51, 1, 0, 0, 0, 300, 303, 3, 54, 27, 0, 301, 303, 3, 60, 30, 0, 302, 300, 1, 0, 0, 0, 302, 301, 1, 0, 0, 0, 303, 53, 1, 0, 0, 0, 304, 307, 3, 56, 28, 0, 305, 307, 3, 58, 29, 0, 306, 304, 1, 0, 0, 0, 306, 305, 1, 0, 0, 0, 307, 55, 1, 0, 0, 0, 308, 309, 5, 1, 0, 0, 309, 310, 3, 66, 33, 0, 310, 57, 1, 0, 0, 0, 311, 312, 3, 66, 33, 0, 312, 313, 5, 1, 0, 0, 313, 59, 1, 0, 0, 0, 314, 317, 3, 62, 31, 0, 315, 317, 3, 64, 32, 0, 316, 314, 1, 0, 0, 0, 316, 315, 1, 0, 0, 0, 317, 61, 1, 0, 0, 0, 318, 319, 5, 2, 0, 0, 319, 320, 3, 66, 33, 0, 320, 63, 1, 0, 0, 0, 321, 322, 3, 66, 33, 0, 322, 323, 5, 2, 0, 0, 323, 65, 1, 0, 0, 0, 324, 327, 5, 48, 0, 0, 325, 327, 3, 68, 34, 0, 326, 324, 1, 0, 0, 0, 326, 325, 1, 0, 0, 0, 327, 67, 1, 0, 0, 0, 328, 329, 5, 36, 0, 0, 329, 330, 5, 28, 0, 0, 330, 343, 5, 48, 0, 0, 331, 332, 5, 36, 0, 0, 332, 334, 5, 28, 0, 0, 333, 331, 1, 0, 0, 0, 333, 334, 1, 0, 0, 0, 334, 337, 1, 0, 0, 0, 335, 336, 5, 48, 0, 0, 336, 338, 5, 28, 0, 0, 337, 335, 1, 0, 0, 0, 338, 339, 1, 0, 0, 0, 339, 337, 1, 0, 0, 0, 339, 340, 1, 0, 0, 0, 340, 341, 1, 0, 0, 0, 341, 343, 5, 48, 0, 0, 342, 328, 1, 0, 0, 0, 342, 333, 1, 0, 0, 0, 343, 69, 1, 0, 0, 0, 344, 347, 3, 72, 36, 0, 345, 347, 3, 78, 39, 0, 346, 344, 1, 0, 0, 0, 346, 345, 1, 0, 0, 0, 347, 71, 1, 0, 0, 0, 348, 349, 6, 36, -1, 0, 349, 350, 3, 74, 37, 0, 350, 356, 1, 0, 0, 0, 351, 352, 10, 2, 0, 0, 352, 353, 5, 10, 0, 0, 353, 355, 3, 74, 37, 0, 354, 351, 1, 0, 0, 0, 355, 358, 1, 0, 0, 0, 356, 354, 1, 0, 0, 0, 356, 357, 1, 0, 0, 0, 357, 73, 1, 0, 0, 0, 358, 356, 1, 0, 0, 0, 359, 360, 6, 37, -1, 0, 360, 361, 3, 76, 38, 0, 361, 367, 1, 0, 0, 0, 362, 363, 10, 2, 0, 0, 363, 364, 5, 9, 0, 0, 364, 366, 3, 76, 38, 0, 365, 362, 1, 0, 0, 0, 366, 369, 1, 0, 0, 0, 367, 365, 1, 0, 0, 0, 367, 368, 1, 0, 0, 0, 368, 75, 1, 0, 0, 0, 369, 367, 1, 0, 0, 0, 370, 379, 5, 45, 0, 0, 371, 379, 5, 48, 0, 0, 372, 379, 3, 68, 34, 0, 373, 374, 3, 80, 40, 0, 374, 375, 5, 29, 0, 0, 375, 376, 3, 72, 36, 0, 376, 377, 5, 30, 0, 0, 377, 379, 1, 0, 0, 0, 378, 370, 1, 0, 0, 0, 378, 371, 1, 0, 0, 0, 378, 372, 1, 0, 0, 0, 378, 373, 1, 0, 0, 0, 379, 77, 1, 0, 0, 0, 380, 381, 3, 48, 24, 0, 381, 382, 3, 90, 45, 0, 382, 383, 3, 46, 23, 0, 383, 79, 1, 0, 0, 0, 384, 386, 3, 82, 41, 0, 385, 384, 1, 0, 0, 0, 385, 386, 1, 0, 0, 0, 386, 390, 1, 0, 0, 0, 387, 389, 3, 84, 42, 0, 388, 387, 1, 0, 0, 0, 389, 392, 1, 0, 0, 0, 390, 388, 1, 0, 0, 0, 390, 391, 1, 0, 0, 0, 391, 393, 1, 0, 0, 0, 392, 390, 1, 0, 0, 0, 393, 394, 5, 48, 0, 0, 394, 395, 5, 29, 0, 0, 395, 396, 3, 16, 8, 0, 396, 397, 5, 30, 0, 0, 397, 81, 1, 0, 0, 0, 398, 403, 5, 36, 0, 0, 399, 403, 3, 68, 34, 0, 400, 403, 3, 44, 22, 0, 401, 403, 5, 48, 0, 0, 402, 398, 1, 0, 0, 0, 402, 399, 1, 0, 0, 0, 402, 400, 1, 0, 0, 0, 402, 401, 1, 0, 0, 0, 403, 404, 1, 0, 0, 0, 404, 405, 5, 28, 0, 0, 405, 83, 1, 0, 0, 0, 406, 407, 5, 48, 0, 0, 407, 408, 5, 29, 0, 0, 408, 409, 3, 16, 8, 0, 409, 410, 5, 30, 0, 0, 410, 411, 5, 28, 0, 0, 411, 85, 1, 0, 0, 0, 412, 413, 7, 0, 0, 0, 413, 87, 1, 0, 0, 0, 414, 415, 7, 1, 0, 0, 415, 89, 1, 0, 0, 0, 416, 417, 7, 2, 0, 0, 417, 91, 1, 0, 0, 0, 40, 95, 98, 106, 114, 117, 122, 128, 137, 141, 146, 150, 157, 168, 171, 187, 193, 200, 206, 226, 230, 234, 243, 247, 269, 283, 295, 302, 306, 316, 326, 333, 339, 342, 346, 356, 367, 378, 385, 390, 402] \ No newline at end of file +[4, 1, 55, 462, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 1, 0, 4, 0, 100, 8, 0, 11, 0, 12, 0, 101, 1, 1, 3, 1, 105, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 111, 8, 1, 10, 1, 12, 1, 114, 9, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 3, 2, 121, 8, 2, 1, 3, 3, 3, 124, 8, 3, 1, 3, 1, 3, 1, 3, 3, 3, 129, 8, 3, 1, 3, 1, 3, 1, 3, 1, 4, 3, 4, 135, 8, 4, 1, 4, 1, 4, 1, 4, 1, 4, 3, 4, 141, 8, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 3, 5, 148, 8, 5, 1, 5, 1, 5, 3, 5, 152, 8, 5, 1, 5, 1, 5, 1, 5, 3, 5, 157, 8, 5, 1, 5, 1, 5, 3, 5, 161, 8, 5, 1, 6, 1, 6, 1, 6, 5, 6, 166, 8, 6, 10, 6, 12, 6, 169, 9, 6, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 5, 8, 177, 8, 8, 10, 8, 12, 8, 180, 9, 8, 3, 8, 182, 8, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 199, 8, 9, 1, 10, 1, 10, 5, 10, 203, 8, 10, 10, 10, 12, 10, 206, 9, 10, 1, 10, 1, 10, 1, 11, 1, 11, 3, 11, 212, 8, 11, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 218, 8, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 238, 8, 15, 1, 15, 1, 15, 3, 15, 242, 8, 15, 1, 15, 1, 15, 3, 15, 246, 8, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 5, 16, 253, 8, 16, 10, 16, 12, 16, 256, 9, 16, 1, 16, 3, 16, 259, 8, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 4, 20, 283, 8, 20, 11, 20, 12, 20, 284, 1, 20, 3, 20, 288, 8, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 5, 21, 296, 8, 21, 10, 21, 12, 21, 299, 9, 21, 1, 22, 1, 22, 1, 22, 5, 22, 304, 8, 22, 10, 22, 12, 22, 307, 9, 22, 1, 23, 1, 23, 1, 23, 1, 23, 3, 23, 313, 8, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 3, 26, 327, 8, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 3, 27, 339, 8, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 3, 29, 346, 8, 29, 1, 30, 1, 30, 3, 30, 350, 8, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 3, 33, 360, 8, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 3, 36, 370, 8, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 3, 37, 377, 8, 37, 1, 37, 1, 37, 4, 37, 381, 8, 37, 11, 37, 12, 37, 382, 1, 37, 3, 37, 386, 8, 37, 1, 38, 1, 38, 3, 38, 390, 8, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 5, 39, 398, 8, 39, 10, 39, 12, 39, 401, 9, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 5, 40, 409, 8, 40, 10, 40, 12, 40, 412, 9, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 3, 41, 422, 8, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 3, 43, 429, 8, 43, 1, 43, 5, 43, 432, 8, 43, 10, 43, 12, 43, 435, 9, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 44, 1, 44, 3, 44, 446, 8, 44, 1, 44, 1, 44, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 0, 2, 78, 80, 49, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 0, 3, 2, 0, 4, 6, 52, 52, 1, 0, 48, 51, 1, 0, 11, 12, 476, 0, 99, 1, 0, 0, 0, 2, 104, 1, 0, 0, 0, 4, 120, 1, 0, 0, 0, 6, 123, 1, 0, 0, 0, 8, 134, 1, 0, 0, 0, 10, 160, 1, 0, 0, 0, 12, 162, 1, 0, 0, 0, 14, 170, 1, 0, 0, 0, 16, 181, 1, 0, 0, 0, 18, 198, 1, 0, 0, 0, 20, 200, 1, 0, 0, 0, 22, 209, 1, 0, 0, 0, 24, 213, 1, 0, 0, 0, 26, 219, 1, 0, 0, 0, 28, 225, 1, 0, 0, 0, 30, 233, 1, 0, 0, 0, 32, 250, 1, 0, 0, 0, 34, 260, 1, 0, 0, 0, 36, 266, 1, 0, 0, 0, 38, 273, 1, 0, 0, 0, 40, 276, 1, 0, 0, 0, 42, 291, 1, 0, 0, 0, 44, 300, 1, 0, 0, 0, 46, 312, 1, 0, 0, 0, 48, 314, 1, 0, 0, 0, 50, 318, 1, 0, 0, 0, 52, 326, 1, 0, 0, 0, 54, 338, 1, 0, 0, 0, 56, 340, 1, 0, 0, 0, 58, 345, 1, 0, 0, 0, 60, 349, 1, 0, 0, 0, 62, 351, 1, 0, 0, 0, 64, 354, 1, 0, 0, 0, 66, 359, 1, 0, 0, 0, 68, 361, 1, 0, 0, 0, 70, 364, 1, 0, 0, 0, 72, 369, 1, 0, 0, 0, 74, 385, 1, 0, 0, 0, 76, 389, 1, 0, 0, 0, 78, 391, 1, 0, 0, 0, 80, 402, 1, 0, 0, 0, 82, 421, 1, 0, 0, 0, 84, 423, 1, 0, 0, 0, 86, 428, 1, 0, 0, 0, 88, 445, 1, 0, 0, 0, 90, 449, 1, 0, 0, 0, 92, 455, 1, 0, 0, 0, 94, 457, 1, 0, 0, 0, 96, 459, 1, 0, 0, 0, 98, 100, 3, 2, 1, 0, 99, 98, 1, 0, 0, 0, 100, 101, 1, 0, 0, 0, 101, 99, 1, 0, 0, 0, 101, 102, 1, 0, 0, 0, 102, 1, 1, 0, 0, 0, 103, 105, 5, 7, 0, 0, 104, 103, 1, 0, 0, 0, 104, 105, 1, 0, 0, 0, 105, 106, 1, 0, 0, 0, 106, 107, 5, 35, 0, 0, 107, 108, 5, 52, 0, 0, 108, 112, 5, 31, 0, 0, 109, 111, 3, 4, 2, 0, 110, 109, 1, 0, 0, 0, 111, 114, 1, 0, 0, 0, 112, 110, 1, 0, 0, 0, 112, 113, 1, 0, 0, 0, 113, 115, 1, 0, 0, 0, 114, 112, 1, 0, 0, 0, 115, 116, 5, 32, 0, 0, 116, 3, 1, 0, 0, 0, 117, 121, 3, 6, 3, 0, 118, 121, 3, 8, 4, 0, 119, 121, 3, 10, 5, 0, 120, 117, 1, 0, 0, 0, 120, 118, 1, 0, 0, 0, 120, 119, 1, 0, 0, 0, 121, 5, 1, 0, 0, 0, 122, 124, 5, 7, 0, 0, 123, 122, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 125, 1, 0, 0, 0, 125, 126, 5, 52, 0, 0, 126, 128, 5, 29, 0, 0, 127, 129, 3, 12, 6, 0, 128, 127, 1, 0, 0, 0, 128, 129, 1, 0, 0, 0, 129, 130, 1, 0, 0, 0, 130, 131, 5, 30, 0, 0, 131, 132, 3, 20, 10, 0, 132, 7, 1, 0, 0, 0, 133, 135, 5, 7, 0, 0, 134, 133, 1, 0, 0, 0, 134, 135, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 137, 3, 92, 46, 0, 137, 140, 5, 52, 0, 0, 138, 139, 5, 13, 0, 0, 139, 141, 3, 52, 26, 0, 140, 138, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 142, 1, 0, 0, 0, 142, 143, 5, 33, 0, 0, 143, 9, 1, 0, 0, 0, 144, 145, 5, 8, 0, 0, 145, 161, 3, 20, 10, 0, 146, 148, 5, 7, 0, 0, 147, 146, 1, 0, 0, 0, 147, 148, 1, 0, 0, 0, 148, 151, 1, 0, 0, 0, 149, 152, 3, 92, 46, 0, 150, 152, 5, 3, 0, 0, 151, 149, 1, 0, 0, 0, 151, 150, 1, 0, 0, 0, 152, 153, 1, 0, 0, 0, 153, 154, 5, 52, 0, 0, 154, 156, 5, 29, 0, 0, 155, 157, 3, 12, 6, 0, 156, 155, 1, 0, 0, 0, 156, 157, 1, 0, 0, 0, 157, 158, 1, 0, 0, 0, 158, 159, 5, 30, 0, 0, 159, 161, 3, 20, 10, 0, 160, 144, 1, 0, 0, 0, 160, 147, 1, 0, 0, 0, 161, 11, 1, 0, 0, 0, 162, 167, 3, 14, 7, 0, 163, 164, 5, 34, 0, 0, 164, 166, 3, 14, 7, 0, 165, 163, 1, 0, 0, 0, 166, 169, 1, 0, 0, 0, 167, 165, 1, 0, 0, 0, 167, 168, 1, 0, 0, 0, 168, 13, 1, 0, 0, 0, 169, 167, 1, 0, 0, 0, 170, 171, 3, 92, 46, 0, 171, 172, 5, 52, 0, 0, 172, 15, 1, 0, 0, 0, 173, 178, 3, 52, 26, 0, 174, 175, 5, 34, 0, 0, 175, 177, 3, 52, 26, 0, 176, 174, 1, 0, 0, 0, 177, 180, 1, 0, 0, 0, 178, 176, 1, 0, 0, 0, 178, 179, 1, 0, 0, 0, 179, 182, 1, 0, 0, 0, 180, 178, 1, 0, 0, 0, 181, 173, 1, 0, 0, 0, 181, 182, 1, 0, 0, 0, 182, 17, 1, 0, 0, 0, 183, 184, 3, 22, 11, 0, 184, 185, 5, 33, 0, 0, 185, 199, 1, 0, 0, 0, 186, 187, 3, 24, 12, 0, 187, 188, 5, 33, 0, 0, 188, 199, 1, 0, 0, 0, 189, 199, 3, 20, 10, 0, 190, 199, 3, 26, 13, 0, 191, 199, 3, 28, 14, 0, 192, 199, 3, 30, 15, 0, 193, 199, 3, 32, 16, 0, 194, 199, 3, 40, 20, 0, 195, 196, 3, 46, 23, 0, 196, 197, 5, 33, 0, 0, 197, 199, 1, 0, 0, 0, 198, 183, 1, 0, 0, 0, 198, 186, 1, 0, 0, 0, 198, 189, 1, 0, 0, 0, 198, 190, 1, 0, 0, 0, 198, 191, 1, 0, 0, 0, 198, 192, 1, 0, 0, 0, 198, 193, 1, 0, 0, 0, 198, 194, 1, 0, 0, 0, 198, 195, 1, 0, 0, 0, 199, 19, 1, 0, 0, 0, 200, 204, 5, 31, 0, 0, 201, 203, 3, 18, 9, 0, 202, 201, 1, 0, 0, 0, 203, 206, 1, 0, 0, 0, 204, 202, 1, 0, 0, 0, 204, 205, 1, 0, 0, 0, 205, 207, 1, 0, 0, 0, 206, 204, 1, 0, 0, 0, 207, 208, 5, 32, 0, 0, 208, 21, 1, 0, 0, 0, 209, 211, 5, 42, 0, 0, 210, 212, 3, 52, 26, 0, 211, 210, 1, 0, 0, 0, 211, 212, 1, 0, 0, 0, 212, 23, 1, 0, 0, 0, 213, 214, 3, 92, 46, 0, 214, 217, 5, 52, 0, 0, 215, 216, 5, 13, 0, 0, 216, 218, 3, 52, 26, 0, 217, 215, 1, 0, 0, 0, 217, 218, 1, 0, 0, 0, 218, 25, 1, 0, 0, 0, 219, 220, 5, 37, 0, 0, 220, 221, 5, 29, 0, 0, 221, 222, 3, 52, 26, 0, 222, 223, 5, 30, 0, 0, 223, 224, 3, 20, 10, 0, 224, 27, 1, 0, 0, 0, 225, 226, 5, 38, 0, 0, 226, 227, 3, 20, 10, 0, 227, 228, 5, 37, 0, 0, 228, 229, 5, 29, 0, 0, 229, 230, 3, 52, 26, 0, 230, 231, 5, 30, 0, 0, 231, 232, 5, 33, 0, 0, 232, 29, 1, 0, 0, 0, 233, 234, 5, 41, 0, 0, 234, 237, 5, 29, 0, 0, 235, 238, 3, 46, 23, 0, 236, 238, 3, 24, 12, 0, 237, 235, 1, 0, 0, 0, 237, 236, 1, 0, 0, 0, 238, 239, 1, 0, 0, 0, 239, 241, 5, 33, 0, 0, 240, 242, 3, 52, 26, 0, 241, 240, 1, 0, 0, 0, 241, 242, 1, 0, 0, 0, 242, 243, 1, 0, 0, 0, 243, 245, 5, 33, 0, 0, 244, 246, 3, 46, 23, 0, 245, 244, 1, 0, 0, 0, 245, 246, 1, 0, 0, 0, 246, 247, 1, 0, 0, 0, 247, 248, 5, 30, 0, 0, 248, 249, 3, 20, 10, 0, 249, 31, 1, 0, 0, 0, 250, 254, 3, 34, 17, 0, 251, 253, 3, 36, 18, 0, 252, 251, 1, 0, 0, 0, 253, 256, 1, 0, 0, 0, 254, 252, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 258, 1, 0, 0, 0, 256, 254, 1, 0, 0, 0, 257, 259, 3, 38, 19, 0, 258, 257, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0, 259, 33, 1, 0, 0, 0, 260, 261, 5, 39, 0, 0, 261, 262, 5, 29, 0, 0, 262, 263, 3, 52, 26, 0, 263, 264, 5, 30, 0, 0, 264, 265, 3, 20, 10, 0, 265, 35, 1, 0, 0, 0, 266, 267, 5, 40, 0, 0, 267, 268, 5, 39, 0, 0, 268, 269, 5, 29, 0, 0, 269, 270, 3, 52, 26, 0, 270, 271, 5, 30, 0, 0, 271, 272, 3, 20, 10, 0, 272, 37, 1, 0, 0, 0, 273, 274, 5, 40, 0, 0, 274, 275, 3, 20, 10, 0, 275, 39, 1, 0, 0, 0, 276, 277, 5, 44, 0, 0, 277, 278, 5, 29, 0, 0, 278, 279, 3, 52, 26, 0, 279, 280, 5, 30, 0, 0, 280, 282, 5, 31, 0, 0, 281, 283, 3, 42, 21, 0, 282, 281, 1, 0, 0, 0, 283, 284, 1, 0, 0, 0, 284, 282, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 287, 1, 0, 0, 0, 286, 288, 3, 44, 22, 0, 287, 286, 1, 0, 0, 0, 287, 288, 1, 0, 0, 0, 288, 289, 1, 0, 0, 0, 289, 290, 5, 32, 0, 0, 290, 41, 1, 0, 0, 0, 291, 292, 5, 45, 0, 0, 292, 293, 3, 94, 47, 0, 293, 297, 5, 47, 0, 0, 294, 296, 3, 18, 9, 0, 295, 294, 1, 0, 0, 0, 296, 299, 1, 0, 0, 0, 297, 295, 1, 0, 0, 0, 297, 298, 1, 0, 0, 0, 298, 43, 1, 0, 0, 0, 299, 297, 1, 0, 0, 0, 300, 301, 5, 46, 0, 0, 301, 305, 5, 47, 0, 0, 302, 304, 3, 18, 9, 0, 303, 302, 1, 0, 0, 0, 304, 307, 1, 0, 0, 0, 305, 303, 1, 0, 0, 0, 305, 306, 1, 0, 0, 0, 306, 45, 1, 0, 0, 0, 307, 305, 1, 0, 0, 0, 308, 313, 3, 48, 24, 0, 309, 313, 3, 50, 25, 0, 310, 313, 3, 86, 43, 0, 311, 313, 3, 58, 29, 0, 312, 308, 1, 0, 0, 0, 312, 309, 1, 0, 0, 0, 312, 310, 1, 0, 0, 0, 312, 311, 1, 0, 0, 0, 313, 47, 1, 0, 0, 0, 314, 315, 3, 72, 36, 0, 315, 316, 5, 13, 0, 0, 316, 317, 3, 52, 26, 0, 317, 49, 1, 0, 0, 0, 318, 319, 5, 43, 0, 0, 319, 320, 5, 52, 0, 0, 320, 321, 5, 29, 0, 0, 321, 322, 3, 16, 8, 0, 322, 323, 5, 30, 0, 0, 323, 51, 1, 0, 0, 0, 324, 327, 3, 54, 27, 0, 325, 327, 3, 76, 38, 0, 326, 324, 1, 0, 0, 0, 326, 325, 1, 0, 0, 0, 327, 53, 1, 0, 0, 0, 328, 339, 5, 36, 0, 0, 329, 339, 5, 52, 0, 0, 330, 339, 3, 74, 37, 0, 331, 339, 3, 94, 47, 0, 332, 339, 3, 56, 28, 0, 333, 339, 3, 46, 23, 0, 334, 335, 5, 29, 0, 0, 335, 336, 3, 52, 26, 0, 336, 337, 5, 30, 0, 0, 337, 339, 1, 0, 0, 0, 338, 328, 1, 0, 0, 0, 338, 329, 1, 0, 0, 0, 338, 330, 1, 0, 0, 0, 338, 331, 1, 0, 0, 0, 338, 332, 1, 0, 0, 0, 338, 333, 1, 0, 0, 0, 338, 334, 1, 0, 0, 0, 339, 55, 1, 0, 0, 0, 340, 341, 5, 25, 0, 0, 341, 342, 3, 52, 26, 0, 342, 57, 1, 0, 0, 0, 343, 346, 3, 60, 30, 0, 344, 346, 3, 66, 33, 0, 345, 343, 1, 0, 0, 0, 345, 344, 1, 0, 0, 0, 346, 59, 1, 0, 0, 0, 347, 350, 3, 62, 31, 0, 348, 350, 3, 64, 32, 0, 349, 347, 1, 0, 0, 0, 349, 348, 1, 0, 0, 0, 350, 61, 1, 0, 0, 0, 351, 352, 5, 1, 0, 0, 352, 353, 3, 72, 36, 0, 353, 63, 1, 0, 0, 0, 354, 355, 3, 72, 36, 0, 355, 356, 5, 1, 0, 0, 356, 65, 1, 0, 0, 0, 357, 360, 3, 68, 34, 0, 358, 360, 3, 70, 35, 0, 359, 357, 1, 0, 0, 0, 359, 358, 1, 0, 0, 0, 360, 67, 1, 0, 0, 0, 361, 362, 5, 2, 0, 0, 362, 363, 3, 72, 36, 0, 363, 69, 1, 0, 0, 0, 364, 365, 3, 72, 36, 0, 365, 366, 5, 2, 0, 0, 366, 71, 1, 0, 0, 0, 367, 370, 5, 52, 0, 0, 368, 370, 3, 74, 37, 0, 369, 367, 1, 0, 0, 0, 369, 368, 1, 0, 0, 0, 370, 73, 1, 0, 0, 0, 371, 372, 5, 36, 0, 0, 372, 373, 5, 28, 0, 0, 373, 386, 5, 52, 0, 0, 374, 375, 5, 36, 0, 0, 375, 377, 5, 28, 0, 0, 376, 374, 1, 0, 0, 0, 376, 377, 1, 0, 0, 0, 377, 380, 1, 0, 0, 0, 378, 379, 5, 52, 0, 0, 379, 381, 5, 28, 0, 0, 380, 378, 1, 0, 0, 0, 381, 382, 1, 0, 0, 0, 382, 380, 1, 0, 0, 0, 382, 383, 1, 0, 0, 0, 383, 384, 1, 0, 0, 0, 384, 386, 5, 52, 0, 0, 385, 371, 1, 0, 0, 0, 385, 376, 1, 0, 0, 0, 386, 75, 1, 0, 0, 0, 387, 390, 3, 78, 39, 0, 388, 390, 3, 84, 42, 0, 389, 387, 1, 0, 0, 0, 389, 388, 1, 0, 0, 0, 390, 77, 1, 0, 0, 0, 391, 392, 6, 39, -1, 0, 392, 393, 3, 80, 40, 0, 393, 399, 1, 0, 0, 0, 394, 395, 10, 2, 0, 0, 395, 396, 5, 10, 0, 0, 396, 398, 3, 80, 40, 0, 397, 394, 1, 0, 0, 0, 398, 401, 1, 0, 0, 0, 399, 397, 1, 0, 0, 0, 399, 400, 1, 0, 0, 0, 400, 79, 1, 0, 0, 0, 401, 399, 1, 0, 0, 0, 402, 403, 6, 40, -1, 0, 403, 404, 3, 82, 41, 0, 404, 410, 1, 0, 0, 0, 405, 406, 10, 2, 0, 0, 406, 407, 5, 9, 0, 0, 407, 409, 3, 82, 41, 0, 408, 405, 1, 0, 0, 0, 409, 412, 1, 0, 0, 0, 410, 408, 1, 0, 0, 0, 410, 411, 1, 0, 0, 0, 411, 81, 1, 0, 0, 0, 412, 410, 1, 0, 0, 0, 413, 422, 5, 49, 0, 0, 414, 422, 5, 52, 0, 0, 415, 422, 3, 74, 37, 0, 416, 417, 3, 86, 43, 0, 417, 418, 5, 29, 0, 0, 418, 419, 3, 78, 39, 0, 419, 420, 5, 30, 0, 0, 420, 422, 1, 0, 0, 0, 421, 413, 1, 0, 0, 0, 421, 414, 1, 0, 0, 0, 421, 415, 1, 0, 0, 0, 421, 416, 1, 0, 0, 0, 422, 83, 1, 0, 0, 0, 423, 424, 3, 54, 27, 0, 424, 425, 3, 96, 48, 0, 425, 426, 3, 52, 26, 0, 426, 85, 1, 0, 0, 0, 427, 429, 3, 88, 44, 0, 428, 427, 1, 0, 0, 0, 428, 429, 1, 0, 0, 0, 429, 433, 1, 0, 0, 0, 430, 432, 3, 90, 45, 0, 431, 430, 1, 0, 0, 0, 432, 435, 1, 0, 0, 0, 433, 431, 1, 0, 0, 0, 433, 434, 1, 0, 0, 0, 434, 436, 1, 0, 0, 0, 435, 433, 1, 0, 0, 0, 436, 437, 5, 52, 0, 0, 437, 438, 5, 29, 0, 0, 438, 439, 3, 16, 8, 0, 439, 440, 5, 30, 0, 0, 440, 87, 1, 0, 0, 0, 441, 446, 5, 36, 0, 0, 442, 446, 3, 74, 37, 0, 443, 446, 3, 50, 25, 0, 444, 446, 5, 52, 0, 0, 445, 441, 1, 0, 0, 0, 445, 442, 1, 0, 0, 0, 445, 443, 1, 0, 0, 0, 445, 444, 1, 0, 0, 0, 446, 447, 1, 0, 0, 0, 447, 448, 5, 28, 0, 0, 448, 89, 1, 0, 0, 0, 449, 450, 5, 52, 0, 0, 450, 451, 5, 29, 0, 0, 451, 452, 3, 16, 8, 0, 452, 453, 5, 30, 0, 0, 453, 454, 5, 28, 0, 0, 454, 91, 1, 0, 0, 0, 455, 456, 7, 0, 0, 0, 456, 93, 1, 0, 0, 0, 457, 458, 7, 1, 0, 0, 458, 95, 1, 0, 0, 0, 459, 460, 7, 2, 0, 0, 460, 97, 1, 0, 0, 0, 45, 101, 104, 112, 120, 123, 128, 134, 140, 147, 151, 156, 160, 167, 178, 181, 198, 204, 211, 217, 237, 241, 245, 254, 258, 284, 287, 297, 305, 312, 326, 338, 345, 349, 359, 369, 376, 382, 385, 389, 399, 410, 421, 428, 433, 445] \ No newline at end of file diff --git a/src/main/java/parser/generated/SimpleJava.tokens b/src/main/java/parser/generated/SimpleJava.tokens index 71246c8..ffe0902 100644 --- a/src/main/java/parser/generated/SimpleJava.tokens +++ b/src/main/java/parser/generated/SimpleJava.tokens @@ -41,14 +41,18 @@ Else=40 For=41 Return=42 New=43 -CharValue=44 -IntValue=45 -BooleanValue=46 -NullValue=47 -Identifier=48 -WS=49 -InlineComment=50 -MultilineComment=51 +Switch=44 +Case=45 +Default=46 +Colon=47 +CharValue=48 +IntValue=49 +BooleanValue=50 +NullValue=51 +Identifier=52 +WS=53 +InlineComment=54 +MultilineComment=55 '++'=1 '--'=2 'void'=3 @@ -87,4 +91,8 @@ MultilineComment=51 'for'=41 'return'=42 'new'=43 -'null'=47 +'switch'=44 +'case'=45 +'default'=46 +':'=47 +'null'=51 diff --git a/src/main/java/parser/generated/SimpleJavaBaseListener.java b/src/main/java/parser/generated/SimpleJavaBaseListener.java index eecc12f..acd7546 100644 --- a/src/main/java/parser/generated/SimpleJavaBaseListener.java +++ b/src/main/java/parser/generated/SimpleJavaBaseListener.java @@ -1,4 +1,4 @@ -// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 +// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 package parser.generated; import org.antlr.v4.runtime.ParserRuleContext; @@ -252,6 +252,42 @@ public class SimpleJavaBaseListener implements SimpleJavaListener { *

The default implementation does nothing.

*/ @Override public void exitElseStatement(SimpleJavaParser.ElseStatementContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterSwitchStatement(SimpleJavaParser.SwitchStatementContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitSwitchStatement(SimpleJavaParser.SwitchStatementContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterCaseStatement(SimpleJavaParser.CaseStatementContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitCaseStatement(SimpleJavaParser.CaseStatementContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterDefaultStatement(SimpleJavaParser.DefaultStatementContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitDefaultStatement(SimpleJavaParser.DefaultStatementContext ctx) { } /** * {@inheritDoc} * diff --git a/src/main/java/parser/generated/SimpleJavaBaseVisitor.java b/src/main/java/parser/generated/SimpleJavaBaseVisitor.java index b3a6029..53d159c 100644 --- a/src/main/java/parser/generated/SimpleJavaBaseVisitor.java +++ b/src/main/java/parser/generated/SimpleJavaBaseVisitor.java @@ -1,4 +1,4 @@ -// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 +// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 package parser.generated; import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor; @@ -152,6 +152,27 @@ public class SimpleJavaBaseVisitor extends AbstractParseTreeVisitor implem * {@link #visitChildren} on {@code ctx}.

*/ @Override public T visitElseStatement(SimpleJavaParser.ElseStatementContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitSwitchStatement(SimpleJavaParser.SwitchStatementContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitCaseStatement(SimpleJavaParser.CaseStatementContext ctx) { return visitChildren(ctx); } + /** + * {@inheritDoc} + * + *

The default implementation returns the result of calling + * {@link #visitChildren} on {@code ctx}.

+ */ + @Override public T visitDefaultStatement(SimpleJavaParser.DefaultStatementContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/src/main/java/parser/generated/SimpleJavaLexer.interp b/src/main/java/parser/generated/SimpleJavaLexer.interp index 61f0ce5..3338105 100644 --- a/src/main/java/parser/generated/SimpleJavaLexer.interp +++ b/src/main/java/parser/generated/SimpleJavaLexer.interp @@ -43,6 +43,10 @@ null 'for' 'return' 'new' +'switch' +'case' +'default' +':' null null null @@ -97,6 +101,10 @@ Else For Return New +Switch +Case +Default +Colon CharValue IntValue BooleanValue @@ -150,6 +158,10 @@ Else For Return New +Switch +Case +Default +Colon CharValue IntValue BooleanValue @@ -170,4 +182,4 @@ mode names: DEFAULT_MODE atn: -[4, 0, 51, 413, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 178, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 3, 8, 222, 8, 8, 1, 9, 1, 9, 3, 9, 226, 8, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 234, 8, 10, 1, 11, 1, 11, 3, 11, 238, 8, 11, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 5, 43, 335, 8, 43, 10, 43, 12, 43, 338, 9, 43, 1, 43, 1, 43, 1, 44, 3, 44, 343, 8, 44, 1, 44, 4, 44, 346, 8, 44, 11, 44, 12, 44, 347, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 3, 45, 359, 8, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 3, 49, 373, 8, 49, 1, 50, 1, 50, 5, 50, 377, 8, 50, 10, 50, 12, 50, 380, 9, 50, 1, 51, 4, 51, 383, 8, 51, 11, 51, 12, 51, 384, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 52, 5, 52, 393, 8, 52, 10, 52, 12, 52, 396, 9, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 53, 5, 53, 404, 8, 53, 10, 53, 12, 53, 407, 9, 53, 1, 53, 1, 53, 1, 53, 1, 53, 1, 53, 1, 405, 0, 54, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 95, 0, 97, 0, 99, 0, 101, 48, 103, 49, 105, 50, 107, 51, 1, 0, 5, 2, 0, 10, 10, 13, 13, 2, 0, 65, 90, 97, 122, 1, 0, 48, 57, 2, 0, 36, 36, 95, 95, 3, 0, 9, 10, 13, 13, 32, 32, 431, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 0, 101, 1, 0, 0, 0, 0, 103, 1, 0, 0, 0, 0, 105, 1, 0, 0, 0, 0, 107, 1, 0, 0, 0, 1, 109, 1, 0, 0, 0, 3, 112, 1, 0, 0, 0, 5, 115, 1, 0, 0, 0, 7, 120, 1, 0, 0, 0, 9, 128, 1, 0, 0, 0, 11, 133, 1, 0, 0, 0, 13, 177, 1, 0, 0, 0, 15, 179, 1, 0, 0, 0, 17, 221, 1, 0, 0, 0, 19, 225, 1, 0, 0, 0, 21, 233, 1, 0, 0, 0, 23, 237, 1, 0, 0, 0, 25, 239, 1, 0, 0, 0, 27, 241, 1, 0, 0, 0, 29, 243, 1, 0, 0, 0, 31, 245, 1, 0, 0, 0, 33, 247, 1, 0, 0, 0, 35, 249, 1, 0, 0, 0, 37, 251, 1, 0, 0, 0, 39, 253, 1, 0, 0, 0, 41, 255, 1, 0, 0, 0, 43, 258, 1, 0, 0, 0, 45, 261, 1, 0, 0, 0, 47, 264, 1, 0, 0, 0, 49, 267, 1, 0, 0, 0, 51, 269, 1, 0, 0, 0, 53, 272, 1, 0, 0, 0, 55, 275, 1, 0, 0, 0, 57, 277, 1, 0, 0, 0, 59, 279, 1, 0, 0, 0, 61, 281, 1, 0, 0, 0, 63, 283, 1, 0, 0, 0, 65, 285, 1, 0, 0, 0, 67, 287, 1, 0, 0, 0, 69, 289, 1, 0, 0, 0, 71, 295, 1, 0, 0, 0, 73, 300, 1, 0, 0, 0, 75, 306, 1, 0, 0, 0, 77, 309, 1, 0, 0, 0, 79, 312, 1, 0, 0, 0, 81, 317, 1, 0, 0, 0, 83, 321, 1, 0, 0, 0, 85, 328, 1, 0, 0, 0, 87, 332, 1, 0, 0, 0, 89, 342, 1, 0, 0, 0, 91, 358, 1, 0, 0, 0, 93, 360, 1, 0, 0, 0, 95, 365, 1, 0, 0, 0, 97, 367, 1, 0, 0, 0, 99, 372, 1, 0, 0, 0, 101, 374, 1, 0, 0, 0, 103, 382, 1, 0, 0, 0, 105, 388, 1, 0, 0, 0, 107, 399, 1, 0, 0, 0, 109, 110, 5, 43, 0, 0, 110, 111, 5, 43, 0, 0, 111, 2, 1, 0, 0, 0, 112, 113, 5, 45, 0, 0, 113, 114, 5, 45, 0, 0, 114, 4, 1, 0, 0, 0, 115, 116, 5, 118, 0, 0, 116, 117, 5, 111, 0, 0, 117, 118, 5, 105, 0, 0, 118, 119, 5, 100, 0, 0, 119, 6, 1, 0, 0, 0, 120, 121, 5, 98, 0, 0, 121, 122, 5, 111, 0, 0, 122, 123, 5, 111, 0, 0, 123, 124, 5, 108, 0, 0, 124, 125, 5, 101, 0, 0, 125, 126, 5, 97, 0, 0, 126, 127, 5, 110, 0, 0, 127, 8, 1, 0, 0, 0, 128, 129, 5, 99, 0, 0, 129, 130, 5, 104, 0, 0, 130, 131, 5, 97, 0, 0, 131, 132, 5, 114, 0, 0, 132, 10, 1, 0, 0, 0, 133, 134, 5, 105, 0, 0, 134, 135, 5, 110, 0, 0, 135, 136, 5, 116, 0, 0, 136, 12, 1, 0, 0, 0, 137, 138, 5, 112, 0, 0, 138, 139, 5, 117, 0, 0, 139, 140, 5, 98, 0, 0, 140, 141, 5, 108, 0, 0, 141, 142, 5, 105, 0, 0, 142, 178, 5, 99, 0, 0, 143, 144, 5, 112, 0, 0, 144, 145, 5, 114, 0, 0, 145, 146, 5, 105, 0, 0, 146, 147, 5, 118, 0, 0, 147, 148, 5, 97, 0, 0, 148, 149, 5, 116, 0, 0, 149, 178, 5, 101, 0, 0, 150, 151, 5, 112, 0, 0, 151, 152, 5, 117, 0, 0, 152, 153, 5, 98, 0, 0, 153, 154, 5, 108, 0, 0, 154, 155, 5, 105, 0, 0, 155, 156, 5, 99, 0, 0, 156, 157, 5, 32, 0, 0, 157, 158, 5, 115, 0, 0, 158, 159, 5, 116, 0, 0, 159, 160, 5, 97, 0, 0, 160, 161, 5, 116, 0, 0, 161, 162, 5, 105, 0, 0, 162, 178, 5, 99, 0, 0, 163, 164, 5, 112, 0, 0, 164, 165, 5, 114, 0, 0, 165, 166, 5, 105, 0, 0, 166, 167, 5, 118, 0, 0, 167, 168, 5, 97, 0, 0, 168, 169, 5, 116, 0, 0, 169, 170, 5, 101, 0, 0, 170, 171, 5, 32, 0, 0, 171, 172, 5, 115, 0, 0, 172, 173, 5, 116, 0, 0, 173, 174, 5, 97, 0, 0, 174, 175, 5, 116, 0, 0, 175, 176, 5, 105, 0, 0, 176, 178, 5, 99, 0, 0, 177, 137, 1, 0, 0, 0, 177, 143, 1, 0, 0, 0, 177, 150, 1, 0, 0, 0, 177, 163, 1, 0, 0, 0, 178, 14, 1, 0, 0, 0, 179, 180, 5, 112, 0, 0, 180, 181, 5, 117, 0, 0, 181, 182, 5, 98, 0, 0, 182, 183, 5, 108, 0, 0, 183, 184, 5, 105, 0, 0, 184, 185, 5, 99, 0, 0, 185, 186, 5, 32, 0, 0, 186, 187, 5, 115, 0, 0, 187, 188, 5, 116, 0, 0, 188, 189, 5, 97, 0, 0, 189, 190, 5, 116, 0, 0, 190, 191, 5, 105, 0, 0, 191, 192, 5, 99, 0, 0, 192, 193, 5, 32, 0, 0, 193, 194, 5, 118, 0, 0, 194, 195, 5, 111, 0, 0, 195, 196, 5, 105, 0, 0, 196, 197, 5, 100, 0, 0, 197, 198, 5, 32, 0, 0, 198, 199, 5, 109, 0, 0, 199, 200, 5, 97, 0, 0, 200, 201, 5, 105, 0, 0, 201, 202, 5, 110, 0, 0, 202, 203, 5, 40, 0, 0, 203, 204, 5, 83, 0, 0, 204, 205, 5, 116, 0, 0, 205, 206, 5, 114, 0, 0, 206, 207, 5, 105, 0, 0, 207, 208, 5, 110, 0, 0, 208, 209, 5, 103, 0, 0, 209, 210, 5, 91, 0, 0, 210, 211, 5, 93, 0, 0, 211, 212, 5, 32, 0, 0, 212, 213, 5, 97, 0, 0, 213, 214, 5, 114, 0, 0, 214, 215, 5, 103, 0, 0, 215, 216, 5, 115, 0, 0, 216, 217, 5, 41, 0, 0, 217, 16, 1, 0, 0, 0, 218, 222, 3, 31, 15, 0, 219, 222, 3, 35, 17, 0, 220, 222, 3, 33, 16, 0, 221, 218, 1, 0, 0, 0, 221, 219, 1, 0, 0, 0, 221, 220, 1, 0, 0, 0, 222, 18, 1, 0, 0, 0, 223, 226, 3, 27, 13, 0, 224, 226, 3, 29, 14, 0, 225, 223, 1, 0, 0, 0, 225, 224, 1, 0, 0, 0, 226, 20, 1, 0, 0, 0, 227, 234, 3, 37, 18, 0, 228, 234, 3, 39, 19, 0, 229, 234, 3, 41, 20, 0, 230, 234, 3, 43, 21, 0, 231, 234, 3, 45, 22, 0, 232, 234, 3, 47, 23, 0, 233, 227, 1, 0, 0, 0, 233, 228, 1, 0, 0, 0, 233, 229, 1, 0, 0, 0, 233, 230, 1, 0, 0, 0, 233, 231, 1, 0, 0, 0, 233, 232, 1, 0, 0, 0, 234, 22, 1, 0, 0, 0, 235, 238, 3, 51, 25, 0, 236, 238, 3, 53, 26, 0, 237, 235, 1, 0, 0, 0, 237, 236, 1, 0, 0, 0, 238, 24, 1, 0, 0, 0, 239, 240, 5, 61, 0, 0, 240, 26, 1, 0, 0, 0, 241, 242, 5, 43, 0, 0, 242, 28, 1, 0, 0, 0, 243, 244, 5, 45, 0, 0, 244, 30, 1, 0, 0, 0, 245, 246, 5, 42, 0, 0, 246, 32, 1, 0, 0, 0, 247, 248, 5, 37, 0, 0, 248, 34, 1, 0, 0, 0, 249, 250, 5, 47, 0, 0, 250, 36, 1, 0, 0, 0, 251, 252, 5, 62, 0, 0, 252, 38, 1, 0, 0, 0, 253, 254, 5, 60, 0, 0, 254, 40, 1, 0, 0, 0, 255, 256, 5, 62, 0, 0, 256, 257, 5, 61, 0, 0, 257, 42, 1, 0, 0, 0, 258, 259, 5, 60, 0, 0, 259, 260, 5, 61, 0, 0, 260, 44, 1, 0, 0, 0, 261, 262, 5, 61, 0, 0, 262, 263, 5, 61, 0, 0, 263, 46, 1, 0, 0, 0, 264, 265, 5, 33, 0, 0, 265, 266, 5, 61, 0, 0, 266, 48, 1, 0, 0, 0, 267, 268, 5, 33, 0, 0, 268, 50, 1, 0, 0, 0, 269, 270, 5, 38, 0, 0, 270, 271, 5, 38, 0, 0, 271, 52, 1, 0, 0, 0, 272, 273, 5, 124, 0, 0, 273, 274, 5, 124, 0, 0, 274, 54, 1, 0, 0, 0, 275, 276, 5, 46, 0, 0, 276, 56, 1, 0, 0, 0, 277, 278, 5, 40, 0, 0, 278, 58, 1, 0, 0, 0, 279, 280, 5, 41, 0, 0, 280, 60, 1, 0, 0, 0, 281, 282, 5, 123, 0, 0, 282, 62, 1, 0, 0, 0, 283, 284, 5, 125, 0, 0, 284, 64, 1, 0, 0, 0, 285, 286, 5, 59, 0, 0, 286, 66, 1, 0, 0, 0, 287, 288, 5, 44, 0, 0, 288, 68, 1, 0, 0, 0, 289, 290, 5, 99, 0, 0, 290, 291, 5, 108, 0, 0, 291, 292, 5, 97, 0, 0, 292, 293, 5, 115, 0, 0, 293, 294, 5, 115, 0, 0, 294, 70, 1, 0, 0, 0, 295, 296, 5, 116, 0, 0, 296, 297, 5, 104, 0, 0, 297, 298, 5, 105, 0, 0, 298, 299, 5, 115, 0, 0, 299, 72, 1, 0, 0, 0, 300, 301, 5, 119, 0, 0, 301, 302, 5, 104, 0, 0, 302, 303, 5, 105, 0, 0, 303, 304, 5, 108, 0, 0, 304, 305, 5, 101, 0, 0, 305, 74, 1, 0, 0, 0, 306, 307, 5, 100, 0, 0, 307, 308, 5, 111, 0, 0, 308, 76, 1, 0, 0, 0, 309, 310, 5, 105, 0, 0, 310, 311, 5, 102, 0, 0, 311, 78, 1, 0, 0, 0, 312, 313, 5, 101, 0, 0, 313, 314, 5, 108, 0, 0, 314, 315, 5, 115, 0, 0, 315, 316, 5, 101, 0, 0, 316, 80, 1, 0, 0, 0, 317, 318, 5, 102, 0, 0, 318, 319, 5, 111, 0, 0, 319, 320, 5, 114, 0, 0, 320, 82, 1, 0, 0, 0, 321, 322, 5, 114, 0, 0, 322, 323, 5, 101, 0, 0, 323, 324, 5, 116, 0, 0, 324, 325, 5, 117, 0, 0, 325, 326, 5, 114, 0, 0, 326, 327, 5, 110, 0, 0, 327, 84, 1, 0, 0, 0, 328, 329, 5, 110, 0, 0, 329, 330, 5, 101, 0, 0, 330, 331, 5, 119, 0, 0, 331, 86, 1, 0, 0, 0, 332, 336, 5, 39, 0, 0, 333, 335, 8, 0, 0, 0, 334, 333, 1, 0, 0, 0, 335, 338, 1, 0, 0, 0, 336, 334, 1, 0, 0, 0, 336, 337, 1, 0, 0, 0, 337, 339, 1, 0, 0, 0, 338, 336, 1, 0, 0, 0, 339, 340, 5, 39, 0, 0, 340, 88, 1, 0, 0, 0, 341, 343, 3, 29, 14, 0, 342, 341, 1, 0, 0, 0, 342, 343, 1, 0, 0, 0, 343, 345, 1, 0, 0, 0, 344, 346, 3, 97, 48, 0, 345, 344, 1, 0, 0, 0, 346, 347, 1, 0, 0, 0, 347, 345, 1, 0, 0, 0, 347, 348, 1, 0, 0, 0, 348, 90, 1, 0, 0, 0, 349, 350, 5, 116, 0, 0, 350, 351, 5, 114, 0, 0, 351, 352, 5, 117, 0, 0, 352, 359, 5, 101, 0, 0, 353, 354, 5, 102, 0, 0, 354, 355, 5, 97, 0, 0, 355, 356, 5, 108, 0, 0, 356, 357, 5, 115, 0, 0, 357, 359, 5, 101, 0, 0, 358, 349, 1, 0, 0, 0, 358, 353, 1, 0, 0, 0, 359, 92, 1, 0, 0, 0, 360, 361, 5, 110, 0, 0, 361, 362, 5, 117, 0, 0, 362, 363, 5, 108, 0, 0, 363, 364, 5, 108, 0, 0, 364, 94, 1, 0, 0, 0, 365, 366, 7, 1, 0, 0, 366, 96, 1, 0, 0, 0, 367, 368, 7, 2, 0, 0, 368, 98, 1, 0, 0, 0, 369, 373, 3, 95, 47, 0, 370, 373, 3, 97, 48, 0, 371, 373, 7, 3, 0, 0, 372, 369, 1, 0, 0, 0, 372, 370, 1, 0, 0, 0, 372, 371, 1, 0, 0, 0, 373, 100, 1, 0, 0, 0, 374, 378, 3, 95, 47, 0, 375, 377, 3, 99, 49, 0, 376, 375, 1, 0, 0, 0, 377, 380, 1, 0, 0, 0, 378, 376, 1, 0, 0, 0, 378, 379, 1, 0, 0, 0, 379, 102, 1, 0, 0, 0, 380, 378, 1, 0, 0, 0, 381, 383, 7, 4, 0, 0, 382, 381, 1, 0, 0, 0, 383, 384, 1, 0, 0, 0, 384, 382, 1, 0, 0, 0, 384, 385, 1, 0, 0, 0, 385, 386, 1, 0, 0, 0, 386, 387, 6, 51, 0, 0, 387, 104, 1, 0, 0, 0, 388, 389, 5, 47, 0, 0, 389, 390, 5, 47, 0, 0, 390, 394, 1, 0, 0, 0, 391, 393, 8, 0, 0, 0, 392, 391, 1, 0, 0, 0, 393, 396, 1, 0, 0, 0, 394, 392, 1, 0, 0, 0, 394, 395, 1, 0, 0, 0, 395, 397, 1, 0, 0, 0, 396, 394, 1, 0, 0, 0, 397, 398, 6, 52, 0, 0, 398, 106, 1, 0, 0, 0, 399, 400, 5, 47, 0, 0, 400, 401, 5, 42, 0, 0, 401, 405, 1, 0, 0, 0, 402, 404, 9, 0, 0, 0, 403, 402, 1, 0, 0, 0, 404, 407, 1, 0, 0, 0, 405, 406, 1, 0, 0, 0, 405, 403, 1, 0, 0, 0, 406, 408, 1, 0, 0, 0, 407, 405, 1, 0, 0, 0, 408, 409, 5, 42, 0, 0, 409, 410, 5, 47, 0, 0, 410, 411, 1, 0, 0, 0, 411, 412, 6, 53, 0, 0, 412, 108, 1, 0, 0, 0, 15, 0, 177, 221, 225, 233, 237, 336, 342, 347, 358, 372, 378, 384, 394, 405, 1, 6, 0, 0] \ No newline at end of file +[4, 0, 55, 443, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 186, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 3, 8, 230, 8, 8, 1, 9, 1, 9, 3, 9, 234, 8, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 242, 8, 10, 1, 11, 1, 11, 3, 11, 246, 8, 11, 1, 12, 1, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 47, 1, 47, 5, 47, 365, 8, 47, 10, 47, 12, 47, 368, 9, 47, 1, 47, 1, 47, 1, 48, 3, 48, 373, 8, 48, 1, 48, 4, 48, 376, 8, 48, 11, 48, 12, 48, 377, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 3, 49, 389, 8, 49, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 51, 1, 51, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 3, 53, 403, 8, 53, 1, 54, 1, 54, 5, 54, 407, 8, 54, 10, 54, 12, 54, 410, 9, 54, 1, 55, 4, 55, 413, 8, 55, 11, 55, 12, 55, 414, 1, 55, 1, 55, 1, 56, 1, 56, 1, 56, 1, 56, 5, 56, 423, 8, 56, 10, 56, 12, 56, 426, 9, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 57, 5, 57, 434, 8, 57, 10, 57, 12, 57, 437, 9, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 435, 0, 58, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 95, 48, 97, 49, 99, 50, 101, 51, 103, 0, 105, 0, 107, 0, 109, 52, 111, 53, 113, 54, 115, 55, 1, 0, 5, 2, 0, 10, 10, 13, 13, 2, 0, 65, 90, 97, 122, 1, 0, 48, 57, 2, 0, 36, 36, 95, 95, 3, 0, 9, 10, 13, 13, 32, 32, 461, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 0, 95, 1, 0, 0, 0, 0, 97, 1, 0, 0, 0, 0, 99, 1, 0, 0, 0, 0, 101, 1, 0, 0, 0, 0, 109, 1, 0, 0, 0, 0, 111, 1, 0, 0, 0, 0, 113, 1, 0, 0, 0, 0, 115, 1, 0, 0, 0, 1, 117, 1, 0, 0, 0, 3, 120, 1, 0, 0, 0, 5, 123, 1, 0, 0, 0, 7, 128, 1, 0, 0, 0, 9, 136, 1, 0, 0, 0, 11, 141, 1, 0, 0, 0, 13, 185, 1, 0, 0, 0, 15, 187, 1, 0, 0, 0, 17, 229, 1, 0, 0, 0, 19, 233, 1, 0, 0, 0, 21, 241, 1, 0, 0, 0, 23, 245, 1, 0, 0, 0, 25, 247, 1, 0, 0, 0, 27, 249, 1, 0, 0, 0, 29, 251, 1, 0, 0, 0, 31, 253, 1, 0, 0, 0, 33, 255, 1, 0, 0, 0, 35, 257, 1, 0, 0, 0, 37, 259, 1, 0, 0, 0, 39, 261, 1, 0, 0, 0, 41, 263, 1, 0, 0, 0, 43, 266, 1, 0, 0, 0, 45, 269, 1, 0, 0, 0, 47, 272, 1, 0, 0, 0, 49, 275, 1, 0, 0, 0, 51, 277, 1, 0, 0, 0, 53, 280, 1, 0, 0, 0, 55, 283, 1, 0, 0, 0, 57, 285, 1, 0, 0, 0, 59, 287, 1, 0, 0, 0, 61, 289, 1, 0, 0, 0, 63, 291, 1, 0, 0, 0, 65, 293, 1, 0, 0, 0, 67, 295, 1, 0, 0, 0, 69, 297, 1, 0, 0, 0, 71, 303, 1, 0, 0, 0, 73, 308, 1, 0, 0, 0, 75, 314, 1, 0, 0, 0, 77, 317, 1, 0, 0, 0, 79, 320, 1, 0, 0, 0, 81, 325, 1, 0, 0, 0, 83, 329, 1, 0, 0, 0, 85, 336, 1, 0, 0, 0, 87, 340, 1, 0, 0, 0, 89, 347, 1, 0, 0, 0, 91, 352, 1, 0, 0, 0, 93, 360, 1, 0, 0, 0, 95, 362, 1, 0, 0, 0, 97, 372, 1, 0, 0, 0, 99, 388, 1, 0, 0, 0, 101, 390, 1, 0, 0, 0, 103, 395, 1, 0, 0, 0, 105, 397, 1, 0, 0, 0, 107, 402, 1, 0, 0, 0, 109, 404, 1, 0, 0, 0, 111, 412, 1, 0, 0, 0, 113, 418, 1, 0, 0, 0, 115, 429, 1, 0, 0, 0, 117, 118, 5, 43, 0, 0, 118, 119, 5, 43, 0, 0, 119, 2, 1, 0, 0, 0, 120, 121, 5, 45, 0, 0, 121, 122, 5, 45, 0, 0, 122, 4, 1, 0, 0, 0, 123, 124, 5, 118, 0, 0, 124, 125, 5, 111, 0, 0, 125, 126, 5, 105, 0, 0, 126, 127, 5, 100, 0, 0, 127, 6, 1, 0, 0, 0, 128, 129, 5, 98, 0, 0, 129, 130, 5, 111, 0, 0, 130, 131, 5, 111, 0, 0, 131, 132, 5, 108, 0, 0, 132, 133, 5, 101, 0, 0, 133, 134, 5, 97, 0, 0, 134, 135, 5, 110, 0, 0, 135, 8, 1, 0, 0, 0, 136, 137, 5, 99, 0, 0, 137, 138, 5, 104, 0, 0, 138, 139, 5, 97, 0, 0, 139, 140, 5, 114, 0, 0, 140, 10, 1, 0, 0, 0, 141, 142, 5, 105, 0, 0, 142, 143, 5, 110, 0, 0, 143, 144, 5, 116, 0, 0, 144, 12, 1, 0, 0, 0, 145, 146, 5, 112, 0, 0, 146, 147, 5, 117, 0, 0, 147, 148, 5, 98, 0, 0, 148, 149, 5, 108, 0, 0, 149, 150, 5, 105, 0, 0, 150, 186, 5, 99, 0, 0, 151, 152, 5, 112, 0, 0, 152, 153, 5, 114, 0, 0, 153, 154, 5, 105, 0, 0, 154, 155, 5, 118, 0, 0, 155, 156, 5, 97, 0, 0, 156, 157, 5, 116, 0, 0, 157, 186, 5, 101, 0, 0, 158, 159, 5, 112, 0, 0, 159, 160, 5, 117, 0, 0, 160, 161, 5, 98, 0, 0, 161, 162, 5, 108, 0, 0, 162, 163, 5, 105, 0, 0, 163, 164, 5, 99, 0, 0, 164, 165, 5, 32, 0, 0, 165, 166, 5, 115, 0, 0, 166, 167, 5, 116, 0, 0, 167, 168, 5, 97, 0, 0, 168, 169, 5, 116, 0, 0, 169, 170, 5, 105, 0, 0, 170, 186, 5, 99, 0, 0, 171, 172, 5, 112, 0, 0, 172, 173, 5, 114, 0, 0, 173, 174, 5, 105, 0, 0, 174, 175, 5, 118, 0, 0, 175, 176, 5, 97, 0, 0, 176, 177, 5, 116, 0, 0, 177, 178, 5, 101, 0, 0, 178, 179, 5, 32, 0, 0, 179, 180, 5, 115, 0, 0, 180, 181, 5, 116, 0, 0, 181, 182, 5, 97, 0, 0, 182, 183, 5, 116, 0, 0, 183, 184, 5, 105, 0, 0, 184, 186, 5, 99, 0, 0, 185, 145, 1, 0, 0, 0, 185, 151, 1, 0, 0, 0, 185, 158, 1, 0, 0, 0, 185, 171, 1, 0, 0, 0, 186, 14, 1, 0, 0, 0, 187, 188, 5, 112, 0, 0, 188, 189, 5, 117, 0, 0, 189, 190, 5, 98, 0, 0, 190, 191, 5, 108, 0, 0, 191, 192, 5, 105, 0, 0, 192, 193, 5, 99, 0, 0, 193, 194, 5, 32, 0, 0, 194, 195, 5, 115, 0, 0, 195, 196, 5, 116, 0, 0, 196, 197, 5, 97, 0, 0, 197, 198, 5, 116, 0, 0, 198, 199, 5, 105, 0, 0, 199, 200, 5, 99, 0, 0, 200, 201, 5, 32, 0, 0, 201, 202, 5, 118, 0, 0, 202, 203, 5, 111, 0, 0, 203, 204, 5, 105, 0, 0, 204, 205, 5, 100, 0, 0, 205, 206, 5, 32, 0, 0, 206, 207, 5, 109, 0, 0, 207, 208, 5, 97, 0, 0, 208, 209, 5, 105, 0, 0, 209, 210, 5, 110, 0, 0, 210, 211, 5, 40, 0, 0, 211, 212, 5, 83, 0, 0, 212, 213, 5, 116, 0, 0, 213, 214, 5, 114, 0, 0, 214, 215, 5, 105, 0, 0, 215, 216, 5, 110, 0, 0, 216, 217, 5, 103, 0, 0, 217, 218, 5, 91, 0, 0, 218, 219, 5, 93, 0, 0, 219, 220, 5, 32, 0, 0, 220, 221, 5, 97, 0, 0, 221, 222, 5, 114, 0, 0, 222, 223, 5, 103, 0, 0, 223, 224, 5, 115, 0, 0, 224, 225, 5, 41, 0, 0, 225, 16, 1, 0, 0, 0, 226, 230, 3, 31, 15, 0, 227, 230, 3, 35, 17, 0, 228, 230, 3, 33, 16, 0, 229, 226, 1, 0, 0, 0, 229, 227, 1, 0, 0, 0, 229, 228, 1, 0, 0, 0, 230, 18, 1, 0, 0, 0, 231, 234, 3, 27, 13, 0, 232, 234, 3, 29, 14, 0, 233, 231, 1, 0, 0, 0, 233, 232, 1, 0, 0, 0, 234, 20, 1, 0, 0, 0, 235, 242, 3, 37, 18, 0, 236, 242, 3, 39, 19, 0, 237, 242, 3, 41, 20, 0, 238, 242, 3, 43, 21, 0, 239, 242, 3, 45, 22, 0, 240, 242, 3, 47, 23, 0, 241, 235, 1, 0, 0, 0, 241, 236, 1, 0, 0, 0, 241, 237, 1, 0, 0, 0, 241, 238, 1, 0, 0, 0, 241, 239, 1, 0, 0, 0, 241, 240, 1, 0, 0, 0, 242, 22, 1, 0, 0, 0, 243, 246, 3, 51, 25, 0, 244, 246, 3, 53, 26, 0, 245, 243, 1, 0, 0, 0, 245, 244, 1, 0, 0, 0, 246, 24, 1, 0, 0, 0, 247, 248, 5, 61, 0, 0, 248, 26, 1, 0, 0, 0, 249, 250, 5, 43, 0, 0, 250, 28, 1, 0, 0, 0, 251, 252, 5, 45, 0, 0, 252, 30, 1, 0, 0, 0, 253, 254, 5, 42, 0, 0, 254, 32, 1, 0, 0, 0, 255, 256, 5, 37, 0, 0, 256, 34, 1, 0, 0, 0, 257, 258, 5, 47, 0, 0, 258, 36, 1, 0, 0, 0, 259, 260, 5, 62, 0, 0, 260, 38, 1, 0, 0, 0, 261, 262, 5, 60, 0, 0, 262, 40, 1, 0, 0, 0, 263, 264, 5, 62, 0, 0, 264, 265, 5, 61, 0, 0, 265, 42, 1, 0, 0, 0, 266, 267, 5, 60, 0, 0, 267, 268, 5, 61, 0, 0, 268, 44, 1, 0, 0, 0, 269, 270, 5, 61, 0, 0, 270, 271, 5, 61, 0, 0, 271, 46, 1, 0, 0, 0, 272, 273, 5, 33, 0, 0, 273, 274, 5, 61, 0, 0, 274, 48, 1, 0, 0, 0, 275, 276, 5, 33, 0, 0, 276, 50, 1, 0, 0, 0, 277, 278, 5, 38, 0, 0, 278, 279, 5, 38, 0, 0, 279, 52, 1, 0, 0, 0, 280, 281, 5, 124, 0, 0, 281, 282, 5, 124, 0, 0, 282, 54, 1, 0, 0, 0, 283, 284, 5, 46, 0, 0, 284, 56, 1, 0, 0, 0, 285, 286, 5, 40, 0, 0, 286, 58, 1, 0, 0, 0, 287, 288, 5, 41, 0, 0, 288, 60, 1, 0, 0, 0, 289, 290, 5, 123, 0, 0, 290, 62, 1, 0, 0, 0, 291, 292, 5, 125, 0, 0, 292, 64, 1, 0, 0, 0, 293, 294, 5, 59, 0, 0, 294, 66, 1, 0, 0, 0, 295, 296, 5, 44, 0, 0, 296, 68, 1, 0, 0, 0, 297, 298, 5, 99, 0, 0, 298, 299, 5, 108, 0, 0, 299, 300, 5, 97, 0, 0, 300, 301, 5, 115, 0, 0, 301, 302, 5, 115, 0, 0, 302, 70, 1, 0, 0, 0, 303, 304, 5, 116, 0, 0, 304, 305, 5, 104, 0, 0, 305, 306, 5, 105, 0, 0, 306, 307, 5, 115, 0, 0, 307, 72, 1, 0, 0, 0, 308, 309, 5, 119, 0, 0, 309, 310, 5, 104, 0, 0, 310, 311, 5, 105, 0, 0, 311, 312, 5, 108, 0, 0, 312, 313, 5, 101, 0, 0, 313, 74, 1, 0, 0, 0, 314, 315, 5, 100, 0, 0, 315, 316, 5, 111, 0, 0, 316, 76, 1, 0, 0, 0, 317, 318, 5, 105, 0, 0, 318, 319, 5, 102, 0, 0, 319, 78, 1, 0, 0, 0, 320, 321, 5, 101, 0, 0, 321, 322, 5, 108, 0, 0, 322, 323, 5, 115, 0, 0, 323, 324, 5, 101, 0, 0, 324, 80, 1, 0, 0, 0, 325, 326, 5, 102, 0, 0, 326, 327, 5, 111, 0, 0, 327, 328, 5, 114, 0, 0, 328, 82, 1, 0, 0, 0, 329, 330, 5, 114, 0, 0, 330, 331, 5, 101, 0, 0, 331, 332, 5, 116, 0, 0, 332, 333, 5, 117, 0, 0, 333, 334, 5, 114, 0, 0, 334, 335, 5, 110, 0, 0, 335, 84, 1, 0, 0, 0, 336, 337, 5, 110, 0, 0, 337, 338, 5, 101, 0, 0, 338, 339, 5, 119, 0, 0, 339, 86, 1, 0, 0, 0, 340, 341, 5, 115, 0, 0, 341, 342, 5, 119, 0, 0, 342, 343, 5, 105, 0, 0, 343, 344, 5, 116, 0, 0, 344, 345, 5, 99, 0, 0, 345, 346, 5, 104, 0, 0, 346, 88, 1, 0, 0, 0, 347, 348, 5, 99, 0, 0, 348, 349, 5, 97, 0, 0, 349, 350, 5, 115, 0, 0, 350, 351, 5, 101, 0, 0, 351, 90, 1, 0, 0, 0, 352, 353, 5, 100, 0, 0, 353, 354, 5, 101, 0, 0, 354, 355, 5, 102, 0, 0, 355, 356, 5, 97, 0, 0, 356, 357, 5, 117, 0, 0, 357, 358, 5, 108, 0, 0, 358, 359, 5, 116, 0, 0, 359, 92, 1, 0, 0, 0, 360, 361, 5, 58, 0, 0, 361, 94, 1, 0, 0, 0, 362, 366, 5, 39, 0, 0, 363, 365, 8, 0, 0, 0, 364, 363, 1, 0, 0, 0, 365, 368, 1, 0, 0, 0, 366, 364, 1, 0, 0, 0, 366, 367, 1, 0, 0, 0, 367, 369, 1, 0, 0, 0, 368, 366, 1, 0, 0, 0, 369, 370, 5, 39, 0, 0, 370, 96, 1, 0, 0, 0, 371, 373, 3, 29, 14, 0, 372, 371, 1, 0, 0, 0, 372, 373, 1, 0, 0, 0, 373, 375, 1, 0, 0, 0, 374, 376, 3, 105, 52, 0, 375, 374, 1, 0, 0, 0, 376, 377, 1, 0, 0, 0, 377, 375, 1, 0, 0, 0, 377, 378, 1, 0, 0, 0, 378, 98, 1, 0, 0, 0, 379, 380, 5, 116, 0, 0, 380, 381, 5, 114, 0, 0, 381, 382, 5, 117, 0, 0, 382, 389, 5, 101, 0, 0, 383, 384, 5, 102, 0, 0, 384, 385, 5, 97, 0, 0, 385, 386, 5, 108, 0, 0, 386, 387, 5, 115, 0, 0, 387, 389, 5, 101, 0, 0, 388, 379, 1, 0, 0, 0, 388, 383, 1, 0, 0, 0, 389, 100, 1, 0, 0, 0, 390, 391, 5, 110, 0, 0, 391, 392, 5, 117, 0, 0, 392, 393, 5, 108, 0, 0, 393, 394, 5, 108, 0, 0, 394, 102, 1, 0, 0, 0, 395, 396, 7, 1, 0, 0, 396, 104, 1, 0, 0, 0, 397, 398, 7, 2, 0, 0, 398, 106, 1, 0, 0, 0, 399, 403, 3, 103, 51, 0, 400, 403, 3, 105, 52, 0, 401, 403, 7, 3, 0, 0, 402, 399, 1, 0, 0, 0, 402, 400, 1, 0, 0, 0, 402, 401, 1, 0, 0, 0, 403, 108, 1, 0, 0, 0, 404, 408, 3, 103, 51, 0, 405, 407, 3, 107, 53, 0, 406, 405, 1, 0, 0, 0, 407, 410, 1, 0, 0, 0, 408, 406, 1, 0, 0, 0, 408, 409, 1, 0, 0, 0, 409, 110, 1, 0, 0, 0, 410, 408, 1, 0, 0, 0, 411, 413, 7, 4, 0, 0, 412, 411, 1, 0, 0, 0, 413, 414, 1, 0, 0, 0, 414, 412, 1, 0, 0, 0, 414, 415, 1, 0, 0, 0, 415, 416, 1, 0, 0, 0, 416, 417, 6, 55, 0, 0, 417, 112, 1, 0, 0, 0, 418, 419, 5, 47, 0, 0, 419, 420, 5, 47, 0, 0, 420, 424, 1, 0, 0, 0, 421, 423, 8, 0, 0, 0, 422, 421, 1, 0, 0, 0, 423, 426, 1, 0, 0, 0, 424, 422, 1, 0, 0, 0, 424, 425, 1, 0, 0, 0, 425, 427, 1, 0, 0, 0, 426, 424, 1, 0, 0, 0, 427, 428, 6, 56, 0, 0, 428, 114, 1, 0, 0, 0, 429, 430, 5, 47, 0, 0, 430, 431, 5, 42, 0, 0, 431, 435, 1, 0, 0, 0, 432, 434, 9, 0, 0, 0, 433, 432, 1, 0, 0, 0, 434, 437, 1, 0, 0, 0, 435, 436, 1, 0, 0, 0, 435, 433, 1, 0, 0, 0, 436, 438, 1, 0, 0, 0, 437, 435, 1, 0, 0, 0, 438, 439, 5, 42, 0, 0, 439, 440, 5, 47, 0, 0, 440, 441, 1, 0, 0, 0, 441, 442, 6, 57, 0, 0, 442, 116, 1, 0, 0, 0, 15, 0, 185, 229, 233, 241, 245, 366, 372, 377, 388, 402, 408, 414, 424, 435, 1, 6, 0, 0] \ No newline at end of file diff --git a/src/main/java/parser/generated/SimpleJavaLexer.java b/src/main/java/parser/generated/SimpleJavaLexer.java index 23296ee..116ed8e 100644 --- a/src/main/java/parser/generated/SimpleJavaLexer.java +++ b/src/main/java/parser/generated/SimpleJavaLexer.java @@ -1,4 +1,4 @@ -// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 +// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 package parser.generated; import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.CharStream; @@ -23,9 +23,9 @@ public class SimpleJavaLexer extends Lexer { Less=20, GreaterEqual=21, LessEqual=22, Equal=23, NotEqual=24, Not=25, And=26, Or=27, Dot=28, OpenRoundBracket=29, ClosedRoundBracket=30, OpenCurlyBracket=31, ClosedCurlyBracket=32, Semicolon=33, Comma=34, Class=35, This=36, While=37, - Do=38, If=39, Else=40, For=41, Return=42, New=43, CharValue=44, IntValue=45, - BooleanValue=46, NullValue=47, Identifier=48, WS=49, InlineComment=50, - MultilineComment=51; + Do=38, If=39, Else=40, For=41, Return=42, New=43, Switch=44, Case=45, + Default=46, Colon=47, CharValue=48, IntValue=49, BooleanValue=50, NullValue=51, + Identifier=52, WS=53, InlineComment=54, MultilineComment=55; public static String[] channelNames = { "DEFAULT_TOKEN_CHANNEL", "HIDDEN" }; @@ -42,9 +42,10 @@ public class SimpleJavaLexer extends Lexer { "GreaterEqual", "LessEqual", "Equal", "NotEqual", "Not", "And", "Or", "Dot", "OpenRoundBracket", "ClosedRoundBracket", "OpenCurlyBracket", "ClosedCurlyBracket", "Semicolon", "Comma", "Class", "This", "While", - "Do", "If", "Else", "For", "Return", "New", "CharValue", "IntValue", - "BooleanValue", "NullValue", "Alphabetic", "Numeric", "ValidIdentSymbols", - "Identifier", "WS", "InlineComment", "MultilineComment" + "Do", "If", "Else", "For", "Return", "New", "Switch", "Case", "Default", + "Colon", "CharValue", "IntValue", "BooleanValue", "NullValue", "Alphabetic", + "Numeric", "ValidIdentSymbols", "Identifier", "WS", "InlineComment", + "MultilineComment" }; } public static final String[] ruleNames = makeRuleNames(); @@ -56,7 +57,8 @@ public class SimpleJavaLexer extends Lexer { "'+'", "'-'", "'*'", "'%'", "'/'", "'>'", "'<'", "'>='", "'<='", "'=='", "'!='", "'!'", "'&&'", "'||'", "'.'", "'('", "')'", "'{'", "'}'", "';'", "','", "'class'", "'this'", "'while'", "'do'", "'if'", "'else'", "'for'", - "'return'", "'new'", null, null, null, "'null'" + "'return'", "'new'", "'switch'", "'case'", "'default'", "':'", null, + null, null, "'null'" }; } private static final String[] _LITERAL_NAMES = makeLiteralNames(); @@ -68,9 +70,9 @@ public class SimpleJavaLexer extends Lexer { "Greater", "Less", "GreaterEqual", "LessEqual", "Equal", "NotEqual", "Not", "And", "Or", "Dot", "OpenRoundBracket", "ClosedRoundBracket", "OpenCurlyBracket", "ClosedCurlyBracket", "Semicolon", "Comma", "Class", - "This", "While", "Do", "If", "Else", "For", "Return", "New", "CharValue", - "IntValue", "BooleanValue", "NullValue", "Identifier", "WS", "InlineComment", - "MultilineComment" + "This", "While", "Do", "If", "Else", "For", "Return", "New", "Switch", + "Case", "Default", "Colon", "CharValue", "IntValue", "BooleanValue", + "NullValue", "Identifier", "WS", "InlineComment", "MultilineComment" }; } private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames(); @@ -132,7 +134,7 @@ public class SimpleJavaLexer extends Lexer { public ATN getATN() { return _ATN; } public static final String _serializedATN = - "\u0004\u00003\u019d\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+ + "\u0004\u00007\u01bb\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+ "\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+ "\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+ "\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b"+ @@ -147,245 +149,263 @@ public class SimpleJavaLexer extends Lexer { "&\u0002\'\u0007\'\u0002(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007"+ "+\u0002,\u0007,\u0002-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u0007"+ "0\u00021\u00071\u00022\u00072\u00023\u00073\u00024\u00074\u00025\u0007"+ - "5\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001"+ - "\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003"+ + "5\u00026\u00076\u00027\u00077\u00028\u00078\u00029\u00079\u0001\u0000"+ + "\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002"+ + "\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003"+ "\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003"+ - "\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004"+ - "\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006"+ + "\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005"+ + "\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006\u0001\u0006"+ "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ "\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+ - "\u0001\u0006\u0001\u0006\u0003\u0006\u00b2\b\u0006\u0001\u0007\u0001\u0007"+ + "\u0001\u0006\u0003\u0006\u00ba\b\u0006\u0001\u0007\u0001\u0007\u0001\u0007"+ "\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ "\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ "\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ "\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ "\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ "\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ - "\u0001\u0007\u0001\b\u0001\b\u0001\b\u0003\b\u00de\b\b\u0001\t\u0001\t"+ - "\u0003\t\u00e2\b\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0003"+ - "\n\u00ea\b\n\u0001\u000b\u0001\u000b\u0003\u000b\u00ee\b\u000b\u0001\f"+ - "\u0001\f\u0001\r\u0001\r\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f"+ - "\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012"+ - "\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015"+ - "\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0017"+ - "\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019"+ - "\u0001\u0019\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b"+ - "\u0001\u001c\u0001\u001c\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e"+ - "\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001!\u0001!\u0001\"\u0001\"\u0001"+ - "\"\u0001\"\u0001\"\u0001\"\u0001#\u0001#\u0001#\u0001#\u0001#\u0001$\u0001"+ - "$\u0001$\u0001$\u0001$\u0001$\u0001%\u0001%\u0001%\u0001&\u0001&\u0001"+ - "&\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001(\u0001(\u0001(\u0001("+ - "\u0001)\u0001)\u0001)\u0001)\u0001)\u0001)\u0001)\u0001*\u0001*\u0001"+ - "*\u0001*\u0001+\u0001+\u0005+\u014f\b+\n+\f+\u0152\t+\u0001+\u0001+\u0001"+ - ",\u0003,\u0157\b,\u0001,\u0004,\u015a\b,\u000b,\f,\u015b\u0001-\u0001"+ - "-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0003-\u0167\b-\u0001"+ - ".\u0001.\u0001.\u0001.\u0001.\u0001/\u0001/\u00010\u00010\u00011\u0001"+ - "1\u00011\u00031\u0175\b1\u00012\u00012\u00052\u0179\b2\n2\f2\u017c\t2"+ - "\u00013\u00043\u017f\b3\u000b3\f3\u0180\u00013\u00013\u00014\u00014\u0001"+ - "4\u00014\u00054\u0189\b4\n4\f4\u018c\t4\u00014\u00014\u00015\u00015\u0001"+ - "5\u00015\u00055\u0194\b5\n5\f5\u0197\t5\u00015\u00015\u00015\u00015\u0001"+ - "5\u0001\u0195\u00006\u0001\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t"+ - "\u0005\u000b\u0006\r\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f"+ - "\u0019\r\u001b\u000e\u001d\u000f\u001f\u0010!\u0011#\u0012%\u0013\'\u0014"+ - ")\u0015+\u0016-\u0017/\u00181\u00193\u001a5\u001b7\u001c9\u001d;\u001e"+ - "=\u001f? A!C\"E#G$I%K&M\'O(Q)S*U+W,Y-[.]/_\u0000a\u0000c\u0000e0g1i2k"+ - "3\u0001\u0000\u0005\u0002\u0000\n\n\r\r\u0002\u0000AZaz\u0001\u000009"+ - "\u0002\u0000$$__\u0003\u0000\t\n\r\r \u01af\u0000\u0001\u0001\u0000\u0000"+ - "\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005\u0001\u0000\u0000"+ - "\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000\u0000\u0000"+ - "\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000\u0000\u0000"+ - "\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000\u0000\u0000\u0000"+ - "\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000\u0000\u0000\u0000"+ - "\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000\u0000\u0000\u0000"+ - "\u001b\u0001\u0000\u0000\u0000\u0000\u001d\u0001\u0000\u0000\u0000\u0000"+ - "\u001f\u0001\u0000\u0000\u0000\u0000!\u0001\u0000\u0000\u0000\u0000#\u0001"+ - "\u0000\u0000\u0000\u0000%\u0001\u0000\u0000\u0000\u0000\'\u0001\u0000"+ - "\u0000\u0000\u0000)\u0001\u0000\u0000\u0000\u0000+\u0001\u0000\u0000\u0000"+ - "\u0000-\u0001\u0000\u0000\u0000\u0000/\u0001\u0000\u0000\u0000\u00001"+ - "\u0001\u0000\u0000\u0000\u00003\u0001\u0000\u0000\u0000\u00005\u0001\u0000"+ - "\u0000\u0000\u00007\u0001\u0000\u0000\u0000\u00009\u0001\u0000\u0000\u0000"+ - "\u0000;\u0001\u0000\u0000\u0000\u0000=\u0001\u0000\u0000\u0000\u0000?"+ - "\u0001\u0000\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000C\u0001\u0000"+ - "\u0000\u0000\u0000E\u0001\u0000\u0000\u0000\u0000G\u0001\u0000\u0000\u0000"+ - "\u0000I\u0001\u0000\u0000\u0000\u0000K\u0001\u0000\u0000\u0000\u0000M"+ - "\u0001\u0000\u0000\u0000\u0000O\u0001\u0000\u0000\u0000\u0000Q\u0001\u0000"+ - "\u0000\u0000\u0000S\u0001\u0000\u0000\u0000\u0000U\u0001\u0000\u0000\u0000"+ - "\u0000W\u0001\u0000\u0000\u0000\u0000Y\u0001\u0000\u0000\u0000\u0000["+ - "\u0001\u0000\u0000\u0000\u0000]\u0001\u0000\u0000\u0000\u0000e\u0001\u0000"+ - "\u0000\u0000\u0000g\u0001\u0000\u0000\u0000\u0000i\u0001\u0000\u0000\u0000"+ - "\u0000k\u0001\u0000\u0000\u0000\u0001m\u0001\u0000\u0000\u0000\u0003p"+ - "\u0001\u0000\u0000\u0000\u0005s\u0001\u0000\u0000\u0000\u0007x\u0001\u0000"+ - "\u0000\u0000\t\u0080\u0001\u0000\u0000\u0000\u000b\u0085\u0001\u0000\u0000"+ - "\u0000\r\u00b1\u0001\u0000\u0000\u0000\u000f\u00b3\u0001\u0000\u0000\u0000"+ - "\u0011\u00dd\u0001\u0000\u0000\u0000\u0013\u00e1\u0001\u0000\u0000\u0000"+ - "\u0015\u00e9\u0001\u0000\u0000\u0000\u0017\u00ed\u0001\u0000\u0000\u0000"+ - "\u0019\u00ef\u0001\u0000\u0000\u0000\u001b\u00f1\u0001\u0000\u0000\u0000"+ - "\u001d\u00f3\u0001\u0000\u0000\u0000\u001f\u00f5\u0001\u0000\u0000\u0000"+ - "!\u00f7\u0001\u0000\u0000\u0000#\u00f9\u0001\u0000\u0000\u0000%\u00fb"+ - "\u0001\u0000\u0000\u0000\'\u00fd\u0001\u0000\u0000\u0000)\u00ff\u0001"+ - "\u0000\u0000\u0000+\u0102\u0001\u0000\u0000\u0000-\u0105\u0001\u0000\u0000"+ - "\u0000/\u0108\u0001\u0000\u0000\u00001\u010b\u0001\u0000\u0000\u00003"+ - "\u010d\u0001\u0000\u0000\u00005\u0110\u0001\u0000\u0000\u00007\u0113\u0001"+ - "\u0000\u0000\u00009\u0115\u0001\u0000\u0000\u0000;\u0117\u0001\u0000\u0000"+ - "\u0000=\u0119\u0001\u0000\u0000\u0000?\u011b\u0001\u0000\u0000\u0000A"+ - "\u011d\u0001\u0000\u0000\u0000C\u011f\u0001\u0000\u0000\u0000E\u0121\u0001"+ - "\u0000\u0000\u0000G\u0127\u0001\u0000\u0000\u0000I\u012c\u0001\u0000\u0000"+ - "\u0000K\u0132\u0001\u0000\u0000\u0000M\u0135\u0001\u0000\u0000\u0000O"+ - "\u0138\u0001\u0000\u0000\u0000Q\u013d\u0001\u0000\u0000\u0000S\u0141\u0001"+ - "\u0000\u0000\u0000U\u0148\u0001\u0000\u0000\u0000W\u014c\u0001\u0000\u0000"+ - "\u0000Y\u0156\u0001\u0000\u0000\u0000[\u0166\u0001\u0000\u0000\u0000]"+ - "\u0168\u0001\u0000\u0000\u0000_\u016d\u0001\u0000\u0000\u0000a\u016f\u0001"+ - "\u0000\u0000\u0000c\u0174\u0001\u0000\u0000\u0000e\u0176\u0001\u0000\u0000"+ - "\u0000g\u017e\u0001\u0000\u0000\u0000i\u0184\u0001\u0000\u0000\u0000k"+ - "\u018f\u0001\u0000\u0000\u0000mn\u0005+\u0000\u0000no\u0005+\u0000\u0000"+ - "o\u0002\u0001\u0000\u0000\u0000pq\u0005-\u0000\u0000qr\u0005-\u0000\u0000"+ - "r\u0004\u0001\u0000\u0000\u0000st\u0005v\u0000\u0000tu\u0005o\u0000\u0000"+ - "uv\u0005i\u0000\u0000vw\u0005d\u0000\u0000w\u0006\u0001\u0000\u0000\u0000"+ - "xy\u0005b\u0000\u0000yz\u0005o\u0000\u0000z{\u0005o\u0000\u0000{|\u0005"+ - "l\u0000\u0000|}\u0005e\u0000\u0000}~\u0005a\u0000\u0000~\u007f\u0005n"+ - "\u0000\u0000\u007f\b\u0001\u0000\u0000\u0000\u0080\u0081\u0005c\u0000"+ - "\u0000\u0081\u0082\u0005h\u0000\u0000\u0082\u0083\u0005a\u0000\u0000\u0083"+ - "\u0084\u0005r\u0000\u0000\u0084\n\u0001\u0000\u0000\u0000\u0085\u0086"+ - "\u0005i\u0000\u0000\u0086\u0087\u0005n\u0000\u0000\u0087\u0088\u0005t"+ - "\u0000\u0000\u0088\f\u0001\u0000\u0000\u0000\u0089\u008a\u0005p\u0000"+ - "\u0000\u008a\u008b\u0005u\u0000\u0000\u008b\u008c\u0005b\u0000\u0000\u008c"+ - "\u008d\u0005l\u0000\u0000\u008d\u008e\u0005i\u0000\u0000\u008e\u00b2\u0005"+ - "c\u0000\u0000\u008f\u0090\u0005p\u0000\u0000\u0090\u0091\u0005r\u0000"+ - "\u0000\u0091\u0092\u0005i\u0000\u0000\u0092\u0093\u0005v\u0000\u0000\u0093"+ - "\u0094\u0005a\u0000\u0000\u0094\u0095\u0005t\u0000\u0000\u0095\u00b2\u0005"+ - "e\u0000\u0000\u0096\u0097\u0005p\u0000\u0000\u0097\u0098\u0005u\u0000"+ - "\u0000\u0098\u0099\u0005b\u0000\u0000\u0099\u009a\u0005l\u0000\u0000\u009a"+ - "\u009b\u0005i\u0000\u0000\u009b\u009c\u0005c\u0000\u0000\u009c\u009d\u0005"+ - " \u0000\u0000\u009d\u009e\u0005s\u0000\u0000\u009e\u009f\u0005t\u0000"+ - "\u0000\u009f\u00a0\u0005a\u0000\u0000\u00a0\u00a1\u0005t\u0000\u0000\u00a1"+ - "\u00a2\u0005i\u0000\u0000\u00a2\u00b2\u0005c\u0000\u0000\u00a3\u00a4\u0005"+ - "p\u0000\u0000\u00a4\u00a5\u0005r\u0000\u0000\u00a5\u00a6\u0005i\u0000"+ - "\u0000\u00a6\u00a7\u0005v\u0000\u0000\u00a7\u00a8\u0005a\u0000\u0000\u00a8"+ - "\u00a9\u0005t\u0000\u0000\u00a9\u00aa\u0005e\u0000\u0000\u00aa\u00ab\u0005"+ - " \u0000\u0000\u00ab\u00ac\u0005s\u0000\u0000\u00ac\u00ad\u0005t\u0000"+ - "\u0000\u00ad\u00ae\u0005a\u0000\u0000\u00ae\u00af\u0005t\u0000\u0000\u00af"+ - "\u00b0\u0005i\u0000\u0000\u00b0\u00b2\u0005c\u0000\u0000\u00b1\u0089\u0001"+ - "\u0000\u0000\u0000\u00b1\u008f\u0001\u0000\u0000\u0000\u00b1\u0096\u0001"+ - "\u0000\u0000\u0000\u00b1\u00a3\u0001\u0000\u0000\u0000\u00b2\u000e\u0001"+ - "\u0000\u0000\u0000\u00b3\u00b4\u0005p\u0000\u0000\u00b4\u00b5\u0005u\u0000"+ - "\u0000\u00b5\u00b6\u0005b\u0000\u0000\u00b6\u00b7\u0005l\u0000\u0000\u00b7"+ - "\u00b8\u0005i\u0000\u0000\u00b8\u00b9\u0005c\u0000\u0000\u00b9\u00ba\u0005"+ - " \u0000\u0000\u00ba\u00bb\u0005s\u0000\u0000\u00bb\u00bc\u0005t\u0000"+ - "\u0000\u00bc\u00bd\u0005a\u0000\u0000\u00bd\u00be\u0005t\u0000\u0000\u00be"+ - "\u00bf\u0005i\u0000\u0000\u00bf\u00c0\u0005c\u0000\u0000\u00c0\u00c1\u0005"+ - " \u0000\u0000\u00c1\u00c2\u0005v\u0000\u0000\u00c2\u00c3\u0005o\u0000"+ - "\u0000\u00c3\u00c4\u0005i\u0000\u0000\u00c4\u00c5\u0005d\u0000\u0000\u00c5"+ - "\u00c6\u0005 \u0000\u0000\u00c6\u00c7\u0005m\u0000\u0000\u00c7\u00c8\u0005"+ - "a\u0000\u0000\u00c8\u00c9\u0005i\u0000\u0000\u00c9\u00ca\u0005n\u0000"+ - "\u0000\u00ca\u00cb\u0005(\u0000\u0000\u00cb\u00cc\u0005S\u0000\u0000\u00cc"+ - "\u00cd\u0005t\u0000\u0000\u00cd\u00ce\u0005r\u0000\u0000\u00ce\u00cf\u0005"+ - "i\u0000\u0000\u00cf\u00d0\u0005n\u0000\u0000\u00d0\u00d1\u0005g\u0000"+ - "\u0000\u00d1\u00d2\u0005[\u0000\u0000\u00d2\u00d3\u0005]\u0000\u0000\u00d3"+ - "\u00d4\u0005 \u0000\u0000\u00d4\u00d5\u0005a\u0000\u0000\u00d5\u00d6\u0005"+ - "r\u0000\u0000\u00d6\u00d7\u0005g\u0000\u0000\u00d7\u00d8\u0005s\u0000"+ - "\u0000\u00d8\u00d9\u0005)\u0000\u0000\u00d9\u0010\u0001\u0000\u0000\u0000"+ - "\u00da\u00de\u0003\u001f\u000f\u0000\u00db\u00de\u0003#\u0011\u0000\u00dc"+ - "\u00de\u0003!\u0010\u0000\u00dd\u00da\u0001\u0000\u0000\u0000\u00dd\u00db"+ - "\u0001\u0000\u0000\u0000\u00dd\u00dc\u0001\u0000\u0000\u0000\u00de\u0012"+ - "\u0001\u0000\u0000\u0000\u00df\u00e2\u0003\u001b\r\u0000\u00e0\u00e2\u0003"+ - "\u001d\u000e\u0000\u00e1\u00df\u0001\u0000\u0000\u0000\u00e1\u00e0\u0001"+ - "\u0000\u0000\u0000\u00e2\u0014\u0001\u0000\u0000\u0000\u00e3\u00ea\u0003"+ - "%\u0012\u0000\u00e4\u00ea\u0003\'\u0013\u0000\u00e5\u00ea\u0003)\u0014"+ - "\u0000\u00e6\u00ea\u0003+\u0015\u0000\u00e7\u00ea\u0003-\u0016\u0000\u00e8"+ - "\u00ea\u0003/\u0017\u0000\u00e9\u00e3\u0001\u0000\u0000\u0000\u00e9\u00e4"+ - "\u0001\u0000\u0000\u0000\u00e9\u00e5\u0001\u0000\u0000\u0000\u00e9\u00e6"+ - "\u0001\u0000\u0000\u0000\u00e9\u00e7\u0001\u0000\u0000\u0000\u00e9\u00e8"+ - "\u0001\u0000\u0000\u0000\u00ea\u0016\u0001\u0000\u0000\u0000\u00eb\u00ee"+ - "\u00033\u0019\u0000\u00ec\u00ee\u00035\u001a\u0000\u00ed\u00eb\u0001\u0000"+ - "\u0000\u0000\u00ed\u00ec\u0001\u0000\u0000\u0000\u00ee\u0018\u0001\u0000"+ - "\u0000\u0000\u00ef\u00f0\u0005=\u0000\u0000\u00f0\u001a\u0001\u0000\u0000"+ - "\u0000\u00f1\u00f2\u0005+\u0000\u0000\u00f2\u001c\u0001\u0000\u0000\u0000"+ - "\u00f3\u00f4\u0005-\u0000\u0000\u00f4\u001e\u0001\u0000\u0000\u0000\u00f5"+ - "\u00f6\u0005*\u0000\u0000\u00f6 \u0001\u0000\u0000\u0000\u00f7\u00f8\u0005"+ - "%\u0000\u0000\u00f8\"\u0001\u0000\u0000\u0000\u00f9\u00fa\u0005/\u0000"+ - "\u0000\u00fa$\u0001\u0000\u0000\u0000\u00fb\u00fc\u0005>\u0000\u0000\u00fc"+ - "&\u0001\u0000\u0000\u0000\u00fd\u00fe\u0005<\u0000\u0000\u00fe(\u0001"+ - "\u0000\u0000\u0000\u00ff\u0100\u0005>\u0000\u0000\u0100\u0101\u0005=\u0000"+ - "\u0000\u0101*\u0001\u0000\u0000\u0000\u0102\u0103\u0005<\u0000\u0000\u0103"+ - "\u0104\u0005=\u0000\u0000\u0104,\u0001\u0000\u0000\u0000\u0105\u0106\u0005"+ - "=\u0000\u0000\u0106\u0107\u0005=\u0000\u0000\u0107.\u0001\u0000\u0000"+ - "\u0000\u0108\u0109\u0005!\u0000\u0000\u0109\u010a\u0005=\u0000\u0000\u010a"+ - "0\u0001\u0000\u0000\u0000\u010b\u010c\u0005!\u0000\u0000\u010c2\u0001"+ - "\u0000\u0000\u0000\u010d\u010e\u0005&\u0000\u0000\u010e\u010f\u0005&\u0000"+ - "\u0000\u010f4\u0001\u0000\u0000\u0000\u0110\u0111\u0005|\u0000\u0000\u0111"+ - "\u0112\u0005|\u0000\u0000\u01126\u0001\u0000\u0000\u0000\u0113\u0114\u0005"+ - ".\u0000\u0000\u01148\u0001\u0000\u0000\u0000\u0115\u0116\u0005(\u0000"+ - "\u0000\u0116:\u0001\u0000\u0000\u0000\u0117\u0118\u0005)\u0000\u0000\u0118"+ - "<\u0001\u0000\u0000\u0000\u0119\u011a\u0005{\u0000\u0000\u011a>\u0001"+ - "\u0000\u0000\u0000\u011b\u011c\u0005}\u0000\u0000\u011c@\u0001\u0000\u0000"+ - "\u0000\u011d\u011e\u0005;\u0000\u0000\u011eB\u0001\u0000\u0000\u0000\u011f"+ - "\u0120\u0005,\u0000\u0000\u0120D\u0001\u0000\u0000\u0000\u0121\u0122\u0005"+ - "c\u0000\u0000\u0122\u0123\u0005l\u0000\u0000\u0123\u0124\u0005a\u0000"+ - "\u0000\u0124\u0125\u0005s\u0000\u0000\u0125\u0126\u0005s\u0000\u0000\u0126"+ - "F\u0001\u0000\u0000\u0000\u0127\u0128\u0005t\u0000\u0000\u0128\u0129\u0005"+ - "h\u0000\u0000\u0129\u012a\u0005i\u0000\u0000\u012a\u012b\u0005s\u0000"+ - "\u0000\u012bH\u0001\u0000\u0000\u0000\u012c\u012d\u0005w\u0000\u0000\u012d"+ - "\u012e\u0005h\u0000\u0000\u012e\u012f\u0005i\u0000\u0000\u012f\u0130\u0005"+ - "l\u0000\u0000\u0130\u0131\u0005e\u0000\u0000\u0131J\u0001\u0000\u0000"+ - "\u0000\u0132\u0133\u0005d\u0000\u0000\u0133\u0134\u0005o\u0000\u0000\u0134"+ - "L\u0001\u0000\u0000\u0000\u0135\u0136\u0005i\u0000\u0000\u0136\u0137\u0005"+ - "f\u0000\u0000\u0137N\u0001\u0000\u0000\u0000\u0138\u0139\u0005e\u0000"+ - "\u0000\u0139\u013a\u0005l\u0000\u0000\u013a\u013b\u0005s\u0000\u0000\u013b"+ - "\u013c\u0005e\u0000\u0000\u013cP\u0001\u0000\u0000\u0000\u013d\u013e\u0005"+ - "f\u0000\u0000\u013e\u013f\u0005o\u0000\u0000\u013f\u0140\u0005r\u0000"+ - "\u0000\u0140R\u0001\u0000\u0000\u0000\u0141\u0142\u0005r\u0000\u0000\u0142"+ - "\u0143\u0005e\u0000\u0000\u0143\u0144\u0005t\u0000\u0000\u0144\u0145\u0005"+ - "u\u0000\u0000\u0145\u0146\u0005r\u0000\u0000\u0146\u0147\u0005n\u0000"+ - "\u0000\u0147T\u0001\u0000\u0000\u0000\u0148\u0149\u0005n\u0000\u0000\u0149"+ - "\u014a\u0005e\u0000\u0000\u014a\u014b\u0005w\u0000\u0000\u014bV\u0001"+ - "\u0000\u0000\u0000\u014c\u0150\u0005\'\u0000\u0000\u014d\u014f\b\u0000"+ - "\u0000\u0000\u014e\u014d\u0001\u0000\u0000\u0000\u014f\u0152\u0001\u0000"+ - "\u0000\u0000\u0150\u014e\u0001\u0000\u0000\u0000\u0150\u0151\u0001\u0000"+ - "\u0000\u0000\u0151\u0153\u0001\u0000\u0000\u0000\u0152\u0150\u0001\u0000"+ - "\u0000\u0000\u0153\u0154\u0005\'\u0000\u0000\u0154X\u0001\u0000\u0000"+ - "\u0000\u0155\u0157\u0003\u001d\u000e\u0000\u0156\u0155\u0001\u0000\u0000"+ - "\u0000\u0156\u0157\u0001\u0000\u0000\u0000\u0157\u0159\u0001\u0000\u0000"+ - "\u0000\u0158\u015a\u0003a0\u0000\u0159\u0158\u0001\u0000\u0000\u0000\u015a"+ - "\u015b\u0001\u0000\u0000\u0000\u015b\u0159\u0001\u0000\u0000\u0000\u015b"+ - "\u015c\u0001\u0000\u0000\u0000\u015cZ\u0001\u0000\u0000\u0000\u015d\u015e"+ - "\u0005t\u0000\u0000\u015e\u015f\u0005r\u0000\u0000\u015f\u0160\u0005u"+ - "\u0000\u0000\u0160\u0167\u0005e\u0000\u0000\u0161\u0162\u0005f\u0000\u0000"+ - "\u0162\u0163\u0005a\u0000\u0000\u0163\u0164\u0005l\u0000\u0000\u0164\u0165"+ - "\u0005s\u0000\u0000\u0165\u0167\u0005e\u0000\u0000\u0166\u015d\u0001\u0000"+ - "\u0000\u0000\u0166\u0161\u0001\u0000\u0000\u0000\u0167\\\u0001\u0000\u0000"+ - "\u0000\u0168\u0169\u0005n\u0000\u0000\u0169\u016a\u0005u\u0000\u0000\u016a"+ - "\u016b\u0005l\u0000\u0000\u016b\u016c\u0005l\u0000\u0000\u016c^\u0001"+ - "\u0000\u0000\u0000\u016d\u016e\u0007\u0001\u0000\u0000\u016e`\u0001\u0000"+ - "\u0000\u0000\u016f\u0170\u0007\u0002\u0000\u0000\u0170b\u0001\u0000\u0000"+ - "\u0000\u0171\u0175\u0003_/\u0000\u0172\u0175\u0003a0\u0000\u0173\u0175"+ - "\u0007\u0003\u0000\u0000\u0174\u0171\u0001\u0000\u0000\u0000\u0174\u0172"+ - "\u0001\u0000\u0000\u0000\u0174\u0173\u0001\u0000\u0000\u0000\u0175d\u0001"+ - "\u0000\u0000\u0000\u0176\u017a\u0003_/\u0000\u0177\u0179\u0003c1\u0000"+ - "\u0178\u0177\u0001\u0000\u0000\u0000\u0179\u017c\u0001\u0000\u0000\u0000"+ - "\u017a\u0178\u0001\u0000\u0000\u0000\u017a\u017b\u0001\u0000\u0000\u0000"+ - "\u017bf\u0001\u0000\u0000\u0000\u017c\u017a\u0001\u0000\u0000\u0000\u017d"+ - "\u017f\u0007\u0004\u0000\u0000\u017e\u017d\u0001\u0000\u0000\u0000\u017f"+ - "\u0180\u0001\u0000\u0000\u0000\u0180\u017e\u0001\u0000\u0000\u0000\u0180"+ - "\u0181\u0001\u0000\u0000\u0000\u0181\u0182\u0001\u0000\u0000\u0000\u0182"+ - "\u0183\u00063\u0000\u0000\u0183h\u0001\u0000\u0000\u0000\u0184\u0185\u0005"+ - "/\u0000\u0000\u0185\u0186\u0005/\u0000\u0000\u0186\u018a\u0001\u0000\u0000"+ - "\u0000\u0187\u0189\b\u0000\u0000\u0000\u0188\u0187\u0001\u0000\u0000\u0000"+ - "\u0189\u018c\u0001\u0000\u0000\u0000\u018a\u0188\u0001\u0000\u0000\u0000"+ - "\u018a\u018b\u0001\u0000\u0000\u0000\u018b\u018d\u0001\u0000\u0000\u0000"+ - "\u018c\u018a\u0001\u0000\u0000\u0000\u018d\u018e\u00064\u0000\u0000\u018e"+ - "j\u0001\u0000\u0000\u0000\u018f\u0190\u0005/\u0000\u0000\u0190\u0191\u0005"+ - "*\u0000\u0000\u0191\u0195\u0001\u0000\u0000\u0000\u0192\u0194\t\u0000"+ - "\u0000\u0000\u0193\u0192\u0001\u0000\u0000\u0000\u0194\u0197\u0001\u0000"+ - "\u0000\u0000\u0195\u0196\u0001\u0000\u0000\u0000\u0195\u0193\u0001\u0000"+ - "\u0000\u0000\u0196\u0198\u0001\u0000\u0000\u0000\u0197\u0195\u0001\u0000"+ - "\u0000\u0000\u0198\u0199\u0005*\u0000\u0000\u0199\u019a\u0005/\u0000\u0000"+ - "\u019a\u019b\u0001\u0000\u0000\u0000\u019b\u019c\u00065\u0000\u0000\u019c"+ - "l\u0001\u0000\u0000\u0000\u000f\u0000\u00b1\u00dd\u00e1\u00e9\u00ed\u0150"+ - "\u0156\u015b\u0166\u0174\u017a\u0180\u018a\u0195\u0001\u0006\u0000\u0000"; + "\u0001\b\u0001\b\u0001\b\u0003\b\u00e6\b\b\u0001\t\u0001\t\u0003\t\u00ea"+ + "\b\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0003\n\u00f2\b\n"+ + "\u0001\u000b\u0001\u000b\u0003\u000b\u00f6\b\u000b\u0001\f\u0001\f\u0001"+ + "\r\u0001\r\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0001\u0010"+ + "\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0013"+ + "\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015"+ + "\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017"+ + "\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u0019"+ + "\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001c"+ + "\u0001\u001c\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001f"+ + "\u0001\u001f\u0001 \u0001 \u0001!\u0001!\u0001\"\u0001\"\u0001\"\u0001"+ + "\"\u0001\"\u0001\"\u0001#\u0001#\u0001#\u0001#\u0001#\u0001$\u0001$\u0001"+ + "$\u0001$\u0001$\u0001$\u0001%\u0001%\u0001%\u0001&\u0001&\u0001&\u0001"+ + "\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001(\u0001(\u0001(\u0001(\u0001)"+ + "\u0001)\u0001)\u0001)\u0001)\u0001)\u0001)\u0001*\u0001*\u0001*\u0001"+ + "*\u0001+\u0001+\u0001+\u0001+\u0001+\u0001+\u0001+\u0001,\u0001,\u0001"+ + ",\u0001,\u0001,\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001"+ + "-\u0001.\u0001.\u0001/\u0001/\u0005/\u016d\b/\n/\f/\u0170\t/\u0001/\u0001"+ + "/\u00010\u00030\u0175\b0\u00010\u00040\u0178\b0\u000b0\f0\u0179\u0001"+ + "1\u00011\u00011\u00011\u00011\u00011\u00011\u00011\u00011\u00031\u0185"+ + "\b1\u00012\u00012\u00012\u00012\u00012\u00013\u00013\u00014\u00014\u0001"+ + "5\u00015\u00015\u00035\u0193\b5\u00016\u00016\u00056\u0197\b6\n6\f6\u019a"+ + "\t6\u00017\u00047\u019d\b7\u000b7\f7\u019e\u00017\u00017\u00018\u0001"+ + "8\u00018\u00018\u00058\u01a7\b8\n8\f8\u01aa\t8\u00018\u00018\u00019\u0001"+ + "9\u00019\u00019\u00059\u01b2\b9\n9\f9\u01b5\t9\u00019\u00019\u00019\u0001"+ + "9\u00019\u0001\u01b3\u0000:\u0001\u0001\u0003\u0002\u0005\u0003\u0007"+ + "\u0004\t\u0005\u000b\u0006\r\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b"+ + "\u0017\f\u0019\r\u001b\u000e\u001d\u000f\u001f\u0010!\u0011#\u0012%\u0013"+ + "\'\u0014)\u0015+\u0016-\u0017/\u00181\u00193\u001a5\u001b7\u001c9\u001d"+ + ";\u001e=\u001f? A!C\"E#G$I%K&M\'O(Q)S*U+W,Y-[.]/_0a1c2e3g\u0000i\u0000"+ + "k\u0000m4o5q6s7\u0001\u0000\u0005\u0002\u0000\n\n\r\r\u0002\u0000AZaz"+ + "\u0001\u000009\u0002\u0000$$__\u0003\u0000\t\n\r\r \u01cd\u0000\u0001"+ + "\u0001\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005"+ + "\u0001\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001"+ + "\u0000\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000"+ + "\u0000\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000"+ + "\u0000\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000"+ + "\u0000\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000"+ + "\u0000\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0000\u001d\u0001\u0000"+ + "\u0000\u0000\u0000\u001f\u0001\u0000\u0000\u0000\u0000!\u0001\u0000\u0000"+ + "\u0000\u0000#\u0001\u0000\u0000\u0000\u0000%\u0001\u0000\u0000\u0000\u0000"+ + "\'\u0001\u0000\u0000\u0000\u0000)\u0001\u0000\u0000\u0000\u0000+\u0001"+ + "\u0000\u0000\u0000\u0000-\u0001\u0000\u0000\u0000\u0000/\u0001\u0000\u0000"+ + "\u0000\u00001\u0001\u0000\u0000\u0000\u00003\u0001\u0000\u0000\u0000\u0000"+ + "5\u0001\u0000\u0000\u0000\u00007\u0001\u0000\u0000\u0000\u00009\u0001"+ + "\u0000\u0000\u0000\u0000;\u0001\u0000\u0000\u0000\u0000=\u0001\u0000\u0000"+ + "\u0000\u0000?\u0001\u0000\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000"+ + "C\u0001\u0000\u0000\u0000\u0000E\u0001\u0000\u0000\u0000\u0000G\u0001"+ + "\u0000\u0000\u0000\u0000I\u0001\u0000\u0000\u0000\u0000K\u0001\u0000\u0000"+ + "\u0000\u0000M\u0001\u0000\u0000\u0000\u0000O\u0001\u0000\u0000\u0000\u0000"+ + "Q\u0001\u0000\u0000\u0000\u0000S\u0001\u0000\u0000\u0000\u0000U\u0001"+ + "\u0000\u0000\u0000\u0000W\u0001\u0000\u0000\u0000\u0000Y\u0001\u0000\u0000"+ + "\u0000\u0000[\u0001\u0000\u0000\u0000\u0000]\u0001\u0000\u0000\u0000\u0000"+ + "_\u0001\u0000\u0000\u0000\u0000a\u0001\u0000\u0000\u0000\u0000c\u0001"+ + "\u0000\u0000\u0000\u0000e\u0001\u0000\u0000\u0000\u0000m\u0001\u0000\u0000"+ + "\u0000\u0000o\u0001\u0000\u0000\u0000\u0000q\u0001\u0000\u0000\u0000\u0000"+ + "s\u0001\u0000\u0000\u0000\u0001u\u0001\u0000\u0000\u0000\u0003x\u0001"+ + "\u0000\u0000\u0000\u0005{\u0001\u0000\u0000\u0000\u0007\u0080\u0001\u0000"+ + "\u0000\u0000\t\u0088\u0001\u0000\u0000\u0000\u000b\u008d\u0001\u0000\u0000"+ + "\u0000\r\u00b9\u0001\u0000\u0000\u0000\u000f\u00bb\u0001\u0000\u0000\u0000"+ + "\u0011\u00e5\u0001\u0000\u0000\u0000\u0013\u00e9\u0001\u0000\u0000\u0000"+ + "\u0015\u00f1\u0001\u0000\u0000\u0000\u0017\u00f5\u0001\u0000\u0000\u0000"+ + "\u0019\u00f7\u0001\u0000\u0000\u0000\u001b\u00f9\u0001\u0000\u0000\u0000"+ + "\u001d\u00fb\u0001\u0000\u0000\u0000\u001f\u00fd\u0001\u0000\u0000\u0000"+ + "!\u00ff\u0001\u0000\u0000\u0000#\u0101\u0001\u0000\u0000\u0000%\u0103"+ + "\u0001\u0000\u0000\u0000\'\u0105\u0001\u0000\u0000\u0000)\u0107\u0001"+ + "\u0000\u0000\u0000+\u010a\u0001\u0000\u0000\u0000-\u010d\u0001\u0000\u0000"+ + "\u0000/\u0110\u0001\u0000\u0000\u00001\u0113\u0001\u0000\u0000\u00003"+ + "\u0115\u0001\u0000\u0000\u00005\u0118\u0001\u0000\u0000\u00007\u011b\u0001"+ + "\u0000\u0000\u00009\u011d\u0001\u0000\u0000\u0000;\u011f\u0001\u0000\u0000"+ + "\u0000=\u0121\u0001\u0000\u0000\u0000?\u0123\u0001\u0000\u0000\u0000A"+ + "\u0125\u0001\u0000\u0000\u0000C\u0127\u0001\u0000\u0000\u0000E\u0129\u0001"+ + "\u0000\u0000\u0000G\u012f\u0001\u0000\u0000\u0000I\u0134\u0001\u0000\u0000"+ + "\u0000K\u013a\u0001\u0000\u0000\u0000M\u013d\u0001\u0000\u0000\u0000O"+ + "\u0140\u0001\u0000\u0000\u0000Q\u0145\u0001\u0000\u0000\u0000S\u0149\u0001"+ + "\u0000\u0000\u0000U\u0150\u0001\u0000\u0000\u0000W\u0154\u0001\u0000\u0000"+ + "\u0000Y\u015b\u0001\u0000\u0000\u0000[\u0160\u0001\u0000\u0000\u0000]"+ + "\u0168\u0001\u0000\u0000\u0000_\u016a\u0001\u0000\u0000\u0000a\u0174\u0001"+ + "\u0000\u0000\u0000c\u0184\u0001\u0000\u0000\u0000e\u0186\u0001\u0000\u0000"+ + "\u0000g\u018b\u0001\u0000\u0000\u0000i\u018d\u0001\u0000\u0000\u0000k"+ + "\u0192\u0001\u0000\u0000\u0000m\u0194\u0001\u0000\u0000\u0000o\u019c\u0001"+ + "\u0000\u0000\u0000q\u01a2\u0001\u0000\u0000\u0000s\u01ad\u0001\u0000\u0000"+ + "\u0000uv\u0005+\u0000\u0000vw\u0005+\u0000\u0000w\u0002\u0001\u0000\u0000"+ + "\u0000xy\u0005-\u0000\u0000yz\u0005-\u0000\u0000z\u0004\u0001\u0000\u0000"+ + "\u0000{|\u0005v\u0000\u0000|}\u0005o\u0000\u0000}~\u0005i\u0000\u0000"+ + "~\u007f\u0005d\u0000\u0000\u007f\u0006\u0001\u0000\u0000\u0000\u0080\u0081"+ + "\u0005b\u0000\u0000\u0081\u0082\u0005o\u0000\u0000\u0082\u0083\u0005o"+ + "\u0000\u0000\u0083\u0084\u0005l\u0000\u0000\u0084\u0085\u0005e\u0000\u0000"+ + "\u0085\u0086\u0005a\u0000\u0000\u0086\u0087\u0005n\u0000\u0000\u0087\b"+ + "\u0001\u0000\u0000\u0000\u0088\u0089\u0005c\u0000\u0000\u0089\u008a\u0005"+ + "h\u0000\u0000\u008a\u008b\u0005a\u0000\u0000\u008b\u008c\u0005r\u0000"+ + "\u0000\u008c\n\u0001\u0000\u0000\u0000\u008d\u008e\u0005i\u0000\u0000"+ + "\u008e\u008f\u0005n\u0000\u0000\u008f\u0090\u0005t\u0000\u0000\u0090\f"+ + "\u0001\u0000\u0000\u0000\u0091\u0092\u0005p\u0000\u0000\u0092\u0093\u0005"+ + "u\u0000\u0000\u0093\u0094\u0005b\u0000\u0000\u0094\u0095\u0005l\u0000"+ + "\u0000\u0095\u0096\u0005i\u0000\u0000\u0096\u00ba\u0005c\u0000\u0000\u0097"+ + "\u0098\u0005p\u0000\u0000\u0098\u0099\u0005r\u0000\u0000\u0099\u009a\u0005"+ + "i\u0000\u0000\u009a\u009b\u0005v\u0000\u0000\u009b\u009c\u0005a\u0000"+ + "\u0000\u009c\u009d\u0005t\u0000\u0000\u009d\u00ba\u0005e\u0000\u0000\u009e"+ + "\u009f\u0005p\u0000\u0000\u009f\u00a0\u0005u\u0000\u0000\u00a0\u00a1\u0005"+ + "b\u0000\u0000\u00a1\u00a2\u0005l\u0000\u0000\u00a2\u00a3\u0005i\u0000"+ + "\u0000\u00a3\u00a4\u0005c\u0000\u0000\u00a4\u00a5\u0005 \u0000\u0000\u00a5"+ + "\u00a6\u0005s\u0000\u0000\u00a6\u00a7\u0005t\u0000\u0000\u00a7\u00a8\u0005"+ + "a\u0000\u0000\u00a8\u00a9\u0005t\u0000\u0000\u00a9\u00aa\u0005i\u0000"+ + "\u0000\u00aa\u00ba\u0005c\u0000\u0000\u00ab\u00ac\u0005p\u0000\u0000\u00ac"+ + "\u00ad\u0005r\u0000\u0000\u00ad\u00ae\u0005i\u0000\u0000\u00ae\u00af\u0005"+ + "v\u0000\u0000\u00af\u00b0\u0005a\u0000\u0000\u00b0\u00b1\u0005t\u0000"+ + "\u0000\u00b1\u00b2\u0005e\u0000\u0000\u00b2\u00b3\u0005 \u0000\u0000\u00b3"+ + "\u00b4\u0005s\u0000\u0000\u00b4\u00b5\u0005t\u0000\u0000\u00b5\u00b6\u0005"+ + "a\u0000\u0000\u00b6\u00b7\u0005t\u0000\u0000\u00b7\u00b8\u0005i\u0000"+ + "\u0000\u00b8\u00ba\u0005c\u0000\u0000\u00b9\u0091\u0001\u0000\u0000\u0000"+ + "\u00b9\u0097\u0001\u0000\u0000\u0000\u00b9\u009e\u0001\u0000\u0000\u0000"+ + "\u00b9\u00ab\u0001\u0000\u0000\u0000\u00ba\u000e\u0001\u0000\u0000\u0000"+ + "\u00bb\u00bc\u0005p\u0000\u0000\u00bc\u00bd\u0005u\u0000\u0000\u00bd\u00be"+ + "\u0005b\u0000\u0000\u00be\u00bf\u0005l\u0000\u0000\u00bf\u00c0\u0005i"+ + "\u0000\u0000\u00c0\u00c1\u0005c\u0000\u0000\u00c1\u00c2\u0005 \u0000\u0000"+ + "\u00c2\u00c3\u0005s\u0000\u0000\u00c3\u00c4\u0005t\u0000\u0000\u00c4\u00c5"+ + "\u0005a\u0000\u0000\u00c5\u00c6\u0005t\u0000\u0000\u00c6\u00c7\u0005i"+ + "\u0000\u0000\u00c7\u00c8\u0005c\u0000\u0000\u00c8\u00c9\u0005 \u0000\u0000"+ + "\u00c9\u00ca\u0005v\u0000\u0000\u00ca\u00cb\u0005o\u0000\u0000\u00cb\u00cc"+ + "\u0005i\u0000\u0000\u00cc\u00cd\u0005d\u0000\u0000\u00cd\u00ce\u0005 "+ + "\u0000\u0000\u00ce\u00cf\u0005m\u0000\u0000\u00cf\u00d0\u0005a\u0000\u0000"+ + "\u00d0\u00d1\u0005i\u0000\u0000\u00d1\u00d2\u0005n\u0000\u0000\u00d2\u00d3"+ + "\u0005(\u0000\u0000\u00d3\u00d4\u0005S\u0000\u0000\u00d4\u00d5\u0005t"+ + "\u0000\u0000\u00d5\u00d6\u0005r\u0000\u0000\u00d6\u00d7\u0005i\u0000\u0000"+ + "\u00d7\u00d8\u0005n\u0000\u0000\u00d8\u00d9\u0005g\u0000\u0000\u00d9\u00da"+ + "\u0005[\u0000\u0000\u00da\u00db\u0005]\u0000\u0000\u00db\u00dc\u0005 "+ + "\u0000\u0000\u00dc\u00dd\u0005a\u0000\u0000\u00dd\u00de\u0005r\u0000\u0000"+ + "\u00de\u00df\u0005g\u0000\u0000\u00df\u00e0\u0005s\u0000\u0000\u00e0\u00e1"+ + "\u0005)\u0000\u0000\u00e1\u0010\u0001\u0000\u0000\u0000\u00e2\u00e6\u0003"+ + "\u001f\u000f\u0000\u00e3\u00e6\u0003#\u0011\u0000\u00e4\u00e6\u0003!\u0010"+ + "\u0000\u00e5\u00e2\u0001\u0000\u0000\u0000\u00e5\u00e3\u0001\u0000\u0000"+ + "\u0000\u00e5\u00e4\u0001\u0000\u0000\u0000\u00e6\u0012\u0001\u0000\u0000"+ + "\u0000\u00e7\u00ea\u0003\u001b\r\u0000\u00e8\u00ea\u0003\u001d\u000e\u0000"+ + "\u00e9\u00e7\u0001\u0000\u0000\u0000\u00e9\u00e8\u0001\u0000\u0000\u0000"+ + "\u00ea\u0014\u0001\u0000\u0000\u0000\u00eb\u00f2\u0003%\u0012\u0000\u00ec"+ + "\u00f2\u0003\'\u0013\u0000\u00ed\u00f2\u0003)\u0014\u0000\u00ee\u00f2"+ + "\u0003+\u0015\u0000\u00ef\u00f2\u0003-\u0016\u0000\u00f0\u00f2\u0003/"+ + "\u0017\u0000\u00f1\u00eb\u0001\u0000\u0000\u0000\u00f1\u00ec\u0001\u0000"+ + "\u0000\u0000\u00f1\u00ed\u0001\u0000\u0000\u0000\u00f1\u00ee\u0001\u0000"+ + "\u0000\u0000\u00f1\u00ef\u0001\u0000\u0000\u0000\u00f1\u00f0\u0001\u0000"+ + "\u0000\u0000\u00f2\u0016\u0001\u0000\u0000\u0000\u00f3\u00f6\u00033\u0019"+ + "\u0000\u00f4\u00f6\u00035\u001a\u0000\u00f5\u00f3\u0001\u0000\u0000\u0000"+ + "\u00f5\u00f4\u0001\u0000\u0000\u0000\u00f6\u0018\u0001\u0000\u0000\u0000"+ + "\u00f7\u00f8\u0005=\u0000\u0000\u00f8\u001a\u0001\u0000\u0000\u0000\u00f9"+ + "\u00fa\u0005+\u0000\u0000\u00fa\u001c\u0001\u0000\u0000\u0000\u00fb\u00fc"+ + "\u0005-\u0000\u0000\u00fc\u001e\u0001\u0000\u0000\u0000\u00fd\u00fe\u0005"+ + "*\u0000\u0000\u00fe \u0001\u0000\u0000\u0000\u00ff\u0100\u0005%\u0000"+ + "\u0000\u0100\"\u0001\u0000\u0000\u0000\u0101\u0102\u0005/\u0000\u0000"+ + "\u0102$\u0001\u0000\u0000\u0000\u0103\u0104\u0005>\u0000\u0000\u0104&"+ + "\u0001\u0000\u0000\u0000\u0105\u0106\u0005<\u0000\u0000\u0106(\u0001\u0000"+ + "\u0000\u0000\u0107\u0108\u0005>\u0000\u0000\u0108\u0109\u0005=\u0000\u0000"+ + "\u0109*\u0001\u0000\u0000\u0000\u010a\u010b\u0005<\u0000\u0000\u010b\u010c"+ + "\u0005=\u0000\u0000\u010c,\u0001\u0000\u0000\u0000\u010d\u010e\u0005="+ + "\u0000\u0000\u010e\u010f\u0005=\u0000\u0000\u010f.\u0001\u0000\u0000\u0000"+ + "\u0110\u0111\u0005!\u0000\u0000\u0111\u0112\u0005=\u0000\u0000\u01120"+ + "\u0001\u0000\u0000\u0000\u0113\u0114\u0005!\u0000\u0000\u01142\u0001\u0000"+ + "\u0000\u0000\u0115\u0116\u0005&\u0000\u0000\u0116\u0117\u0005&\u0000\u0000"+ + "\u01174\u0001\u0000\u0000\u0000\u0118\u0119\u0005|\u0000\u0000\u0119\u011a"+ + "\u0005|\u0000\u0000\u011a6\u0001\u0000\u0000\u0000\u011b\u011c\u0005."+ + "\u0000\u0000\u011c8\u0001\u0000\u0000\u0000\u011d\u011e\u0005(\u0000\u0000"+ + "\u011e:\u0001\u0000\u0000\u0000\u011f\u0120\u0005)\u0000\u0000\u0120<"+ + "\u0001\u0000\u0000\u0000\u0121\u0122\u0005{\u0000\u0000\u0122>\u0001\u0000"+ + "\u0000\u0000\u0123\u0124\u0005}\u0000\u0000\u0124@\u0001\u0000\u0000\u0000"+ + "\u0125\u0126\u0005;\u0000\u0000\u0126B\u0001\u0000\u0000\u0000\u0127\u0128"+ + "\u0005,\u0000\u0000\u0128D\u0001\u0000\u0000\u0000\u0129\u012a\u0005c"+ + "\u0000\u0000\u012a\u012b\u0005l\u0000\u0000\u012b\u012c\u0005a\u0000\u0000"+ + "\u012c\u012d\u0005s\u0000\u0000\u012d\u012e\u0005s\u0000\u0000\u012eF"+ + "\u0001\u0000\u0000\u0000\u012f\u0130\u0005t\u0000\u0000\u0130\u0131\u0005"+ + "h\u0000\u0000\u0131\u0132\u0005i\u0000\u0000\u0132\u0133\u0005s\u0000"+ + "\u0000\u0133H\u0001\u0000\u0000\u0000\u0134\u0135\u0005w\u0000\u0000\u0135"+ + "\u0136\u0005h\u0000\u0000\u0136\u0137\u0005i\u0000\u0000\u0137\u0138\u0005"+ + "l\u0000\u0000\u0138\u0139\u0005e\u0000\u0000\u0139J\u0001\u0000\u0000"+ + "\u0000\u013a\u013b\u0005d\u0000\u0000\u013b\u013c\u0005o\u0000\u0000\u013c"+ + "L\u0001\u0000\u0000\u0000\u013d\u013e\u0005i\u0000\u0000\u013e\u013f\u0005"+ + "f\u0000\u0000\u013fN\u0001\u0000\u0000\u0000\u0140\u0141\u0005e\u0000"+ + "\u0000\u0141\u0142\u0005l\u0000\u0000\u0142\u0143\u0005s\u0000\u0000\u0143"+ + "\u0144\u0005e\u0000\u0000\u0144P\u0001\u0000\u0000\u0000\u0145\u0146\u0005"+ + "f\u0000\u0000\u0146\u0147\u0005o\u0000\u0000\u0147\u0148\u0005r\u0000"+ + "\u0000\u0148R\u0001\u0000\u0000\u0000\u0149\u014a\u0005r\u0000\u0000\u014a"+ + "\u014b\u0005e\u0000\u0000\u014b\u014c\u0005t\u0000\u0000\u014c\u014d\u0005"+ + "u\u0000\u0000\u014d\u014e\u0005r\u0000\u0000\u014e\u014f\u0005n\u0000"+ + "\u0000\u014fT\u0001\u0000\u0000\u0000\u0150\u0151\u0005n\u0000\u0000\u0151"+ + "\u0152\u0005e\u0000\u0000\u0152\u0153\u0005w\u0000\u0000\u0153V\u0001"+ + "\u0000\u0000\u0000\u0154\u0155\u0005s\u0000\u0000\u0155\u0156\u0005w\u0000"+ + "\u0000\u0156\u0157\u0005i\u0000\u0000\u0157\u0158\u0005t\u0000\u0000\u0158"+ + "\u0159\u0005c\u0000\u0000\u0159\u015a\u0005h\u0000\u0000\u015aX\u0001"+ + "\u0000\u0000\u0000\u015b\u015c\u0005c\u0000\u0000\u015c\u015d\u0005a\u0000"+ + "\u0000\u015d\u015e\u0005s\u0000\u0000\u015e\u015f\u0005e\u0000\u0000\u015f"+ + "Z\u0001\u0000\u0000\u0000\u0160\u0161\u0005d\u0000\u0000\u0161\u0162\u0005"+ + "e\u0000\u0000\u0162\u0163\u0005f\u0000\u0000\u0163\u0164\u0005a\u0000"+ + "\u0000\u0164\u0165\u0005u\u0000\u0000\u0165\u0166\u0005l\u0000\u0000\u0166"+ + "\u0167\u0005t\u0000\u0000\u0167\\\u0001\u0000\u0000\u0000\u0168\u0169"+ + "\u0005:\u0000\u0000\u0169^\u0001\u0000\u0000\u0000\u016a\u016e\u0005\'"+ + "\u0000\u0000\u016b\u016d\b\u0000\u0000\u0000\u016c\u016b\u0001\u0000\u0000"+ + "\u0000\u016d\u0170\u0001\u0000\u0000\u0000\u016e\u016c\u0001\u0000\u0000"+ + "\u0000\u016e\u016f\u0001\u0000\u0000\u0000\u016f\u0171\u0001\u0000\u0000"+ + "\u0000\u0170\u016e\u0001\u0000\u0000\u0000\u0171\u0172\u0005\'\u0000\u0000"+ + "\u0172`\u0001\u0000\u0000\u0000\u0173\u0175\u0003\u001d\u000e\u0000\u0174"+ + "\u0173\u0001\u0000\u0000\u0000\u0174\u0175\u0001\u0000\u0000\u0000\u0175"+ + "\u0177\u0001\u0000\u0000\u0000\u0176\u0178\u0003i4\u0000\u0177\u0176\u0001"+ + "\u0000\u0000\u0000\u0178\u0179\u0001\u0000\u0000\u0000\u0179\u0177\u0001"+ + "\u0000\u0000\u0000\u0179\u017a\u0001\u0000\u0000\u0000\u017ab\u0001\u0000"+ + "\u0000\u0000\u017b\u017c\u0005t\u0000\u0000\u017c\u017d\u0005r\u0000\u0000"+ + "\u017d\u017e\u0005u\u0000\u0000\u017e\u0185\u0005e\u0000\u0000\u017f\u0180"+ + "\u0005f\u0000\u0000\u0180\u0181\u0005a\u0000\u0000\u0181\u0182\u0005l"+ + "\u0000\u0000\u0182\u0183\u0005s\u0000\u0000\u0183\u0185\u0005e\u0000\u0000"+ + "\u0184\u017b\u0001\u0000\u0000\u0000\u0184\u017f\u0001\u0000\u0000\u0000"+ + "\u0185d\u0001\u0000\u0000\u0000\u0186\u0187\u0005n\u0000\u0000\u0187\u0188"+ + "\u0005u\u0000\u0000\u0188\u0189\u0005l\u0000\u0000\u0189\u018a\u0005l"+ + "\u0000\u0000\u018af\u0001\u0000\u0000\u0000\u018b\u018c\u0007\u0001\u0000"+ + "\u0000\u018ch\u0001\u0000\u0000\u0000\u018d\u018e\u0007\u0002\u0000\u0000"+ + "\u018ej\u0001\u0000\u0000\u0000\u018f\u0193\u0003g3\u0000\u0190\u0193"+ + "\u0003i4\u0000\u0191\u0193\u0007\u0003\u0000\u0000\u0192\u018f\u0001\u0000"+ + "\u0000\u0000\u0192\u0190\u0001\u0000\u0000\u0000\u0192\u0191\u0001\u0000"+ + "\u0000\u0000\u0193l\u0001\u0000\u0000\u0000\u0194\u0198\u0003g3\u0000"+ + "\u0195\u0197\u0003k5\u0000\u0196\u0195\u0001\u0000\u0000\u0000\u0197\u019a"+ + "\u0001\u0000\u0000\u0000\u0198\u0196\u0001\u0000\u0000\u0000\u0198\u0199"+ + "\u0001\u0000\u0000\u0000\u0199n\u0001\u0000\u0000\u0000\u019a\u0198\u0001"+ + "\u0000\u0000\u0000\u019b\u019d\u0007\u0004\u0000\u0000\u019c\u019b\u0001"+ + "\u0000\u0000\u0000\u019d\u019e\u0001\u0000\u0000\u0000\u019e\u019c\u0001"+ + "\u0000\u0000\u0000\u019e\u019f\u0001\u0000\u0000\u0000\u019f\u01a0\u0001"+ + "\u0000\u0000\u0000\u01a0\u01a1\u00067\u0000\u0000\u01a1p\u0001\u0000\u0000"+ + "\u0000\u01a2\u01a3\u0005/\u0000\u0000\u01a3\u01a4\u0005/\u0000\u0000\u01a4"+ + "\u01a8\u0001\u0000\u0000\u0000\u01a5\u01a7\b\u0000\u0000\u0000\u01a6\u01a5"+ + "\u0001\u0000\u0000\u0000\u01a7\u01aa\u0001\u0000\u0000\u0000\u01a8\u01a6"+ + "\u0001\u0000\u0000\u0000\u01a8\u01a9\u0001\u0000\u0000\u0000\u01a9\u01ab"+ + "\u0001\u0000\u0000\u0000\u01aa\u01a8\u0001\u0000\u0000\u0000\u01ab\u01ac"+ + "\u00068\u0000\u0000\u01acr\u0001\u0000\u0000\u0000\u01ad\u01ae\u0005/"+ + "\u0000\u0000\u01ae\u01af\u0005*\u0000\u0000\u01af\u01b3\u0001\u0000\u0000"+ + "\u0000\u01b0\u01b2\t\u0000\u0000\u0000\u01b1\u01b0\u0001\u0000\u0000\u0000"+ + "\u01b2\u01b5\u0001\u0000\u0000\u0000\u01b3\u01b4\u0001\u0000\u0000\u0000"+ + "\u01b3\u01b1\u0001\u0000\u0000\u0000\u01b4\u01b6\u0001\u0000\u0000\u0000"+ + "\u01b5\u01b3\u0001\u0000\u0000\u0000\u01b6\u01b7\u0005*\u0000\u0000\u01b7"+ + "\u01b8\u0005/\u0000\u0000\u01b8\u01b9\u0001\u0000\u0000\u0000\u01b9\u01ba"+ + "\u00069\u0000\u0000\u01bat\u0001\u0000\u0000\u0000\u000f\u0000\u00b9\u00e5"+ + "\u00e9\u00f1\u00f5\u016e\u0174\u0179\u0184\u0192\u0198\u019e\u01a8\u01b3"+ + "\u0001\u0006\u0000\u0000"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/src/main/java/parser/generated/SimpleJavaLexer.tokens b/src/main/java/parser/generated/SimpleJavaLexer.tokens index 71246c8..ffe0902 100644 --- a/src/main/java/parser/generated/SimpleJavaLexer.tokens +++ b/src/main/java/parser/generated/SimpleJavaLexer.tokens @@ -41,14 +41,18 @@ Else=40 For=41 Return=42 New=43 -CharValue=44 -IntValue=45 -BooleanValue=46 -NullValue=47 -Identifier=48 -WS=49 -InlineComment=50 -MultilineComment=51 +Switch=44 +Case=45 +Default=46 +Colon=47 +CharValue=48 +IntValue=49 +BooleanValue=50 +NullValue=51 +Identifier=52 +WS=53 +InlineComment=54 +MultilineComment=55 '++'=1 '--'=2 'void'=3 @@ -87,4 +91,8 @@ MultilineComment=51 'for'=41 'return'=42 'new'=43 -'null'=47 +'switch'=44 +'case'=45 +'default'=46 +':'=47 +'null'=51 diff --git a/src/main/java/parser/generated/SimpleJavaListener.java b/src/main/java/parser/generated/SimpleJavaListener.java index 580bfe1..e352191 100644 --- a/src/main/java/parser/generated/SimpleJavaListener.java +++ b/src/main/java/parser/generated/SimpleJavaListener.java @@ -1,4 +1,4 @@ -// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 +// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 package parser.generated; import org.antlr.v4.runtime.tree.ParseTreeListener; @@ -207,6 +207,36 @@ public interface SimpleJavaListener extends ParseTreeListener { * @param ctx the parse tree */ void exitElseStatement(SimpleJavaParser.ElseStatementContext ctx); + /** + * Enter a parse tree produced by {@link SimpleJavaParser#switchStatement}. + * @param ctx the parse tree + */ + void enterSwitchStatement(SimpleJavaParser.SwitchStatementContext ctx); + /** + * Exit a parse tree produced by {@link SimpleJavaParser#switchStatement}. + * @param ctx the parse tree + */ + void exitSwitchStatement(SimpleJavaParser.SwitchStatementContext ctx); + /** + * Enter a parse tree produced by {@link SimpleJavaParser#caseStatement}. + * @param ctx the parse tree + */ + void enterCaseStatement(SimpleJavaParser.CaseStatementContext ctx); + /** + * Exit a parse tree produced by {@link SimpleJavaParser#caseStatement}. + * @param ctx the parse tree + */ + void exitCaseStatement(SimpleJavaParser.CaseStatementContext ctx); + /** + * Enter a parse tree produced by {@link SimpleJavaParser#defaultStatement}. + * @param ctx the parse tree + */ + void enterDefaultStatement(SimpleJavaParser.DefaultStatementContext ctx); + /** + * Exit a parse tree produced by {@link SimpleJavaParser#defaultStatement}. + * @param ctx the parse tree + */ + void exitDefaultStatement(SimpleJavaParser.DefaultStatementContext ctx); /** * Enter a parse tree produced by {@link SimpleJavaParser#statementExpression}. * @param ctx the parse tree diff --git a/src/main/java/parser/generated/SimpleJavaParser.java b/src/main/java/parser/generated/SimpleJavaParser.java index 3a80a6a..0d6fb65 100644 --- a/src/main/java/parser/generated/SimpleJavaParser.java +++ b/src/main/java/parser/generated/SimpleJavaParser.java @@ -1,4 +1,4 @@ -// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 +// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 package parser.generated; import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; @@ -23,9 +23,9 @@ public class SimpleJavaParser extends Parser { Less=20, GreaterEqual=21, LessEqual=22, Equal=23, NotEqual=24, Not=25, And=26, Or=27, Dot=28, OpenRoundBracket=29, ClosedRoundBracket=30, OpenCurlyBracket=31, ClosedCurlyBracket=32, Semicolon=33, Comma=34, Class=35, This=36, While=37, - Do=38, If=39, Else=40, For=41, Return=42, New=43, CharValue=44, IntValue=45, - BooleanValue=46, NullValue=47, Identifier=48, WS=49, InlineComment=50, - MultilineComment=51; + Do=38, If=39, Else=40, For=41, Return=42, New=43, Switch=44, Case=45, + Default=46, Colon=47, CharValue=48, IntValue=49, BooleanValue=50, NullValue=51, + Identifier=52, WS=53, InlineComment=54, MultilineComment=55; public static final int RULE_program = 0, RULE_classDeclaration = 1, RULE_memberDeclaration = 2, RULE_constructorDeclaration = 3, RULE_fieldDeclaration = 4, RULE_methodDeclaration = 5, @@ -33,29 +33,30 @@ public class SimpleJavaParser extends Parser { RULE_blockStatement = 10, RULE_returnStatement = 11, RULE_localVariableDeclaration = 12, RULE_whileStatement = 13, RULE_doWhileStatement = 14, RULE_forStatement = 15, RULE_ifElseStatement = 16, RULE_ifStatement = 17, RULE_elseIfStatement = 18, - RULE_elseStatement = 19, RULE_statementExpression = 20, RULE_assign = 21, - RULE_newDeclaration = 22, RULE_expression = 23, RULE_unaryExpression = 24, - RULE_notExpression = 25, RULE_crementExpression = 26, RULE_incrementExpression = 27, - RULE_prefixIncrementExpression = 28, RULE_suffixIncrementExpression = 29, - RULE_decrementExpression = 30, RULE_prefixDecrementExpression = 31, RULE_suffixDecrementExpression = 32, - RULE_assignableExpression = 33, RULE_memberAccess = 34, RULE_binaryExpression = 35, - RULE_calculationExpression = 36, RULE_dotExpression = 37, RULE_dotSubtractionExpression = 38, - RULE_nonCalculationExpression = 39, RULE_methodCall = 40, RULE_target = 41, - RULE_chainedMethod = 42, RULE_type = 43, RULE_value = 44, RULE_nonCalculationOperator = 45; + RULE_elseStatement = 19, RULE_switchStatement = 20, RULE_caseStatement = 21, + RULE_defaultStatement = 22, RULE_statementExpression = 23, RULE_assign = 24, + RULE_newDeclaration = 25, RULE_expression = 26, RULE_unaryExpression = 27, + RULE_notExpression = 28, RULE_crementExpression = 29, RULE_incrementExpression = 30, + RULE_prefixIncrementExpression = 31, RULE_suffixIncrementExpression = 32, + RULE_decrementExpression = 33, RULE_prefixDecrementExpression = 34, RULE_suffixDecrementExpression = 35, + RULE_assignableExpression = 36, RULE_memberAccess = 37, RULE_binaryExpression = 38, + RULE_calculationExpression = 39, RULE_dotExpression = 40, RULE_dotSubtractionExpression = 41, + RULE_nonCalculationExpression = 42, RULE_methodCall = 43, RULE_target = 44, + RULE_chainedMethod = 45, RULE_type = 46, RULE_value = 47, RULE_nonCalculationOperator = 48; private static String[] makeRuleNames() { return new String[] { "program", "classDeclaration", "memberDeclaration", "constructorDeclaration", "fieldDeclaration", "methodDeclaration", "parameterList", "parameter", "argumentList", "statement", "blockStatement", "returnStatement", "localVariableDeclaration", "whileStatement", "doWhileStatement", "forStatement", "ifElseStatement", - "ifStatement", "elseIfStatement", "elseStatement", "statementExpression", - "assign", "newDeclaration", "expression", "unaryExpression", "notExpression", - "crementExpression", "incrementExpression", "prefixIncrementExpression", - "suffixIncrementExpression", "decrementExpression", "prefixDecrementExpression", - "suffixDecrementExpression", "assignableExpression", "memberAccess", - "binaryExpression", "calculationExpression", "dotExpression", "dotSubtractionExpression", - "nonCalculationExpression", "methodCall", "target", "chainedMethod", - "type", "value", "nonCalculationOperator" + "ifStatement", "elseIfStatement", "elseStatement", "switchStatement", + "caseStatement", "defaultStatement", "statementExpression", "assign", + "newDeclaration", "expression", "unaryExpression", "notExpression", "crementExpression", + "incrementExpression", "prefixIncrementExpression", "suffixIncrementExpression", + "decrementExpression", "prefixDecrementExpression", "suffixDecrementExpression", + "assignableExpression", "memberAccess", "binaryExpression", "calculationExpression", + "dotExpression", "dotSubtractionExpression", "nonCalculationExpression", + "methodCall", "target", "chainedMethod", "type", "value", "nonCalculationOperator" }; } public static final String[] ruleNames = makeRuleNames(); @@ -67,7 +68,8 @@ public class SimpleJavaParser extends Parser { "'+'", "'-'", "'*'", "'%'", "'/'", "'>'", "'<'", "'>='", "'<='", "'=='", "'!='", "'!'", "'&&'", "'||'", "'.'", "'('", "')'", "'{'", "'}'", "';'", "','", "'class'", "'this'", "'while'", "'do'", "'if'", "'else'", "'for'", - "'return'", "'new'", null, null, null, "'null'" + "'return'", "'new'", "'switch'", "'case'", "'default'", "':'", null, + null, null, "'null'" }; } private static final String[] _LITERAL_NAMES = makeLiteralNames(); @@ -79,9 +81,9 @@ public class SimpleJavaParser extends Parser { "Greater", "Less", "GreaterEqual", "LessEqual", "Equal", "NotEqual", "Not", "And", "Or", "Dot", "OpenRoundBracket", "ClosedRoundBracket", "OpenCurlyBracket", "ClosedCurlyBracket", "Semicolon", "Comma", "Class", - "This", "While", "Do", "If", "Else", "For", "Return", "New", "CharValue", - "IntValue", "BooleanValue", "NullValue", "Identifier", "WS", "InlineComment", - "MultilineComment" + "This", "While", "Do", "If", "Else", "For", "Return", "New", "Switch", + "Case", "Default", "Colon", "CharValue", "IntValue", "BooleanValue", + "NullValue", "Identifier", "WS", "InlineComment", "MultilineComment" }; } private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames(); @@ -169,17 +171,17 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(93); + setState(99); _errHandler.sync(this); _la = _input.LA(1); do { { { - setState(92); + setState(98); classDeclaration(); } } - setState(95); + setState(101); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==AccessModifier || _la==Class ); @@ -235,37 +237,37 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(98); + setState(104); _errHandler.sync(this); _la = _input.LA(1); if (_la==AccessModifier) { { - setState(97); + setState(103); match(AccessModifier); } } - setState(100); - match(Class); - setState(101); - match(Identifier); - setState(102); - match(OpenCurlyBracket); setState(106); + match(Class); + setState(107); + match(Identifier); + setState(108); + match(OpenCurlyBracket); + setState(112); _errHandler.sync(this); _la = _input.LA(1); - while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 281474976711160L) != 0)) { + while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 4503599627371000L) != 0)) { { { - setState(103); + setState(109); memberDeclaration(); } } - setState(108); + setState(114); _errHandler.sync(this); _la = _input.LA(1); } - setState(109); + setState(115); match(ClosedCurlyBracket); } } @@ -314,27 +316,27 @@ public class SimpleJavaParser extends Parser { MemberDeclarationContext _localctx = new MemberDeclarationContext(_ctx, getState()); enterRule(_localctx, 4, RULE_memberDeclaration); try { - setState(114); + setState(120); _errHandler.sync(this); switch ( getInterpreter().adaptivePredict(_input,3,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(111); + setState(117); constructorDeclaration(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(112); + setState(118); fieldDeclaration(); } break; case 3: enterOuterAlt(_localctx, 3); { - setState(113); + setState(119); methodDeclaration(); } break; @@ -389,33 +391,33 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(117); + setState(123); _errHandler.sync(this); _la = _input.LA(1); if (_la==AccessModifier) { { - setState(116); + setState(122); match(AccessModifier); } } - setState(119); + setState(125); match(Identifier); - setState(120); + setState(126); match(OpenRoundBracket); - setState(122); + setState(128); _errHandler.sync(this); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 281474976710768L) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 4503599627370608L) != 0)) { { - setState(121); + setState(127); parameterList(); } } - setState(124); + setState(130); match(ClosedRoundBracket); - setState(125); + setState(131); blockStatement(); } } @@ -438,6 +440,10 @@ public class SimpleJavaParser extends Parser { public TerminalNode Identifier() { return getToken(SimpleJavaParser.Identifier, 0); } public TerminalNode Semicolon() { return getToken(SimpleJavaParser.Semicolon, 0); } public TerminalNode AccessModifier() { return getToken(SimpleJavaParser.AccessModifier, 0); } + public TerminalNode Assign() { return getToken(SimpleJavaParser.Assign, 0); } + public ExpressionContext expression() { + return getRuleContext(ExpressionContext.class,0); + } public FieldDeclarationContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); } @@ -464,21 +470,33 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(128); + setState(134); _errHandler.sync(this); _la = _input.LA(1); if (_la==AccessModifier) { { - setState(127); + setState(133); match(AccessModifier); } } - setState(130); + setState(136); type(); - setState(131); + setState(137); match(Identifier); - setState(132); + setState(140); + _errHandler.sync(this); + _la = _input.LA(1); + if (_la==Assign) { + { + setState(138); + match(Assign); + setState(139); + expression(); + } + } + + setState(142); match(Semicolon); } } @@ -534,15 +552,15 @@ public class SimpleJavaParser extends Parser { enterRule(_localctx, 10, RULE_methodDeclaration); int _la; try { - setState(150); + setState(160); _errHandler.sync(this); switch (_input.LA(1)) { case MainMethodDeclaration: enterOuterAlt(_localctx, 1); { - setState(134); + setState(144); match(MainMethodDeclaration); - setState(135); + setState(145); blockStatement(); } break; @@ -554,17 +572,17 @@ public class SimpleJavaParser extends Parser { case Identifier: enterOuterAlt(_localctx, 2); { - setState(137); + setState(147); _errHandler.sync(this); _la = _input.LA(1); if (_la==AccessModifier) { { - setState(136); + setState(146); match(AccessModifier); } } - setState(141); + setState(151); _errHandler.sync(this); switch (_input.LA(1)) { case Boolean: @@ -572,36 +590,36 @@ public class SimpleJavaParser extends Parser { case Int: case Identifier: { - setState(139); + setState(149); type(); } break; case Void: { - setState(140); + setState(150); match(Void); } break; default: throw new NoViableAltException(this); } - setState(143); + setState(153); match(Identifier); - setState(144); + setState(154); match(OpenRoundBracket); - setState(146); + setState(156); _errHandler.sync(this); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 281474976710768L) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 4503599627370608L) != 0)) { { - setState(145); + setState(155); parameterList(); } } - setState(148); + setState(158); match(ClosedRoundBracket); - setState(149); + setState(159); blockStatement(); } break; @@ -658,21 +676,21 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(152); + setState(162); parameter(); - setState(157); + setState(167); _errHandler.sync(this); _la = _input.LA(1); while (_la==Comma) { { { - setState(153); + setState(163); match(Comma); - setState(154); + setState(164); parameter(); } } - setState(159); + setState(169); _errHandler.sync(this); _la = _input.LA(1); } @@ -720,9 +738,9 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(160); + setState(170); type(); - setState(161); + setState(171); match(Identifier); } } @@ -775,26 +793,26 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(171); + setState(181); _errHandler.sync(this); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 554223150301190L) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 8734589660954630L) != 0)) { { - setState(163); + setState(173); expression(); - setState(168); + setState(178); _errHandler.sync(this); _la = _input.LA(1); while (_la==Comma) { { { - setState(164); + setState(174); match(Comma); - setState(165); + setState(175); expression(); } } - setState(170); + setState(180); _errHandler.sync(this); _la = _input.LA(1); } @@ -838,6 +856,9 @@ public class SimpleJavaParser extends Parser { public IfElseStatementContext ifElseStatement() { return getRuleContext(IfElseStatementContext.class,0); } + public SwitchStatementContext switchStatement() { + return getRuleContext(SwitchStatementContext.class,0); + } public StatementExpressionContext statementExpression() { return getRuleContext(StatementExpressionContext.class,0); } @@ -864,68 +885,75 @@ public class SimpleJavaParser extends Parser { StatementContext _localctx = new StatementContext(_ctx, getState()); enterRule(_localctx, 18, RULE_statement); try { - setState(187); + setState(198); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(173); + setState(183); returnStatement(); - setState(174); + setState(184); match(Semicolon); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(176); + setState(186); localVariableDeclaration(); - setState(177); + setState(187); match(Semicolon); } break; case 3: enterOuterAlt(_localctx, 3); { - setState(179); + setState(189); blockStatement(); } break; case 4: enterOuterAlt(_localctx, 4); { - setState(180); + setState(190); whileStatement(); } break; case 5: enterOuterAlt(_localctx, 5); { - setState(181); + setState(191); doWhileStatement(); } break; case 6: enterOuterAlt(_localctx, 6); { - setState(182); + setState(192); forStatement(); } break; case 7: enterOuterAlt(_localctx, 7); { - setState(183); + setState(193); ifElseStatement(); } break; case 8: enterOuterAlt(_localctx, 8); { - setState(184); + setState(194); + switchStatement(); + } + break; + case 9: + enterOuterAlt(_localctx, 9); + { + setState(195); statementExpression(); - setState(185); + setState(196); match(Semicolon); } break; @@ -978,23 +1006,23 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(189); + setState(200); match(OpenCurlyBracket); - setState(193); + setState(204); _errHandler.sync(this); _la = _input.LA(1); - while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 297901079134326L) != 0)) { + while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 4537617915838582L) != 0)) { { { - setState(190); + setState(201); statement(); } } - setState(195); + setState(206); _errHandler.sync(this); _la = _input.LA(1); } - setState(196); + setState(207); match(ClosedCurlyBracket); } } @@ -1041,14 +1069,14 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(198); + setState(209); match(Return); - setState(200); + setState(211); _errHandler.sync(this); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 554223150301190L) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 8734589660954630L) != 0)) { { - setState(199); + setState(210); expression(); } } @@ -1102,18 +1130,18 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(202); + setState(213); type(); - setState(203); + setState(214); match(Identifier); - setState(206); + setState(217); _errHandler.sync(this); _la = _input.LA(1); if (_la==Assign) { { - setState(204); + setState(215); match(Assign); - setState(205); + setState(216); expression(); } } @@ -1167,15 +1195,15 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(208); + setState(219); match(While); - setState(209); + setState(220); match(OpenRoundBracket); - setState(210); + setState(221); expression(); - setState(211); + setState(222); match(ClosedRoundBracket); - setState(212); + setState(223); blockStatement(); } } @@ -1228,19 +1256,19 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(214); + setState(225); match(Do); - setState(215); + setState(226); blockStatement(); - setState(216); + setState(227); match(While); - setState(217); + setState(228); match(OpenRoundBracket); - setState(218); + setState(229); expression(); - setState(219); + setState(230); match(ClosedRoundBracket); - setState(220); + setState(231); match(Semicolon); } } @@ -1305,53 +1333,53 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(222); + setState(233); match(For); - setState(223); + setState(234); match(OpenRoundBracket); - setState(226); + setState(237); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,19,_ctx) ) { case 1: { - setState(224); + setState(235); statementExpression(); } break; case 2: { - setState(225); + setState(236); localVariableDeclaration(); } break; } - setState(228); + setState(239); match(Semicolon); - setState(230); + setState(241); _errHandler.sync(this); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 554223150301190L) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 8734589660954630L) != 0)) { { - setState(229); + setState(240); expression(); } } - setState(232); + setState(243); match(Semicolon); - setState(234); + setState(245); _errHandler.sync(this); _la = _input.LA(1); - if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 290339789209606L) != 0)) { + if ((((_la) & ~0x3f) == 0 && ((1L << _la) & 4512464439869446L) != 0)) { { - setState(233); + setState(244); statementExpression(); } } - setState(236); + setState(247); match(ClosedRoundBracket); - setState(237); + setState(248); blockStatement(); } } @@ -1407,30 +1435,30 @@ public class SimpleJavaParser extends Parser { int _alt; enterOuterAlt(_localctx, 1); { - setState(239); + setState(250); ifStatement(); - setState(243); + setState(254); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,21,_ctx); + _alt = getInterpreter().adaptivePredict(_input,22,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(240); + setState(251); elseIfStatement(); } } } - setState(245); + setState(256); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,21,_ctx); + _alt = getInterpreter().adaptivePredict(_input,22,_ctx); } - setState(247); + setState(258); _errHandler.sync(this); _la = _input.LA(1); if (_la==Else) { { - setState(246); + setState(257); elseStatement(); } } @@ -1484,15 +1512,15 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(249); + setState(260); match(If); - setState(250); + setState(261); match(OpenRoundBracket); - setState(251); + setState(262); expression(); - setState(252); + setState(263); match(ClosedRoundBracket); - setState(253); + setState(264); blockStatement(); } } @@ -1544,17 +1572,17 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(255); + setState(266); match(Else); - setState(256); + setState(267); match(If); - setState(257); + setState(268); match(OpenRoundBracket); - setState(258); + setState(269); expression(); - setState(259); + setState(270); match(ClosedRoundBracket); - setState(260); + setState(271); blockStatement(); } } @@ -1600,9 +1628,9 @@ public class SimpleJavaParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(262); + setState(273); match(Else); - setState(263); + setState(274); blockStatement(); } } @@ -1617,6 +1645,239 @@ public class SimpleJavaParser extends Parser { return _localctx; } + @SuppressWarnings("CheckReturnValue") + public static class SwitchStatementContext extends ParserRuleContext { + public TerminalNode Switch() { return getToken(SimpleJavaParser.Switch, 0); } + public TerminalNode OpenRoundBracket() { return getToken(SimpleJavaParser.OpenRoundBracket, 0); } + public ExpressionContext expression() { + return getRuleContext(ExpressionContext.class,0); + } + public TerminalNode ClosedRoundBracket() { return getToken(SimpleJavaParser.ClosedRoundBracket, 0); } + public TerminalNode OpenCurlyBracket() { return getToken(SimpleJavaParser.OpenCurlyBracket, 0); } + public TerminalNode ClosedCurlyBracket() { return getToken(SimpleJavaParser.ClosedCurlyBracket, 0); } + public List caseStatement() { + return getRuleContexts(CaseStatementContext.class); + } + public CaseStatementContext caseStatement(int i) { + return getRuleContext(CaseStatementContext.class,i); + } + public DefaultStatementContext defaultStatement() { + return getRuleContext(DefaultStatementContext.class,0); + } + public SwitchStatementContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_switchStatement; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterSwitchStatement(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitSwitchStatement(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor)visitor).visitSwitchStatement(this); + else return visitor.visitChildren(this); + } + } + + public final SwitchStatementContext switchStatement() throws RecognitionException { + SwitchStatementContext _localctx = new SwitchStatementContext(_ctx, getState()); + enterRule(_localctx, 40, RULE_switchStatement); + int _la; + try { + enterOuterAlt(_localctx, 1); + { + setState(276); + match(Switch); + setState(277); + match(OpenRoundBracket); + setState(278); + expression(); + setState(279); + match(ClosedRoundBracket); + setState(280); + match(OpenCurlyBracket); + setState(282); + _errHandler.sync(this); + _la = _input.LA(1); + do { + { + { + setState(281); + caseStatement(); + } + } + setState(284); + _errHandler.sync(this); + _la = _input.LA(1); + } while ( _la==Case ); + setState(287); + _errHandler.sync(this); + _la = _input.LA(1); + if (_la==Default) { + { + setState(286); + defaultStatement(); + } + } + + setState(289); + match(ClosedCurlyBracket); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + @SuppressWarnings("CheckReturnValue") + public static class CaseStatementContext extends ParserRuleContext { + public TerminalNode Case() { return getToken(SimpleJavaParser.Case, 0); } + public ValueContext value() { + return getRuleContext(ValueContext.class,0); + } + public TerminalNode Colon() { return getToken(SimpleJavaParser.Colon, 0); } + public List statement() { + return getRuleContexts(StatementContext.class); + } + public StatementContext statement(int i) { + return getRuleContext(StatementContext.class,i); + } + public CaseStatementContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_caseStatement; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterCaseStatement(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitCaseStatement(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor)visitor).visitCaseStatement(this); + else return visitor.visitChildren(this); + } + } + + public final CaseStatementContext caseStatement() throws RecognitionException { + CaseStatementContext _localctx = new CaseStatementContext(_ctx, getState()); + enterRule(_localctx, 42, RULE_caseStatement); + int _la; + try { + enterOuterAlt(_localctx, 1); + { + setState(291); + match(Case); + setState(292); + value(); + setState(293); + match(Colon); + setState(297); + _errHandler.sync(this); + _la = _input.LA(1); + while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 4537617915838582L) != 0)) { + { + { + setState(294); + statement(); + } + } + setState(299); + _errHandler.sync(this); + _la = _input.LA(1); + } + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + @SuppressWarnings("CheckReturnValue") + public static class DefaultStatementContext extends ParserRuleContext { + public TerminalNode Default() { return getToken(SimpleJavaParser.Default, 0); } + public TerminalNode Colon() { return getToken(SimpleJavaParser.Colon, 0); } + public List statement() { + return getRuleContexts(StatementContext.class); + } + public StatementContext statement(int i) { + return getRuleContext(StatementContext.class,i); + } + public DefaultStatementContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_defaultStatement; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).enterDefaultStatement(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof SimpleJavaListener ) ((SimpleJavaListener)listener).exitDefaultStatement(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SimpleJavaVisitor ) return ((SimpleJavaVisitor)visitor).visitDefaultStatement(this); + else return visitor.visitChildren(this); + } + } + + public final DefaultStatementContext defaultStatement() throws RecognitionException { + DefaultStatementContext _localctx = new DefaultStatementContext(_ctx, getState()); + enterRule(_localctx, 44, RULE_defaultStatement); + int _la; + try { + enterOuterAlt(_localctx, 1); + { + setState(300); + match(Default); + setState(301); + match(Colon); + setState(305); + _errHandler.sync(this); + _la = _input.LA(1); + while ((((_la) & ~0x3f) == 0 && ((1L << _la) & 4537617915838582L) != 0)) { + { + { + setState(302); + statement(); + } + } + setState(307); + _errHandler.sync(this); + _la = _input.LA(1); + } + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + @SuppressWarnings("CheckReturnValue") public static class StatementExpressionContext extends ParserRuleContext { public AssignContext assign() { @@ -1652,36 +1913,36 @@ public class SimpleJavaParser extends Parser { public final StatementExpressionContext statementExpression() throws RecognitionException { StatementExpressionContext _localctx = new StatementExpressionContext(_ctx, getState()); - enterRule(_localctx, 40, RULE_statementExpression); + enterRule(_localctx, 46, RULE_statementExpression); try { - setState(269); + setState(312); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,28,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(265); + setState(308); assign(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(266); + setState(309); newDeclaration(); } break; case 3: enterOuterAlt(_localctx, 3); { - setState(267); + setState(310); methodCall(); } break; case 4: enterOuterAlt(_localctx, 4); { - setState(268); + setState(311); crementExpression(); } break; @@ -1728,15 +1989,15 @@ public class SimpleJavaParser extends Parser { public final AssignContext assign() throws RecognitionException { AssignContext _localctx = new AssignContext(_ctx, getState()); - enterRule(_localctx, 42, RULE_assign); + enterRule(_localctx, 48, RULE_assign); try { enterOuterAlt(_localctx, 1); { - setState(271); + setState(314); assignableExpression(); - setState(272); + setState(315); match(Assign); - setState(273); + setState(316); expression(); } } @@ -1781,19 +2042,19 @@ public class SimpleJavaParser extends Parser { public final NewDeclarationContext newDeclaration() throws RecognitionException { NewDeclarationContext _localctx = new NewDeclarationContext(_ctx, getState()); - enterRule(_localctx, 44, RULE_newDeclaration); + enterRule(_localctx, 50, RULE_newDeclaration); try { enterOuterAlt(_localctx, 1); { - setState(275); + setState(318); match(New); - setState(276); + setState(319); match(Identifier); - setState(277); + setState(320); match(OpenRoundBracket); - setState(278); + setState(321); argumentList(); - setState(279); + setState(322); match(ClosedRoundBracket); } } @@ -1837,22 +2098,22 @@ public class SimpleJavaParser extends Parser { public final ExpressionContext expression() throws RecognitionException { ExpressionContext _localctx = new ExpressionContext(_ctx, getState()); - enterRule(_localctx, 46, RULE_expression); + enterRule(_localctx, 52, RULE_expression); try { - setState(283); + setState(326); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(281); + setState(324); unaryExpression(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(282); + setState(325); binaryExpression(); } break; @@ -1911,61 +2172,61 @@ public class SimpleJavaParser extends Parser { public final UnaryExpressionContext unaryExpression() throws RecognitionException { UnaryExpressionContext _localctx = new UnaryExpressionContext(_ctx, getState()); - enterRule(_localctx, 48, RULE_unaryExpression); + enterRule(_localctx, 54, RULE_unaryExpression); try { - setState(295); + setState(338); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,30,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(285); + setState(328); match(This); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(286); + setState(329); match(Identifier); } break; case 3: enterOuterAlt(_localctx, 3); { - setState(287); + setState(330); memberAccess(); } break; case 4: enterOuterAlt(_localctx, 4); { - setState(288); + setState(331); value(); } break; case 5: enterOuterAlt(_localctx, 5); { - setState(289); + setState(332); notExpression(); } break; case 6: enterOuterAlt(_localctx, 6); { - setState(290); + setState(333); statementExpression(); } break; case 7: enterOuterAlt(_localctx, 7); { - setState(291); + setState(334); match(OpenRoundBracket); - setState(292); + setState(335); expression(); - setState(293); + setState(336); match(ClosedRoundBracket); } break; @@ -2009,13 +2270,13 @@ public class SimpleJavaParser extends Parser { public final NotExpressionContext notExpression() throws RecognitionException { NotExpressionContext _localctx = new NotExpressionContext(_ctx, getState()); - enterRule(_localctx, 50, RULE_notExpression); + enterRule(_localctx, 56, RULE_notExpression); try { enterOuterAlt(_localctx, 1); { - setState(297); + setState(340); match(Not); - setState(298); + setState(341); expression(); } } @@ -2059,22 +2320,22 @@ public class SimpleJavaParser extends Parser { public final CrementExpressionContext crementExpression() throws RecognitionException { CrementExpressionContext _localctx = new CrementExpressionContext(_ctx, getState()); - enterRule(_localctx, 52, RULE_crementExpression); + enterRule(_localctx, 58, RULE_crementExpression); try { - setState(302); + setState(345); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,31,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(300); + setState(343); incrementExpression(); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(301); + setState(344); decrementExpression(); } break; @@ -2120,15 +2381,15 @@ public class SimpleJavaParser extends Parser { public final IncrementExpressionContext incrementExpression() throws RecognitionException { IncrementExpressionContext _localctx = new IncrementExpressionContext(_ctx, getState()); - enterRule(_localctx, 54, RULE_incrementExpression); + enterRule(_localctx, 60, RULE_incrementExpression); try { - setState(306); + setState(349); _errHandler.sync(this); switch (_input.LA(1)) { case T__0: enterOuterAlt(_localctx, 1); { - setState(304); + setState(347); prefixIncrementExpression(); } break; @@ -2136,7 +2397,7 @@ public class SimpleJavaParser extends Parser { case Identifier: enterOuterAlt(_localctx, 2); { - setState(305); + setState(348); suffixIncrementExpression(); } break; @@ -2181,13 +2442,13 @@ public class SimpleJavaParser extends Parser { public final PrefixIncrementExpressionContext prefixIncrementExpression() throws RecognitionException { PrefixIncrementExpressionContext _localctx = new PrefixIncrementExpressionContext(_ctx, getState()); - enterRule(_localctx, 56, RULE_prefixIncrementExpression); + enterRule(_localctx, 62, RULE_prefixIncrementExpression); try { enterOuterAlt(_localctx, 1); { - setState(308); + setState(351); match(T__0); - setState(309); + setState(352); assignableExpression(); } } @@ -2228,13 +2489,13 @@ public class SimpleJavaParser extends Parser { public final SuffixIncrementExpressionContext suffixIncrementExpression() throws RecognitionException { SuffixIncrementExpressionContext _localctx = new SuffixIncrementExpressionContext(_ctx, getState()); - enterRule(_localctx, 58, RULE_suffixIncrementExpression); + enterRule(_localctx, 64, RULE_suffixIncrementExpression); try { enterOuterAlt(_localctx, 1); { - setState(311); + setState(354); assignableExpression(); - setState(312); + setState(355); match(T__0); } } @@ -2278,15 +2539,15 @@ public class SimpleJavaParser extends Parser { public final DecrementExpressionContext decrementExpression() throws RecognitionException { DecrementExpressionContext _localctx = new DecrementExpressionContext(_ctx, getState()); - enterRule(_localctx, 60, RULE_decrementExpression); + enterRule(_localctx, 66, RULE_decrementExpression); try { - setState(316); + setState(359); _errHandler.sync(this); switch (_input.LA(1)) { case T__1: enterOuterAlt(_localctx, 1); { - setState(314); + setState(357); prefixDecrementExpression(); } break; @@ -2294,7 +2555,7 @@ public class SimpleJavaParser extends Parser { case Identifier: enterOuterAlt(_localctx, 2); { - setState(315); + setState(358); suffixDecrementExpression(); } break; @@ -2339,13 +2600,13 @@ public class SimpleJavaParser extends Parser { public final PrefixDecrementExpressionContext prefixDecrementExpression() throws RecognitionException { PrefixDecrementExpressionContext _localctx = new PrefixDecrementExpressionContext(_ctx, getState()); - enterRule(_localctx, 62, RULE_prefixDecrementExpression); + enterRule(_localctx, 68, RULE_prefixDecrementExpression); try { enterOuterAlt(_localctx, 1); { - setState(318); + setState(361); match(T__1); - setState(319); + setState(362); assignableExpression(); } } @@ -2386,13 +2647,13 @@ public class SimpleJavaParser extends Parser { public final SuffixDecrementExpressionContext suffixDecrementExpression() throws RecognitionException { SuffixDecrementExpressionContext _localctx = new SuffixDecrementExpressionContext(_ctx, getState()); - enterRule(_localctx, 64, RULE_suffixDecrementExpression); + enterRule(_localctx, 70, RULE_suffixDecrementExpression); try { enterOuterAlt(_localctx, 1); { - setState(321); + setState(364); assignableExpression(); - setState(322); + setState(365); match(T__1); } } @@ -2434,22 +2695,22 @@ public class SimpleJavaParser extends Parser { public final AssignableExpressionContext assignableExpression() throws RecognitionException { AssignableExpressionContext _localctx = new AssignableExpressionContext(_ctx, getState()); - enterRule(_localctx, 66, RULE_assignableExpression); + enterRule(_localctx, 72, RULE_assignableExpression); try { - setState(326); + setState(369); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,34,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(324); + setState(367); match(Identifier); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(325); + setState(368); memberAccess(); } break; @@ -2498,40 +2759,40 @@ public class SimpleJavaParser extends Parser { public final MemberAccessContext memberAccess() throws RecognitionException { MemberAccessContext _localctx = new MemberAccessContext(_ctx, getState()); - enterRule(_localctx, 68, RULE_memberAccess); + enterRule(_localctx, 74, RULE_memberAccess); int _la; try { int _alt; - setState(342); + setState(385); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,32,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,37,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(328); + setState(371); match(This); - setState(329); + setState(372); match(Dot); - setState(330); + setState(373); match(Identifier); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(333); + setState(376); _errHandler.sync(this); _la = _input.LA(1); if (_la==This) { { - setState(331); + setState(374); match(This); - setState(332); + setState(375); match(Dot); } } - setState(337); + setState(380); _errHandler.sync(this); _alt = 1; do { @@ -2539,9 +2800,9 @@ public class SimpleJavaParser extends Parser { case 1: { { - setState(335); + setState(378); match(Identifier); - setState(336); + setState(379); match(Dot); } } @@ -2549,11 +2810,11 @@ public class SimpleJavaParser extends Parser { default: throw new NoViableAltException(this); } - setState(339); + setState(382); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,31,_ctx); + _alt = getInterpreter().adaptivePredict(_input,36,_ctx); } while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ); - setState(341); + setState(384); match(Identifier); } break; @@ -2599,22 +2860,22 @@ public class SimpleJavaParser extends Parser { public final BinaryExpressionContext binaryExpression() throws RecognitionException { BinaryExpressionContext _localctx = new BinaryExpressionContext(_ctx, getState()); - enterRule(_localctx, 70, RULE_binaryExpression); + enterRule(_localctx, 76, RULE_binaryExpression); try { - setState(346); + setState(389); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,33,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,38,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(344); + setState(387); calculationExpression(0); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(345); + setState(388); nonCalculationExpression(); } break; @@ -2668,20 +2929,20 @@ public class SimpleJavaParser extends Parser { int _parentState = getState(); CalculationExpressionContext _localctx = new CalculationExpressionContext(_ctx, _parentState); CalculationExpressionContext _prevctx = _localctx; - int _startState = 72; - enterRecursionRule(_localctx, 72, RULE_calculationExpression, _p); + int _startState = 78; + enterRecursionRule(_localctx, 78, RULE_calculationExpression, _p); try { int _alt; enterOuterAlt(_localctx, 1); { { - setState(349); + setState(392); dotExpression(0); } _ctx.stop = _input.LT(-1); - setState(356); + setState(399); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,34,_ctx); + _alt = getInterpreter().adaptivePredict(_input,39,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { if ( _parseListeners!=null ) triggerExitRuleEvent(); @@ -2690,18 +2951,18 @@ public class SimpleJavaParser extends Parser { { _localctx = new CalculationExpressionContext(_parentctx, _parentState); pushNewRecursionContext(_localctx, _startState, RULE_calculationExpression); - setState(351); + setState(394); if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); - setState(352); + setState(395); match(LineOperator); - setState(353); + setState(396); dotExpression(0); } } } - setState(358); + setState(401); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,34,_ctx); + _alt = getInterpreter().adaptivePredict(_input,39,_ctx); } } } @@ -2753,20 +3014,20 @@ public class SimpleJavaParser extends Parser { int _parentState = getState(); DotExpressionContext _localctx = new DotExpressionContext(_ctx, _parentState); DotExpressionContext _prevctx = _localctx; - int _startState = 74; - enterRecursionRule(_localctx, 74, RULE_dotExpression, _p); + int _startState = 80; + enterRecursionRule(_localctx, 80, RULE_dotExpression, _p); try { int _alt; enterOuterAlt(_localctx, 1); { { - setState(360); + setState(403); dotSubtractionExpression(); } _ctx.stop = _input.LT(-1); - setState(367); + setState(410); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,35,_ctx); + _alt = getInterpreter().adaptivePredict(_input,40,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { if ( _parseListeners!=null ) triggerExitRuleEvent(); @@ -2775,18 +3036,18 @@ public class SimpleJavaParser extends Parser { { _localctx = new DotExpressionContext(_parentctx, _parentState); pushNewRecursionContext(_localctx, _startState, RULE_dotExpression); - setState(362); + setState(405); if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)"); - setState(363); + setState(406); match(DotOperator); - setState(364); + setState(407); dotSubtractionExpression(); } } } - setState(369); + setState(412); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,35,_ctx); + _alt = getInterpreter().adaptivePredict(_input,40,_ctx); } } } @@ -2837,42 +3098,42 @@ public class SimpleJavaParser extends Parser { public final DotSubtractionExpressionContext dotSubtractionExpression() throws RecognitionException { DotSubtractionExpressionContext _localctx = new DotSubtractionExpressionContext(_ctx, getState()); - enterRule(_localctx, 76, RULE_dotSubtractionExpression); + enterRule(_localctx, 82, RULE_dotSubtractionExpression); try { - setState(378); + setState(421); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,36,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,41,_ctx) ) { case 1: enterOuterAlt(_localctx, 1); { - setState(370); + setState(413); match(IntValue); } break; case 2: enterOuterAlt(_localctx, 2); { - setState(371); + setState(414); match(Identifier); } break; case 3: enterOuterAlt(_localctx, 3); { - setState(372); + setState(415); memberAccess(); } break; case 4: enterOuterAlt(_localctx, 4); { - setState(373); + setState(416); methodCall(); - setState(374); + setState(417); match(OpenRoundBracket); - setState(375); + setState(418); calculationExpression(0); - setState(376); + setState(419); match(ClosedRoundBracket); } break; @@ -2921,15 +3182,15 @@ public class SimpleJavaParser extends Parser { public final NonCalculationExpressionContext nonCalculationExpression() throws RecognitionException { NonCalculationExpressionContext _localctx = new NonCalculationExpressionContext(_ctx, getState()); - enterRule(_localctx, 78, RULE_nonCalculationExpression); + enterRule(_localctx, 84, RULE_nonCalculationExpression); try { enterOuterAlt(_localctx, 1); { - setState(380); + setState(423); unaryExpression(); - setState(381); + setState(424); nonCalculationOperator(); - setState(382); + setState(425); expression(); } } @@ -2982,44 +3243,44 @@ public class SimpleJavaParser extends Parser { public final MethodCallContext methodCall() throws RecognitionException { MethodCallContext _localctx = new MethodCallContext(_ctx, getState()); - enterRule(_localctx, 80, RULE_methodCall); + enterRule(_localctx, 86, RULE_methodCall); try { int _alt; enterOuterAlt(_localctx, 1); { - setState(385); + setState(428); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,37,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,42,_ctx) ) { case 1: { - setState(384); + setState(427); target(); } break; } - setState(390); + setState(433); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,38,_ctx); + _alt = getInterpreter().adaptivePredict(_input,43,_ctx); while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) { if ( _alt==1 ) { { { - setState(387); + setState(430); chainedMethod(); } } } - setState(392); + setState(435); _errHandler.sync(this); - _alt = getInterpreter().adaptivePredict(_input,38,_ctx); + _alt = getInterpreter().adaptivePredict(_input,43,_ctx); } - setState(393); + setState(436); match(Identifier); - setState(394); + setState(437); match(OpenRoundBracket); - setState(395); + setState(438); argumentList(); - setState(396); + setState(439); match(ClosedRoundBracket); } } @@ -3066,39 +3327,39 @@ public class SimpleJavaParser extends Parser { public final TargetContext target() throws RecognitionException { TargetContext _localctx = new TargetContext(_ctx, getState()); - enterRule(_localctx, 82, RULE_target); + enterRule(_localctx, 88, RULE_target); try { enterOuterAlt(_localctx, 1); { - setState(402); + setState(445); _errHandler.sync(this); - switch ( getInterpreter().adaptivePredict(_input,39,_ctx) ) { + switch ( getInterpreter().adaptivePredict(_input,44,_ctx) ) { case 1: { - setState(398); + setState(441); match(This); } break; case 2: { - setState(399); + setState(442); memberAccess(); } break; case 3: { - setState(400); + setState(443); newDeclaration(); } break; case 4: { - setState(401); + setState(444); match(Identifier); } break; } - setState(404); + setState(447); match(Dot); } } @@ -3143,19 +3404,19 @@ public class SimpleJavaParser extends Parser { public final ChainedMethodContext chainedMethod() throws RecognitionException { ChainedMethodContext _localctx = new ChainedMethodContext(_ctx, getState()); - enterRule(_localctx, 84, RULE_chainedMethod); + enterRule(_localctx, 90, RULE_chainedMethod); try { enterOuterAlt(_localctx, 1); { - setState(406); + setState(449); match(Identifier); - setState(407); + setState(450); match(OpenRoundBracket); - setState(408); + setState(451); argumentList(); - setState(409); + setState(452); match(ClosedRoundBracket); - setState(410); + setState(453); match(Dot); } } @@ -3197,14 +3458,14 @@ public class SimpleJavaParser extends Parser { public final TypeContext type() throws RecognitionException { TypeContext _localctx = new TypeContext(_ctx, getState()); - enterRule(_localctx, 86, RULE_type); + enterRule(_localctx, 92, RULE_type); int _la; try { enterOuterAlt(_localctx, 1); { - setState(412); + setState(455); _la = _input.LA(1); - if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 281474976710768L) != 0)) ) { + if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 4503599627370608L) != 0)) ) { _errHandler.recoverInline(this); } else { @@ -3252,14 +3513,14 @@ public class SimpleJavaParser extends Parser { public final ValueContext value() throws RecognitionException { ValueContext _localctx = new ValueContext(_ctx, getState()); - enterRule(_localctx, 88, RULE_value); + enterRule(_localctx, 94, RULE_value); int _la; try { enterOuterAlt(_localctx, 1); { - setState(414); + setState(457); _la = _input.LA(1); - if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 263882790666240L) != 0)) ) { + if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 4222124650659840L) != 0)) ) { _errHandler.recoverInline(this); } else { @@ -3305,12 +3566,12 @@ public class SimpleJavaParser extends Parser { public final NonCalculationOperatorContext nonCalculationOperator() throws RecognitionException { NonCalculationOperatorContext _localctx = new NonCalculationOperatorContext(_ctx, getState()); - enterRule(_localctx, 90, RULE_nonCalculationOperator); + enterRule(_localctx, 96, RULE_nonCalculationOperator); int _la; try { enterOuterAlt(_localctx, 1); { - setState(416); + setState(459); _la = _input.LA(1); if ( !(_la==ComparisonOperator || _la==LogicalOperator) ) { _errHandler.recoverInline(this); @@ -3335,9 +3596,9 @@ public class SimpleJavaParser extends Parser { public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) { switch (ruleIndex) { - case 36: + case 39: return calculationExpression_sempred((CalculationExpressionContext)_localctx, predIndex); - case 37: + case 40: return dotExpression_sempred((DotExpressionContext)_localctx, predIndex); } return true; @@ -3358,7 +3619,7 @@ public class SimpleJavaParser extends Parser { } public static final String _serializedATN = - "\u0004\u00013\u01a3\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ + "\u0004\u00017\u01ce\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ "\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002"+ "\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002"+ "\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b\u0007\u000b\u0002"+ @@ -3371,252 +3632,281 @@ public class SimpleJavaParser extends Parser { "\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007!\u0002\"\u0007\"\u0002"+ "#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002&\u0007&\u0002\'\u0007\'\u0002"+ "(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007+\u0002,\u0007,\u0002"+ - "-\u0007-\u0001\u0000\u0004\u0000^\b\u0000\u000b\u0000\f\u0000_\u0001\u0001"+ - "\u0003\u0001c\b\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+ - "\u0005\u0001i\b\u0001\n\u0001\f\u0001l\t\u0001\u0001\u0001\u0001\u0001"+ - "\u0001\u0002\u0001\u0002\u0001\u0002\u0003\u0002s\b\u0002\u0001\u0003"+ - "\u0003\u0003v\b\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0003\u0003"+ - "{\b\u0003\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0004\u0003\u0004"+ - "\u0081\b\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005"+ - "\u0001\u0005\u0001\u0005\u0003\u0005\u008a\b\u0005\u0001\u0005\u0001\u0005"+ - "\u0003\u0005\u008e\b\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005"+ - "\u0093\b\u0005\u0001\u0005\u0001\u0005\u0003\u0005\u0097\b\u0005\u0001"+ - "\u0006\u0001\u0006\u0001\u0006\u0005\u0006\u009c\b\u0006\n\u0006\f\u0006"+ - "\u009f\t\u0006\u0001\u0007\u0001\u0007\u0001\u0007\u0001\b\u0001\b\u0001"+ - "\b\u0005\b\u00a7\b\b\n\b\f\b\u00aa\t\b\u0003\b\u00ac\b\b\u0001\t\u0001"+ - "\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+ - "\t\u0001\t\u0001\t\u0001\t\u0003\t\u00bc\b\t\u0001\n\u0001\n\u0005\n\u00c0"+ - "\b\n\n\n\f\n\u00c3\t\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0003\u000b"+ - "\u00c9\b\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0003\f\u00cf\b\f\u0001"+ - "\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\u000e\u0001\u000e\u0001"+ + "-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u00070\u0001\u0000\u0004\u0000"+ + "d\b\u0000\u000b\u0000\f\u0000e\u0001\u0001\u0003\u0001i\b\u0001\u0001"+ + "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0005\u0001o\b\u0001\n\u0001"+ + "\f\u0001r\t\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0001"+ + "\u0002\u0003\u0002y\b\u0002\u0001\u0003\u0003\u0003|\b\u0003\u0001\u0003"+ + "\u0001\u0003\u0001\u0003\u0003\u0003\u0081\b\u0003\u0001\u0003\u0001\u0003"+ + "\u0001\u0003\u0001\u0004\u0003\u0004\u0087\b\u0004\u0001\u0004\u0001\u0004"+ + "\u0001\u0004\u0001\u0004\u0003\u0004\u008d\b\u0004\u0001\u0004\u0001\u0004"+ + "\u0001\u0005\u0001\u0005\u0001\u0005\u0003\u0005\u0094\b\u0005\u0001\u0005"+ + "\u0001\u0005\u0003\u0005\u0098\b\u0005\u0001\u0005\u0001\u0005\u0001\u0005"+ + "\u0003\u0005\u009d\b\u0005\u0001\u0005\u0001\u0005\u0003\u0005\u00a1\b"+ + "\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0005\u0006\u00a6\b\u0006\n"+ + "\u0006\f\u0006\u00a9\t\u0006\u0001\u0007\u0001\u0007\u0001\u0007\u0001"+ + "\b\u0001\b\u0001\b\u0005\b\u00b1\b\b\n\b\f\b\u00b4\t\b\u0003\b\u00b6\b"+ + "\b\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+ + "\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0003\t\u00c7\b\t\u0001"+ + "\n\u0001\n\u0005\n\u00cb\b\n\n\n\f\n\u00ce\t\n\u0001\n\u0001\n\u0001\u000b"+ + "\u0001\u000b\u0003\u000b\u00d4\b\u000b\u0001\f\u0001\f\u0001\f\u0001\f"+ + "\u0003\f\u00da\b\f\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001\r\u0001"+ "\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001"+ - "\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0003\u000f\u00e3\b\u000f\u0001"+ - "\u000f\u0001\u000f\u0003\u000f\u00e7\b\u000f\u0001\u000f\u0001\u000f\u0003"+ - "\u000f\u00eb\b\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u0010\u0001"+ - "\u0010\u0005\u0010\u00f2\b\u0010\n\u0010\f\u0010\u00f5\t\u0010\u0001\u0010"+ - "\u0003\u0010\u00f8\b\u0010\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011"+ - "\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012"+ - "\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0001\u0013"+ - "\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0003\u0014\u010e\b\u0014"+ - "\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016"+ - "\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017"+ - "\u0003\u0017\u011c\b\u0017\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018"+ - "\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018"+ - "\u0003\u0018\u0128\b\u0018\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u001a"+ - "\u0001\u001a\u0003\u001a\u012f\b\u001a\u0001\u001b\u0001\u001b\u0003\u001b"+ - "\u0133\b\u001b\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001d\u0001\u001d"+ - "\u0001\u001d\u0001\u001e\u0001\u001e\u0003\u001e\u013d\b\u001e\u0001\u001f"+ - "\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001 \u0001!\u0001!\u0003!\u0147"+ - "\b!\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0003\"\u014e\b\"\u0001\""+ - "\u0001\"\u0004\"\u0152\b\"\u000b\"\f\"\u0153\u0001\"\u0003\"\u0157\b\""+ - "\u0001#\u0001#\u0003#\u015b\b#\u0001$\u0001$\u0001$\u0001$\u0001$\u0001"+ - "$\u0005$\u0163\b$\n$\f$\u0166\t$\u0001%\u0001%\u0001%\u0001%\u0001%\u0001"+ - "%\u0005%\u016e\b%\n%\f%\u0171\t%\u0001&\u0001&\u0001&\u0001&\u0001&\u0001"+ - "&\u0001&\u0001&\u0003&\u017b\b&\u0001\'\u0001\'\u0001\'\u0001\'\u0001"+ - "(\u0003(\u0182\b(\u0001(\u0005(\u0185\b(\n(\f(\u0188\t(\u0001(\u0001("+ - "\u0001(\u0001(\u0001(\u0001)\u0001)\u0001)\u0001)\u0003)\u0193\b)\u0001"+ - ")\u0001)\u0001*\u0001*\u0001*\u0001*\u0001*\u0001*\u0001+\u0001+\u0001"+ - ",\u0001,\u0001-\u0001-\u0001-\u0000\u0002HJ.\u0000\u0002\u0004\u0006\b"+ - "\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c\u001e \"$&(*,.02"+ - "468:<>@BDFHJLNPRTVXZ\u0000\u0003\u0002\u0000\u0004\u000600\u0001\u0000"+ - ",/\u0001\u0000\u000b\f\u01ae\u0000]\u0001\u0000\u0000\u0000\u0002b\u0001"+ - "\u0000\u0000\u0000\u0004r\u0001\u0000\u0000\u0000\u0006u\u0001\u0000\u0000"+ - "\u0000\b\u0080\u0001\u0000\u0000\u0000\n\u0096\u0001\u0000\u0000\u0000"+ - "\f\u0098\u0001\u0000\u0000\u0000\u000e\u00a0\u0001\u0000\u0000\u0000\u0010"+ - "\u00ab\u0001\u0000\u0000\u0000\u0012\u00bb\u0001\u0000\u0000\u0000\u0014"+ - "\u00bd\u0001\u0000\u0000\u0000\u0016\u00c6\u0001\u0000\u0000\u0000\u0018"+ - "\u00ca\u0001\u0000\u0000\u0000\u001a\u00d0\u0001\u0000\u0000\u0000\u001c"+ - "\u00d6\u0001\u0000\u0000\u0000\u001e\u00de\u0001\u0000\u0000\u0000 \u00ef"+ - "\u0001\u0000\u0000\u0000\"\u00f9\u0001\u0000\u0000\u0000$\u00ff\u0001"+ - "\u0000\u0000\u0000&\u0106\u0001\u0000\u0000\u0000(\u010d\u0001\u0000\u0000"+ - "\u0000*\u010f\u0001\u0000\u0000\u0000,\u0113\u0001\u0000\u0000\u0000."+ - "\u011b\u0001\u0000\u0000\u00000\u0127\u0001\u0000\u0000\u00002\u0129\u0001"+ - "\u0000\u0000\u00004\u012e\u0001\u0000\u0000\u00006\u0132\u0001\u0000\u0000"+ - "\u00008\u0134\u0001\u0000\u0000\u0000:\u0137\u0001\u0000\u0000\u0000<"+ - "\u013c\u0001\u0000\u0000\u0000>\u013e\u0001\u0000\u0000\u0000@\u0141\u0001"+ - "\u0000\u0000\u0000B\u0146\u0001\u0000\u0000\u0000D\u0156\u0001\u0000\u0000"+ - "\u0000F\u015a\u0001\u0000\u0000\u0000H\u015c\u0001\u0000\u0000\u0000J"+ - "\u0167\u0001\u0000\u0000\u0000L\u017a\u0001\u0000\u0000\u0000N\u017c\u0001"+ - "\u0000\u0000\u0000P\u0181\u0001\u0000\u0000\u0000R\u0192\u0001\u0000\u0000"+ - "\u0000T\u0196\u0001\u0000\u0000\u0000V\u019c\u0001\u0000\u0000\u0000X"+ - "\u019e\u0001\u0000\u0000\u0000Z\u01a0\u0001\u0000\u0000\u0000\\^\u0003"+ - "\u0002\u0001\u0000]\\\u0001\u0000\u0000\u0000^_\u0001\u0000\u0000\u0000"+ - "_]\u0001\u0000\u0000\u0000_`\u0001\u0000\u0000\u0000`\u0001\u0001\u0000"+ - "\u0000\u0000ac\u0005\u0007\u0000\u0000ba\u0001\u0000\u0000\u0000bc\u0001"+ - "\u0000\u0000\u0000cd\u0001\u0000\u0000\u0000de\u0005#\u0000\u0000ef\u0005"+ - "0\u0000\u0000fj\u0005\u001f\u0000\u0000gi\u0003\u0004\u0002\u0000hg\u0001"+ - "\u0000\u0000\u0000il\u0001\u0000\u0000\u0000jh\u0001\u0000\u0000\u0000"+ - "jk\u0001\u0000\u0000\u0000km\u0001\u0000\u0000\u0000lj\u0001\u0000\u0000"+ - "\u0000mn\u0005 \u0000\u0000n\u0003\u0001\u0000\u0000\u0000os\u0003\u0006"+ - "\u0003\u0000ps\u0003\b\u0004\u0000qs\u0003\n\u0005\u0000ro\u0001\u0000"+ - "\u0000\u0000rp\u0001\u0000\u0000\u0000rq\u0001\u0000\u0000\u0000s\u0005"+ - "\u0001\u0000\u0000\u0000tv\u0005\u0007\u0000\u0000ut\u0001\u0000\u0000"+ - "\u0000uv\u0001\u0000\u0000\u0000vw\u0001\u0000\u0000\u0000wx\u00050\u0000"+ - "\u0000xz\u0005\u001d\u0000\u0000y{\u0003\f\u0006\u0000zy\u0001\u0000\u0000"+ - "\u0000z{\u0001\u0000\u0000\u0000{|\u0001\u0000\u0000\u0000|}\u0005\u001e"+ - "\u0000\u0000}~\u0003\u0014\n\u0000~\u0007\u0001\u0000\u0000\u0000\u007f"+ - "\u0081\u0005\u0007\u0000\u0000\u0080\u007f\u0001\u0000\u0000\u0000\u0080"+ + "\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0003"+ + "\u000f\u00ee\b\u000f\u0001\u000f\u0001\u000f\u0003\u000f\u00f2\b\u000f"+ + "\u0001\u000f\u0001\u000f\u0003\u000f\u00f6\b\u000f\u0001\u000f\u0001\u000f"+ + "\u0001\u000f\u0001\u0010\u0001\u0010\u0005\u0010\u00fd\b\u0010\n\u0010"+ + "\f\u0010\u0100\t\u0010\u0001\u0010\u0003\u0010\u0103\b\u0010\u0001\u0011"+ + "\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0012"+ + "\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012"+ + "\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014"+ + "\u0001\u0014\u0001\u0014\u0001\u0014\u0004\u0014\u011b\b\u0014\u000b\u0014"+ + "\f\u0014\u011c\u0001\u0014\u0003\u0014\u0120\b\u0014\u0001\u0014\u0001"+ + "\u0014\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0005\u0015\u0128"+ + "\b\u0015\n\u0015\f\u0015\u012b\t\u0015\u0001\u0016\u0001\u0016\u0001\u0016"+ + "\u0005\u0016\u0130\b\u0016\n\u0016\f\u0016\u0133\t\u0016\u0001\u0017\u0001"+ + "\u0017\u0001\u0017\u0001\u0017\u0003\u0017\u0139\b\u0017\u0001\u0018\u0001"+ + "\u0018\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u0019\u0001"+ + "\u0019\u0001\u0019\u0001\u0019\u0001\u001a\u0001\u001a\u0003\u001a\u0147"+ + "\b\u001a\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001"+ + "\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0003\u001b\u0153"+ + "\b\u001b\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001d\u0001\u001d\u0003"+ + "\u001d\u015a\b\u001d\u0001\u001e\u0001\u001e\u0003\u001e\u015e\b\u001e"+ + "\u0001\u001f\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001 \u0001!\u0001"+ + "!\u0003!\u0168\b!\u0001\"\u0001\"\u0001\"\u0001#\u0001#\u0001#\u0001$"+ + "\u0001$\u0003$\u0172\b$\u0001%\u0001%\u0001%\u0001%\u0001%\u0003%\u0179"+ + "\b%\u0001%\u0001%\u0004%\u017d\b%\u000b%\f%\u017e\u0001%\u0003%\u0182"+ + "\b%\u0001&\u0001&\u0003&\u0186\b&\u0001\'\u0001\'\u0001\'\u0001\'\u0001"+ + "\'\u0001\'\u0005\'\u018e\b\'\n\'\f\'\u0191\t\'\u0001(\u0001(\u0001(\u0001"+ + "(\u0001(\u0001(\u0005(\u0199\b(\n(\f(\u019c\t(\u0001)\u0001)\u0001)\u0001"+ + ")\u0001)\u0001)\u0001)\u0001)\u0003)\u01a6\b)\u0001*\u0001*\u0001*\u0001"+ + "*\u0001+\u0003+\u01ad\b+\u0001+\u0005+\u01b0\b+\n+\f+\u01b3\t+\u0001+"+ + "\u0001+\u0001+\u0001+\u0001+\u0001,\u0001,\u0001,\u0001,\u0003,\u01be"+ + "\b,\u0001,\u0001,\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001.\u0001"+ + ".\u0001/\u0001/\u00010\u00010\u00010\u0000\u0002NP1\u0000\u0002\u0004"+ + "\u0006\b\n\f\u000e\u0010\u0012\u0014\u0016\u0018\u001a\u001c\u001e \""+ + "$&(*,.02468:<>@BDFHJLNPRTVXZ\\^`\u0000\u0003\u0002\u0000\u0004\u00064"+ + "4\u0001\u000003\u0001\u0000\u000b\f\u01dc\u0000c\u0001\u0000\u0000\u0000"+ + "\u0002h\u0001\u0000\u0000\u0000\u0004x\u0001\u0000\u0000\u0000\u0006{"+ + "\u0001\u0000\u0000\u0000\b\u0086\u0001\u0000\u0000\u0000\n\u00a0\u0001"+ + "\u0000\u0000\u0000\f\u00a2\u0001\u0000\u0000\u0000\u000e\u00aa\u0001\u0000"+ + "\u0000\u0000\u0010\u00b5\u0001\u0000\u0000\u0000\u0012\u00c6\u0001\u0000"+ + "\u0000\u0000\u0014\u00c8\u0001\u0000\u0000\u0000\u0016\u00d1\u0001\u0000"+ + "\u0000\u0000\u0018\u00d5\u0001\u0000\u0000\u0000\u001a\u00db\u0001\u0000"+ + "\u0000\u0000\u001c\u00e1\u0001\u0000\u0000\u0000\u001e\u00e9\u0001\u0000"+ + "\u0000\u0000 \u00fa\u0001\u0000\u0000\u0000\"\u0104\u0001\u0000\u0000"+ + "\u0000$\u010a\u0001\u0000\u0000\u0000&\u0111\u0001\u0000\u0000\u0000("+ + "\u0114\u0001\u0000\u0000\u0000*\u0123\u0001\u0000\u0000\u0000,\u012c\u0001"+ + "\u0000\u0000\u0000.\u0138\u0001\u0000\u0000\u00000\u013a\u0001\u0000\u0000"+ + "\u00002\u013e\u0001\u0000\u0000\u00004\u0146\u0001\u0000\u0000\u00006"+ + "\u0152\u0001\u0000\u0000\u00008\u0154\u0001\u0000\u0000\u0000:\u0159\u0001"+ + "\u0000\u0000\u0000<\u015d\u0001\u0000\u0000\u0000>\u015f\u0001\u0000\u0000"+ + "\u0000@\u0162\u0001\u0000\u0000\u0000B\u0167\u0001\u0000\u0000\u0000D"+ + "\u0169\u0001\u0000\u0000\u0000F\u016c\u0001\u0000\u0000\u0000H\u0171\u0001"+ + "\u0000\u0000\u0000J\u0181\u0001\u0000\u0000\u0000L\u0185\u0001\u0000\u0000"+ + "\u0000N\u0187\u0001\u0000\u0000\u0000P\u0192\u0001\u0000\u0000\u0000R"+ + "\u01a5\u0001\u0000\u0000\u0000T\u01a7\u0001\u0000\u0000\u0000V\u01ac\u0001"+ + "\u0000\u0000\u0000X\u01bd\u0001\u0000\u0000\u0000Z\u01c1\u0001\u0000\u0000"+ + "\u0000\\\u01c7\u0001\u0000\u0000\u0000^\u01c9\u0001\u0000\u0000\u0000"+ + "`\u01cb\u0001\u0000\u0000\u0000bd\u0003\u0002\u0001\u0000cb\u0001\u0000"+ + "\u0000\u0000de\u0001\u0000\u0000\u0000ec\u0001\u0000\u0000\u0000ef\u0001"+ + "\u0000\u0000\u0000f\u0001\u0001\u0000\u0000\u0000gi\u0005\u0007\u0000"+ + "\u0000hg\u0001\u0000\u0000\u0000hi\u0001\u0000\u0000\u0000ij\u0001\u0000"+ + "\u0000\u0000jk\u0005#\u0000\u0000kl\u00054\u0000\u0000lp\u0005\u001f\u0000"+ + "\u0000mo\u0003\u0004\u0002\u0000nm\u0001\u0000\u0000\u0000or\u0001\u0000"+ + "\u0000\u0000pn\u0001\u0000\u0000\u0000pq\u0001\u0000\u0000\u0000qs\u0001"+ + "\u0000\u0000\u0000rp\u0001\u0000\u0000\u0000st\u0005 \u0000\u0000t\u0003"+ + "\u0001\u0000\u0000\u0000uy\u0003\u0006\u0003\u0000vy\u0003\b\u0004\u0000"+ + "wy\u0003\n\u0005\u0000xu\u0001\u0000\u0000\u0000xv\u0001\u0000\u0000\u0000"+ + "xw\u0001\u0000\u0000\u0000y\u0005\u0001\u0000\u0000\u0000z|\u0005\u0007"+ + "\u0000\u0000{z\u0001\u0000\u0000\u0000{|\u0001\u0000\u0000\u0000|}\u0001"+ + "\u0000\u0000\u0000}~\u00054\u0000\u0000~\u0080\u0005\u001d\u0000\u0000"+ + "\u007f\u0081\u0003\f\u0006\u0000\u0080\u007f\u0001\u0000\u0000\u0000\u0080"+ "\u0081\u0001\u0000\u0000\u0000\u0081\u0082\u0001\u0000\u0000\u0000\u0082"+ - "\u0083\u0003V+\u0000\u0083\u0084\u00050\u0000\u0000\u0084\u0085\u0005"+ - "!\u0000\u0000\u0085\t\u0001\u0000\u0000\u0000\u0086\u0087\u0005\b\u0000"+ - "\u0000\u0087\u0097\u0003\u0014\n\u0000\u0088\u008a\u0005\u0007\u0000\u0000"+ - "\u0089\u0088\u0001\u0000\u0000\u0000\u0089\u008a\u0001\u0000\u0000\u0000"+ - "\u008a\u008d\u0001\u0000\u0000\u0000\u008b\u008e\u0003V+\u0000\u008c\u008e"+ - "\u0005\u0003\u0000\u0000\u008d\u008b\u0001\u0000\u0000\u0000\u008d\u008c"+ - "\u0001\u0000\u0000\u0000\u008e\u008f\u0001\u0000\u0000\u0000\u008f\u0090"+ - "\u00050\u0000\u0000\u0090\u0092\u0005\u001d\u0000\u0000\u0091\u0093\u0003"+ - "\f\u0006\u0000\u0092\u0091\u0001\u0000\u0000\u0000\u0092\u0093\u0001\u0000"+ - "\u0000\u0000\u0093\u0094\u0001\u0000\u0000\u0000\u0094\u0095\u0005\u001e"+ - "\u0000\u0000\u0095\u0097\u0003\u0014\n\u0000\u0096\u0086\u0001\u0000\u0000"+ - "\u0000\u0096\u0089\u0001\u0000\u0000\u0000\u0097\u000b\u0001\u0000\u0000"+ - "\u0000\u0098\u009d\u0003\u000e\u0007\u0000\u0099\u009a\u0005\"\u0000\u0000"+ - "\u009a\u009c\u0003\u000e\u0007\u0000\u009b\u0099\u0001\u0000\u0000\u0000"+ - "\u009c\u009f\u0001\u0000\u0000\u0000\u009d\u009b\u0001\u0000\u0000\u0000"+ - "\u009d\u009e\u0001\u0000\u0000\u0000\u009e\r\u0001\u0000\u0000\u0000\u009f"+ - "\u009d\u0001\u0000\u0000\u0000\u00a0\u00a1\u0003V+\u0000\u00a1\u00a2\u0005"+ - "0\u0000\u0000\u00a2\u000f\u0001\u0000\u0000\u0000\u00a3\u00a8\u0003.\u0017"+ - "\u0000\u00a4\u00a5\u0005\"\u0000\u0000\u00a5\u00a7\u0003.\u0017\u0000"+ - "\u00a6\u00a4\u0001\u0000\u0000\u0000\u00a7\u00aa\u0001\u0000\u0000\u0000"+ - "\u00a8\u00a6\u0001\u0000\u0000\u0000\u00a8\u00a9\u0001\u0000\u0000\u0000"+ - "\u00a9\u00ac\u0001\u0000\u0000\u0000\u00aa\u00a8\u0001\u0000\u0000\u0000"+ - "\u00ab\u00a3\u0001\u0000\u0000\u0000\u00ab\u00ac\u0001\u0000\u0000\u0000"+ - "\u00ac\u0011\u0001\u0000\u0000\u0000\u00ad\u00ae\u0003\u0016\u000b\u0000"+ - "\u00ae\u00af\u0005!\u0000\u0000\u00af\u00bc\u0001\u0000\u0000\u0000\u00b0"+ - "\u00b1\u0003\u0018\f\u0000\u00b1\u00b2\u0005!\u0000\u0000\u00b2\u00bc"+ - "\u0001\u0000\u0000\u0000\u00b3\u00bc\u0003\u0014\n\u0000\u00b4\u00bc\u0003"+ - "\u001a\r\u0000\u00b5\u00bc\u0003\u001c\u000e\u0000\u00b6\u00bc\u0003\u001e"+ - "\u000f\u0000\u00b7\u00bc\u0003 \u0010\u0000\u00b8\u00b9\u0003(\u0014\u0000"+ - "\u00b9\u00ba\u0005!\u0000\u0000\u00ba\u00bc\u0001\u0000\u0000\u0000\u00bb"+ - "\u00ad\u0001\u0000\u0000\u0000\u00bb\u00b0\u0001\u0000\u0000\u0000\u00bb"+ - "\u00b3\u0001\u0000\u0000\u0000\u00bb\u00b4\u0001\u0000\u0000\u0000\u00bb"+ - "\u00b5\u0001\u0000\u0000\u0000\u00bb\u00b6\u0001\u0000\u0000\u0000\u00bb"+ - "\u00b7\u0001\u0000\u0000\u0000\u00bb\u00b8\u0001\u0000\u0000\u0000\u00bc"+ - "\u0013\u0001\u0000\u0000\u0000\u00bd\u00c1\u0005\u001f\u0000\u0000\u00be"+ - "\u00c0\u0003\u0012\t\u0000\u00bf\u00be\u0001\u0000\u0000\u0000\u00c0\u00c3"+ - "\u0001\u0000\u0000\u0000\u00c1\u00bf\u0001\u0000\u0000\u0000\u00c1\u00c2"+ - "\u0001\u0000\u0000\u0000\u00c2\u00c4\u0001\u0000\u0000\u0000\u00c3\u00c1"+ - "\u0001\u0000\u0000\u0000\u00c4\u00c5\u0005 \u0000\u0000\u00c5\u0015\u0001"+ - "\u0000\u0000\u0000\u00c6\u00c8\u0005*\u0000\u0000\u00c7\u00c9\u0003.\u0017"+ - "\u0000\u00c8\u00c7\u0001\u0000\u0000\u0000\u00c8\u00c9\u0001\u0000\u0000"+ - "\u0000\u00c9\u0017\u0001\u0000\u0000\u0000\u00ca\u00cb\u0003V+\u0000\u00cb"+ - "\u00ce\u00050\u0000\u0000\u00cc\u00cd\u0005\r\u0000\u0000\u00cd\u00cf"+ - "\u0003.\u0017\u0000\u00ce\u00cc\u0001\u0000\u0000\u0000\u00ce\u00cf\u0001"+ - "\u0000\u0000\u0000\u00cf\u0019\u0001\u0000\u0000\u0000\u00d0\u00d1\u0005"+ - "%\u0000\u0000\u00d1\u00d2\u0005\u001d\u0000\u0000\u00d2\u00d3\u0003.\u0017"+ - "\u0000\u00d3\u00d4\u0005\u001e\u0000\u0000\u00d4\u00d5\u0003\u0014\n\u0000"+ - "\u00d5\u001b\u0001\u0000\u0000\u0000\u00d6\u00d7\u0005&\u0000\u0000\u00d7"+ - "\u00d8\u0003\u0014\n\u0000\u00d8\u00d9\u0005%\u0000\u0000\u00d9\u00da"+ - "\u0005\u001d\u0000\u0000\u00da\u00db\u0003.\u0017\u0000\u00db\u00dc\u0005"+ - "\u001e\u0000\u0000\u00dc\u00dd\u0005!\u0000\u0000\u00dd\u001d\u0001\u0000"+ - "\u0000\u0000\u00de\u00df\u0005)\u0000\u0000\u00df\u00e2\u0005\u001d\u0000"+ - "\u0000\u00e0\u00e3\u0003(\u0014\u0000\u00e1\u00e3\u0003\u0018\f\u0000"+ - "\u00e2\u00e0\u0001\u0000\u0000\u0000\u00e2\u00e1\u0001\u0000\u0000\u0000"+ - "\u00e3\u00e4\u0001\u0000\u0000\u0000\u00e4\u00e6\u0005!\u0000\u0000\u00e5"+ - "\u00e7\u0003.\u0017\u0000\u00e6\u00e5\u0001\u0000\u0000\u0000\u00e6\u00e7"+ - "\u0001\u0000\u0000\u0000\u00e7\u00e8\u0001\u0000\u0000\u0000\u00e8\u00ea"+ - "\u0005!\u0000\u0000\u00e9\u00eb\u0003(\u0014\u0000\u00ea\u00e9\u0001\u0000"+ - "\u0000\u0000\u00ea\u00eb\u0001\u0000\u0000\u0000\u00eb\u00ec\u0001\u0000"+ - "\u0000\u0000\u00ec\u00ed\u0005\u001e\u0000\u0000\u00ed\u00ee\u0003\u0014"+ - "\n\u0000\u00ee\u001f\u0001\u0000\u0000\u0000\u00ef\u00f3\u0003\"\u0011"+ - "\u0000\u00f0\u00f2\u0003$\u0012\u0000\u00f1\u00f0\u0001\u0000\u0000\u0000"+ - "\u00f2\u00f5\u0001\u0000\u0000\u0000\u00f3\u00f1\u0001\u0000\u0000\u0000"+ - "\u00f3\u00f4\u0001\u0000\u0000\u0000\u00f4\u00f7\u0001\u0000\u0000\u0000"+ - "\u00f5\u00f3\u0001\u0000\u0000\u0000\u00f6\u00f8\u0003&\u0013\u0000\u00f7"+ - "\u00f6\u0001\u0000\u0000\u0000\u00f7\u00f8\u0001\u0000\u0000\u0000\u00f8"+ - "!\u0001\u0000\u0000\u0000\u00f9\u00fa\u0005\'\u0000\u0000\u00fa\u00fb"+ - "\u0005\u001d\u0000\u0000\u00fb\u00fc\u0003.\u0017\u0000\u00fc\u00fd\u0005"+ - "\u001e\u0000\u0000\u00fd\u00fe\u0003\u0014\n\u0000\u00fe#\u0001\u0000"+ - "\u0000\u0000\u00ff\u0100\u0005(\u0000\u0000\u0100\u0101\u0005\'\u0000"+ - "\u0000\u0101\u0102\u0005\u001d\u0000\u0000\u0102\u0103\u0003.\u0017\u0000"+ - "\u0103\u0104\u0005\u001e\u0000\u0000\u0104\u0105\u0003\u0014\n\u0000\u0105"+ - "%\u0001\u0000\u0000\u0000\u0106\u0107\u0005(\u0000\u0000\u0107\u0108\u0003"+ - "\u0014\n\u0000\u0108\'\u0001\u0000\u0000\u0000\u0109\u010e\u0003*\u0015"+ - "\u0000\u010a\u010e\u0003,\u0016\u0000\u010b\u010e\u0003P(\u0000\u010c"+ - "\u010e\u00034\u001a\u0000\u010d\u0109\u0001\u0000\u0000\u0000\u010d\u010a"+ - "\u0001\u0000\u0000\u0000\u010d\u010b\u0001\u0000\u0000\u0000\u010d\u010c"+ - "\u0001\u0000\u0000\u0000\u010e)\u0001\u0000\u0000\u0000\u010f\u0110\u0003"+ - "B!\u0000\u0110\u0111\u0005\r\u0000\u0000\u0111\u0112\u0003.\u0017\u0000"+ - "\u0112+\u0001\u0000\u0000\u0000\u0113\u0114\u0005+\u0000\u0000\u0114\u0115"+ - "\u00050\u0000\u0000\u0115\u0116\u0005\u001d\u0000\u0000\u0116\u0117\u0003"+ - "\u0010\b\u0000\u0117\u0118\u0005\u001e\u0000\u0000\u0118-\u0001\u0000"+ - "\u0000\u0000\u0119\u011c\u00030\u0018\u0000\u011a\u011c\u0003F#\u0000"+ - "\u011b\u0119\u0001\u0000\u0000\u0000\u011b\u011a\u0001\u0000\u0000\u0000"+ - "\u011c/\u0001\u0000\u0000\u0000\u011d\u0128\u0005$\u0000\u0000\u011e\u0128"+ - "\u00050\u0000\u0000\u011f\u0128\u0003D\"\u0000\u0120\u0128\u0003X,\u0000"+ - "\u0121\u0128\u00032\u0019\u0000\u0122\u0128\u0003(\u0014\u0000\u0123\u0124"+ - "\u0005\u001d\u0000\u0000\u0124\u0125\u0003.\u0017\u0000\u0125\u0126\u0005"+ - "\u001e\u0000\u0000\u0126\u0128\u0001\u0000\u0000\u0000\u0127\u011d\u0001"+ - "\u0000\u0000\u0000\u0127\u011e\u0001\u0000\u0000\u0000\u0127\u011f\u0001"+ - "\u0000\u0000\u0000\u0127\u0120\u0001\u0000\u0000\u0000\u0127\u0121\u0001"+ - "\u0000\u0000\u0000\u0127\u0122\u0001\u0000\u0000\u0000\u0127\u0123\u0001"+ - "\u0000\u0000\u0000\u01281\u0001\u0000\u0000\u0000\u0129\u012a\u0005\u0019"+ - "\u0000\u0000\u012a\u012b\u0003.\u0017\u0000\u012b3\u0001\u0000\u0000\u0000"+ - "\u012c\u012f\u00036\u001b\u0000\u012d\u012f\u0003<\u001e\u0000\u012e\u012c"+ - "\u0001\u0000\u0000\u0000\u012e\u012d\u0001\u0000\u0000\u0000\u012f5\u0001"+ - "\u0000\u0000\u0000\u0130\u0133\u00038\u001c\u0000\u0131\u0133\u0003:\u001d"+ - "\u0000\u0132\u0130\u0001\u0000\u0000\u0000\u0132\u0131\u0001\u0000\u0000"+ - "\u0000\u01337\u0001\u0000\u0000\u0000\u0134\u0135\u0005\u0001\u0000\u0000"+ - "\u0135\u0136\u0003B!\u0000\u01369\u0001\u0000\u0000\u0000\u0137\u0138"+ - "\u0003B!\u0000\u0138\u0139\u0005\u0001\u0000\u0000\u0139;\u0001\u0000"+ - "\u0000\u0000\u013a\u013d\u0003>\u001f\u0000\u013b\u013d\u0003@ \u0000"+ - "\u013c\u013a\u0001\u0000\u0000\u0000\u013c\u013b\u0001\u0000\u0000\u0000"+ - "\u013d=\u0001\u0000\u0000\u0000\u013e\u013f\u0005\u0002\u0000\u0000\u013f"+ - "\u0140\u0003B!\u0000\u0140?\u0001\u0000\u0000\u0000\u0141\u0142\u0003"+ - "B!\u0000\u0142\u0143\u0005\u0002\u0000\u0000\u0143A\u0001\u0000\u0000"+ - "\u0000\u0144\u0147\u00050\u0000\u0000\u0145\u0147\u0003D\"\u0000\u0146"+ - "\u0144\u0001\u0000\u0000\u0000\u0146\u0145\u0001\u0000\u0000\u0000\u0147"+ - "C\u0001\u0000\u0000\u0000\u0148\u0149\u0005$\u0000\u0000\u0149\u014a\u0005"+ - "\u001c\u0000\u0000\u014a\u0157\u00050\u0000\u0000\u014b\u014c\u0005$\u0000"+ - "\u0000\u014c\u014e\u0005\u001c\u0000\u0000\u014d\u014b\u0001\u0000\u0000"+ - "\u0000\u014d\u014e\u0001\u0000\u0000\u0000\u014e\u0151\u0001\u0000\u0000"+ - "\u0000\u014f\u0150\u00050\u0000\u0000\u0150\u0152\u0005\u001c\u0000\u0000"+ - "\u0151\u014f\u0001\u0000\u0000\u0000\u0152\u0153\u0001\u0000\u0000\u0000"+ - "\u0153\u0151\u0001\u0000\u0000\u0000\u0153\u0154\u0001\u0000\u0000\u0000"+ - "\u0154\u0155\u0001\u0000\u0000\u0000\u0155\u0157\u00050\u0000\u0000\u0156"+ - "\u0148\u0001\u0000\u0000\u0000\u0156\u014d\u0001\u0000\u0000\u0000\u0157"+ - "E\u0001\u0000\u0000\u0000\u0158\u015b\u0003H$\u0000\u0159\u015b\u0003"+ - "N\'\u0000\u015a\u0158\u0001\u0000\u0000\u0000\u015a\u0159\u0001\u0000"+ - "\u0000\u0000\u015bG\u0001\u0000\u0000\u0000\u015c\u015d\u0006$\uffff\uffff"+ - "\u0000\u015d\u015e\u0003J%\u0000\u015e\u0164\u0001\u0000\u0000\u0000\u015f"+ - "\u0160\n\u0002\u0000\u0000\u0160\u0161\u0005\n\u0000\u0000\u0161\u0163"+ - "\u0003J%\u0000\u0162\u015f\u0001\u0000\u0000\u0000\u0163\u0166\u0001\u0000"+ - "\u0000\u0000\u0164\u0162\u0001\u0000\u0000\u0000\u0164\u0165\u0001\u0000"+ - "\u0000\u0000\u0165I\u0001\u0000\u0000\u0000\u0166\u0164\u0001\u0000\u0000"+ - "\u0000\u0167\u0168\u0006%\uffff\uffff\u0000\u0168\u0169\u0003L&\u0000"+ - "\u0169\u016f\u0001\u0000\u0000\u0000\u016a\u016b\n\u0002\u0000\u0000\u016b"+ - "\u016c\u0005\t\u0000\u0000\u016c\u016e\u0003L&\u0000\u016d\u016a\u0001"+ - "\u0000\u0000\u0000\u016e\u0171\u0001\u0000\u0000\u0000\u016f\u016d\u0001"+ - "\u0000\u0000\u0000\u016f\u0170\u0001\u0000\u0000\u0000\u0170K\u0001\u0000"+ - "\u0000\u0000\u0171\u016f\u0001\u0000\u0000\u0000\u0172\u017b\u0005-\u0000"+ - "\u0000\u0173\u017b\u00050\u0000\u0000\u0174\u017b\u0003D\"\u0000\u0175"+ - "\u0176\u0003P(\u0000\u0176\u0177\u0005\u001d\u0000\u0000\u0177\u0178\u0003"+ - "H$\u0000\u0178\u0179\u0005\u001e\u0000\u0000\u0179\u017b\u0001\u0000\u0000"+ - "\u0000\u017a\u0172\u0001\u0000\u0000\u0000\u017a\u0173\u0001\u0000\u0000"+ - "\u0000\u017a\u0174\u0001\u0000\u0000\u0000\u017a\u0175\u0001\u0000\u0000"+ - "\u0000\u017bM\u0001\u0000\u0000\u0000\u017c\u017d\u00030\u0018\u0000\u017d"+ - "\u017e\u0003Z-\u0000\u017e\u017f\u0003.\u0017\u0000\u017fO\u0001\u0000"+ - "\u0000\u0000\u0180\u0182\u0003R)\u0000\u0181\u0180\u0001\u0000\u0000\u0000"+ - "\u0181\u0182\u0001\u0000\u0000\u0000\u0182\u0186\u0001\u0000\u0000\u0000"+ - "\u0183\u0185\u0003T*\u0000\u0184\u0183\u0001\u0000\u0000\u0000\u0185\u0188"+ - "\u0001\u0000\u0000\u0000\u0186\u0184\u0001\u0000\u0000\u0000\u0186\u0187"+ - "\u0001\u0000\u0000\u0000\u0187\u0189\u0001\u0000\u0000\u0000\u0188\u0186"+ - "\u0001\u0000\u0000\u0000\u0189\u018a\u00050\u0000\u0000\u018a\u018b\u0005"+ - "\u001d\u0000\u0000\u018b\u018c\u0003\u0010\b\u0000\u018c\u018d\u0005\u001e"+ - "\u0000\u0000\u018dQ\u0001\u0000\u0000\u0000\u018e\u0193\u0005$\u0000\u0000"+ - "\u018f\u0193\u0003D\"\u0000\u0190\u0193\u0003,\u0016\u0000\u0191\u0193"+ - "\u00050\u0000\u0000\u0192\u018e\u0001\u0000\u0000\u0000\u0192\u018f\u0001"+ - "\u0000\u0000\u0000\u0192\u0190\u0001\u0000\u0000\u0000\u0192\u0191\u0001"+ - "\u0000\u0000\u0000\u0193\u0194\u0001\u0000\u0000\u0000\u0194\u0195\u0005"+ - "\u001c\u0000\u0000\u0195S\u0001\u0000\u0000\u0000\u0196\u0197\u00050\u0000"+ - "\u0000\u0197\u0198\u0005\u001d\u0000\u0000\u0198\u0199\u0003\u0010\b\u0000"+ - "\u0199\u019a\u0005\u001e\u0000\u0000\u019a\u019b\u0005\u001c\u0000\u0000"+ - "\u019bU\u0001\u0000\u0000\u0000\u019c\u019d\u0007\u0000\u0000\u0000\u019d"+ - "W\u0001\u0000\u0000\u0000\u019e\u019f\u0007\u0001\u0000\u0000\u019fY\u0001"+ - "\u0000\u0000\u0000\u01a0\u01a1\u0007\u0002\u0000\u0000\u01a1[\u0001\u0000"+ - "\u0000\u0000(_bjruz\u0080\u0089\u008d\u0092\u0096\u009d\u00a8\u00ab\u00bb"+ - "\u00c1\u00c8\u00ce\u00e2\u00e6\u00ea\u00f3\u00f7\u010d\u011b\u0127\u012e"+ - "\u0132\u013c\u0146\u014d\u0153\u0156\u015a\u0164\u016f\u017a\u0181\u0186"+ - "\u0192"; + "\u0083\u0005\u001e\u0000\u0000\u0083\u0084\u0003\u0014\n\u0000\u0084\u0007"+ + "\u0001\u0000\u0000\u0000\u0085\u0087\u0005\u0007\u0000\u0000\u0086\u0085"+ + "\u0001\u0000\u0000\u0000\u0086\u0087\u0001\u0000\u0000\u0000\u0087\u0088"+ + "\u0001\u0000\u0000\u0000\u0088\u0089\u0003\\.\u0000\u0089\u008c\u0005"+ + "4\u0000\u0000\u008a\u008b\u0005\r\u0000\u0000\u008b\u008d\u00034\u001a"+ + "\u0000\u008c\u008a\u0001\u0000\u0000\u0000\u008c\u008d\u0001\u0000\u0000"+ + "\u0000\u008d\u008e\u0001\u0000\u0000\u0000\u008e\u008f\u0005!\u0000\u0000"+ + "\u008f\t\u0001\u0000\u0000\u0000\u0090\u0091\u0005\b\u0000\u0000\u0091"+ + "\u00a1\u0003\u0014\n\u0000\u0092\u0094\u0005\u0007\u0000\u0000\u0093\u0092"+ + "\u0001\u0000\u0000\u0000\u0093\u0094\u0001\u0000\u0000\u0000\u0094\u0097"+ + "\u0001\u0000\u0000\u0000\u0095\u0098\u0003\\.\u0000\u0096\u0098\u0005"+ + "\u0003\u0000\u0000\u0097\u0095\u0001\u0000\u0000\u0000\u0097\u0096\u0001"+ + "\u0000\u0000\u0000\u0098\u0099\u0001\u0000\u0000\u0000\u0099\u009a\u0005"+ + "4\u0000\u0000\u009a\u009c\u0005\u001d\u0000\u0000\u009b\u009d\u0003\f"+ + "\u0006\u0000\u009c\u009b\u0001\u0000\u0000\u0000\u009c\u009d\u0001\u0000"+ + "\u0000\u0000\u009d\u009e\u0001\u0000\u0000\u0000\u009e\u009f\u0005\u001e"+ + "\u0000\u0000\u009f\u00a1\u0003\u0014\n\u0000\u00a0\u0090\u0001\u0000\u0000"+ + "\u0000\u00a0\u0093\u0001\u0000\u0000\u0000\u00a1\u000b\u0001\u0000\u0000"+ + "\u0000\u00a2\u00a7\u0003\u000e\u0007\u0000\u00a3\u00a4\u0005\"\u0000\u0000"+ + "\u00a4\u00a6\u0003\u000e\u0007\u0000\u00a5\u00a3\u0001\u0000\u0000\u0000"+ + "\u00a6\u00a9\u0001\u0000\u0000\u0000\u00a7\u00a5\u0001\u0000\u0000\u0000"+ + "\u00a7\u00a8\u0001\u0000\u0000\u0000\u00a8\r\u0001\u0000\u0000\u0000\u00a9"+ + "\u00a7\u0001\u0000\u0000\u0000\u00aa\u00ab\u0003\\.\u0000\u00ab\u00ac"+ + "\u00054\u0000\u0000\u00ac\u000f\u0001\u0000\u0000\u0000\u00ad\u00b2\u0003"+ + "4\u001a\u0000\u00ae\u00af\u0005\"\u0000\u0000\u00af\u00b1\u00034\u001a"+ + "\u0000\u00b0\u00ae\u0001\u0000\u0000\u0000\u00b1\u00b4\u0001\u0000\u0000"+ + "\u0000\u00b2\u00b0\u0001\u0000\u0000\u0000\u00b2\u00b3\u0001\u0000\u0000"+ + "\u0000\u00b3\u00b6\u0001\u0000\u0000\u0000\u00b4\u00b2\u0001\u0000\u0000"+ + "\u0000\u00b5\u00ad\u0001\u0000\u0000\u0000\u00b5\u00b6\u0001\u0000\u0000"+ + "\u0000\u00b6\u0011\u0001\u0000\u0000\u0000\u00b7\u00b8\u0003\u0016\u000b"+ + "\u0000\u00b8\u00b9\u0005!\u0000\u0000\u00b9\u00c7\u0001\u0000\u0000\u0000"+ + "\u00ba\u00bb\u0003\u0018\f\u0000\u00bb\u00bc\u0005!\u0000\u0000\u00bc"+ + "\u00c7\u0001\u0000\u0000\u0000\u00bd\u00c7\u0003\u0014\n\u0000\u00be\u00c7"+ + "\u0003\u001a\r\u0000\u00bf\u00c7\u0003\u001c\u000e\u0000\u00c0\u00c7\u0003"+ + "\u001e\u000f\u0000\u00c1\u00c7\u0003 \u0010\u0000\u00c2\u00c7\u0003(\u0014"+ + "\u0000\u00c3\u00c4\u0003.\u0017\u0000\u00c4\u00c5\u0005!\u0000\u0000\u00c5"+ + "\u00c7\u0001\u0000\u0000\u0000\u00c6\u00b7\u0001\u0000\u0000\u0000\u00c6"+ + "\u00ba\u0001\u0000\u0000\u0000\u00c6\u00bd\u0001\u0000\u0000\u0000\u00c6"+ + "\u00be\u0001\u0000\u0000\u0000\u00c6\u00bf\u0001\u0000\u0000\u0000\u00c6"+ + "\u00c0\u0001\u0000\u0000\u0000\u00c6\u00c1\u0001\u0000\u0000\u0000\u00c6"+ + "\u00c2\u0001\u0000\u0000\u0000\u00c6\u00c3\u0001\u0000\u0000\u0000\u00c7"+ + "\u0013\u0001\u0000\u0000\u0000\u00c8\u00cc\u0005\u001f\u0000\u0000\u00c9"+ + "\u00cb\u0003\u0012\t\u0000\u00ca\u00c9\u0001\u0000\u0000\u0000\u00cb\u00ce"+ + "\u0001\u0000\u0000\u0000\u00cc\u00ca\u0001\u0000\u0000\u0000\u00cc\u00cd"+ + "\u0001\u0000\u0000\u0000\u00cd\u00cf\u0001\u0000\u0000\u0000\u00ce\u00cc"+ + "\u0001\u0000\u0000\u0000\u00cf\u00d0\u0005 \u0000\u0000\u00d0\u0015\u0001"+ + "\u0000\u0000\u0000\u00d1\u00d3\u0005*\u0000\u0000\u00d2\u00d4\u00034\u001a"+ + "\u0000\u00d3\u00d2\u0001\u0000\u0000\u0000\u00d3\u00d4\u0001\u0000\u0000"+ + "\u0000\u00d4\u0017\u0001\u0000\u0000\u0000\u00d5\u00d6\u0003\\.\u0000"+ + "\u00d6\u00d9\u00054\u0000\u0000\u00d7\u00d8\u0005\r\u0000\u0000\u00d8"+ + "\u00da\u00034\u001a\u0000\u00d9\u00d7\u0001\u0000\u0000\u0000\u00d9\u00da"+ + "\u0001\u0000\u0000\u0000\u00da\u0019\u0001\u0000\u0000\u0000\u00db\u00dc"+ + "\u0005%\u0000\u0000\u00dc\u00dd\u0005\u001d\u0000\u0000\u00dd\u00de\u0003"+ + "4\u001a\u0000\u00de\u00df\u0005\u001e\u0000\u0000\u00df\u00e0\u0003\u0014"+ + "\n\u0000\u00e0\u001b\u0001\u0000\u0000\u0000\u00e1\u00e2\u0005&\u0000"+ + "\u0000\u00e2\u00e3\u0003\u0014\n\u0000\u00e3\u00e4\u0005%\u0000\u0000"+ + "\u00e4\u00e5\u0005\u001d\u0000\u0000\u00e5\u00e6\u00034\u001a\u0000\u00e6"+ + "\u00e7\u0005\u001e\u0000\u0000\u00e7\u00e8\u0005!\u0000\u0000\u00e8\u001d"+ + "\u0001\u0000\u0000\u0000\u00e9\u00ea\u0005)\u0000\u0000\u00ea\u00ed\u0005"+ + "\u001d\u0000\u0000\u00eb\u00ee\u0003.\u0017\u0000\u00ec\u00ee\u0003\u0018"+ + "\f\u0000\u00ed\u00eb\u0001\u0000\u0000\u0000\u00ed\u00ec\u0001\u0000\u0000"+ + "\u0000\u00ee\u00ef\u0001\u0000\u0000\u0000\u00ef\u00f1\u0005!\u0000\u0000"+ + "\u00f0\u00f2\u00034\u001a\u0000\u00f1\u00f0\u0001\u0000\u0000\u0000\u00f1"+ + "\u00f2\u0001\u0000\u0000\u0000\u00f2\u00f3\u0001\u0000\u0000\u0000\u00f3"+ + "\u00f5\u0005!\u0000\u0000\u00f4\u00f6\u0003.\u0017\u0000\u00f5\u00f4\u0001"+ + "\u0000\u0000\u0000\u00f5\u00f6\u0001\u0000\u0000\u0000\u00f6\u00f7\u0001"+ + "\u0000\u0000\u0000\u00f7\u00f8\u0005\u001e\u0000\u0000\u00f8\u00f9\u0003"+ + "\u0014\n\u0000\u00f9\u001f\u0001\u0000\u0000\u0000\u00fa\u00fe\u0003\""+ + "\u0011\u0000\u00fb\u00fd\u0003$\u0012\u0000\u00fc\u00fb\u0001\u0000\u0000"+ + "\u0000\u00fd\u0100\u0001\u0000\u0000\u0000\u00fe\u00fc\u0001\u0000\u0000"+ + "\u0000\u00fe\u00ff\u0001\u0000\u0000\u0000\u00ff\u0102\u0001\u0000\u0000"+ + "\u0000\u0100\u00fe\u0001\u0000\u0000\u0000\u0101\u0103\u0003&\u0013\u0000"+ + "\u0102\u0101\u0001\u0000\u0000\u0000\u0102\u0103\u0001\u0000\u0000\u0000"+ + "\u0103!\u0001\u0000\u0000\u0000\u0104\u0105\u0005\'\u0000\u0000\u0105"+ + "\u0106\u0005\u001d\u0000\u0000\u0106\u0107\u00034\u001a\u0000\u0107\u0108"+ + "\u0005\u001e\u0000\u0000\u0108\u0109\u0003\u0014\n\u0000\u0109#\u0001"+ + "\u0000\u0000\u0000\u010a\u010b\u0005(\u0000\u0000\u010b\u010c\u0005\'"+ + "\u0000\u0000\u010c\u010d\u0005\u001d\u0000\u0000\u010d\u010e\u00034\u001a"+ + "\u0000\u010e\u010f\u0005\u001e\u0000\u0000\u010f\u0110\u0003\u0014\n\u0000"+ + "\u0110%\u0001\u0000\u0000\u0000\u0111\u0112\u0005(\u0000\u0000\u0112\u0113"+ + "\u0003\u0014\n\u0000\u0113\'\u0001\u0000\u0000\u0000\u0114\u0115\u0005"+ + ",\u0000\u0000\u0115\u0116\u0005\u001d\u0000\u0000\u0116\u0117\u00034\u001a"+ + "\u0000\u0117\u0118\u0005\u001e\u0000\u0000\u0118\u011a\u0005\u001f\u0000"+ + "\u0000\u0119\u011b\u0003*\u0015\u0000\u011a\u0119\u0001\u0000\u0000\u0000"+ + "\u011b\u011c\u0001\u0000\u0000\u0000\u011c\u011a\u0001\u0000\u0000\u0000"+ + "\u011c\u011d\u0001\u0000\u0000\u0000\u011d\u011f\u0001\u0000\u0000\u0000"+ + "\u011e\u0120\u0003,\u0016\u0000\u011f\u011e\u0001\u0000\u0000\u0000\u011f"+ + "\u0120\u0001\u0000\u0000\u0000\u0120\u0121\u0001\u0000\u0000\u0000\u0121"+ + "\u0122\u0005 \u0000\u0000\u0122)\u0001\u0000\u0000\u0000\u0123\u0124\u0005"+ + "-\u0000\u0000\u0124\u0125\u0003^/\u0000\u0125\u0129\u0005/\u0000\u0000"+ + "\u0126\u0128\u0003\u0012\t\u0000\u0127\u0126\u0001\u0000\u0000\u0000\u0128"+ + "\u012b\u0001\u0000\u0000\u0000\u0129\u0127\u0001\u0000\u0000\u0000\u0129"+ + "\u012a\u0001\u0000\u0000\u0000\u012a+\u0001\u0000\u0000\u0000\u012b\u0129"+ + "\u0001\u0000\u0000\u0000\u012c\u012d\u0005.\u0000\u0000\u012d\u0131\u0005"+ + "/\u0000\u0000\u012e\u0130\u0003\u0012\t\u0000\u012f\u012e\u0001\u0000"+ + "\u0000\u0000\u0130\u0133\u0001\u0000\u0000\u0000\u0131\u012f\u0001\u0000"+ + "\u0000\u0000\u0131\u0132\u0001\u0000\u0000\u0000\u0132-\u0001\u0000\u0000"+ + "\u0000\u0133\u0131\u0001\u0000\u0000\u0000\u0134\u0139\u00030\u0018\u0000"+ + "\u0135\u0139\u00032\u0019\u0000\u0136\u0139\u0003V+\u0000\u0137\u0139"+ + "\u0003:\u001d\u0000\u0138\u0134\u0001\u0000\u0000\u0000\u0138\u0135\u0001"+ + "\u0000\u0000\u0000\u0138\u0136\u0001\u0000\u0000\u0000\u0138\u0137\u0001"+ + "\u0000\u0000\u0000\u0139/\u0001\u0000\u0000\u0000\u013a\u013b\u0003H$"+ + "\u0000\u013b\u013c\u0005\r\u0000\u0000\u013c\u013d\u00034\u001a\u0000"+ + "\u013d1\u0001\u0000\u0000\u0000\u013e\u013f\u0005+\u0000\u0000\u013f\u0140"+ + "\u00054\u0000\u0000\u0140\u0141\u0005\u001d\u0000\u0000\u0141\u0142\u0003"+ + "\u0010\b\u0000\u0142\u0143\u0005\u001e\u0000\u0000\u01433\u0001\u0000"+ + "\u0000\u0000\u0144\u0147\u00036\u001b\u0000\u0145\u0147\u0003L&\u0000"+ + "\u0146\u0144\u0001\u0000\u0000\u0000\u0146\u0145\u0001\u0000\u0000\u0000"+ + "\u01475\u0001\u0000\u0000\u0000\u0148\u0153\u0005$\u0000\u0000\u0149\u0153"+ + "\u00054\u0000\u0000\u014a\u0153\u0003J%\u0000\u014b\u0153\u0003^/\u0000"+ + "\u014c\u0153\u00038\u001c\u0000\u014d\u0153\u0003.\u0017\u0000\u014e\u014f"+ + "\u0005\u001d\u0000\u0000\u014f\u0150\u00034\u001a\u0000\u0150\u0151\u0005"+ + "\u001e\u0000\u0000\u0151\u0153\u0001\u0000\u0000\u0000\u0152\u0148\u0001"+ + "\u0000\u0000\u0000\u0152\u0149\u0001\u0000\u0000\u0000\u0152\u014a\u0001"+ + "\u0000\u0000\u0000\u0152\u014b\u0001\u0000\u0000\u0000\u0152\u014c\u0001"+ + "\u0000\u0000\u0000\u0152\u014d\u0001\u0000\u0000\u0000\u0152\u014e\u0001"+ + "\u0000\u0000\u0000\u01537\u0001\u0000\u0000\u0000\u0154\u0155\u0005\u0019"+ + "\u0000\u0000\u0155\u0156\u00034\u001a\u0000\u01569\u0001\u0000\u0000\u0000"+ + "\u0157\u015a\u0003<\u001e\u0000\u0158\u015a\u0003B!\u0000\u0159\u0157"+ + "\u0001\u0000\u0000\u0000\u0159\u0158\u0001\u0000\u0000\u0000\u015a;\u0001"+ + "\u0000\u0000\u0000\u015b\u015e\u0003>\u001f\u0000\u015c\u015e\u0003@ "+ + "\u0000\u015d\u015b\u0001\u0000\u0000\u0000\u015d\u015c\u0001\u0000\u0000"+ + "\u0000\u015e=\u0001\u0000\u0000\u0000\u015f\u0160\u0005\u0001\u0000\u0000"+ + "\u0160\u0161\u0003H$\u0000\u0161?\u0001\u0000\u0000\u0000\u0162\u0163"+ + "\u0003H$\u0000\u0163\u0164\u0005\u0001\u0000\u0000\u0164A\u0001\u0000"+ + "\u0000\u0000\u0165\u0168\u0003D\"\u0000\u0166\u0168\u0003F#\u0000\u0167"+ + "\u0165\u0001\u0000\u0000\u0000\u0167\u0166\u0001\u0000\u0000\u0000\u0168"+ + "C\u0001\u0000\u0000\u0000\u0169\u016a\u0005\u0002\u0000\u0000\u016a\u016b"+ + "\u0003H$\u0000\u016bE\u0001\u0000\u0000\u0000\u016c\u016d\u0003H$\u0000"+ + "\u016d\u016e\u0005\u0002\u0000\u0000\u016eG\u0001\u0000\u0000\u0000\u016f"+ + "\u0172\u00054\u0000\u0000\u0170\u0172\u0003J%\u0000\u0171\u016f\u0001"+ + "\u0000\u0000\u0000\u0171\u0170\u0001\u0000\u0000\u0000\u0172I\u0001\u0000"+ + "\u0000\u0000\u0173\u0174\u0005$\u0000\u0000\u0174\u0175\u0005\u001c\u0000"+ + "\u0000\u0175\u0182\u00054\u0000\u0000\u0176\u0177\u0005$\u0000\u0000\u0177"+ + "\u0179\u0005\u001c\u0000\u0000\u0178\u0176\u0001\u0000\u0000\u0000\u0178"+ + "\u0179\u0001\u0000\u0000\u0000\u0179\u017c\u0001\u0000\u0000\u0000\u017a"+ + "\u017b\u00054\u0000\u0000\u017b\u017d\u0005\u001c\u0000\u0000\u017c\u017a"+ + "\u0001\u0000\u0000\u0000\u017d\u017e\u0001\u0000\u0000\u0000\u017e\u017c"+ + "\u0001\u0000\u0000\u0000\u017e\u017f\u0001\u0000\u0000\u0000\u017f\u0180"+ + "\u0001\u0000\u0000\u0000\u0180\u0182\u00054\u0000\u0000\u0181\u0173\u0001"+ + "\u0000\u0000\u0000\u0181\u0178\u0001\u0000\u0000\u0000\u0182K\u0001\u0000"+ + "\u0000\u0000\u0183\u0186\u0003N\'\u0000\u0184\u0186\u0003T*\u0000\u0185"+ + "\u0183\u0001\u0000\u0000\u0000\u0185\u0184\u0001\u0000\u0000\u0000\u0186"+ + "M\u0001\u0000\u0000\u0000\u0187\u0188\u0006\'\uffff\uffff\u0000\u0188"+ + "\u0189\u0003P(\u0000\u0189\u018f\u0001\u0000\u0000\u0000\u018a\u018b\n"+ + "\u0002\u0000\u0000\u018b\u018c\u0005\n\u0000\u0000\u018c\u018e\u0003P"+ + "(\u0000\u018d\u018a\u0001\u0000\u0000\u0000\u018e\u0191\u0001\u0000\u0000"+ + "\u0000\u018f\u018d\u0001\u0000\u0000\u0000\u018f\u0190\u0001\u0000\u0000"+ + "\u0000\u0190O\u0001\u0000\u0000\u0000\u0191\u018f\u0001\u0000\u0000\u0000"+ + "\u0192\u0193\u0006(\uffff\uffff\u0000\u0193\u0194\u0003R)\u0000\u0194"+ + "\u019a\u0001\u0000\u0000\u0000\u0195\u0196\n\u0002\u0000\u0000\u0196\u0197"+ + "\u0005\t\u0000\u0000\u0197\u0199\u0003R)\u0000\u0198\u0195\u0001\u0000"+ + "\u0000\u0000\u0199\u019c\u0001\u0000\u0000\u0000\u019a\u0198\u0001\u0000"+ + "\u0000\u0000\u019a\u019b\u0001\u0000\u0000\u0000\u019bQ\u0001\u0000\u0000"+ + "\u0000\u019c\u019a\u0001\u0000\u0000\u0000\u019d\u01a6\u00051\u0000\u0000"+ + "\u019e\u01a6\u00054\u0000\u0000\u019f\u01a6\u0003J%\u0000\u01a0\u01a1"+ + "\u0003V+\u0000\u01a1\u01a2\u0005\u001d\u0000\u0000\u01a2\u01a3\u0003N"+ + "\'\u0000\u01a3\u01a4\u0005\u001e\u0000\u0000\u01a4\u01a6\u0001\u0000\u0000"+ + "\u0000\u01a5\u019d\u0001\u0000\u0000\u0000\u01a5\u019e\u0001\u0000\u0000"+ + "\u0000\u01a5\u019f\u0001\u0000\u0000\u0000\u01a5\u01a0\u0001\u0000\u0000"+ + "\u0000\u01a6S\u0001\u0000\u0000\u0000\u01a7\u01a8\u00036\u001b\u0000\u01a8"+ + "\u01a9\u0003`0\u0000\u01a9\u01aa\u00034\u001a\u0000\u01aaU\u0001\u0000"+ + "\u0000\u0000\u01ab\u01ad\u0003X,\u0000\u01ac\u01ab\u0001\u0000\u0000\u0000"+ + "\u01ac\u01ad\u0001\u0000\u0000\u0000\u01ad\u01b1\u0001\u0000\u0000\u0000"+ + "\u01ae\u01b0\u0003Z-\u0000\u01af\u01ae\u0001\u0000\u0000\u0000\u01b0\u01b3"+ + "\u0001\u0000\u0000\u0000\u01b1\u01af\u0001\u0000\u0000\u0000\u01b1\u01b2"+ + "\u0001\u0000\u0000\u0000\u01b2\u01b4\u0001\u0000\u0000\u0000\u01b3\u01b1"+ + "\u0001\u0000\u0000\u0000\u01b4\u01b5\u00054\u0000\u0000\u01b5\u01b6\u0005"+ + "\u001d\u0000\u0000\u01b6\u01b7\u0003\u0010\b\u0000\u01b7\u01b8\u0005\u001e"+ + "\u0000\u0000\u01b8W\u0001\u0000\u0000\u0000\u01b9\u01be\u0005$\u0000\u0000"+ + "\u01ba\u01be\u0003J%\u0000\u01bb\u01be\u00032\u0019\u0000\u01bc\u01be"+ + "\u00054\u0000\u0000\u01bd\u01b9\u0001\u0000\u0000\u0000\u01bd\u01ba\u0001"+ + "\u0000\u0000\u0000\u01bd\u01bb\u0001\u0000\u0000\u0000\u01bd\u01bc\u0001"+ + "\u0000\u0000\u0000\u01be\u01bf\u0001\u0000\u0000\u0000\u01bf\u01c0\u0005"+ + "\u001c\u0000\u0000\u01c0Y\u0001\u0000\u0000\u0000\u01c1\u01c2\u00054\u0000"+ + "\u0000\u01c2\u01c3\u0005\u001d\u0000\u0000\u01c3\u01c4\u0003\u0010\b\u0000"+ + "\u01c4\u01c5\u0005\u001e\u0000\u0000\u01c5\u01c6\u0005\u001c\u0000\u0000"+ + "\u01c6[\u0001\u0000\u0000\u0000\u01c7\u01c8\u0007\u0000\u0000\u0000\u01c8"+ + "]\u0001\u0000\u0000\u0000\u01c9\u01ca\u0007\u0001\u0000\u0000\u01ca_\u0001"+ + "\u0000\u0000\u0000\u01cb\u01cc\u0007\u0002\u0000\u0000\u01cca\u0001\u0000"+ + "\u0000\u0000-ehpx{\u0080\u0086\u008c\u0093\u0097\u009c\u00a0\u00a7\u00b2"+ + "\u00b5\u00c6\u00cc\u00d3\u00d9\u00ed\u00f1\u00f5\u00fe\u0102\u011c\u011f"+ + "\u0129\u0131\u0138\u0146\u0152\u0159\u015d\u0167\u0171\u0178\u017e\u0181"+ + "\u0185\u018f\u019a\u01a5\u01ac\u01b1\u01bd"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/src/main/java/parser/generated/SimpleJavaVisitor.java b/src/main/java/parser/generated/SimpleJavaVisitor.java index beefef9..37fc395 100644 --- a/src/main/java/parser/generated/SimpleJavaVisitor.java +++ b/src/main/java/parser/generated/SimpleJavaVisitor.java @@ -1,4 +1,4 @@ -// Generated from C:/Users/janni/Desktop/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 +// Generated from C:/Users/Maxi/Documents/DHBW/Compilerbau/NichtHaskell2.0/src/main/java/parser/grammar/SimpleJava.g4 by ANTLR 4.13.1 package parser.generated; import org.antlr.v4.runtime.tree.ParseTreeVisitor; @@ -130,6 +130,24 @@ public interface SimpleJavaVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitElseStatement(SimpleJavaParser.ElseStatementContext ctx); + /** + * Visit a parse tree produced by {@link SimpleJavaParser#switchStatement}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitSwitchStatement(SimpleJavaParser.SwitchStatementContext ctx); + /** + * Visit a parse tree produced by {@link SimpleJavaParser#caseStatement}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitCaseStatement(SimpleJavaParser.CaseStatementContext ctx); + /** + * Visit a parse tree produced by {@link SimpleJavaParser#defaultStatement}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitDefaultStatement(SimpleJavaParser.DefaultStatementContext ctx); /** * Visit a parse tree produced by {@link SimpleJavaParser#statementExpression}. * @param ctx the parse tree diff --git a/src/main/java/parser/grammar/SimpleJava.g4 b/src/main/java/parser/grammar/SimpleJava.g4 index 51b7bc1..5d0647a 100644 --- a/src/main/java/parser/grammar/SimpleJava.g4 +++ b/src/main/java/parser/grammar/SimpleJava.g4 @@ -1,18 +1,18 @@ grammar SimpleJava; // Programm-Konstrukte -program: classDeclaration+; +program: classDeclaration+; // Ein Programm besteht aus einer oder mehreren Klassendeklarationen -classDeclaration: AccessModifier? 'class' Identifier OpenCurlyBracket memberDeclaration* ClosedCurlyBracket; -memberDeclaration: constructorDeclaration | fieldDeclaration | methodDeclaration; +classDeclaration: AccessModifier? 'class' Identifier OpenCurlyBracket memberDeclaration* ClosedCurlyBracket; // Deklariert eine Klasse mit optionalem Zugriffsmodifikator und mehreren Mitgliedern +memberDeclaration: constructorDeclaration | fieldDeclaration | methodDeclaration; // Ein Mitglied kann ein Konstruktor, ein Feld oder eine Methode sein -constructorDeclaration: AccessModifier? Identifier OpenRoundBracket parameterList? ClosedRoundBracket blockStatement; -fieldDeclaration: AccessModifier? type Identifier Semicolon; -methodDeclaration: MainMethodDeclaration blockStatement | AccessModifier? (type | Void) Identifier OpenRoundBracket parameterList? ClosedRoundBracket blockStatement; +constructorDeclaration: AccessModifier? Identifier OpenRoundBracket parameterList? ClosedRoundBracket blockStatement; // Deklariert einen Konstruktor +fieldDeclaration: AccessModifier? type Identifier (Assign expression)? Semicolon; // Deklariert ein Feld mit optionaler Initialisierung +methodDeclaration: MainMethodDeclaration blockStatement | AccessModifier? (type | Void) Identifier OpenRoundBracket parameterList? ClosedRoundBracket blockStatement; // Deklariert eine Methode -parameterList: parameter (Comma parameter)*; -parameter: type Identifier; -argumentList: (expression (Comma expression)*)?; +parameterList: parameter (Comma parameter)*; // Parameterliste für Methoden und Konstruktoren +parameter: type Identifier; // Ein einzelner Parameter mit Typ und Bezeichner +argumentList: (expression (Comma expression)*)?; // Argumentliste für Methodenaufrufe // Anweisungen statement: returnStatement Semicolon @@ -22,28 +22,33 @@ statement: returnStatement Semicolon | doWhileStatement | forStatement | ifElseStatement - | statementExpression Semicolon; + | switchStatement + | statementExpression Semicolon; // Verschiedene Arten von Anweisungen -blockStatement: OpenCurlyBracket statement* ClosedCurlyBracket; +blockStatement: OpenCurlyBracket statement* ClosedCurlyBracket; // Ein Block von Anweisungen -returnStatement: Return (expression)?; -localVariableDeclaration: type Identifier (Assign expression)?; +returnStatement: Return (expression)?; // Rückgabe-Anweisung +localVariableDeclaration: type Identifier (Assign expression)?; // Deklaration einer lokalen Variable -whileStatement: While OpenRoundBracket expression ClosedRoundBracket blockStatement; -doWhileStatement: Do blockStatement While OpenRoundBracket expression ClosedRoundBracket Semicolon; -forStatement: For OpenRoundBracket (statementExpression | localVariableDeclaration) Semicolon (expression)? Semicolon (statementExpression)? ClosedRoundBracket blockStatement; +whileStatement: While OpenRoundBracket expression ClosedRoundBracket blockStatement; // While-Schleife +doWhileStatement: Do blockStatement While OpenRoundBracket expression ClosedRoundBracket Semicolon; // Do-While-Schleife +forStatement: For OpenRoundBracket (statementExpression | localVariableDeclaration) Semicolon (expression)? Semicolon (statementExpression)? ClosedRoundBracket blockStatement; // For-Schleife -ifElseStatement: ifStatement elseIfStatement* elseStatement?; -ifStatement: If OpenRoundBracket expression ClosedRoundBracket blockStatement; -elseIfStatement: Else If OpenRoundBracket expression ClosedRoundBracket blockStatement; -elseStatement: Else blockStatement; +ifElseStatement: ifStatement elseIfStatement* elseStatement?; // If-Else-Bedingung +ifStatement: If OpenRoundBracket expression ClosedRoundBracket blockStatement; // If-Teil der Bedingung +elseIfStatement: Else If OpenRoundBracket expression ClosedRoundBracket blockStatement; // Else-If-Teil der Bedingung +elseStatement: Else blockStatement; // Else-Teil der Bedingung -statementExpression: assign | newDeclaration | methodCall | crementExpression; -assign: assignableExpression Assign expression; -newDeclaration: New Identifier OpenRoundBracket argumentList ClosedRoundBracket; +switchStatement: Switch OpenRoundBracket expression ClosedRoundBracket OpenCurlyBracket caseStatement+ defaultStatement? ClosedCurlyBracket; // Switch-Anweisung +caseStatement: Case value Colon statement*; // Ein Case-Teil einer Switch-Anweisung +defaultStatement: Default Colon statement*; // Default-Teil einer Switch-Anweisung + +statementExpression: assign | newDeclaration | methodCall | crementExpression; // Ausdruck innerhalb einer Anweisung +assign: assignableExpression Assign expression; // Zuweisung +newDeclaration: New Identifier OpenRoundBracket argumentList ClosedRoundBracket; // Instanziierung eines neuen Objekts // Ausdrücke -expression: unaryExpression | binaryExpression; +expression: unaryExpression | binaryExpression; // Ein Ausdruck kann unär oder binär sein unaryExpression: This | Identifier @@ -51,97 +56,97 @@ unaryExpression: This | value | notExpression | statementExpression - | OpenRoundBracket expression ClosedRoundBracket; + | OpenRoundBracket expression ClosedRoundBracket; // Unäre Ausdrücke -notExpression: Not expression; +notExpression: Not expression; // Nicht-Ausdruck -crementExpression: incrementExpression | decrementExpression; +crementExpression: incrementExpression | decrementExpression; // Inkrement-/Dekrement-Ausdrücke incrementExpression: prefixIncrementExpression | suffixIncrementExpression; -prefixIncrementExpression: '++' assignableExpression; -suffixIncrementExpression: assignableExpression '++'; +prefixIncrementExpression: '++' assignableExpression; // Präfix-Inkrement +suffixIncrementExpression: assignableExpression '++'; // Suffix-Inkrement -decrementExpression: prefixDecrementExpression | suffixDecrementExpression; -prefixDecrementExpression: '--' assignableExpression; -suffixDecrementExpression: assignableExpression '--'; +decrementExpression: prefixDecrementExpression | suffixDecrementExpression; // Dekrement-Ausdrücke +prefixDecrementExpression: '--' assignableExpression; // Präfix-Dekrement +suffixDecrementExpression: assignableExpression '--'; // Suffix-Dekrement -assignableExpression: Identifier | memberAccess; +assignableExpression: Identifier | memberAccess; // Zuweisbarer Ausdruck memberAccess: This Dot Identifier - | (This Dot)? (Identifier Dot)+ Identifier; + | (This Dot)? (Identifier Dot)+ Identifier; // Mitgliedszugriff -binaryExpression: calculationExpression | nonCalculationExpression; +binaryExpression: calculationExpression | nonCalculationExpression; // Binäre Ausdrücke calculationExpression: calculationExpression LineOperator dotExpression - | dotExpression; + | dotExpression; // Berechnungsausdrücke dotExpression: dotExpression DotOperator dotSubtractionExpression - | dotSubtractionExpression; + | dotSubtractionExpression; // Punktoperationen dotSubtractionExpression: IntValue | Identifier | memberAccess - | methodCall OpenRoundBracket calculationExpression ClosedRoundBracket; + | methodCall OpenRoundBracket calculationExpression ClosedRoundBracket; // Punkt-Subtraktionsausdrücke -nonCalculationExpression: unaryExpression nonCalculationOperator expression; +nonCalculationExpression: unaryExpression nonCalculationOperator expression; // Nicht-Berechnungsausdrücke // Methodenaufrufe -methodCall: target? chainedMethod* Identifier OpenRoundBracket argumentList ClosedRoundBracket; -target: (This | memberAccess | newDeclaration | Identifier) Dot; -chainedMethod: Identifier OpenRoundBracket argumentList ClosedRoundBracket Dot; +methodCall: target? chainedMethod* Identifier OpenRoundBracket argumentList ClosedRoundBracket; // Methodenaufruf +target: (This | memberAccess | newDeclaration | Identifier) Dot; // Ziel eines Methodenaufrufs +chainedMethod: Identifier OpenRoundBracket argumentList ClosedRoundBracket Dot; // Verkettete Methode // Typen type: Int | Boolean | Char - | Identifier; + | Identifier; // Datentypen -Void: 'void'; -Boolean: 'boolean'; -Char: 'char'; -Int: 'int'; +Void: 'void'; // Void-Typ +Boolean: 'boolean'; // Boolean-Typ +Char: 'char'; // Char-Typ +Int: 'int'; // Integer-Typ value: IntValue | BooleanValue | CharValue - | NullValue; + | NullValue; // Werte // Zugriffsmodifikatoren -AccessModifier: 'public' | 'private' | 'public static' | 'private static'; -MainMethodDeclaration: 'public static void main(String[] args)'; +AccessModifier: 'public' | 'private' | 'public static' | 'private static'; // Zugriffsmodifikatoren +MainMethodDeclaration: 'public static void main(String[] args)'; // Hauptmethoden-Deklaration // Operatoren -nonCalculationOperator: LogicalOperator | ComparisonOperator; +nonCalculationOperator: LogicalOperator | ComparisonOperator; // Nicht-Berechnungsoperatoren -DotOperator: Mult | Div | Modulo; -LineOperator: Plus | Minus; -ComparisonOperator: Greater | Less | GreaterEqual | LessEqual | Equal | NotEqual; -LogicalOperator: And | Or; +DotOperator: Mult | Div | Modulo; // Punktoperatoren +LineOperator: Plus | Minus; // Linienoperatoren +ComparisonOperator: Greater | Less | GreaterEqual | LessEqual | Equal | NotEqual; // Vergleichsoperatoren +LogicalOperator: And | Or; // Logische Operatoren -Assign: '='; -Plus: '+'; -Minus: '-'; -Mult: '*'; -Modulo: '%'; -Div: '/'; -Greater: '>'; -Less: '<'; -GreaterEqual: '>='; -LessEqual: '<='; -Equal: '=='; -NotEqual: '!='; -Not: '!'; -And: '&&'; -Or: '||'; +Assign: '='; // Zuweisungsoperator +Plus: '+'; // Plus-Operator +Minus: '-'; // Minus-Operator +Mult: '*'; // Multiplikationsoperator +Modulo: '%'; // Modulo-Operator +Div: '/'; // Divisionsoperator +Greater: '>'; // Größer-Operator +Less: '<'; // Kleiner-Operator +GreaterEqual: '>='; // Größer-Gleich-Operator +LessEqual: '<='; // Kleiner-Gleich-Operator +Equal: '=='; // Gleichheitsoperator +NotEqual: '!='; // Ungleichheitsoperator +Not: '!'; // Nicht-Operator +And: '&&'; // Und-Operator +Or: '||'; // Oder-Operator // Symbole -Dot: '.'; -OpenRoundBracket: '('; -ClosedRoundBracket: ')'; -OpenCurlyBracket: '{'; -ClosedCurlyBracket: '}'; -Semicolon: ';'; -Comma: ','; +Dot: '.'; // Punkt-Symbol +OpenRoundBracket: '('; // Öffnende runde Klammer +ClosedRoundBracket: ')'; // Schließende runde Klammer +OpenCurlyBracket: '{'; // Öffnende geschweifte Klammer +ClosedCurlyBracket: '}'; // Schließende geschweifte Klammer +Semicolon: ';'; // Semikolon +Comma: ','; // Komma // Schlüsselwörter Class: 'class'; @@ -153,20 +158,24 @@ Else: 'else'; For: 'for'; Return: 'return'; New: 'new'; +Switch: 'switch'; +Case: 'case'; +Default: 'default'; +Colon: ':'; // Doppelpunkt // Werte -CharValue: '\'' ~[\r\n]* '\''; -IntValue: Minus? Numeric+; -BooleanValue: 'true' | 'false'; -NullValue: 'null'; +CharValue: '\'' ~[\r\n]* '\''; // Zeichenwert +IntValue: Minus? Numeric+; // Ganzzahlwert +BooleanValue: 'true' | 'false'; // Boolean-Wert +NullValue: 'null'; // Null-Wert // Bezeichner fragment Alphabetic: [a-zA-Z]; fragment Numeric: [0-9]; fragment ValidIdentSymbols: Alphabetic | Numeric | '$' | '_'; -Identifier: Alphabetic ValidIdentSymbols*; +Identifier: Alphabetic ValidIdentSymbols*; // Bezeichner // Whitespaces und Kommentare ignorieren -WS: [ \t\r\n]+ -> skip; -InlineComment: '//' ~[\r\n]* -> skip; -MultilineComment: '/*' .*? '*/' -> skip; \ No newline at end of file +WS: [ \t\r\n]+ -> skip; // Leerzeichen ignorieren +InlineComment: '//' ~[\r\n]* -> skip; // Einzeilige Kommentare ignorieren +MultilineComment: '/*' .*? '*/' -> skip; // Mehrzeilige Kommentare ignorieren diff --git a/src/main/java/parser/parser_pp.md b/src/main/java/parser/parser_pp.md new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/semantic/Scope.java b/src/main/java/semantic/Scope.java index b6b40c4..955e31f 100644 --- a/src/main/java/semantic/Scope.java +++ b/src/main/java/semantic/Scope.java @@ -8,7 +8,7 @@ import java.util.Stack; public class Scope { - private Stack> localVars; + private final Stack> localVars; public Scope() { localVars = new Stack>(); diff --git a/src/main/java/semantic/SemanticAnalyzer.java b/src/main/java/semantic/SemanticAnalyzer.java index 6ebd124..9740d6a 100644 --- a/src/main/java/semantic/SemanticAnalyzer.java +++ b/src/main/java/semantic/SemanticAnalyzer.java @@ -1,6 +1,5 @@ package semantic; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,17 +20,15 @@ import ast.statementexpressions.AssignableNode; import ast.statementexpressions.NewDeclarationNode; import ast.statementexpressions.crementexpressions.DecrementNode; import ast.statementexpressions.crementexpressions.IncrementNode; +import ast.statementexpressions.methodcallstatementnexpressions.ChainedMethodNode; import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode; import ast.statementexpressions.methodcallstatementnexpressions.TargetNode; import ast.statements.*; -import ast.type.AccessModifierNode; import ast.type.EnumAccessModifierNode; import ast.type.ValueNode; import ast.type.type.*; -import com.sun.jdi.IntegerType; import semantic.context.Context; import semantic.exceptions.*; -import typechecker.TypeCheckResult; public class SemanticAnalyzer implements SemanticVisitor { @@ -112,10 +109,6 @@ public class SemanticAnalyzer implements SemanticVisitor { @Override public TypeCheckResult analyze(MethodNode methodNode) { - if (methodNode instanceof ConstructorNode) { - return new TypeCheckResult(true, new BaseType(TypeEnum.VOID)); - } else { - var valid = true; for (var otherMethod : currentClass.getMethods()) { @@ -157,12 +150,15 @@ public class SemanticAnalyzer implements SemanticVisitor { } return new TypeCheckResult(valid, resultType); - - } } @Override public TypeCheckResult analyze(FieldNode toCheck) { + if (toCheck.type instanceof ReferenceType referenceType) { + if (!context.containsClass(referenceType.getIdentifier())) { + errors.add(new NotDeclaredException(referenceType.getIdentifier() + " not declared")); + } + } if (currentFields.get(toCheck.identifier) != null) { errors.add(new AlreadyDeclaredException("Already declared " + toCheck.identifier)); return new TypeCheckResult(false, null); @@ -224,7 +220,7 @@ public class SemanticAnalyzer implements SemanticVisitor { } for (IStatementNode statementNode : blockNode.statements) { var result = statementNode.accept(this); - if(!(statementNode instanceof IncrementNode) && !(statementNode instanceof DecrementNode)){ + if (!(statementNode instanceof IncrementNode) && !(statementNode instanceof DecrementNode)) { if (result.getType() != null) { if (blockReturnType == null) { blockReturnType = result.getType(); @@ -244,21 +240,25 @@ public class SemanticAnalyzer implements SemanticVisitor { if (toCheck.memberAccess != null) { var result = toCheck.memberAccess.accept(this); + toCheck.identifier = toCheck.memberAccess.identifiers.getLast(); toCheck.setTypeNode(result.getType()); return result; } else { if (currentFields.get(toCheck.identifier) != null) { var type = currentFields.get(toCheck.identifier); + MemberAccessNode memberAccessNode = new MemberAccessNode(false); + memberAccessNode.identifiers.add(currentClass.identifier); + memberAccessNode.identifiers.add(toCheck.identifier); + toCheck.memberAccess = memberAccessNode; toCheck.setTypeNode(type); return new TypeCheckResult(true, type); } else if (currentScope.getLocalVar(toCheck.identifier) != null) { var type = currentScope.getLocalVar(toCheck.identifier); + toCheck.setTypeNode(type); return new TypeCheckResult(true, type); } } - return new TypeCheckResult(true, null); - } @Override @@ -275,13 +275,6 @@ public class SemanticAnalyzer implements SemanticVisitor { currentNullType = oldNullType; var valid = true; - // This check currently handles things like : - /** - * private int i; - * void foo(int i){ - * i = i; - * } - */ if (assignable.equals(rExpression)) { errors.add(new TypeMismatchException("Cannot assign to self")); valid = false; @@ -310,41 +303,97 @@ public class SemanticAnalyzer implements SemanticVisitor { @Override public TypeCheckResult analyze(IfElseNode toCheck) { var resultIf = toCheck.ifStatement.accept(this); - var resultElse = toCheck.elseStatement.accept(this); + var validElseIf = true; - return new TypeCheckResult(resultIf.isValid() && resultElse.isValid(), new BaseType(TypeEnum.VOID)); + if(!toCheck.elseIfStatements.isEmpty()) { + for(IfNode ifNode : toCheck.elseIfStatements) { + var resultIfFor = ifNode.accept(this); + validElseIf = validElseIf && resultIfFor.isValid(); + } + } + + if(toCheck.elseStatement != null){ + var resultElse = toCheck.elseStatement.accept(this); + return new TypeCheckResult(resultIf.isValid() && resultElse.isValid() && validElseIf, new BaseType(TypeEnum.VOID)); + } + + + return new TypeCheckResult(resultIf.isValid(), new BaseType(TypeEnum.VOID)); } @Override public TypeCheckResult analyze(MethodCallNode toCheck) { - if (toCheck.target.identifier != null) { - var targetType = currentScope.getLocalVar(toCheck.target.identifier); - if (targetType == null) { - targetType = currentFields.get(toCheck.target.identifier); + if (toCheck.target != null) { + if(toCheck.target.memberAccess == null){ + MemberAccessNode memberAccessNode = new MemberAccessNode(false); + memberAccessNode.identifiers.add(currentClass.identifier); + memberAccessNode.identifiers.add(toCheck.target.identifier); + toCheck.target.memberAccess = memberAccessNode; } - if (targetType instanceof ReferenceType reference) { - var type = getTypeFromMethod(toCheck, reference); - if (type != null) { - return new TypeCheckResult(true, type); - } else { - return new TypeCheckResult(false, null); + if (toCheck.target.identifier != null) { + var targetType = currentScope.getLocalVar(toCheck.target.identifier); + if (targetType == null) { + targetType = currentFields.get(toCheck.target.identifier); } + if (targetType instanceof ReferenceType reference) { + if (!toCheck.chainedMethods.isEmpty()) { + for (ChainedMethodNode chainedMethod : toCheck.chainedMethods) { + var type = getTypeFromMethod(chainedMethod, reference); + if (type instanceof ReferenceType referenceType) + reference = referenceType; + else + errors.add(new TypeMismatchException("Ein Basetyp hat keine funktionen")); + } + } + var type = getTypeFromMethod(toCheck, reference); + if (type != null) { + return new TypeCheckResult(true, type); + } else { + return new TypeCheckResult(false, null); + } - } - } else { - if (toCheck.target.thisTar) { - var type = getTypeFromMethod(toCheck, new ReferenceType(currentClass.identifier)); - if (type != null) { - return new TypeCheckResult(true, type); } } else { - var result = toCheck.target.accept(this); - if (result.getType() instanceof ReferenceType reference) { - return new TypeCheckResult(true, getTypeFromMethod(toCheck, reference)); + if (toCheck.target.thisTar != null) { + if (toCheck.target.thisTar) { + var type = getTypeFromMethod(toCheck, new ReferenceType(currentClass.identifier)); + if (type != null) { + toCheck.type = type; + return new TypeCheckResult(true, type); + } + } + } else { + var result = toCheck.target.accept(this); + if (result.getType() instanceof ReferenceType reference) { + return new TypeCheckResult(true, getTypeFromMethod(toCheck, reference)); + } } } + } else { + if(toCheck.identifier != null) { + toCheck.target = new TargetNode(new MemberAccessNode(false)); + toCheck.target.memberAccess.identifiers.add(currentClass.identifier); + } + + ReferenceType reference = new ReferenceType(currentClass.identifier); + if (!toCheck.chainedMethods.isEmpty()) { + for (ChainedMethodNode chainedMethod : toCheck.chainedMethods) { + var type = getTypeFromMethod(chainedMethod, reference); + if (type instanceof ReferenceType referenceType) + reference = referenceType; + else + errors.add(new TypeMismatchException("Ein Basetyp hat keine funktionen")); + } + } + var type = getTypeFromMethod(toCheck, reference); + if (type != null) { + return new TypeCheckResult(true, type); + } else { + return new TypeCheckResult(false, null); + } } + return new TypeCheckResult(false, null); } @@ -380,12 +429,14 @@ public class SemanticAnalyzer implements SemanticVisitor { @Override public TypeCheckResult analyze(NewDeclarationNode toCheck) { - if (context.containsClass(toCheck.identifier)) { + for(var t : toCheck.expressions) { + t.accept(this); + } return new TypeCheckResult(true, new ReferenceType(toCheck.identifier)); + } else { + throw new RuntimeException("Cannot find class " + toCheck.identifier); } - - return null; } @Override @@ -409,6 +460,7 @@ public class SemanticAnalyzer implements SemanticVisitor { case PLUS, MINUS: if (calcRes.getType() instanceof BaseType calcType && dotRes.getType() instanceof BaseType dotType && calcType.getTypeEnum().equals(TypeEnum.INT) && dotType.getTypeEnum().equals(TypeEnum.INT)) { + calcNode.setType(new BaseType(TypeEnum.INT)); return new TypeCheckResult(true, new BaseType(TypeEnum.INT)); } break; @@ -416,10 +468,12 @@ public class SemanticAnalyzer implements SemanticVisitor { } } else { + calcNode.setType(calcNode.getType()); return new TypeCheckResult(calcRes.isValid(), calcRes.getType()); } } else if (calcNode.dotExpression != null) { var dotRes = calcNode.dotExpression.accept(this); + calcNode.setType(dotRes.getType()); return new TypeCheckResult(dotRes.isValid(), dotRes.getType()); } return new TypeCheckResult(false, null); @@ -427,28 +481,46 @@ public class SemanticAnalyzer implements SemanticVisitor { @Override public TypeCheckResult analyze(DotNode toCheck) { - if (toCheck.dotSubstractionExpression != null) { - return toCheck.dotSubstractionExpression.accept(this); + if (toCheck.dotSubtractionExpression != null) { + var result = toCheck.dotSubtractionExpression.accept(this); + toCheck.setType(result.getType()); + return result; } return new TypeCheckResult(false, null); } @Override - public TypeCheckResult analyze(DotSubstractionNode toCheck) { + public TypeCheckResult analyze(DotSubtractionNode toCheck) { if (toCheck.value != null) { - return toCheck.value.accept(this); + var result = toCheck.value.accept(this); + toCheck.setType(result.getType()); + return result; } else if (toCheck.memberAccess != null) { - return toCheck.memberAccess.accept(this); + var result = toCheck.memberAccess.accept(this); + toCheck.setType(result.getType()); + return result; } else if (toCheck.methodCall != null) { - return toCheck.methodCall.accept(this); + var result = toCheck.methodCall.accept(this); + toCheck.setType(result.getType()); + return result; } else if (toCheck.identifier != null) { if (currentScope.contains(toCheck.identifier)) { - return new TypeCheckResult(true, currentScope.getLocalVar(toCheck.identifier)); + var type = currentScope.getLocalVar(toCheck.identifier); + toCheck.setType(type); + return new TypeCheckResult(true, type); } else if (currentFields.get(toCheck.identifier) != null) { - return new TypeCheckResult(true, currentFields.get(toCheck.identifier)); + var type = currentFields.get(toCheck.identifier); + toCheck.setType(type); + MemberAccessNode memberAccessNode = new MemberAccessNode(false); + memberAccessNode.identifiers.add(currentClass.identifier); + memberAccessNode.identifiers.add(toCheck.identifier); + toCheck.memberAccess = memberAccessNode; + return new TypeCheckResult(true, type); } } else if (toCheck.calculationExpression != null) { - return toCheck.calculationExpression.accept(this); + var result = toCheck.calculationExpression.accept(this); + toCheck.setType(result.getType()); + return result; } return null; } @@ -462,15 +534,19 @@ public class SemanticAnalyzer implements SemanticVisitor { case LESS, LESS_EQUAL, GREATER, GREATER_EQUAL: if (expResult.getType() instanceof BaseType expResultType && expResultType.getTypeEnum().equals(TypeEnum.INT) && unaryResult.getType() instanceof BaseType unaryResultType && unaryResultType.getTypeEnum().equals(TypeEnum.INT)) { - return new TypeCheckResult(true, new BaseType(TypeEnum.BOOL)); + ITypeNode type = new BaseType(TypeEnum.BOOL); + nonCalculationNode.setType(type); + return new TypeCheckResult(true, type); } else { errors.add(new TypeMismatchException("Both types must be Integer")); } break; case OR, AND: - if (expResult.getType() instanceof BaseType expResultType && expResultType.getTypeEnum().equals(TypeEnum.INT) && - unaryResult.getType() instanceof BaseType unaryResultType && unaryResultType.getTypeEnum().equals(TypeEnum.INT)) { - return new TypeCheckResult(true, new BaseType(TypeEnum.BOOL)); + if (expResult.getType() instanceof BaseType expResultType && expResultType.getTypeEnum().equals(TypeEnum.BOOL) && + unaryResult.getType() instanceof BaseType unaryResultType && unaryResultType.getTypeEnum().equals(TypeEnum.BOOL)) { + ITypeNode type = new BaseType(TypeEnum.BOOL); + nonCalculationNode.setType(type); + return new TypeCheckResult(true, type); } else { errors.add(new TypeMismatchException("Both types must be Boolean")); } @@ -478,7 +554,9 @@ public class SemanticAnalyzer implements SemanticVisitor { case EQUAL, NOT_EQUAL: if (expResult.getType() instanceof BaseType expResultType && unaryResult.getType() instanceof BaseType unaryResultType && Objects.equals(expResultType, unaryResultType)) { - return new TypeCheckResult(true, new BaseType(TypeEnum.BOOL)); + ITypeNode type = new BaseType(TypeEnum.BOOL); + nonCalculationNode.setType(type); + return new TypeCheckResult(true, type); } else { errors.add(new TypeMismatchException("Both types must be the same")); } @@ -493,9 +571,21 @@ public class SemanticAnalyzer implements SemanticVisitor { if (unary.identifier != null) { if (currentScope.contains(unary.identifier)) { - return new TypeCheckResult(valid, currentScope.getLocalVar(unary.identifier)); + var type = currentScope.getLocalVar(unary.identifier); + unary.setType(type); + return new TypeCheckResult(valid, type); } else if (currentFields.get(unary.identifier) != null) { - return new TypeCheckResult(valid, currentFields.get(unary.identifier)); + MemberAccessNode memberAccessNode = new MemberAccessNode(false); + memberAccessNode.identifiers.add(currentClass.identifier); + memberAccessNode.identifiers.add(unary.identifier); + unary.memberAccess = memberAccessNode; + var type = currentFields.get(unary.identifier); + unary.setType(type); + return new TypeCheckResult(valid,type ); + } else if (unary.value != null) { + var result = unary.value.accept(this); + unary.setType(result.getType()); + return new TypeCheckResult(result.isValid(), result.getType()); } else if (unary.statement != null) { var result = unary.statement.accept(this); unary.setType(result.getType()); @@ -505,15 +595,19 @@ public class SemanticAnalyzer implements SemanticVisitor { } } else if (unary.statement != null) { var result = unary.statement.accept(this); + unary.setType(result.getType()); return new TypeCheckResult(result.isValid(), result.getType()); } else if (unary.value != null) { var result = unary.value.accept(this); + unary.setType(result.getType()); return new TypeCheckResult(result.isValid(), result.getType()); } else if (unary.memberAccess != null) { var result = unary.memberAccess.accept(this); + unary.setType(result.getType()); return new TypeCheckResult(result.isValid(), result.getType()); } else if (unary.expression != null) { var result = unary.expression.accept(this); + unary.setType(result.getType()); return new TypeCheckResult(result.isValid(), result.getType()); } @@ -524,12 +618,23 @@ public class SemanticAnalyzer implements SemanticVisitor { public TypeCheckResult analyze(MemberAccessNode memberAccessNode) { ITypeNode currentType = null; + int start = 0; + if(!memberAccessNode.identifiers.isEmpty()){ + if(currentFields.get(memberAccessNode.identifiers.getFirst()) != null){ + memberAccessNode.identifiers.addFirst(currentClass.identifier); + start++; + } + } + if(context.getClasses().get(memberAccessNode.identifiers.getFirst()) == null){ + memberAccessNode.identifiers.addFirst(currentClass.identifier); + start++; + } + for (int i = start; i < memberAccessNode.identifiers.size(); i++) { - for (String s : memberAccessNode.identifiers) { + String s = memberAccessNode.identifiers.get(i); if (currentType == null) { if (currentScope.getLocalVar(s) != null) { currentType = currentScope.getLocalVar(s); - } else if (currentFields.get(s) != null) { currentType = currentFields.get(s); } else { @@ -540,7 +645,8 @@ public class SemanticAnalyzer implements SemanticVisitor { } else { if (currentType instanceof ReferenceType reference) { var currentTypeClass = context.getClass(reference.getIdentifier()); - + memberAccessNode.identifiers.add(i, reference.getIdentifier()); + i++; var currentField = currentTypeClass.getField(s); if (currentField.getAccessModifier().accessType == EnumAccessModifierNode.PUBLIC) { currentType = currentField.getType(); @@ -552,7 +658,7 @@ public class SemanticAnalyzer implements SemanticVisitor { } } - + memberAccessNode.setTypeNode(currentType); return new TypeCheckResult(true, currentType); } @@ -561,6 +667,11 @@ public class SemanticAnalyzer implements SemanticVisitor { if (targetNode.memberAccess != null) { return targetNode.memberAccess.accept(this); + } else if(targetNode.identifier != null) { + MemberAccessNode memberAccessNode = new MemberAccessNode(false); + memberAccessNode.identifiers.add(currentClass.identifier); + memberAccessNode.identifiers.add(targetNode.identifier); + targetNode.memberAccess = memberAccessNode; } return null; } @@ -573,6 +684,7 @@ public class SemanticAnalyzer implements SemanticVisitor { return new TypeCheckResult(true, new BaseType(TypeEnum.INT)); } case CHAR_VALUE -> { + valueNode.value = valueNode.value.replace("'", ""); return new TypeCheckResult(true, new BaseType(TypeEnum.CHAR)); } case BOOLEAN_VALUE -> { @@ -620,4 +732,37 @@ public class SemanticAnalyzer implements SemanticVisitor { return null; } + private ITypeNode getTypeFromMethod(ChainedMethodNode toCheck, ReferenceType reference) { + var classContext = context.getClass(reference.getIdentifier()); + + var methods = classContext.getMethods(); + for (var method : methods) { + if (toCheck.identifier.equals(method.getIdentifier())) { + if (method.getParameters().size() == toCheck.expressions.size() && !(method instanceof ConstructorNode)) { + boolean same = true; + for (int i = 0; i < method.getParameters().size(); i++) { + var result1 = method.getParameters().get(i).accept(this); + var result2 = toCheck.expressions.get(i).accept(this); + if (!Objects.equals(result1.getType(), result2.getType())) { + same = false; + } + } + if (same) { + if (method.accesModifier.accessType == EnumAccessModifierNode.PUBLIC) { + if (method.getType() == null) { + return new BaseType(TypeEnum.VOID); + } + return method.getType(); + } else { + errors.add(new NotVisibleException("This Method is not Visible")); + } + + } + } + } + } + + return null; + } + } \ No newline at end of file diff --git a/src/main/java/semantic/SemanticVisitor.java b/src/main/java/semantic/SemanticVisitor.java index 0c979ca..7d57189 100644 --- a/src/main/java/semantic/SemanticVisitor.java +++ b/src/main/java/semantic/SemanticVisitor.java @@ -15,7 +15,6 @@ import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode; import ast.statementexpressions.methodcallstatementnexpressions.TargetNode; import ast.statements.*; import ast.type.ValueNode; -import typechecker.TypeCheckResult; public interface SemanticVisitor { @@ -61,7 +60,7 @@ public interface SemanticVisitor { TypeCheckResult analyze(DotNode toCheck); - TypeCheckResult analyze(DotSubstractionNode toCheck); + TypeCheckResult analyze(DotSubtractionNode toCheck); TypeCheckResult analyze(NonCalculationNode toCheck); diff --git a/src/main/java/typechecker/TypeCheckResult.java b/src/main/java/semantic/TypeCheckResult.java similarity index 72% rename from src/main/java/typechecker/TypeCheckResult.java rename to src/main/java/semantic/TypeCheckResult.java index f52818d..eb667ee 100644 --- a/src/main/java/typechecker/TypeCheckResult.java +++ b/src/main/java/semantic/TypeCheckResult.java @@ -1,23 +1,23 @@ -package typechecker; - - -import ast.type.type.ITypeNode; - -public class TypeCheckResult { - - private boolean valid; - private ITypeNode type; - - public TypeCheckResult(boolean valid, ITypeNode type) { - this.valid = valid; - this.type = type; - } - - public boolean isValid() { - return valid; - } - - public ITypeNode getType() { - return type; - } +package semantic; + + +import ast.type.type.ITypeNode; + +public class TypeCheckResult { + + private final boolean valid; + private final ITypeNode type; + + public TypeCheckResult(boolean valid, ITypeNode type) { + this.valid = valid; + this.type = type; + } + + public boolean isValid() { + return valid; + } + + public ITypeNode getType() { + return type; + } } \ No newline at end of file diff --git a/src/main/java/semantic/context/ClassContext.java b/src/main/java/semantic/context/ClassContext.java index b9e39a4..35600b0 100644 --- a/src/main/java/semantic/context/ClassContext.java +++ b/src/main/java/semantic/context/ClassContext.java @@ -9,8 +9,8 @@ import java.util.HashMap; public class ClassContext { - private HashMap fields; - private ArrayList methods = new ArrayList<>(); + private final HashMap fields; + private final ArrayList methods = new ArrayList<>(); public ClassContext(ClassNode classNode) { diff --git a/src/main/java/semantic/context/Context.java b/src/main/java/semantic/context/Context.java index 39e279a..cf4eb95 100644 --- a/src/main/java/semantic/context/Context.java +++ b/src/main/java/semantic/context/Context.java @@ -5,7 +5,7 @@ import java.util.HashMap; public class Context { - private HashMap classes; + private final HashMap classes; public Context(ProgramNode programNode) { classes = new HashMap<>(); @@ -21,6 +21,10 @@ public class Context { return classes.get(identifier); } + public HashMap getClasses() { + return classes; + } + public boolean containsClass(String identifier) { return classes.containsKey(identifier); } diff --git a/src/main/java/semantic/context/FieldContext.java b/src/main/java/semantic/context/FieldContext.java index aba5ba0..8a32915 100644 --- a/src/main/java/semantic/context/FieldContext.java +++ b/src/main/java/semantic/context/FieldContext.java @@ -6,8 +6,8 @@ import ast.type.type.*; public class FieldContext { - private AccessModifierNode accessModifier; - private ITypeNode type; + private final AccessModifierNode accessModifier; + private final ITypeNode type; public FieldContext(FieldNode field) { accessModifier = field.accessTypeNode; diff --git a/src/main/java/visitor/Visitable.java b/src/main/java/visitor/Visitable.java index bd69777..6e22b41 100644 --- a/src/main/java/visitor/Visitable.java +++ b/src/main/java/visitor/Visitable.java @@ -4,7 +4,7 @@ import bytecode.visitor.ClassVisitor; import bytecode.visitor.MethodVisitor; import bytecode.visitor.ProgramVisitor; import semantic.SemanticVisitor; -import typechecker.TypeCheckResult; +import semantic.TypeCheckResult; public interface Visitable { default void accept(ProgramVisitor programVisitor) { diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..6948c82 --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: main.Main + diff --git a/src/main/resources/input/CompilerInput.java b/src/main/resources/input/CompilerInput.java index b27068a..c53f9cb 100644 --- a/src/main/resources/input/CompilerInput.java +++ b/src/main/resources/input/CompilerInput.java @@ -1,16 +1,63 @@ -public class Compiler { - public int add(int i, int j) { - return i+j; +public class CompilerInput { + public int ps; + public char brand; + public int tires; + public int drivenKilometers; + + public CompilerInput(int horsePower) { + this.ps = horsePower; + this.tires = 4; } - public static void main(String[] args) { - int a = 1; + + public int getTires() { + return this.tires; + } + + public boolean isSuperCar() { + if(this.ps > 300) { + return true; + } else { + return false; + } + } + + public void tune(int horsePower) { + this.ps = this.ps + horsePower; + } + + public void tune() { + this.ps = this.ps + 50; + } + + public void driveCircels(int circels) { + for(int i = 0; i < circels; i++) { + this.drivenKilometers = this.drivenKilometers + 5; + } + } + + public void isTunable(boolean hasEngine, boolean hasTires) { + if(hasEngine && hasTires) { + this.tune(5); + } + } + + public char race() { + int enemyHorsePower = 200; + char win = 'W'; + char lose = 'L'; + CompilerInput enemy = new CompilerInput(ps); + if(this.ps > enemyHorsePower) { + return win; + } else { + return lose; + } + } + + public int refuel(int currentTank, int maxTank){ + int tank = currentTank; + do{ + tank++; + }while(tank"] - - Bsp von Ihm mal: - [TokPublic,TokClass,TokIdentifier "Name",TokLeftBrace,TokRightBrace] - -# Parser - -## Parser Input - -CommonTokenStream -(Scanner Output) - -## Parser Output (AST) - -(program (classDeclaration (accessType public) class Name { })) - -ParseTree - -### Beispiel 1: Empty Class - -# Semantische Analyse / Typcheck - -## Typcheck Input - -(Parser Output = AST) - -## Typcheck Output - -### Beispiel 1: Empty Class - -# Bytecodegenerierung - -## Bytecodegenerierung Input - -(Typcheck Output = vom Typcheck eventuell manipulierter AST) - -## Bytecodegenerierung Output - -### Beispiel 1: Empty Class - -Compiled Classfile - - public class javaFileInput.Example { - } - -## E2E Tests: - -- Testdatei mit Main ausführen/kompilieren -- Testdatei mit "javac -d output .\CompilerInput.java" kompilieren -- -> Dateien mit javap vergleichen - -wenn beides erfolgreich - -- Ergebnis vom eigenen Compiler mithilfe von main.EndToEndTester ausführen -- (Ergebnis von javac mithilfe von main.EndToEndTester ausführen) - -### Andis Tipps: - -- cp mitgeben -- makefile -- java -jar pfadtocompiler.jar EmptyClass.java -- mvn package -- javac tester // tester compilen -- java tester // tester ausführen -- -> tester ist in unserem Fall main.EndToEndTester.java -- -> Hab ich alles umgesetzt \ No newline at end of file diff --git a/src/test/java/main/E2EReflectionsTest.java b/src/test/java/main/E2EReflectionsTest.java index 453d7b3..8c2d591 100644 --- a/src/test/java/main/E2EReflectionsTest.java +++ b/src/test/java/main/E2EReflectionsTest.java @@ -1,177 +1,215 @@ package main; -import ast.ASTNode; -import ast.ProgramNode; -import bytecode.ByteCodeGenerator; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.CommonTokenStream; -import org.antlr.v4.runtime.tree.ParseTree; -import parser.astBuilder.ASTBuilder; -import parser.generated.SimpleJavaLexer; -import parser.generated.SimpleJavaParser; -import semantic.SemanticAnalyzer; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.ArrayList; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import javax.tools.JavaCompiler; +import javax.tools.ToolProvider; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; public class E2EReflectionsTest { - - private CharStream mockInputCharStream; - private String outputDirectoryPath; - private SimpleJavaLexer mockLexer; - private CommonTokenStream mockTokenStream; - private SimpleJavaParser mockParser; - private ParseTree mockParseTree; - private ASTBuilder mockASTBuilder; - private ASTNode mockASTNode; - private SemanticAnalyzer mockSemanticAnalyzer; - private ASTNode mockTypedAST; - private ByteCodeGenerator mockByteCodeGenerator; - - @BeforeEach - public void setUp() { - mockInputCharStream = mock(CharStream.class); - outputDirectoryPath = "path/to/output"; - mockLexer = mock(SimpleJavaLexer.class); - mockTokenStream = mock(CommonTokenStream.class); - mockParser = mock(SimpleJavaParser.class); - mockParseTree = mock(ParseTree.class); - mockASTBuilder = mock(ASTBuilder.class); - mockASTNode = mock(ASTNode.class); - mockSemanticAnalyzer = mock(SemanticAnalyzer.class); - mockTypedAST = mock(ASTNode.class); - mockByteCodeGenerator = mock(ByteCodeGenerator.class); + @Test + public void CharTest() { + runTest("Char"); } @Test - public void testCompileFile() throws Exception { - // Mock the dependencies - SimpleJavaLexer mockLexer = mock(SimpleJavaLexer.class); - CommonTokenStream mockTokenStream = mock(CommonTokenStream.class); - SimpleJavaParser mockParser = mock(SimpleJavaParser.class); - ParseTree mockParseTree = mock(ParseTree.class); - ASTBuilder mockASTBuilder = mock(ASTBuilder.class); - ASTNode mockASTNode = mock(ASTNode.class); - SemanticAnalyzer mockSemanticAnalyzer = mock(SemanticAnalyzer.class); - ASTNode mockTypedAST = mock(ASTNode.class); - ByteCodeGenerator mockByteCodeGenerator = mock(ByteCodeGenerator.class); - - // Mock the behavior - when(mockLexer.nextToken()).thenReturn(null); - when(mockTokenStream.getTokens()).thenReturn(new ArrayList<>()); - when(mockParser.program()).thenReturn((SimpleJavaParser.ProgramContext) mockParseTree); - when(mockASTBuilder.visit(mockParseTree)).thenReturn(mockASTNode); - when(SemanticAnalyzer.generateTast(mockASTNode)).thenReturn(mockTypedAST); - - // Use reflection to invoke the compileFile method - Method compileFileMethod = main.Main.class.getDeclaredMethod("compileFile", CharStream.class, String.class); - compileFileMethod.setAccessible(true); - - compileFileMethod.invoke(null, mockInputCharStream, outputDirectoryPath); - - // Verify each step - verify(mockLexer, times(1)).nextToken(); - verify(mockTokenStream, times(1)).getTokens(); - verify(mockParser, times(1)).program(); - verify(mockASTBuilder, times(1)).visit(mockParseTree); - verify(mockSemanticAnalyzer, times(1)).generateTast(mockASTNode); - verify(mockByteCodeGenerator, times(1)).visit((ProgramNode) mockTypedAST); + public void CommentsTest() { + runTest("Comments"); } @Test - public void testCompileFile2() throws Exception { - // Mock the behavior - when(mockLexer.nextToken()).thenReturn(null); - when(mockTokenStream.getTokens()).thenReturn(new ArrayList<>()); - when(mockParser.program()).thenReturn((SimpleJavaParser.ProgramContext) mockParseTree); - when(mockASTBuilder.visit(mockParseTree)).thenReturn(mockASTNode); - when(SemanticAnalyzer.generateTast(mockASTNode)).thenReturn(mockTypedAST); - - // Use reflection to invoke the compileFile method - Method compileFileMethod = main.Main.class.getDeclaredMethod("compileFile", CharStream.class, String.class); - compileFileMethod.setAccessible(true); - - compileFileMethod.invoke(null, mockInputCharStream, outputDirectoryPath); - - // Verify each step - verify(mockLexer, times(1)).nextToken(); - verify(mockTokenStream, times(1)).getTokens(); - verify(mockParser, times(1)).program(); - verify(mockASTBuilder, times(1)).visit(mockParseTree); - verify(mockSemanticAnalyzer, times(1)).generateTast(mockASTNode); - verify(mockByteCodeGenerator, times(1)).visit((ProgramNode) mockTypedAST); - } - - - - - - - @Test - public void testLexer() { - // Mock the behavior - when(mockLexer.nextToken()).thenReturn(null); - - // Test the lexer - SimpleJavaLexer lexer = new SimpleJavaLexer(mockInputCharStream); - CommonTokenStream tokenStream = new CommonTokenStream(lexer); - tokenStream.fill(); - - assertNotNull(tokenStream.getTokens()); - verify(mockLexer, atLeastOnce()).nextToken(); + public void ConstructorMethodCallTest() { + runTest("ConstructorMethodCall"); } @Test - public void testParser() { - // Mock the behavior - when(mockParser.program()).thenReturn((SimpleJavaParser.ProgramContext) mockParseTree); - - // Test the parser - SimpleJavaParser parser = new SimpleJavaParser(mockTokenStream); - ParseTree parseTree = parser.program(); - - assertNotNull(parseTree); - verify(mockParser, times(1)).program(); + public void ConstructorMethodCallParametersTest() { + runTest("ConstructorMethodCallParameters"); } @Test - public void testASTBuilder() { - // Mock the behavior - when(mockASTBuilder.visit(mockParseTree)).thenReturn(mockASTNode); - - // Test the AST builder - ASTBuilder astBuilder = new ASTBuilder(); - ASTNode abstractSyntaxTree = astBuilder.visit(mockParseTree); - - assertNotNull(abstractSyntaxTree); - verify(mockASTBuilder, times(1)).visit(mockParseTree); + public void ConstructorParameterTest() { + runTest("ConstructorParameter"); } @Test - public void testSemanticAnalyzer() { - // Mock the behavior - when(SemanticAnalyzer.generateTast(mockASTNode)).thenReturn(mockTypedAST); - - // Test the semantic analyzer - ASTNode typedAst = SemanticAnalyzer.generateTast(mockASTNode); - - assertNotNull(typedAst); - verify(mockSemanticAnalyzer, times(1)).generateTast(mockASTNode); + public void ConstructorThisDotTest() { + runTest("ConstructorThisDot"); } @Test - public void testByteCodeGenerator() { - // Test the bytecode generator - ByteCodeGenerator byteCodeGenerator = new ByteCodeGenerator(outputDirectoryPath); - byteCodeGenerator.visit((ProgramNode) mockTypedAST); + public void DoWhileTest() { + runTest("DoWhile"); + } - verify(mockByteCodeGenerator, times(1)).visit((ProgramNode) mockTypedAST); + @Test + public void EmptyClassTest() { + runTest("EmptyClass"); + } + + @Test + public void EmptyClassWithConstructorTest() { + runTest("EmptyClassWithConstructor"); + } + + @Test + public void FieldTest() { + runTest("Field"); + } + + @Test + public void FieldWithAccessModifierTest() { + runTest("FieldWithAccessModifier"); + } + + @Test + public void ForTest() { + runTest("For"); + } + + @Test + public void IfTest() { + runTest("If"); + } + + @Test + public void IfElseTest() { + runTest("IfElse"); + } + + @Test + public void IfElseIfElseTest() { + runTest("IfElseIfElse"); + } + + @Test + public void IncrementTest() { + runTest("Increment"); + } + + @Test + public void MainMethodTest() { + runTest("MainMethod"); + } + + @Test + public void MultipleClassesTest() { + runTest("MultipleClasses"); + } + + @Test + @Disabled + public void SelfReferenceTest() { + runTest("SelfReference"); + } + + @Test + public void ThisDotTest() { + runTest("ThisDot"); + } + + @Test + public void VariableCalculationTest() { + runTest("VariableCalculation"); + } + + @Test + public void VariableCompareTest() { + runTest("VariableCompare"); + } + + @Test + public void VoidMethodTest() { + runTest("VoidMethod"); + } + + @Test + public void WhileTest() { + runTest("While"); + } + + // Helper method to eliminate redundancy + private void runTest(String fileName) { + try { + // compile with miniCompiler + Main.main(new String[]{"src/test/resources/input/singleFeatureTests/" + fileName + ".java", "src/test/resources/output/miniCompiler"}); + // Get the system Java compiler + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + // Assert that the compiler is available + assertNotNull(javac, "Java Compiler is not available"); + // compile with javac + javac.run(null, null, null, "src/test/resources/input/singleFeatureTests/" + fileName + ".java"); + moveFile("src/test/resources/input/singleFeatureTests/" + fileName + ".class", "src/test/resources/output/javac/" + fileName + ".class"); + + // Load the javac class + Path javacClassPath = Paths.get("src/test/resources/output/javac"); + ClassLoader javacClassLoader = new java.net.URLClassLoader(new java.net.URL[]{javacClassPath.toUri().toURL()}); + Class javacLoadedClass = javacClassLoader.loadClass(fileName); + + // Load the miniCompiler class + Path miniCompilerClassPath = Paths.get("src/test/resources/output/miniCompiler"); + ClassLoader miniCompilerClassLoader = new java.net.URLClassLoader(new java.net.URL[]{miniCompilerClassPath.toUri().toURL()}); + Class miniCompilerLoadedClass = miniCompilerClassLoader.loadClass(fileName); + + // Class Name + assertEquals(fileName, javacLoadedClass.getName()); + assertEquals(fileName, miniCompilerLoadedClass.getName()); + + // Constructors + Constructor[] javacConstructors = javacLoadedClass.getDeclaredConstructors(); + Constructor[] miniCompilerConstructors = miniCompilerLoadedClass.getDeclaredConstructors(); + assertEquals(javacConstructors.length, miniCompilerConstructors.length); + for (Constructor c : javacConstructors) { + for (Constructor miniCompilerConstructor : miniCompilerConstructors) { + assertEquals(c.getParameterCount(), miniCompilerConstructor.getParameterCount()); + if (c.getParameterCount() == miniCompilerConstructor.getParameterCount()) { + assertEquals(c.getName(), miniCompilerConstructor.getName()); + } + } + } + + // Methods + Method[] javacMethods = javacLoadedClass.getDeclaredMethods(); + Method[] miniCompilerMethods = miniCompilerLoadedClass.getDeclaredMethods(); + assertEquals(javacMethods.length, miniCompilerMethods.length); + for (int i = 0; i < javacMethods.length; i++) { + assertEquals(javacMethods[i].getName(), miniCompilerMethods[i].getName()); + assertEquals(javacMethods[i].getReturnType(), miniCompilerMethods[i].getReturnType()); + assertEquals(javacMethods[i].getParameterCount(), miniCompilerMethods[i].getParameterCount()); + } + + // Fields + Field[] javacLoadedClassDeclaredFields = javacLoadedClass.getDeclaredFields(); + Field[] miniCompilerLoadedClassDeclaredFields = miniCompilerLoadedClass.getDeclaredFields(); + assertEquals(javacLoadedClassDeclaredFields.length, miniCompilerLoadedClassDeclaredFields.length); + for (Field field : javacLoadedClassDeclaredFields) { + for (Field miniCompilerField : miniCompilerLoadedClassDeclaredFields) { + if (field.getName().equals(miniCompilerField.getName())) { + assertEquals(field.getType(), miniCompilerField.getType()); + } + } + } + } catch (ClassNotFoundException | NoSuchFieldException | NoSuchMethodException e) { + e.printStackTrace(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + // Helper method to move file + public static void moveFile(String sourceFilePath, String destinationFilePath) throws IOException { + Path sourcePath = Paths.get(sourceFilePath); + Path destinationPath = Paths.get(destinationFilePath); + Files.move(sourcePath, destinationPath, StandardCopyOption.REPLACE_EXISTING); } } - diff --git a/src/test/java/main/EndToEndTester.java b/src/test/java/main/EndToEndTester.java index 233a9c3..443890d 100644 --- a/src/test/java/main/EndToEndTester.java +++ b/src/test/java/main/EndToEndTester.java @@ -11,14 +11,12 @@ package main; * Wenn unser Compiler funktioniert, sollten keine Errors kommen (sondern nur die Ausgaben, die wir in der CompilerInput.java Datei gemacht haben, * oder Methoden, die wir hier aufrufen).

* - *

PROBLEM: Hier kommen Errors, was eigentlich heißt, dass der Compiler nicht funktioniert, der Test sollte eigentlich passen. - *
DENN: Wenn ich statt unserem CompilerInput.class die CompilerInput.class von javac verwende (aus src/test/resources/output/javac ), dann funktioniert es.

*/ public class EndToEndTester { public static void main(String[] args) { try { // Try to load the class named "CompilerInput" - Class cls = Class.forName("CompilerInput"); + Class cls = Class.forName("Compiler"); // Print a success message if the class is loaded successfully System.out.println("Class loaded successfully: " + cls.getName()); diff --git a/src/test/java/main/FailureTest.java b/src/test/java/main/FailureTest.java deleted file mode 100644 index 60c504b..0000000 --- a/src/test/java/main/FailureTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package main; - -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.Test; - -import javax.tools.JavaCompiler; -import javax.tools.ToolProvider; -import java.io.File; - -public class FailureTest { - /** - * This test method checks if invalid Java files fail to compile as expected. - * It uses the JavaCompiler from the ToolProvider to compile the files. - * The test passes if all the files fail to compile. - */ - @Test - public void areTestFilesActuallyFailTest() { - // Get the system Java compiler - JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); - // Assert that the compiler is available - assertNotNull(javac, "Java Compiler is not available"); - - String directoryPath = "src/test/resources/input/failureTests"; - File folder = new File(directoryPath); - - if (folder.isDirectory()) { - File[] files = folder.listFiles((dir, name) -> name.endsWith(".java")); - - if (files != null) { - for (File file : files) { - // Try to compile the file and get the result - // The run method returns 0 if the compilation was successful, and non-zero otherwise - int result = javac.run(null, null, null, file.getPath()); - - // Assert that the compilation failed (i.e., the result is non-zero) - assertTrue(result != 0, "Expected compilation failure for " + file.getName()); - } - } else { - System.out.println("No files found in the directory."); - } - } else { - System.out.println("The provided path is not a directory."); - } - } -} - diff --git a/src/test/java/main/FeatureTest.java b/src/test/java/main/FeatureTest.java deleted file mode 100644 index a3e30de..0000000 --- a/src/test/java/main/FeatureTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package main; - -import org.junit.jupiter.api.Test; - -import javax.tools.JavaCompiler; -import javax.tools.ToolProvider; -import java.io.File; - -import static org.junit.jupiter.api.Assertions.*; - -public class FeatureTest { - /** - * This test method checks if valid Java files compile successfully. - * It uses the JavaCompiler from the ToolProvider to compile the files. - * The test passes if all the files compile without errors. - */ - @Test - public void areTestFilesActuallyValid() { - // Get the system Java compiler - JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); - // Assert that the compiler is available - assertNotNull(javac, "Java Compiler is not available"); - - String directoryPath = "src/test/resources/input/featureTests"; - File folder = new File(directoryPath); - - if (folder.isDirectory()) { - File[] files = folder.listFiles((dir, name) -> name.endsWith(".java")); - - if (files != null) { - for (File file : files) { - // Try to compile the file and get the result - // The run method returns 0 if the compilation was successful, and non-zero otherwise - int result = javac.run(null, null, null, file.getPath()); - - // Assert that the compilation succeeded (i.e., the result is zero) - assertEquals(0, result, "Expected compilation success for " + file.getName()); - } - } else { - System.out.println("No files found in the directory."); - } - } else { - System.out.println("The provided path is not a directory."); - } - } -} diff --git a/src/test/java/main/InputFilesTest.java b/src/test/java/main/InputFilesTest.java new file mode 100644 index 0000000..6997510 --- /dev/null +++ b/src/test/java/main/InputFilesTest.java @@ -0,0 +1,238 @@ +package main; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import javax.tools.JavaCompiler; +import javax.tools.ToolProvider; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.List; +import java.util.stream.Collectors; + +import static org.junit.jupiter.api.Assertions.*; + +public class InputFilesTest { + + /** + * This test method checks if valid Java files compile successfully. + * It uses the JavaCompiler from the ToolProvider to compile the files. + * The test passes if all the files compile without errors. + */ + @Test + public void areTestFilesActuallyValid() throws IOException { + // Get the system Java compiler + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + // Assert that the compiler is available + assertNotNull(javac, "Java Compiler is not available"); + + File combinedFeatureTests = new File("src/test/resources/input/combinedFeatureTests"); + File endabgabeTests = new File("src/test/resources/input/endabgabeTests"); + File singleFeatureSemanticTests = new File("src/test/resources/input/singleFeatureSemanticTests"); + File singleFeatureTests = new File("src/test/resources/input/singleFeatureTests"); + File typedAstFeatureTests = new File("src/test/resources/input/typedAstFeatureTests"); + File finalTest = new File("src/test/resources/input/finalTest"); + + List files = getJavaFilesFromDirectory(combinedFeatureTests); + // files.addAll(getJavaFilesFromDirectory(endabgabeTests)); + // files.addAll(getJavaFilesFromDirectory(singleFeatureSemanticTests)); + files.addAll(getJavaFilesFromDirectory(singleFeatureTests)); + // files.addAll(getJavaFilesFromDirectory(typedAstFeatureTests)); + //files.addAll(getJavaFilesFromDirectory(finalTest)); + + if (!files.isEmpty()) { + for (File file : files) { + // Try to compile the file and get the result + int result = javac.run(null, null, null, file.getPath()); + + // Assert that the compilation succeeded (i.e., the result is zero) + assertEquals(0, result, "Expected compilation success for " + file.getName()); + } + } else { + System.out.println("No files found in the directories."); + } + } + + @Test + public void areCombinedFeatureTestsValid() throws IOException { + // Get the system Java compiler + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + // Assert that the compiler is available + assertNotNull(javac, "Java Compiler is not available"); + + File combinedFeatureTests = new File("src/test/resources/input/combinedFeatureTests"); + + List files = getJavaFilesFromDirectory(combinedFeatureTests); + + if (!files.isEmpty()) { + for (File file : files) { + // Try to compile the file and get the result + int result = javac.run(null, null, null, file.getPath()); + + // Assert that the compilation succeeded (i.e., the result is zero) + assertEquals(0, result, "Expected compilation success for " + file.getName()); + } + } else { + System.out.println("No files found in the directories."); + } + } + + @Test + @Disabled + public void areEndabgabeTestsActuallyValid() throws IOException { + // Get the system Java compiler + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + // Assert that the compiler is available + assertNotNull(javac, "Java Compiler is not available"); + + File endabgabeTests = new File("src/test/resources/input/endabgabeTests"); + + List files = getJavaFilesFromDirectory(endabgabeTests); + + if (!files.isEmpty()) { + for (File file : files) { + // Try to compile the file and get the result + int result = javac.run(null, null, null, file.getPath()); + + // Assert that the compilation succeeded (i.e., the result is zero) + assertEquals(0, result, "Expected compilation success for " + file.getName()); + } + } else { + System.out.println("No files found in the directories."); + } + } + + @Test + @Disabled + public void areSingleFeatureSemanticTestsActuallyValid() throws IOException { + // Get the system Java compiler + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + // Assert that the compiler is available + assertNotNull(javac, "Java Compiler is not available"); + + File singleFeatureSemanticTests = new File("src/test/resources/input/singleFeatureSemanticTests"); + + List files = getJavaFilesFromDirectory(singleFeatureSemanticTests); + + if (!files.isEmpty()) { + for (File file : files) { + // Try to compile the file and get the result + int result = javac.run(null, null, null, file.getPath()); + + // Assert that the compilation succeeded (i.e., the result is zero) + assertEquals(0, result, "Expected compilation success for " + file.getName()); + } + } else { + System.out.println("No files found in the directories."); + } + } + + + @Test + public void areSingleFeatureTestsActuallyValid() throws IOException { + // Get the system Java compiler + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + // Assert that the compiler is available + assertNotNull(javac, "Java Compiler is not available"); + + File singleFeatureTests = new File("src/test/resources/input/singleFeatureTests"); + + List files = getJavaFilesFromDirectory(singleFeatureTests); + + if (!files.isEmpty()) { + for (File file : files) { + // Try to compile the file and get the result + int result = javac.run(null, null, null, file.getPath()); + + // Assert that the compilation succeeded (i.e., the result is zero) + assertEquals(0, result, "Expected compilation success for " + file.getName()); + } + } else { + System.out.println("No files found in the directories."); + } + } + + + @Test + @Disabled + public void areTypedAstFeatureTestsActuallyValid() throws IOException { + // Get the system Java compiler + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + // Assert that the compiler is available + assertNotNull(javac, "Java Compiler is not available"); + + File typedAstFeatureTests = new File("src/test/resources/input/typedAstFeatureTests"); + + List files = getJavaFilesFromDirectory(typedAstFeatureTests); + + if (!files.isEmpty()) { + for (File file : files) { + // Try to compile the file and get the result + int result = javac.run(null, null, null, file.getPath()); + + // Assert that the compilation succeeded (i.e., the result is zero) + assertEquals(0, result, "Expected compilation success for " + file.getName()); + } + } else { + System.out.println("No files found in the directories."); + } + } + + + + + /** + * This test method checks if invalid Java files fail to compile as expected. + * It uses the JavaCompiler from the ToolProvider to compile the files. + * The test passes if all the files fail to compile. + */ + @Test + public void areTestFilesActuallyFails() throws IOException { + // Get the system Java compiler + JavaCompiler javac = ToolProvider.getSystemJavaCompiler(); + // Assert that the compiler is available + assertNotNull(javac, "Java Compiler is not available"); + + + File folder1 = new File("src/test/resources/input/failureTests"); + File folder2 = new File("src/test/resources/input/typedAstExceptionsTest"); + + List files = getJavaFilesFromDirectory(folder1); + files.addAll(getJavaFilesFromDirectory(folder2)); + + + if (!files.isEmpty()) { + for (File file : files) { + // Try to compile the file and get the result + // The run method returns 0 if the compilation was successful, and non-zero otherwise + int result = javac.run(null, null, null, file.getPath()); + + // Assert that the compilation failed (i.e., the result is non-zero) + assertTrue(result != 0, "Expected compilation failure for " + file.getName()); + } + } else { + System.out.println("No files found in the directory."); + } + + } + + /** + * Helper method to get all .java files from a directory. + * + * @param directory the directory to search for .java files + * @return a list of .java files + * @throws IOException if an I/O error occurs + */ + private List getJavaFilesFromDirectory(File directory) throws IOException { + if (directory.isDirectory()) { + return Files.list(directory.toPath()) + .filter(path -> path.toString().endsWith(".java")) + .map(java.nio.file.Path::toFile) + .collect(Collectors.toList()); + } else { + System.out.println("The provided path is not a directory: " + directory.getPath()); + return List.of(); + } + } +} diff --git a/src/test/java/main/MainTest.java b/src/test/java/main/MainTest.java index 24389bc..45f07f4 100644 --- a/src/test/java/main/MainTest.java +++ b/src/test/java/main/MainTest.java @@ -1,28 +1,21 @@ package main; -import org.junit.jupiter.api.Test; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.CharStreams; - -import java.io.IOException; -import java.nio.file.Paths; - +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import semantic.EndToTypedAstTest; +import semantic.SemanticTest; /** - * run every test: mvn test - * Nutzen dieser Klasse: Eigentlich nicht vorhanden, in der Main gibts nichts zu testen + * This class is a test suite that runs all the test classes in the project. + *

run: mvn test + *

check results in console or target/surefire-reports */ +@RunWith(Suite.class) +@Suite.SuiteClasses({ + InputFilesTest.class, + SemanticTest.class, + EndToTypedAstTest.class +}) public class MainTest { - @Test - void test() { - CharStream codeCharStream = null; - try { - codeCharStream = CharStreams.fromPath(Paths.get("src/main/test/resources/CompilerInput.java")); - Main.compileFile(codeCharStream, "src/main/test/resources/output"); - } catch (IOException e) { - System.err.println("Error reading the file: " + e.getMessage()); - } - } + // This class remains empty, it is used only as a holder for the above annotations } - - diff --git a/src/test/java/parser/AstBuilderTest.java b/src/test/java/parser/AstBuilderTest.java index b163a2a..d7a9be1 100644 --- a/src/test/java/parser/AstBuilderTest.java +++ b/src/test/java/parser/AstBuilderTest.java @@ -1,146 +1,140 @@ package parser; - import ast.ASTNode; import ast.ClassNode; import ast.ProgramNode; import ast.expressions.IExpressionNode; +import ast.expressions.binaryexpressions.CalculationNode; +import ast.expressions.binaryexpressions.DotNode; +import ast.expressions.binaryexpressions.DotSubtractionNode; +import ast.expressions.binaryexpressions.NonCalculationNode; import ast.expressions.unaryexpressions.MemberAccessNode; import ast.expressions.unaryexpressions.UnaryNode; -import ast.members.ConstructorNode; -import ast.members.FieldNode; -import ast.members.MemberNode; -import ast.members.MethodNode; +import ast.members.*; import ast.parameters.ParameterNode; import ast.statementexpressions.AssignNode; import ast.statementexpressions.AssignableNode; +import ast.statementexpressions.NewDeclarationNode; +import ast.statementexpressions.crementexpressions.CrementType; +import ast.statementexpressions.crementexpressions.DecrementNode; +import ast.statementexpressions.crementexpressions.IncrementNode; import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode; -import ast.statements.BlockNode; -import ast.statements.IStatementNode; -import ast.statements.ReturnNode; +import ast.statementexpressions.methodcallstatementnexpressions.TargetNode; +import ast.statements.*; import ast.type.AccessModifierNode; import ast.type.EnumValueNode; import ast.type.ValueNode; import ast.type.type.BaseType; -import ast.type.type.ITypeNode; +import ast.type.type.ReferenceType; import ast.type.type.TypeEnum; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.CommonTokenStream; -import org.antlr.v4.runtime.tree.ParseTree; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import parser.astBuilder.ASTBuilder; -import parser.generated.SimpleJavaLexer; -import parser.generated.SimpleJavaParser; - -import java.io.IOException; -import java.lang.reflect.Member; import static org.assertj.core.api.Assertions.assertThat; @DisplayName("Untyped Abstract Syntax Tree") class AstBuilderTest { + private final static String directoryPath = "src/test/resources/input/singleFeatureTests/"; + @Test @DisplayName("Empty Class Test") - public void emptyClassTest(){ - ClassNode emptyClass = Helper.generateEmptyClass("TestClass"); + public void emptyClassTest() { + ClassNode emptyClass = Helper.generateEmptyClass("EmptyClass"); ProgramNode expected = new ProgramNode(); expected.addClass(emptyClass); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/EmptyClass.java"); + ASTNode actual = Helper.generateAST(directoryPath + "EmptyClass.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Multiple Empty Classes Test") public void multipleEmptyClassesTest() { - ClassNode class1 = Helper.generateEmptyClass("TestClass1"); + ClassNode class1 = Helper.generateEmptyClass("MultipleClasses"); ClassNode class2 = Helper.generateEmptyClass("TestClass2"); ProgramNode expected = new ProgramNode(); expected.addClass(class1); expected.addClass(class2); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/MultipleClasses.java"); + ASTNode actual = Helper.generateAST(directoryPath + "MultipleClasses.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Empty Class Test with Constructor") public void emptyClassWithConstructorTest() { - ClassNode class1 = Helper.generateEmptyClass("TestClass"); + ClassNode class1 = Helper.generateEmptyClass("EmptyClassWithConstructor"); ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/EmptyClassWithConstructor.java"); + ASTNode actual = Helper.generateAST(directoryPath + "EmptyClassWithConstructor.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Field Test") public void fieldTest() { - ClassNode class1 = Helper.generateEmptyClass("TestClass"); - class1.addMember(new FieldNode(null, new BaseType(TypeEnum.INT), "a")); + ClassNode class1 = Helper.generateEmptyClass("Field"); + class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Field.java"); + ASTNode actual = Helper.generateAST(directoryPath + "Field.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Field Test with Accessmodifier") public void fieldTestWithModifier() { - ClassNode class1 = Helper.generateEmptyClass("TestClass"); + ClassNode class1 = Helper.generateEmptyClass("FieldWithAccessModifier"); class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/FieldWithAccessModifier.java"); + ASTNode actual = Helper.generateAST(directoryPath + "FieldWithAccessModifier.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test - @DisplayName("Commments Ignore Test") - public void commmentsIgnoreTest(){ - ClassNode class1 = Helper.generateEmptyClass("TestClass"); + @DisplayName("Comments Ignore Test") + public void commentsIgnoreTest() { + ClassNode class1 = Helper.generateEmptyClass("Comments"); class1.addMember(new FieldNode(new AccessModifierNode("private"), new BaseType(TypeEnum.INT), "a")); ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Comments.java"); + ASTNode actual = Helper.generateAST(directoryPath + "Comments.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test - @DisplayName("Constructor Paramerter Test") - public void constructorParameterTest(){ + @DisplayName("Constructor Parameter Test") + public void constructorParameterTest() { BlockNode block = new BlockNode(); block.addStatement(new ReturnNode(null)); - ConstructorNode constructor = new ConstructorNode("public", "TestClass", block); + ConstructorNode constructor = new ConstructorNode("public", "ConstructorParameter", block); constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); - ClassNode class1 = new ClassNode("public", "TestClass"); + ClassNode class1 = new ClassNode("public", "ConstructorParameter"); class1.addMember(constructor); ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ConstructorParameter.java"); + ASTNode actual = Helper.generateAST(directoryPath + "ConstructorParameter.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("This Dot Test") - public void thisDotTest(){ + public void thisDotTest() { BlockNode block = new BlockNode(); MemberAccessNode memberAccess = new MemberAccessNode(true); memberAccess.addIdentifier("a"); @@ -152,23 +146,23 @@ class AstBuilderTest { block.addStatement(new AssignNode(assignable, expression)); block.addStatement(new ReturnNode(null)); - ConstructorNode constructor = new ConstructorNode("public", "TestClass", block); + ConstructorNode constructor = new ConstructorNode("public", "ThisDot", block); - ClassNode class1 = new ClassNode("public", "TestClass"); + ClassNode class1 = new ClassNode("public", "ThisDot"); class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); class1.addMember(constructor); ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ThisDot.java"); + ASTNode actual = Helper.generateAST(directoryPath + "ThisDot.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Constructor This Dot Test") - public void constructorThisDotTest(){ + public void constructorThisDotTest() { BlockNode block = new BlockNode(); MemberAccessNode memberAccess = new MemberAccessNode(true); memberAccess.addIdentifier("a"); @@ -179,25 +173,25 @@ class AstBuilderTest { block.addStatement(new AssignNode(assignable, expression)); block.addStatement(new ReturnNode(null)); - ConstructorNode constructor = new ConstructorNode("public", "TestClass", block); + ConstructorNode constructor = new ConstructorNode("public", "ConstructorThisDot", block); constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); - ClassNode class1 = new ClassNode("public", "TestClass"); + ClassNode class1 = new ClassNode("public", "ConstructorThisDot"); class1.addMember(new FieldNode(new AccessModifierNode("private"), new BaseType(TypeEnum.INT), "a")); class1.addMember(constructor); ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ConstructorThisDot.java"); + ASTNode actual = Helper.generateAST(directoryPath + "ConstructorThisDot.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Void Methoden Test") - public void voidMethodenTest(){ - ClassNode class1 = Helper.generateEmptyClass("TestClass"); + public void voidMethodenTest() { + ClassNode class1 = Helper.generateEmptyClass("VoidMethod"); BlockNode block = new BlockNode(); block.addStatement(new ReturnNode(null)); class1.addMember(new MethodNode("public", null, true, "test", block)); @@ -205,14 +199,14 @@ class AstBuilderTest { ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/VoidMethod.java"); + ASTNode actual = Helper.generateAST(directoryPath + "VoidMethod.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Constructor Method call Test") - public void constructorMethodCallTest(){ + public void constructorMethodCallTest() { BlockNode blockCon = new BlockNode(); MemberAccessNode memberAccess = new MemberAccessNode(true); memberAccess.addIdentifier("a"); @@ -223,13 +217,13 @@ class AstBuilderTest { blockCon.addStatement(new AssignNode(assignable, expression)); blockCon.addStatement(new ReturnNode(null)); - ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon); + ConstructorNode constructor = new ConstructorNode("public", "ConstructorMethodCall", blockCon); BlockNode blockMethod = new BlockNode(); blockMethod.addStatement(new ReturnNode(new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "1")))); MethodNode method = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod", blockMethod); - ClassNode class1 = new ClassNode("public", "TestClass"); + ClassNode class1 = new ClassNode("public", "ConstructorMethodCall"); class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); class1.addMember(constructor); class1.addMember(method); @@ -237,14 +231,14 @@ class AstBuilderTest { ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ConstructorMethodCall.java"); + ASTNode actual = Helper.generateAST(directoryPath + "ConstructorMethodCall.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Constructor Method call Parameters Test") - public void constructorMethodCallParametersTest(){ + public void constructorMethodCallParametersTest() { BlockNode blockCon = new BlockNode(); MemberAccessNode memberAccess = new MemberAccessNode(true); memberAccess.addIdentifier("a"); @@ -257,7 +251,7 @@ class AstBuilderTest { blockCon.addStatement(new AssignNode(assignable, expression)); blockCon.addStatement(new ReturnNode(null)); - ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon); + ConstructorNode constructor = new ConstructorNode("public", "ConstructorMethodCallParameters", blockCon); constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); BlockNode blockMethod = new BlockNode(); @@ -265,7 +259,7 @@ class AstBuilderTest { MethodNode method = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod", blockMethod); method.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); - ClassNode class1 = new ClassNode("public", "TestClass"); + ClassNode class1 = new ClassNode("public", "ConstructorMethodCallParameters"); class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); class1.addMember(constructor); class1.addMember(method); @@ -273,14 +267,14 @@ class AstBuilderTest { ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/ConstructorMethodCallParameters.java"); + ASTNode actual = Helper.generateAST(directoryPath + "ConstructorMethodCallParameters.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Char Test") - public void charTest(){ + public void charTest() { BlockNode blockCon = new BlockNode(); MemberAccessNode memberAccess = new MemberAccessNode(true); memberAccess.addIdentifier("a"); @@ -293,7 +287,7 @@ class AstBuilderTest { blockCon.addStatement(new AssignNode(assignable, expression)); blockCon.addStatement(new ReturnNode(null)); - ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon); + ConstructorNode constructor = new ConstructorNode("public", "Char", blockCon); constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.CHAR), "a")); BlockNode blockMethod = new BlockNode(); @@ -301,7 +295,7 @@ class AstBuilderTest { MethodNode method = new MethodNode("public", new BaseType(TypeEnum.CHAR), false, "testMethod", blockMethod); method.addParameter(new ParameterNode(new BaseType(TypeEnum.CHAR), "a")); - ClassNode class1 = new ClassNode("public", "TestClass"); + ClassNode class1 = new ClassNode("public", "Char"); class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.CHAR), "a")); class1.addMember(constructor); class1.addMember(method); @@ -309,32 +303,93 @@ class AstBuilderTest { ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Char.java"); + ASTNode actual = Helper.generateAST(directoryPath + "Char.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test - @DisplayName("Null Test") - public void nullTest(){ - BlockNode blockCon = new BlockNode(); - MemberAccessNode memberAccess = new MemberAccessNode(true); - memberAccess.addIdentifier("a"); + @DisplayName("If Test") + public void ifTest() { + BlockNode block = new BlockNode(); + block.addStatement(new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "intValue", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5")))); - AssignableNode assignable = new AssignableNode(memberAccess); + BlockNode ifBlock = new BlockNode(); + ifBlock.addStatement(new DecrementNode(CrementType.SUFFIX, new AssignableNode("intValue"))); + block.addStatement(new IfElseNode(new IfNode(new NonCalculationNode(new UnaryNode("intValue"), "==", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))), ifBlock), null)); - blockCon.addStatement(new AssignNode(assignable, new UnaryNode(new ValueNode(EnumValueNode.NULL_VALUE, "null")))); - blockCon.addStatement(new ReturnNode(null)); - ConstructorNode constructor = new ConstructorNode("public", "TestClass", blockCon); + block.addStatement(new ReturnNode(null)); - ClassNode class1 = new ClassNode("public", "TestClass"); - class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); + ConstructorNode constructor = new ConstructorNode("public", "If", block); + + ClassNode class1 = new ClassNode("public", "If"); class1.addMember(constructor); ProgramNode expected = new ProgramNode(); expected.addClass(class1); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Null.java"); + ASTNode actual = Helper.generateAST(directoryPath + "If.java"); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + } + + @Test + @DisplayName("If Else Test") + public void ifElseTest() { + BlockNode block = new BlockNode(); + block.addStatement(new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "intValue", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5")))); + + BlockNode ifBlock = new BlockNode(); + ifBlock.addStatement(new DecrementNode(CrementType.SUFFIX, new AssignableNode("intValue"))); + BlockNode elseBlock = new BlockNode(); + elseBlock.addStatement(new IncrementNode(CrementType.SUFFIX, new AssignableNode("intValue"))); + block.addStatement(new IfElseNode(new IfNode(new NonCalculationNode(new UnaryNode("intValue"), "==", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))), ifBlock), new ElseNode(elseBlock))); + + block.addStatement(new ReturnNode(null)); + + ConstructorNode constructor = new ConstructorNode("public", "IfElse", block); + + ClassNode class1 = new ClassNode("public", "IfElse"); + class1.addMember(constructor); + + ProgramNode expected = new ProgramNode(); + expected.addClass(class1); + + ASTNode actual = Helper.generateAST(directoryPath + "IfElse.java"); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + } + + @Test + @DisplayName("If Else If ElseTest") + public void ifElseIfElseTest() { + BlockNode block = new BlockNode(); + block.addStatement(new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "intValue", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5")))); + + BlockNode ifBlock = new BlockNode(); + ifBlock.addStatement(new DecrementNode(CrementType.SUFFIX, new AssignableNode("intValue"))); + BlockNode elseBlock = new BlockNode(); + elseBlock.addStatement(new IncrementNode(CrementType.SUFFIX, new AssignableNode("intValue"))); + + IfElseNode ifElseStatement = new IfElseNode(new IfNode(new NonCalculationNode(new UnaryNode("intValue"), "==", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "5"))), ifBlock), new ElseNode(elseBlock)); + + BlockNode ifElseBlock = new BlockNode(); + ifElseBlock.addStatement(new IncrementNode(CrementType.SUFFIX, new AssignableNode("intValue"))); + ifElseStatement.addElseIfStatement(new IfNode(new NonCalculationNode(new UnaryNode("intValue"), "==", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "4"))), ifElseBlock)); + + block.addStatement(ifElseStatement); + + block.addStatement(new ReturnNode(null)); + + ConstructorNode constructor = new ConstructorNode("public", "IfElseIfElse", block); + + ClassNode class1 = new ClassNode("public", "IfElseIfElse"); + class1.addMember(constructor); + + ProgramNode expected = new ProgramNode(); + expected.addClass(class1); + + ASTNode actual = Helper.generateAST(directoryPath + "IfElseIfElse.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @@ -343,74 +398,268 @@ class AstBuilderTest { @DisplayName("Self Reference Test") public void selfReferneceTest(){ - //assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + ClassNode testClass = Helper.generateEmptyClass("SelfReference"); + + MemberNode testClassObject = new FieldNode(new AccessModifierNode("public"), new ReferenceType("SelfReference"),"selfReference"); + + BlockNode testMethod1Block = new BlockNode(); + testMethod1Block.addStatement(new ReturnNode(new UnaryNode(new MethodCallNode(null, "testMethod2")))); + MethodNode testMethod1 = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod1", testMethod1Block); + + BlockNode testMethod2Block = new BlockNode(); + testMethod2Block.addStatement(new ReturnNode(new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE,"1")))); + MethodNode testMethod2 = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod2", testMethod2Block); + + BlockNode testMethod3Block = new BlockNode(); + testMethod3Block.addStatement(new LocalVariableDeclarationNode(new ReferenceType("SelfReference"),"selfReference1", "=", new UnaryNode(new NewDeclarationNode("SelfReference")))); // Assing einfach "=" ? + MemberAccessNode methodAccess = new MemberAccessNode(false); + TargetNode methodTarget = new TargetNode("selfReference1"); + testMethod3Block.addStatement(new ReturnNode(new UnaryNode(new MethodCallNode(methodTarget,"testMethod1")))); + MethodNode testMethod3 = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod3", testMethod3Block); + + testClass.addMember(testClassObject); + testClass.addMember(testMethod1); + testClass.addMember(testMethod2); + testClass.addMember(testMethod3); + + ProgramNode expected = new ProgramNode(); + expected.addClass(testClass); + + ASTNode actual = Helper.generateAST(directoryPath + "SelfReference.java"); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Variable Compare Test") public void variableCompareTest(){ + ClassNode class1 = Helper.generateEmptyClass("VariableCompare"); + UnaryNode trueValue = new UnaryNode(new ValueNode(EnumValueNode.BOOLEAN_VALUE,"true")); + UnaryNode falseValue = new UnaryNode(new ValueNode(EnumValueNode.BOOLEAN_VALUE,"false")); - //assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + BlockNode trueBlock = new BlockNode(); + trueBlock.addStatement(new ReturnNode(trueValue)); + MethodNode trueMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "trueMethod", trueBlock); + + BlockNode falseBlock = new BlockNode(); + falseBlock.addStatement(new ReturnNode(falseValue)); + MethodNode falseMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "falseMethod", falseBlock); + + BlockNode trueAndTrueBlock = new BlockNode(); + trueAndTrueBlock.addStatement(new ReturnNode(new NonCalculationNode(trueValue, "&&", trueValue))); + MethodNode trueAndTrueMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "trueAndTrueMethod", trueAndTrueBlock); + + BlockNode trueAndFalseBlock = new BlockNode(); + trueAndFalseBlock.addStatement(new ReturnNode(new NonCalculationNode(trueValue, "&&", falseValue))); + MethodNode trueAndFalseMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "trueAndFalseMethod", trueAndFalseBlock); + + BlockNode falseAndFalseBlock = new BlockNode(); + falseAndFalseBlock.addStatement(new ReturnNode(new NonCalculationNode(falseValue, "&&", falseValue))); + MethodNode falseAndFalseMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "falseAndFalseMethod", falseAndFalseBlock); + + BlockNode trueOrTrueBlock = new BlockNode(); + trueOrTrueBlock.addStatement(new ReturnNode(new NonCalculationNode(trueValue, "||", trueValue))); + MethodNode trueOrFalseMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "trueOrTrueMethod", trueOrTrueBlock); + + BlockNode falseOrFalseBlock = new BlockNode(); + falseOrFalseBlock.addStatement(new ReturnNode(new NonCalculationNode(falseValue, "||", falseValue))); + MethodNode falseOrFalseMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "falseOrFalseMethod", falseOrFalseBlock); + + class1.addMember(trueMethod); + class1.addMember(falseMethod); + class1.addMember(trueAndTrueMethod); + class1.addMember(trueAndFalseMethod); + class1.addMember(falseAndFalseMethod); + class1.addMember(trueOrFalseMethod); + class1.addMember(falseOrFalseMethod); + + ProgramNode expected = new ProgramNode(); + expected.addClass(class1); + + ASTNode actual = Helper.generateAST(directoryPath + "VariableCompare.java"); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Variable Calculation Test") public void variableCalculationTest(){ + ClassNode class1 = Helper.generateEmptyClass("VariableCalculation"); - //assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + BlockNode aPlusBBlock = new BlockNode(); + aPlusBBlock.addStatement(new ReturnNode(new CalculationNode(new CalculationNode(new DotNode(new DotSubtractionNode("a"))), "+", new DotNode(new DotSubtractionNode("b"))))); + MethodNode aPlusBMethod = new MethodNode("public", new BaseType(TypeEnum.INT), false, "aPlusB", aPlusBBlock); + aPlusBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + aPlusBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + BlockNode aMinusBBlock = new BlockNode(); + aMinusBBlock.addStatement(new ReturnNode(new CalculationNode(new CalculationNode(new DotNode(new DotSubtractionNode("a"))), "-", new DotNode(new DotSubtractionNode("b"))))); + MethodNode aMinusBMethod = new MethodNode("public", new BaseType(TypeEnum.INT), false, "aMinusB", aMinusBBlock); + aMinusBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + aMinusBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + BlockNode aTimeBBlock = new BlockNode(); + aTimeBBlock.addStatement(new ReturnNode(new CalculationNode(new DotNode(new DotNode(new DotSubtractionNode("a")), "*", new DotSubtractionNode("b"))))); + MethodNode aTimeBMethod = new MethodNode("public", new BaseType(TypeEnum.INT), false, "aTimeB", aTimeBBlock); + aTimeBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + aTimeBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + BlockNode aDivBBlock = new BlockNode(); + aDivBBlock.addStatement(new ReturnNode(new CalculationNode(new DotNode(new DotNode(new DotSubtractionNode("a")), "/", new DotSubtractionNode("b"))))); + MethodNode aDivBMethod = new MethodNode("public", new BaseType(TypeEnum.INT), false, "aDivB", aDivBBlock); + aDivBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + aDivBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + BlockNode complexCalcBlock = new BlockNode(); + complexCalcBlock.addStatement(new ReturnNode(new CalculationNode(null, null, new DotNode(new DotNode(new DotNode(new DotNode(new DotSubtractionNode("a")), "*", new DotSubtractionNode("b")), "/", new DotSubtractionNode(new ValueNode(EnumValueNode.INT_VALUE, "1"))), "*", new DotSubtractionNode(new ValueNode(EnumValueNode.INT_VALUE, "3")))))); + MethodNode complexCalcMethod = new MethodNode("public", new BaseType(TypeEnum.INT), false, "complexCalc", complexCalcBlock); + complexCalcMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + complexCalcMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + BlockNode aSmallerBBlock = new BlockNode(); + aSmallerBBlock.addStatement(new ReturnNode(new NonCalculationNode(new UnaryNode("a"), "<", new UnaryNode("b")))); + MethodNode aSmallerBMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "aSmallerB", aSmallerBBlock); + aSmallerBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + aSmallerBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + BlockNode aGreaterBBlock = new BlockNode(); + aGreaterBBlock.addStatement(new ReturnNode(new NonCalculationNode(new UnaryNode("a"), ">", new UnaryNode("b")))); + MethodNode aGreaterBMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "aGreaterB", aGreaterBBlock); + aGreaterBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + aGreaterBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + BlockNode aEqualsBBlock = new BlockNode(); + aEqualsBBlock.addStatement(new ReturnNode(new NonCalculationNode(new UnaryNode("a"), "==", new UnaryNode("b")))); + MethodNode aEqualsBMethod = new MethodNode("public", new BaseType(TypeEnum.BOOL), false, "aEqualsB", aEqualsBBlock); + aEqualsBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + aEqualsBMethod.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + class1.addMember(aPlusBMethod); + class1.addMember(aMinusBMethod); + class1.addMember(aTimeBMethod); + class1.addMember(aDivBMethod); + class1.addMember(complexCalcMethod); + class1.addMember(aSmallerBMethod); + class1.addMember(aGreaterBMethod); + class1.addMember(aEqualsBMethod); + + ProgramNode expected = new ProgramNode(); + expected.addClass(class1); + + ASTNode actual = Helper.generateAST(directoryPath + "VariableCalculation.java"); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Main Method Test") public void mainMethodTest(){ + ClassNode class1 = Helper.generateEmptyClass("MainMethod"); - //assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + BlockNode block = new BlockNode(); + block.addStatement(new ReturnNode(null)); + + class1.addMember(new MainMethodNode(block)); + + ProgramNode expected = new ProgramNode(); + expected.addClass(class1); + + ASTNode actual = Helper.generateAST(directoryPath + "MainMethod.java"); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("While Test") public void whileTest(){ + NonCalculationNode condition = new NonCalculationNode(new UnaryNode("i"), ">", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "0"))); - //assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + BlockNode whileBlock = new BlockNode(); + whileBlock.addStatement(new DecrementNode(CrementType.SUFFIX, new AssignableNode("i"))); + + WhileNode whileStatement = new WhileNode(condition, whileBlock); + + BlockNode blockCon = new BlockNode(); + blockCon.addStatement(new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "i", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "10")))); + blockCon.addStatement(whileStatement); + blockCon.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "While", blockCon); + + ClassNode class1 = new ClassNode("public", "While"); + class1.addMember(constructor); + + ProgramNode expected = new ProgramNode(); + expected.addClass(class1); + + ASTNode actual = Helper.generateAST(directoryPath + "While.java"); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("Do While Test") public void doWhileTest(){ + NonCalculationNode condition = new NonCalculationNode(new UnaryNode("i"), "<", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "10"))); - //assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); + BlockNode whileBlock = new BlockNode(); + whileBlock.addStatement(new IncrementNode(CrementType.SUFFIX, new AssignableNode("i"))); + + WhileNode whileStatement = new WhileNode(condition, whileBlock); + + BlockNode blockDoWhile = new BlockNode(); + blockDoWhile.addStatement(whileBlock); + blockDoWhile.addStatement(whileStatement); + + BlockNode blockCon = new BlockNode(); + blockCon.addStatement(new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "i", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "0")))); + blockCon.addStatement(blockDoWhile); + blockCon.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "DoWhile", blockCon); + + ClassNode class1 = new ClassNode("public", "DoWhile"); + class1.addMember(constructor); + + ProgramNode expected = new ProgramNode(); + expected.addClass(class1); + + ASTNode actual = Helper.generateAST(directoryPath + "DoWhile.java"); + + assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } @Test @DisplayName("For Test") public void forTest(){ + LocalVariableDeclarationNode forDeclaration = new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "i", "=", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "0"))); - //assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); - } + AssignableNode assignable = new AssignableNode("i"); + IncrementNode increment = new IncrementNode(CrementType.PREFIX, assignable); - //Noch nicht speziell Increment nur zum Development Testen per Debug - @Test - @DisplayName("Increment Test") - public void incrementTest(){ - ClassNode classNode = Helper.generateEmptyClass("TestClass"); - classNode.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); + LocalVariableDeclarationNode declaration = new LocalVariableDeclarationNode(new BaseType(TypeEnum.INT), "a", null, null); + + BlockNode whileBlock = new BlockNode(); + whileBlock.addStatement(declaration); + whileBlock.addStatement(increment); + + WhileNode whileStatement = new WhileNode(new NonCalculationNode(new UnaryNode("i"), "<", new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "10"))), whileBlock); + + BlockNode forStatement = new BlockNode(); + forStatement.addStatement(forDeclaration); + forStatement.addStatement(whileStatement); + + BlockNode blockCon = new BlockNode(); + blockCon.addStatement(forStatement); + blockCon.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "For", blockCon); + + ClassNode class1 = new ClassNode("public", "For"); + class1.addMember(constructor); ProgramNode expected = new ProgramNode(); - expected.addClass(classNode); + expected.addClass(class1); + + ASTNode actual = Helper.generateAST(directoryPath + "For.java"); - ASTNode actual = Helper.generateAST("src/test/resources/input/javaCases/Increment.java"); assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected); } - - - - - - - - - - - - } \ No newline at end of file diff --git a/src/test/java/parser/Helper.java b/src/test/java/parser/Helper.java index a679c8a..63261f4 100644 --- a/src/test/java/parser/Helper.java +++ b/src/test/java/parser/Helper.java @@ -2,12 +2,10 @@ package parser; import ast.ASTNode; import ast.ClassNode; -import ast.ProgramNode; import ast.members.ConstructorNode; import ast.members.MemberNode; import ast.statements.BlockNode; import ast.statements.ReturnNode; -import ast.type.AccessModifierNode; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; @@ -39,7 +37,7 @@ public class Helper { public static ClassNode generateEmptyClass(String className) { BlockNode blockNode = new BlockNode(); blockNode.addStatement(new ReturnNode(null)); - MemberNode constructor = new ConstructorNode("public",className, blockNode); + MemberNode constructor = new ConstructorNode("public", className, blockNode); ClassNode classNode = new ClassNode("public", className); classNode.addMember(constructor); return classNode; diff --git a/src/test/java/parser/ParserTest.java b/src/test/java/parser/ParserTest.java deleted file mode 100644 index c567b4b..0000000 --- a/src/test/java/parser/ParserTest.java +++ /dev/null @@ -1,138 +0,0 @@ -package parser; - -import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.tree.ParseTree; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import parser.generated.SimpleJavaLexer; -import parser.generated.SimpleJavaParser; - -import static org.junit.jupiter.api.Assertions.*; - -import java.util.*; - -public class ParserTest { - /* - @BeforeEach - public void init() { // noch nicht benötigt - String inputFilePath = "src/main/resources/input/CompilerInput.java"; - String outputDirectoryPath = "src/main/resources/output"; - } - */ - - @Test - public void parserTest() { - // init - CharStream inputCharStream = CharStreams.fromString("public class Name {}"); - SimpleJavaLexer lexer = new SimpleJavaLexer(inputCharStream); - CommonTokenStream tokenStream = new CommonTokenStream(lexer); - tokenStream.fill(); - - - /* Parser -> Parsetree */ - SimpleJavaParser parser = new SimpleJavaParser(tokenStream); - ParseTree parseTree = parser.program(); // parse the input - - //Variante 1 (geht) - String expectedParseTreeAsString = "(program (classDeclaration public class Name { }))"; - String actualParseTreeAsString = parseTree.toStringTree(parser); - - assertEquals(expectedParseTreeAsString, actualParseTreeAsString); - - // Variante 2 (geht nicht) - // - Sollte es gehen und es liegt am Parser? (keine Ahnung) -> Bitte Fehler (actual und expected) durchlesen - // ist die Methode parseStringToTree() korrekt? -> (glaub nicht) - Map expectedTreeStructure = parseStringToTree(expectedParseTreeAsString); - Map actualTreeStructure = buildTreeStructure(parseTree, parser); - - // assertEquals(expectedTreeStructure, actualTreeStructure); - } - - - - // Helpers Variante 2.1 - - public static Map buildTreeStructure(ParseTree tree, Parser parser) { - return buildTree(tree, parser, 0); - } - - private static Map buildTree(ParseTree tree, Parser parser, int indent) { - Map node = new HashMap<>(); - - if (tree instanceof RuleContext) { - int ruleIndex = ((RuleContext) tree).getRuleIndex(); - String ruleName = parser.getRuleNames()[ruleIndex]; - node.put("rule", ruleName); - } else { - node.put("text", tree.getText()); - } - - List> children = new ArrayList<>(); - for (int i = 0; i < tree.getChildCount(); i++) { - children.add(buildTree(tree.getChild(i), parser, indent + 1)); - } - - if (!children.isEmpty()) { - node.put("children", children); - } - - return node; - } - - // Helpers Variante 2.2 - - public static Map parseStringToTree(String input) { - input = input.trim(); - if (input.startsWith("(") && input.endsWith(")")) { - input = input.substring(1, input.length() - 1).trim(); - } - return parse(input); - } - - private static Map parse(String input) { - Map node = new HashMap<>(); - StringBuilder currentToken = new StringBuilder(); - List> children = new ArrayList<>(); - - int depth = 0; - boolean inToken = false; - for (char ch : input.toCharArray()) { - if (ch == '(') { - if (depth == 0) { - if (!currentToken.isEmpty()) { - node.put("node", currentToken.toString().trim()); - currentToken.setLength(0); - } - } else { - currentToken.append(ch); - } - depth++; - } else if (ch == ')') { - depth--; - if (depth == 0) { - children.add(parse(currentToken.toString().trim())); - currentToken.setLength(0); - } else { - currentToken.append(ch); - } - } else if (Character.isWhitespace(ch) && depth == 0) { - if (!currentToken.isEmpty()) { - node.put("node", currentToken.toString().trim()); - currentToken.setLength(0); - } - } else { - currentToken.append(ch); - } - } - - if (!currentToken.isEmpty()) { - node.put("node", currentToken.toString().trim()); - } - - if (!children.isEmpty()) { - node.put("children", children); - } - - return node; - } -} diff --git a/src/test/java/parser/ScannerTest.java b/src/test/java/parser/ScannerTest.java deleted file mode 100644 index ba31a81..0000000 --- a/src/test/java/parser/ScannerTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package parser; - -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.CharStreams; -import org.antlr.v4.runtime.CommonTokenStream; -import org.antlr.v4.runtime.Token; -import org.junit.jupiter.api.Test; -import parser.generated.SimpleJavaLexer; - -import java.util.Arrays; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class ScannerTest { - - /** - * This test method is used to test the scanner functionality of the SimpleJavaLexer. - * It creates a CharStream from a string representing a simple Java class declaration, - * and uses the SimpleJavaLexer to tokenize this input. - * It then compares the actual tokens and their types produced by the lexer to the expected tokens and their types. - */ - @Test - public void scannerTest() { - // Create a CharStream from a string representing a simple Java class declaration - CharStream inputCharStream = CharStreams.fromString("public class Name {}"); - - // Use the SimpleJavaLexer to tokenize the input - SimpleJavaLexer lexer = new SimpleJavaLexer(inputCharStream); - CommonTokenStream tokenStream = new CommonTokenStream(lexer); - tokenStream.fill(); - - // Prepare the expected results - List expectedTokens = Arrays.asList("public", "class", "Name", "{", "}", ""); - List expectedTokenTypes = Arrays.asList("AccessModifier", "Class", "Identifier", "OpenCurlyBracket", "ClosedCurlyBracket", "EOF"); - List actualTokens = tokenStream.getTokens(); - - // Compare the actual tokens and their types to the expected tokens and their types - assertEquals(expectedTokens.size(), actualTokens.size()); - for (int i = 0; i < expectedTokens.size(); i++) { - assertEquals(expectedTokens.get(i), actualTokens.get(i).getText()); - assertEquals(expectedTokenTypes.get(i), SimpleJavaLexer.VOCABULARY.getSymbolicName(actualTokens.get(i).getType())); - } - } -} diff --git a/src/test/java/semantic/EndToTypedAstTest.java b/src/test/java/semantic/EndToTypedAstTest.java index 637ebc1..e319a91 100644 --- a/src/test/java/semantic/EndToTypedAstTest.java +++ b/src/test/java/semantic/EndToTypedAstTest.java @@ -26,6 +26,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.junit.jupiter.api.Test; +import semantic.exceptions.*; +import semantic.exceptions.NotDeclaredException; import static org.junit.jupiter.api.Assertions.*; @@ -38,17 +40,14 @@ public class EndToTypedAstTest { CharStream codeCharStream = null; try { - codeCharStream = CharStreams.fromPath(Paths.get("src/test/resources/input/typedAstFeaturesTests/CorrectTest.java")); + codeCharStream = CharStreams.fromPath(Paths.get("src/test/resources/input/typedAstFeatureTests/CorrectTest.java")); } catch (IOException e) { throw new RuntimeException(e); } SimpleJavaLexer lexer = new SimpleJavaLexer(codeCharStream); CommonTokenStream tokenStream = new CommonTokenStream(lexer); - SimpleJavaParser parser = new SimpleJavaParser(tokenStream); - ParseTree parseTree = parser.program(); // parse the input - - /* ------------------------- AST builder -> AST ------------------------- */ + ParseTree parseTree = parser.program(); ASTBuilder astBuilder = new ASTBuilder(); ProgramNode abstractSyntaxTree = (ProgramNode) astBuilder.visit(parseTree); @@ -115,7 +114,7 @@ public class EndToTypedAstTest { @Test public void featureTest() { - String directoryPath = "src/test/resources/input/typedAstFeaturesTests"; + String directoryPath = "src/test/resources/input/typedAstFeatureTests"; File folder = new File(directoryPath); if (folder.isDirectory()) { File[] files = folder.listFiles((_, name) -> name.endsWith(".java")); @@ -155,6 +154,200 @@ public class EndToTypedAstTest { } } + /* + @Test + public void notDeclared() { + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/johnsTests/NotDeclared.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof NotDeclaredException)); + }*/ + + @Test + public void typeMismatchTest() { + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/TypeMismatchIntBool.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException)); + } + + @Test + public void parameterAlreadyDecleared() { + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/ParameterAlreadyDecleared.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof AlreadyDeclaredException)); + } + + @Test + public void fieldAlreadyDecleared(){ + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/FieldAlreadyDecleared.java"); + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof AlreadyDeclaredException)); + + } + + @Test + public void typeMismatchRefType(){ + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/TypeMismatchRefType.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException)); + } + + @Test + public void correctRetType(){ + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/CorrectRetType.java"); + + SemanticAnalyzer.generateTast(tast); + + assertTrue(SemanticAnalyzer.errors.isEmpty()); + } + + @Test + public void retTypeMismatch(){ + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/RetTypeMismatch.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException)); + } + + @Test + public void multipleRetType(){ + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/MultipleRetTypes.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof MultipleReturnTypes)); + } + + @Test + public void BothTypesMustBeSameGreaterSmallerEqual(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/BothTypesMustBeSame.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof TypeMismatchException)); + + } + + @Test + public void NoSuchType(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/ClassNotDeclared.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof NotDeclaredException)); + + } + + @Test + public void FieldIsNotVisible(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/FieldIsNotVisible.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertTrue(SemanticAnalyzer.errors.stream().anyMatch(c -> c instanceof NotVisibleException)); + + } + + @Test + public void ChainedMethods(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/ChainedMethods.java"); + + SemanticAnalyzer.generateTast(tast); + + assertTrue(SemanticAnalyzer.errors.isEmpty()); + + } + + @Test + public void VariableCompare(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/VariableCompare.java"); + + SemanticAnalyzer.generateTast(tast); + + assertTrue(SemanticAnalyzer.errors.isEmpty()); + + } + + @Test + public void IfExpressionInt(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/IfExpressionInt.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertInstanceOf(TypeMismatchException.class, SemanticAnalyzer.errors.getFirst()); + + } + + @Test + public void SelectWrongMethodCauseParameter(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/SelectWrongMethodCauseParameter.java"); + + SemanticAnalyzer.generateTast(tast); + + assertFalse(SemanticAnalyzer.errors.isEmpty()); + assertInstanceOf(TypeMismatchException.class, SemanticAnalyzer.errors.getFirst()); + + } + + @Test + public void SelectRightMethodCauseParameter(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/SelectRightMethodCauseParameter.java"); + + SemanticAnalyzer.generateTast(tast); + + assertTrue(SemanticAnalyzer.errors.isEmpty()); + + } + + @Test + public void VariableCalculation(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/VariableCalculation.java"); + + SemanticAnalyzer.generateTast(tast); + + assertTrue(SemanticAnalyzer.errors.isEmpty()); + + } + + @Test + public void Expression(){ + + ASTNode tast = SemanticHelper.generateTypedASTFrom("src/test/resources/input/singleFeatureSemanticTests/Expression.java"); + + SemanticAnalyzer.generateTast(tast); + + assertTrue(SemanticAnalyzer.errors.isEmpty()); + + } // ------------------ Helpers ------------------ diff --git a/src/test/java/semantic/SemanticHelper.java b/src/test/java/semantic/SemanticHelper.java new file mode 100644 index 0000000..3f187ee --- /dev/null +++ b/src/test/java/semantic/SemanticHelper.java @@ -0,0 +1,35 @@ +package semantic; + +import ast.ASTNode; +import ast.ProgramNode; +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.tree.ParseTree; +import parser.astBuilder.ASTBuilder; +import parser.generated.SimpleJavaLexer; +import parser.generated.SimpleJavaParser; + +import java.io.IOException; + +public class SemanticHelper { + public static ASTNode generateTypedASTFrom(String filePath) { + + SemanticAnalyzer.clearAnalyzer(); + + CharStream testFile = null; + try { + testFile = CharStreams.fromFileName(filePath); + } catch (IOException e) { + throw new RuntimeException(e); + } + SimpleJavaLexer lexer = new SimpleJavaLexer(testFile); + CommonTokenStream tokenStream = new CommonTokenStream(lexer); + tokenStream.fill(); + SimpleJavaParser parser = new SimpleJavaParser(tokenStream); + ParseTree parseTree = parser.program(); + ASTBuilder astBuilder = new ASTBuilder(); + + return astBuilder.visit(parseTree); + } +} diff --git a/src/test/java/semantic/SemanticTest.java b/src/test/java/semantic/SemanticTest.java index 58d0210..e7ded06 100644 --- a/src/test/java/semantic/SemanticTest.java +++ b/src/test/java/semantic/SemanticTest.java @@ -1,113 +1,413 @@ package semantic; +import ast.ASTNode; +import ast.ClassNode; +import ast.ProgramNode; +import ast.expressions.IExpressionNode; +import ast.expressions.unaryexpressions.MemberAccessNode; +import ast.expressions.unaryexpressions.UnaryNode; +import ast.members.ConstructorNode; +import ast.members.FieldNode; +import ast.members.MethodNode; +import ast.parameters.ParameterNode; +import ast.statementexpressions.AssignNode; +import ast.statementexpressions.AssignableNode; +import ast.statementexpressions.methodcallstatementnexpressions.MethodCallNode; +import ast.statements.BlockNode; +import ast.statements.ReturnNode; +import ast.type.AccessModifierNode; +import ast.type.EnumValueNode; +import ast.type.ValueNode; +import ast.type.type.BaseType; +import ast.type.type.TypeEnum; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import parser.Helper; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class SemanticTest { + @BeforeEach + public void setUp() { + SemanticAnalyzer.clearAnalyzer(); + } - public void test(){ + @Test + @DisplayName("Empty Class Test") + public void emptyClassTest() { + ClassNode emptyClass = Helper.generateEmptyClass("EmptyClass"); + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(emptyClass); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + + @Test + @DisplayName("Multiple Empty Classes Test") + public void multipleEmptyClassesTest() { + ClassNode class1 = Helper.generateEmptyClass("MultipleClasses"); + ClassNode class2 = Helper.generateEmptyClass("TestClass2"); + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + abstractSyntaxTree.addClass(class2); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + + @Test + @DisplayName("Empty Class Test with Constructor") + public void emptyClassWithConstructorTest() { + ClassNode class1 = Helper.generateEmptyClass("EmptyClassWithConstructor"); + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Field Test") + public void fieldTest() { + ClassNode class1 = Helper.generateEmptyClass("Field"); + class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Field Test with Accessmodifier") + public void fieldTestWithModifier() { + ClassNode class1 = Helper.generateEmptyClass("FieldWithAccessModifier"); + class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Comments Ignore Test") + public void commentsIgnoreTest() { + ClassNode class1 = Helper.generateEmptyClass("Comments"); + class1.addMember(new FieldNode(new AccessModifierNode("private"), new BaseType(TypeEnum.INT), "a")); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Constructor Parameter Test") + public void constructorParameterTest() { + BlockNode block = new BlockNode(); + block.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "ConstructorParameter", block); + constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "b")); + + ClassNode class1 = new ClassNode("public", "ConstructorParameter"); + class1.addMember(constructor); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("This Dot Test") + public void thisDotTest() { + BlockNode block = new BlockNode(); + MemberAccessNode memberAccess = new MemberAccessNode(true); + memberAccess.addIdentifier("a"); + + AssignableNode assignable = new AssignableNode(memberAccess); + + ValueNode value = new ValueNode(EnumValueNode.INT_VALUE, "1"); + IExpressionNode expression = new UnaryNode(value); + + block.addStatement(new AssignNode(assignable, expression)); + block.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "ThisDot", block); + + ClassNode class1 = new ClassNode("public", "ThisDot"); + class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); + class1.addMember(constructor); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Constructor This Dot Test") + public void constructorThisDotTest() { + BlockNode block = new BlockNode(); + MemberAccessNode memberAccess = new MemberAccessNode(true); + memberAccess.addIdentifier("a"); + + AssignableNode assignable = new AssignableNode(memberAccess); + + IExpressionNode expression = new UnaryNode("a"); + + block.addStatement(new AssignNode(assignable, expression)); + block.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "ConstructorThisDot", block); + constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + + ClassNode class1 = new ClassNode("public", "ConstructorThisDot"); + class1.addMember(new FieldNode(new AccessModifierNode("private"), new BaseType(TypeEnum.INT), "a")); + class1.addMember(constructor); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Void Methoden Test") + public void voidMethodenTest() { + ClassNode class1 = Helper.generateEmptyClass("VoidMethod"); + BlockNode block = new BlockNode(); + block.addStatement(new ReturnNode(null)); + class1.addMember(new MethodNode("public", null, true, "test", block)); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Constructor Method call Test") + public void constructorMethodCallTest() { + BlockNode blockCon = new BlockNode(); + MemberAccessNode memberAccess = new MemberAccessNode(true); + memberAccess.addIdentifier("a"); + + AssignableNode assignable = new AssignableNode(memberAccess); + + IExpressionNode expression = new UnaryNode(new MethodCallNode(null, "testMethod")); + + blockCon.addStatement(new AssignNode(assignable, expression)); + blockCon.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "ConstructorMethodCall", blockCon); + + BlockNode blockMethod = new BlockNode(); + blockMethod.addStatement(new ReturnNode(new UnaryNode(new ValueNode(EnumValueNode.INT_VALUE, "1")))); + MethodNode method = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod", blockMethod); + + ClassNode class1 = new ClassNode("public", "ConstructorMethodCall"); + class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); + class1.addMember(constructor); + class1.addMember(method); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Constructor Method call Parameters Test") + public void constructorMethodCallParametersTest() { + BlockNode blockCon = new BlockNode(); + MemberAccessNode memberAccess = new MemberAccessNode(true); + memberAccess.addIdentifier("a"); + + AssignableNode assignable = new AssignableNode(memberAccess); + + MethodCallNode methodCall = new MethodCallNode(null, "testMethod"); + methodCall.addExpression(new UnaryNode("a")); + IExpressionNode expression = new UnaryNode(methodCall); + + blockCon.addStatement(new AssignNode(assignable, expression)); + blockCon.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "ConstructorMethodCallParameters", blockCon); + constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + + BlockNode blockMethod = new BlockNode(); + blockMethod.addStatement(new ReturnNode(new UnaryNode("a"))); + MethodNode method = new MethodNode("public", new BaseType(TypeEnum.INT), false, "testMethod", blockMethod); + method.addParameter(new ParameterNode(new BaseType(TypeEnum.INT), "a")); + + ClassNode class1 = new ClassNode("public", "ConstructorMethodCallParameters"); + class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); + class1.addMember(constructor); + class1.addMember(method); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Char Test") + public void charTest() { + BlockNode blockCon = new BlockNode(); + MemberAccessNode memberAccess = new MemberAccessNode(true); + memberAccess.addIdentifier("a"); + + AssignableNode assignable = new AssignableNode(memberAccess); + + MethodCallNode methodCall = new MethodCallNode(null, "testMethod"); + methodCall.addExpression(new UnaryNode("a")); + IExpressionNode expression = new UnaryNode(methodCall); + + blockCon.addStatement(new AssignNode(assignable, expression)); + blockCon.addStatement(new ReturnNode(null)); + ConstructorNode constructor = new ConstructorNode("public", "Char", blockCon); + constructor.addParameter(new ParameterNode(new BaseType(TypeEnum.CHAR), "a")); + + BlockNode blockMethod = new BlockNode(); + blockMethod.addStatement(new ReturnNode(new UnaryNode("a"))); + MethodNode method = new MethodNode("public", new BaseType(TypeEnum.CHAR), false, "testMethod", blockMethod); + method.addParameter(new ParameterNode(new BaseType(TypeEnum.CHAR), "a")); + + ClassNode class1 = new ClassNode("public", "Char"); + class1.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.CHAR), "a")); + class1.addMember(constructor); + class1.addMember(method); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(class1); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } + + @Test + @DisplayName("Self Reference Test") + public void selfReferenceTest() { } - public void test(int a, boolean b){ + @Test + @DisplayName("Variable Compare Test") + public void variableCompareTest() { } - public void test(boolean b, int a){ + @Test + @DisplayName("Variable Calculation Test") + public void variableCalculationTest() { } -// @Test -// public void alreadyDeclaredLocalFieldVar() { -// ProgramNode programNode = new ProgramNode(); -// List classList = new ArrayList<>(); -// AccessTypeNode accessTypeNode = new AccessTypeNode(EnumAccessTypeNode.PUBLIC); -// ClassNode classNode = new ClassNode(accessTypeNode, "testClass"); -// -// SemanticAnalyzer semanticAnalyzer = new SemanticAnalyzer(); -// ASTNode tast = semanticAnalyzer.generateTast(ast); -// -// MemberNode memberNode2 = new FieldNode(accessTypeNode, new BaseTypeNode(EnumTypeNode.INT), "testVar"); -// classNode.members.add(memberNode2); -// -// classList.add(classNode); -// programNode.classes = classList; -// -// ASTNode typedAst = SemanticAnalyzer.generateTast(programNode); -// -// assertEquals(1, SemanticAnalyzer.errors.size()); -// assertInstanceOf(AlreadyDeclaredException.class, SemanticAnalyzer.errors.getFirst()); -// assertNull(typedAst); -// } -// -// @Test -// public void shouldWorkWithNoError() { -// ProgramNode programNode = new ProgramNode(); -// List classList = new ArrayList<>(); -// AccessTypeNode accessTypeNode = new AccessTypeNode(EnumAccessTypeNode.PUBLIC); -// ClassNode classNode = new ClassNode(accessTypeNode, "testClass"); -// -// SemanticAnalyzer semanticAnalyzer = new SemanticAnalyzer(); -// ASTNode tast = semanticAnalyzer.generateTast(ast); -// -// assertEquals(semanticAnalyzer.errors.size(), 0); -// assertNotNull(tast); -// -// MemberNode memberNode3 = getMemberNode(accessTypeNode); -// classNode.members.add(memberNode3); -// -// classList.add(classNode); -// programNode.classes = classList; -// -// ASTNode typedAst = SemanticAnalyzer.generateTast(programNode); -// -// assertEquals(0, SemanticAnalyzer.errors.size()); -// assertEquals(programNode, typedAst); -// } -// -// /** -// * This method is used to create a MemberNode representing a method. -// * It first creates a list of ParameterNodes and adds a ParameterNode to it. -// * Then, it creates a ParameterListNode using the list of ParameterNodes. -// * After that, it creates a list of StatementNodes and adds a StatementNode to it by calling the getStatementNode method. -// * Finally, it creates a MethodNode using the provided AccessTypeNode, a BaseTypeNode representing the return type of the method, -// * the method name, the ParameterListNode, and the list of StatementNodes, and returns this MethodNode. -// * -// * @param accessTypeNode The AccessTypeNode representing the access type of the method. -// * @return The created MemberNode representing the method. -// */ -//private static MemberNode getMemberNode(AccessTypeNode accessTypeNode) { -// List parameterNodeList = new ArrayList<>(); -// ParameterNode parameterNode1 = new ParameterNode(new BaseTypeNode(EnumTypeNode.INT), "param1"); -// parameterNodeList.add(parameterNode1); -// ParameterListNode parameterListNode = new ParameterListNode(parameterNodeList); -// -// List statementNodeList = new ArrayList<>(); -// -// StatementNode statementNode1 = getStatementNode(); -// statementNodeList.add(statementNode1); -// -// return new MethodNode(accessTypeNode, new BaseTypeNode(EnumTypeNode.INT), "testVar2", parameterListNode, statementNodeList); -//} -// -// /** -// * This method is used to create a StatementNode for an assignment operation. -// * It first creates two IdentifierExpressionNodes for 'this' and 'objectVar'. -// * Then, it creates a BinaryExpressionNode to represent the operation 'this.objectVar'. -// * After that, it creates a LiteralNode to represent the integer value 1. -// * Finally, it creates another BinaryExpressionNode to represent the assignment operation 'this.objectVar = 1', -// * and wraps this expression in an AssignmentStatementNode. -// * -// * @return The created AssignmentStatementNode representing the assignment operation 'this.objectVar = 1'. -// */ -//private static StatementNode getStatementNode() { -// ExpressionNode expressionNodeObjectVariableLeft = new IdentifierExpressionNode("this"); -// ExpressionNode expressionNodeObjectVariableRight = new IdentifierExpressionNode("objectVar"); -// -// ExpressionNode expressionNodeLeft = new BinaryExpressionNode(expressionNodeObjectVariableLeft, expressionNodeObjectVariableRight, ExpresssionOperator.DOT); -// -// ExpressionNode expressionNodeRight = new LiteralNode(1); -// -// BinaryExpressionNode expressionNode = new BinaryExpressionNode(expressionNodeLeft, expressionNodeRight, ExpresssionOperator.ASSIGNMENT); -// -// return new AssignmentStatementNode(expressionNode); -//} -} + @Test + @DisplayName("Main Method Test") + public void mainMethodTest() { + + } + + @Test + @DisplayName("While Test") + public void whileTest() { + + } + + @Test + @DisplayName("Do While Test") + public void doWhileTest() { + + } + + @Test + @DisplayName("For Test") + public void forTest() { + + } + + @Test + @DisplayName("Increment Test") + public void incrementTest() { + ClassNode classNode = Helper.generateEmptyClass("Increment"); + classNode.addMember(new FieldNode(new AccessModifierNode("public"), new BaseType(TypeEnum.INT), "a")); + + ProgramNode abstractSyntaxTree = new ProgramNode(); + abstractSyntaxTree.addClass(classNode); + + ASTNode typedAst = SemanticAnalyzer.generateTast(abstractSyntaxTree); + for (Exception runtimeException : SemanticAnalyzer.errors) { + runtimeException.printStackTrace(); + } + assertTrue(SemanticAnalyzer.errors.isEmpty()); + assertNotNull(typedAst); + } +} \ No newline at end of file diff --git a/src/test/resources/input/CombinedExample.java b/src/test/resources/input/CombinedExample.java deleted file mode 100644 index e7e000c..0000000 --- a/src/test/resources/input/CombinedExample.java +++ /dev/null @@ -1,23 +0,0 @@ -public class CombinedExample { - int number; - boolean flag; - char letter; - - public CombinedExample(int number, boolean flag, char letter) { - this.number = number; - this.flag = flag; - this.letter = letter; - } - - public void displayValues() { - System.out.println("Number: " + number); - System.out.println("Flag: " + flag); - System.out.println("Letter: " + letter); - } - - public static void main(String[] args) { - CombinedExample obj = new CombinedExample(10, true, 'X'); - obj.displayValues(); - } -} - diff --git a/src/test/resources/input/CompilerInput.java b/src/test/resources/input/CompilerInput.java deleted file mode 100644 index d850a3e..0000000 --- a/src/test/resources/input/CompilerInput.java +++ /dev/null @@ -1,16 +0,0 @@ -public class CompilerInput { - - public int a; - - public static int testMethod(char x){ - return 0; - } - - public class Test { - - public static int testMethod(char x, int a){ - return 0; - } - } -} - diff --git a/src/test/resources/input/MoreFeaturesClassExample.java b/src/test/resources/input/MoreFeaturesClassExample.java deleted file mode 100644 index 4f6fbf3..0000000 --- a/src/test/resources/input/MoreFeaturesClassExample.java +++ /dev/null @@ -1,6 +0,0 @@ -public class MoreFeaturesClassExample { - int hallo; - private class Inner { - int hallo2; - } -} diff --git a/src/test/resources/input/AllFeaturesClassExample.java b/src/test/resources/input/combinedFeatureTests/AllFeaturesClassExample.java similarity index 56% rename from src/test/resources/input/AllFeaturesClassExample.java rename to src/test/resources/input/combinedFeatureTests/AllFeaturesClassExample.java index 73121ee..ed7c73a 100644 --- a/src/test/resources/input/AllFeaturesClassExample.java +++ b/src/test/resources/input/combinedFeatureTests/AllFeaturesClassExample.java @@ -4,7 +4,7 @@ public class AllFeaturesClassExample { char c; // Konstruktor - AllFeaturesClassExample(int a, boolean b, char c) { + public AllFeaturesClassExample(int a, boolean b, char c) { this.a = a; this.b = b; this.c = c; @@ -14,47 +14,54 @@ public class AllFeaturesClassExample { void controlStructures() { // if-else Anweisung if (a > 10) { - // System.out.println("a ist größer als 10"); } else { - // System.out.println("a ist nicht größer als 10"); } // while Schleife while (a > 0) { - // System.out.println("a ist " + a); a--; } - + int c = 0; // for Schleife for (int i = 0; i < 5; i++) { - // System.out.println("for Schleife Iteration: " + i); + c++; } + } // Methode zur Arbeit mit logischen Operatoren void logicalOperations() { // Logische UND-Operation if (b && a > 5) { - // System.out.println("a ist größer als 5 und b ist wahr"); } // Logische ODER-Operation if (b || a < 5) { - // System.out.println("b ist wahr oder a ist kleiner als 5"); } } - void mathOperations() { - // Addition - int sum = a + 5; - // Subtraktion - int difference = a - 5; - // Multiplikation - int product = a * 5; - // Division - int quotient = a / 5; - // Modulo - int remainder = a % 5; + int add(int a, int b) { + return a + b; + } + + int subtract(int a, int b) { + return a - b; + } + + int multiply(int a, int b) { + return a * b; + } + + int divide(int a, int b) { + return a / b; + } + + int modulo(int a, int b) { + return a % b; + } + + boolean greaterThan(int a, int b) { + return a > b; } public static void main(String[] args) { diff --git a/src/test/resources/input/featureTests/BooleanOperations.java b/src/test/resources/input/combinedFeatureTests/BooleanOperations.java similarity index 100% rename from src/test/resources/input/featureTests/BooleanOperations.java rename to src/test/resources/input/combinedFeatureTests/BooleanOperations.java diff --git a/src/test/resources/input/featureTests/CharManipulation.java b/src/test/resources/input/combinedFeatureTests/CharManipulation.java similarity index 100% rename from src/test/resources/input/featureTests/CharManipulation.java rename to src/test/resources/input/combinedFeatureTests/CharManipulation.java diff --git a/src/test/resources/input/featureTests/ConditionalStatements.java b/src/test/resources/input/combinedFeatureTests/ConditionalStatements.java similarity index 100% rename from src/test/resources/input/featureTests/ConditionalStatements.java rename to src/test/resources/input/combinedFeatureTests/ConditionalStatements.java diff --git a/src/test/resources/input/featureTests/EmptyClassExample.java b/src/test/resources/input/combinedFeatureTests/EmptyClassExample.java similarity index 100% rename from src/test/resources/input/featureTests/EmptyClassExample.java rename to src/test/resources/input/combinedFeatureTests/EmptyClassExample.java diff --git a/src/test/resources/input/featureTests/LoopExamples.java b/src/test/resources/input/combinedFeatureTests/LoopExamples.java similarity index 100% rename from src/test/resources/input/featureTests/LoopExamples.java rename to src/test/resources/input/combinedFeatureTests/LoopExamples.java diff --git a/src/test/resources/input/featureTests/MethodOverloading.java b/src/test/resources/input/combinedFeatureTests/MethodOverloading.java similarity index 100% rename from src/test/resources/input/featureTests/MethodOverloading.java rename to src/test/resources/input/combinedFeatureTests/MethodOverloading.java diff --git a/src/test/resources/input/featureTests/BooleanOperations.class b/src/test/resources/input/featureTests/BooleanOperations.class deleted file mode 100644 index cd8092a..0000000 Binary files a/src/test/resources/input/featureTests/BooleanOperations.class and /dev/null differ diff --git a/src/test/resources/input/featureTests/CharManipulation.class b/src/test/resources/input/featureTests/CharManipulation.class deleted file mode 100644 index e47890d..0000000 Binary files a/src/test/resources/input/featureTests/CharManipulation.class and /dev/null differ diff --git a/src/test/resources/input/featureTests/ConditionalStatements.class b/src/test/resources/input/featureTests/ConditionalStatements.class deleted file mode 100644 index 7fa39b3..0000000 Binary files a/src/test/resources/input/featureTests/ConditionalStatements.class and /dev/null differ diff --git a/src/test/resources/input/featureTests/EmptyClassExample.class b/src/test/resources/input/featureTests/EmptyClassExample.class deleted file mode 100644 index a6a129d..0000000 Binary files a/src/test/resources/input/featureTests/EmptyClassExample.class and /dev/null differ diff --git a/src/test/resources/input/featureTests/LoopExamples.class b/src/test/resources/input/featureTests/LoopExamples.class deleted file mode 100644 index 2a398c6..0000000 Binary files a/src/test/resources/input/featureTests/LoopExamples.class and /dev/null differ diff --git a/src/test/resources/input/featureTests/MethodOverloading.class b/src/test/resources/input/featureTests/MethodOverloading.class deleted file mode 100644 index 2357744..0000000 Binary files a/src/test/resources/input/featureTests/MethodOverloading.class and /dev/null differ diff --git a/src/test/resources/input/finalTest/Car.java b/src/test/resources/input/finalTest/Car.java new file mode 100644 index 0000000..ee41937 --- /dev/null +++ b/src/test/resources/input/finalTest/Car.java @@ -0,0 +1,63 @@ +public class Car { + public int ps; + public char brand; + public int tires; + public int drivenKilometers; + + public Car(int horsePower) { + this.ps = horsePower; + this.tires = 4; + } + + public int getTires() { + return this.tires; + } + + public boolean isSuperCar() { + if(this.ps > 300) { + return true; + } else { + return false; + } + } + + public void tune(int horsePower) { + this.ps = this.ps + horsePower; + } + + public void tune() { + this.ps = this.ps + 50; + } + + public void driveCircels(int circels) { + for(int i = 0; i < circels; i++) { + this.drivenKilometers = this.drivenKilometers + 5; + } + } + + public void isTunable(boolean hasEngine, boolean hasTires) { + if(hasEngine && hasTires) { + this.tune(5); + } + } + + public char race() { + int enemyHorsePower = 200; + char win = 'W'; + char lose = 'L'; + Car enemy = new Car(ps); + if(this.ps > enemyHorsePower) { + return win; + } else { + return lose; + } + } + + public int refuel(int currentTank, int maxTank){ + int tank = currentTank; + do{ + tank++; + }while(tank bool) { a--; } + + if (a == bool) { + + } else { + + } + + if (a < bool) { + + } else { + + } + } } diff --git a/src/test/resources/input/singleFeatureSemanticTests/ChainedMethods.java b/src/test/resources/input/singleFeatureSemanticTests/ChainedMethods.java new file mode 100644 index 0000000..7156569 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/ChainedMethods.java @@ -0,0 +1,29 @@ +public class Test { + + public House h; + + public int test(House h){ + return h.getW().getSize(); + } + + +} + +public class House { + + private Window w; + + public Window getW(){ + return w; + } + +} + +public class Window{ + + private int size; + + public int getSize() { + return size; + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureSemanticTests/ClassNotDeclared.java b/src/test/resources/input/singleFeatureSemanticTests/ClassNotDeclared.java new file mode 100644 index 0000000..4f00967 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/ClassNotDeclared.java @@ -0,0 +1,7 @@ +// @expected: NotDeclaredException +public class Test { + + public House1 h; + + +} diff --git a/src/test/resources/input/typedAstFeaturesTests/CorrectReturnType.java b/src/test/resources/input/singleFeatureSemanticTests/CorrectRetType.java similarity index 67% rename from src/test/resources/input/typedAstFeaturesTests/CorrectReturnType.java rename to src/test/resources/input/singleFeatureSemanticTests/CorrectRetType.java index 473e8df..4c0a9f9 100644 --- a/src/test/resources/input/typedAstFeaturesTests/CorrectReturnType.java +++ b/src/test/resources/input/singleFeatureSemanticTests/CorrectRetType.java @@ -1,7 +1,5 @@ -public class Example { - +public class CorrectRetType { public static int testMethod(int x){ return x; } - -} +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureSemanticTests/Expression.java b/src/test/resources/input/singleFeatureSemanticTests/Expression.java new file mode 100644 index 0000000..a18178b --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/Expression.java @@ -0,0 +1,10 @@ +class VariableCompare{ + + void trueMethod(boolean a, int c) { + if(a && c == 10){ + + } + } + + +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureSemanticTests/FieldAlreadyDecleared.java b/src/test/resources/input/singleFeatureSemanticTests/FieldAlreadyDecleared.java new file mode 100644 index 0000000..2889707 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/FieldAlreadyDecleared.java @@ -0,0 +1,4 @@ +public class FieldAlreadyDecleared { + public int a; + public int a; +} \ No newline at end of file diff --git a/src/test/resources/input/typedAstExceptionsTests/FieldIsNotVisible.java b/src/test/resources/input/singleFeatureSemanticTests/FieldIsNotVisible.java similarity index 100% rename from src/test/resources/input/typedAstExceptionsTests/FieldIsNotVisible.java rename to src/test/resources/input/singleFeatureSemanticTests/FieldIsNotVisible.java diff --git a/src/test/resources/input/singleFeatureSemanticTests/FieldTests.java b/src/test/resources/input/singleFeatureSemanticTests/FieldTests.java new file mode 100644 index 0000000..5a8eea4 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/FieldTests.java @@ -0,0 +1,5 @@ +public class Test{ + + int a = 10; + +} \ No newline at end of file diff --git a/src/test/resources/input/typedAstExceptionsTests/IfExpressionInt.java b/src/test/resources/input/singleFeatureSemanticTests/IfExpressionInt.java similarity index 73% rename from src/test/resources/input/typedAstExceptionsTests/IfExpressionInt.java rename to src/test/resources/input/singleFeatureSemanticTests/IfExpressionInt.java index 2fbbbfc..43b5101 100644 --- a/src/test/resources/input/typedAstExceptionsTests/IfExpressionInt.java +++ b/src/test/resources/input/singleFeatureSemanticTests/IfExpressionInt.java @@ -1,4 +1,3 @@ -// @expected: TypeMismatchException public class Test{ public void test(int x){ diff --git a/src/test/resources/input/singleFeatureSemanticTests/MultipleRetTypes.java b/src/test/resources/input/singleFeatureSemanticTests/MultipleRetTypes.java new file mode 100644 index 0000000..1492d28 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/MultipleRetTypes.java @@ -0,0 +1,6 @@ +public class MultipleRetTypes { + public static int testMethod(int x, char c){ + return x; + return c; + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureSemanticTests/NotDeclared.java b/src/test/resources/input/singleFeatureSemanticTests/NotDeclared.java new file mode 100644 index 0000000..45f3333 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/NotDeclared.java @@ -0,0 +1,5 @@ +public class NotDeclared { + public void Method() { + i = 10; + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureSemanticTests/ParameterAlreadyDecleared.java b/src/test/resources/input/singleFeatureSemanticTests/ParameterAlreadyDecleared.java new file mode 100644 index 0000000..b79c10a --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/ParameterAlreadyDecleared.java @@ -0,0 +1,3 @@ +public class ParameterAlreadyDecleared { + public void Method(int a, int a) {} +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureSemanticTests/RetTypeMismatch.java b/src/test/resources/input/singleFeatureSemanticTests/RetTypeMismatch.java new file mode 100644 index 0000000..994d51d --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/RetTypeMismatch.java @@ -0,0 +1,5 @@ +public class Example { + public static int testMethod(char x){ + return x; + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureSemanticTests/SelectRightMethodCauseParameter.java b/src/test/resources/input/singleFeatureSemanticTests/SelectRightMethodCauseParameter.java new file mode 100644 index 0000000..e148c46 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/SelectRightMethodCauseParameter.java @@ -0,0 +1,22 @@ +// @expected: TypeMismatchException +public class Test{ + + public int i; + public boolean b; + + public int test(){ + + return test(b); + + } + + public void test(int a){ + + } + + public int test(boolean bool){ + int ret = 1; + return ret; + } + +} diff --git a/src/test/resources/input/typedAstExceptionsTests/SelectWrongMethodCauseParameter.java b/src/test/resources/input/singleFeatureSemanticTests/SelectWrongMethodCauseParameter.java similarity index 89% rename from src/test/resources/input/typedAstExceptionsTests/SelectWrongMethodCauseParameter.java rename to src/test/resources/input/singleFeatureSemanticTests/SelectWrongMethodCauseParameter.java index f65e757..f376513 100644 --- a/src/test/resources/input/typedAstExceptionsTests/SelectWrongMethodCauseParameter.java +++ b/src/test/resources/input/singleFeatureSemanticTests/SelectWrongMethodCauseParameter.java @@ -6,7 +6,7 @@ public class Test{ public int test(){ - return this.test(i); + return test(i); } @@ -19,4 +19,4 @@ public class Test{ return ret; } -} \ No newline at end of file +} diff --git a/src/test/resources/input/singleFeatureSemanticTests/TypeMismatchIntBool.java b/src/test/resources/input/singleFeatureSemanticTests/TypeMismatchIntBool.java new file mode 100644 index 0000000..cc74248 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/TypeMismatchIntBool.java @@ -0,0 +1,6 @@ +public class TypeMismatchIntBool { + public void Method() { + int intVariable; + intVariable = true; + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureSemanticTests/TypeMismatchRefType.java b/src/test/resources/input/singleFeatureSemanticTests/TypeMismatchRefType.java new file mode 100644 index 0000000..deacce3 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/TypeMismatchRefType.java @@ -0,0 +1,13 @@ +public class TypeMismatchRefType { + public static int Methode(Class1 class1, Class2 class2){ + class1 = class2; + } +} + +public class Class1{ + public int a; +} + +public class Class2{ + public boolean a; +} \ No newline at end of file diff --git a/src/test/resources/input/javaCases/variableCalculationTest.java b/src/test/resources/input/singleFeatureSemanticTests/VariableCalculation.java similarity index 82% rename from src/test/resources/input/javaCases/variableCalculationTest.java rename to src/test/resources/input/singleFeatureSemanticTests/VariableCalculation.java index 7708811..847b1a6 100644 --- a/src/test/resources/input/javaCases/variableCalculationTest.java +++ b/src/test/resources/input/singleFeatureSemanticTests/VariableCalculation.java @@ -1,4 +1,4 @@ -class TestClass{ +class VariableCalculation{ int aPlusB(int a, int b){ return a + b; @@ -16,8 +16,8 @@ class TestClass{ return a / b; } - int colmplexCalc (int a, int b){ - return a * (b / 1); + int complexCalc (int a, int b){ + return a * b / 1 * 3; } boolean aSmallerB (int a, int b){ diff --git a/src/test/resources/input/singleFeatureSemanticTests/VariableCompare.java b/src/test/resources/input/singleFeatureSemanticTests/VariableCompare.java new file mode 100644 index 0000000..70f2a39 --- /dev/null +++ b/src/test/resources/input/singleFeatureSemanticTests/VariableCompare.java @@ -0,0 +1,30 @@ +class VariableCompare{ + + boolean trueMethod() { + return true; + } + + boolean falseMethod(){ + return false; + } + + boolean trueAndTrueMethod(){ + return true && true; + } + + boolean trueAndFalseMethod(){ + return true && false; + } + + boolean falseAndFalseMethod(){ + return false && false; + } + + boolean trueOrTrueMethod(){ + return true || true; + } + + boolean falseOrFalseMethod(){ + return false || false; + } +} \ No newline at end of file diff --git a/src/test/resources/input/javaCases/Char.java b/src/test/resources/input/singleFeatureTests/Char.java similarity index 68% rename from src/test/resources/input/javaCases/Char.java rename to src/test/resources/input/singleFeatureTests/Char.java index de9c21f..54ff6fa 100644 --- a/src/test/resources/input/javaCases/Char.java +++ b/src/test/resources/input/singleFeatureTests/Char.java @@ -1,8 +1,8 @@ -class TestClass{ +class Char { char a; - public TestClass(char a){ + public Char(char a){ this.a = testMethod(a); } diff --git a/src/test/resources/input/javaCases/Comments.java b/src/test/resources/input/singleFeatureTests/Comments.java similarity index 81% rename from src/test/resources/input/javaCases/Comments.java rename to src/test/resources/input/singleFeatureTests/Comments.java index 2af751c..fbf3e12 100644 --- a/src/test/resources/input/javaCases/Comments.java +++ b/src/test/resources/input/singleFeatureTests/Comments.java @@ -3,6 +3,6 @@ Mutliple Line Comment. Ignore */ -class TestClass{ +class Comments{ private int a; // Ignore } diff --git a/src/test/resources/input/javaCases/ConstructorMethodCall.java b/src/test/resources/input/singleFeatureTests/ConstructorMethodCall.java similarity index 56% rename from src/test/resources/input/javaCases/ConstructorMethodCall.java rename to src/test/resources/input/singleFeatureTests/ConstructorMethodCall.java index 172777c..2e0c4a8 100644 --- a/src/test/resources/input/javaCases/ConstructorMethodCall.java +++ b/src/test/resources/input/singleFeatureTests/ConstructorMethodCall.java @@ -1,8 +1,8 @@ -class TestClass { +public class ConstructorMethodCall { int a; - public TestClass(){ + public ConstructorMethodCall(){ this.a = testMethod(); } diff --git a/src/test/resources/input/javaCases/ConstructorMethodCallParameters.java b/src/test/resources/input/singleFeatureTests/ConstructorMethodCallParameters.java similarity index 52% rename from src/test/resources/input/javaCases/ConstructorMethodCallParameters.java rename to src/test/resources/input/singleFeatureTests/ConstructorMethodCallParameters.java index fe3b0fd..61f83e1 100644 --- a/src/test/resources/input/javaCases/ConstructorMethodCallParameters.java +++ b/src/test/resources/input/singleFeatureTests/ConstructorMethodCallParameters.java @@ -1,8 +1,8 @@ -class TestClass { +class ConstructorMethodCallParameters { int a; - public TestClass(int a){ + public ConstructorMethodCallParameters(int a){ this.a = testMethod(a); } diff --git a/src/test/resources/input/singleFeatureTests/ConstructorParameter.java b/src/test/resources/input/singleFeatureTests/ConstructorParameter.java new file mode 100644 index 0000000..1d821ca --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/ConstructorParameter.java @@ -0,0 +1,5 @@ +class ConstructorParameter { + public ConstructorParameter(int a, int b){ + + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/ConstructorThisDot.java b/src/test/resources/input/singleFeatureTests/ConstructorThisDot.java new file mode 100644 index 0000000..8e8077b --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/ConstructorThisDot.java @@ -0,0 +1,8 @@ +class ConstructorThisDot { + + private int a; + + public ConstructorThisDot(int a){ + this.a = a; + } +} \ No newline at end of file diff --git a/src/test/resources/input/javaCases/DoWhile.java b/src/test/resources/input/singleFeatureTests/DoWhile.java similarity index 52% rename from src/test/resources/input/javaCases/DoWhile.java rename to src/test/resources/input/singleFeatureTests/DoWhile.java index 65c25de..db1b1ab 100644 --- a/src/test/resources/input/javaCases/DoWhile.java +++ b/src/test/resources/input/singleFeatureTests/DoWhile.java @@ -1,10 +1,10 @@ -class TestClass{ +class DoWhile{ - public TestClass(){ + public DoWhile(){ int i = 0; do{ - i++ + i++; }while(i < 10); } } \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/EmptyClass.java b/src/test/resources/input/singleFeatureTests/EmptyClass.java new file mode 100644 index 0000000..1d9bc30 --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/EmptyClass.java @@ -0,0 +1 @@ +class EmptyClass {} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/EmptyClassWithConstructor.java b/src/test/resources/input/singleFeatureTests/EmptyClassWithConstructor.java new file mode 100644 index 0000000..5d7333a --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/EmptyClassWithConstructor.java @@ -0,0 +1,5 @@ +public class EmptyClassWithConstructor { + public EmptyClassWithConstructor() { + + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/Field.java b/src/test/resources/input/singleFeatureTests/Field.java new file mode 100644 index 0000000..218857c --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/Field.java @@ -0,0 +1,3 @@ +class Field { + int a; +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/FieldWithAccessModifier.java b/src/test/resources/input/singleFeatureTests/FieldWithAccessModifier.java new file mode 100644 index 0000000..6bb9e11 --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/FieldWithAccessModifier.java @@ -0,0 +1,3 @@ +public class FieldWithAccessModifier { + public int a; +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/For.java b/src/test/resources/input/singleFeatureTests/For.java new file mode 100644 index 0000000..33d074d --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/For.java @@ -0,0 +1,8 @@ +class For{ + + public For(){ + for(int i = 0; i < 10; ++i){ + int a; + } + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/If.java b/src/test/resources/input/singleFeatureTests/If.java new file mode 100644 index 0000000..a83dbbf --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/If.java @@ -0,0 +1,8 @@ +public class If { + public If() { + int intValue = 5; + if(intValue == 5) { + intValue--; + } + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/IfElse.java b/src/test/resources/input/singleFeatureTests/IfElse.java new file mode 100644 index 0000000..a3a597a --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/IfElse.java @@ -0,0 +1,10 @@ +public class IfElse { + public IfElse() { + int intValue = 5; + if(intValue == 5) { + intValue--; + } else { + intValue++; + } + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/IfElseIfElse.java b/src/test/resources/input/singleFeatureTests/IfElseIfElse.java new file mode 100644 index 0000000..b20fb7e --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/IfElseIfElse.java @@ -0,0 +1,12 @@ +public class IfElseIfElse { + public IfElseIfElse() { + int intValue = 5; + if(intValue == 5) { + intValue--; + } else if(intValue ==4) { + intValue++; + } else { + intValue++; + } + } +} \ No newline at end of file diff --git a/src/test/resources/input/javaCases/Increment.java b/src/test/resources/input/singleFeatureTests/Increment.java similarity index 66% rename from src/test/resources/input/javaCases/Increment.java rename to src/test/resources/input/singleFeatureTests/Increment.java index 9560a9b..7806f35 100644 --- a/src/test/resources/input/javaCases/Increment.java +++ b/src/test/resources/input/singleFeatureTests/Increment.java @@ -3,9 +3,9 @@ public class Increment { public int test; public void increment(int p) { - test = p++; + this.test = p++; - for(int i = 1; i<=10, i++) { + for(int i = 1; i<=10; i++) { int a = 5; } } diff --git a/src/test/resources/input/javaCases/MainMehod.java b/src/test/resources/input/singleFeatureTests/MainMethod.java similarity index 73% rename from src/test/resources/input/javaCases/MainMehod.java rename to src/test/resources/input/singleFeatureTests/MainMethod.java index df7c2e1..b6079ae 100644 --- a/src/test/resources/input/javaCases/MainMehod.java +++ b/src/test/resources/input/singleFeatureTests/MainMethod.java @@ -1,4 +1,4 @@ -class TestClass{ +class MainMethod{ public static void main(String[] args) { } diff --git a/src/test/resources/input/singleFeatureTests/MultipleClasses.java b/src/test/resources/input/singleFeatureTests/MultipleClasses.java new file mode 100644 index 0000000..dda277c --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/MultipleClasses.java @@ -0,0 +1,3 @@ +class MultipleClasses {} + +class TestClass2{} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/SelfReference.java b/src/test/resources/input/singleFeatureTests/SelfReference.java new file mode 100644 index 0000000..80d8acd --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/SelfReference.java @@ -0,0 +1,18 @@ +class SelfReference { + + SelfReference selfReference; + + int testMethod1() { + return testMethod2(); + } + + int testMethod2() { + return 1; + } + + int testMethod3() { + SelfReference selfReference1 = new SelfReference(); + return selfReference1.testMethod1(); + } + +} diff --git a/src/test/resources/input/javaCases/ThisDot.java b/src/test/resources/input/singleFeatureTests/ThisDot.java similarity index 51% rename from src/test/resources/input/javaCases/ThisDot.java rename to src/test/resources/input/singleFeatureTests/ThisDot.java index 866b39e..4d3a41e 100644 --- a/src/test/resources/input/javaCases/ThisDot.java +++ b/src/test/resources/input/singleFeatureTests/ThisDot.java @@ -1,8 +1,8 @@ -class TestClass{ +class ThisDot { public int a; - public TestClass() { + public ThisDot() { this.a = 1; } } \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/VariableCalculation.java b/src/test/resources/input/singleFeatureTests/VariableCalculation.java new file mode 100644 index 0000000..847b1a6 --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/VariableCalculation.java @@ -0,0 +1,34 @@ +class VariableCalculation{ + + int aPlusB(int a, int b){ + return a + b; + } + + int aMinusB(int a, int b){ + return a - b; + } + + int aTimeB(int a, int b){ + return a * b; + } + + int aDivB(int a, int b){ + return a / b; + } + + int complexCalc (int a, int b){ + return a * b / 1 * 3; + } + + boolean aSmallerB (int a, int b){ + return a < b; + } + + boolean aGreaterB (int a, int b){ + return a > b; + } + + boolean aEqualsB (int a, int b){ + return a == b; + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/VariableCompare.java b/src/test/resources/input/singleFeatureTests/VariableCompare.java new file mode 100644 index 0000000..70f2a39 --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/VariableCompare.java @@ -0,0 +1,30 @@ +class VariableCompare{ + + boolean trueMethod() { + return true; + } + + boolean falseMethod(){ + return false; + } + + boolean trueAndTrueMethod(){ + return true && true; + } + + boolean trueAndFalseMethod(){ + return true && false; + } + + boolean falseAndFalseMethod(){ + return false && false; + } + + boolean trueOrTrueMethod(){ + return true || true; + } + + boolean falseOrFalseMethod(){ + return false || false; + } +} \ No newline at end of file diff --git a/src/test/resources/input/singleFeatureTests/VoidMethod.java b/src/test/resources/input/singleFeatureTests/VoidMethod.java new file mode 100644 index 0000000..0d45373 --- /dev/null +++ b/src/test/resources/input/singleFeatureTests/VoidMethod.java @@ -0,0 +1,3 @@ +class VoidMethod{ + void test(){} +} \ No newline at end of file diff --git a/src/test/resources/input/javaCases/While.java b/src/test/resources/input/singleFeatureTests/While.java similarity index 65% rename from src/test/resources/input/javaCases/While.java rename to src/test/resources/input/singleFeatureTests/While.java index c06efdd..01dc5fc 100644 --- a/src/test/resources/input/javaCases/While.java +++ b/src/test/resources/input/singleFeatureTests/While.java @@ -1,6 +1,6 @@ -class TestClass{ +class While{ - public TestClass(){ + public While(){ int i = 10; while ( i > 0){ diff --git a/src/test/resources/input/typedAstExceptionsTests/CompareBoolInt.java b/src/test/resources/input/typedAstExceptionsTests/CompareBoolInt.java deleted file mode 100644 index 1eb080a..0000000 --- a/src/test/resources/input/typedAstExceptionsTests/CompareBoolInt.java +++ /dev/null @@ -1,13 +0,0 @@ -// @expected: TypeMismatchException -public class Test{ - - public void test(boolean b){ - if(b == 2){ - - } else { - - } - - } - -} diff --git a/src/test/resources/input/typedAstExceptionsTests/MissingOverloadingParameter.java b/src/test/resources/input/typedAstExceptionsTests/MissingOverloadingParameter.java deleted file mode 100644 index 17eac69..0000000 --- a/src/test/resources/input/typedAstExceptionsTests/MissingOverloadingParameter.java +++ /dev/null @@ -1,19 +0,0 @@ -// @expected: WrongOverloading -public class Test{ - - public void test(int x){ - - if(this.get()){ - - } else { - - } - - } - public boolean b; - - public boolean get(int c){ - return b; - } - -} \ No newline at end of file diff --git a/src/test/resources/input/typedAstFeaturesTests/CallMethodFromObjekt.java b/src/test/resources/input/typedAstFeatureTests/CallMethodFromObjekt.java similarity index 74% rename from src/test/resources/input/typedAstFeaturesTests/CallMethodFromObjekt.java rename to src/test/resources/input/typedAstFeatureTests/CallMethodFromObjekt.java index 61b94f2..469650f 100644 --- a/src/test/resources/input/typedAstFeaturesTests/CallMethodFromObjekt.java +++ b/src/test/resources/input/typedAstFeatureTests/CallMethodFromObjekt.java @@ -1,12 +1,11 @@ -public class Test { +public class CallMethodFromObjekt { public int firstInt; public Car ca; - public int speed(){ + public int speed() { return ca.getSpeed(); } - } public class Car{ diff --git a/src/test/resources/input/typedAstFeatureTests/ChainedMethods.java b/src/test/resources/input/typedAstFeatureTests/ChainedMethods.java new file mode 100644 index 0000000..7156569 --- /dev/null +++ b/src/test/resources/input/typedAstFeatureTests/ChainedMethods.java @@ -0,0 +1,29 @@ +public class Test { + + public House h; + + public int test(House h){ + return h.getW().getSize(); + } + + +} + +public class House { + + private Window w; + + public Window getW(){ + return w; + } + +} + +public class Window{ + + private int size; + + public int getSize() { + return size; + } +} \ No newline at end of file diff --git a/src/test/resources/input/typedAstFeaturesTests/CorrectMemberAccess.java b/src/test/resources/input/typedAstFeatureTests/CorrectMemberAccess.java similarity index 63% rename from src/test/resources/input/typedAstFeaturesTests/CorrectMemberAccess.java rename to src/test/resources/input/typedAstFeatureTests/CorrectMemberAccess.java index b9f3dbb..46cdd5b 100644 --- a/src/test/resources/input/typedAstFeaturesTests/CorrectMemberAccess.java +++ b/src/test/resources/input/typedAstFeatureTests/CorrectMemberAccess.java @@ -1,14 +1,14 @@ -public class Test{ +public class CorrectMemberAccess { public Car c; - public int test(){ + public int test() { return c.getSpeed(); } } -public class Car{ +private class Car{ private int speed; diff --git a/src/test/resources/input/typedAstFeaturesTests/CorrectMethodParameter.java b/src/test/resources/input/typedAstFeatureTests/CorrectMethodParameter.java similarity index 81% rename from src/test/resources/input/typedAstFeaturesTests/CorrectMethodParameter.java rename to src/test/resources/input/typedAstFeatureTests/CorrectMethodParameter.java index ecfad3e..e1c390c 100644 --- a/src/test/resources/input/typedAstFeaturesTests/CorrectMethodParameter.java +++ b/src/test/resources/input/typedAstFeatureTests/CorrectMethodParameter.java @@ -1,4 +1,4 @@ -public class Test{ +public class CorrectMethodParameter{ public void test(int x){ diff --git a/src/test/resources/input/typedAstFeaturesTests/CorrectNonCalcTest.java b/src/test/resources/input/typedAstFeatureTests/CorrectNonCalcTest.java similarity index 74% rename from src/test/resources/input/typedAstFeaturesTests/CorrectNonCalcTest.java rename to src/test/resources/input/typedAstFeatureTests/CorrectNonCalcTest.java index d78e926..1a9ccb7 100644 --- a/src/test/resources/input/typedAstFeaturesTests/CorrectNonCalcTest.java +++ b/src/test/resources/input/typedAstFeatureTests/CorrectNonCalcTest.java @@ -1,4 +1,4 @@ -public class Test{ +public class CorrectNonCalcTest{ public void test(boolean b){ if(b == true){ diff --git a/src/test/resources/input/typedAstFeatureTests/CorrectReturnType.java b/src/test/resources/input/typedAstFeatureTests/CorrectReturnType.java new file mode 100644 index 0000000..62667d4 --- /dev/null +++ b/src/test/resources/input/typedAstFeatureTests/CorrectReturnType.java @@ -0,0 +1,7 @@ +public class CorrectReturnType { + + public static int testMethod(int x){ + return x; + } + +} diff --git a/src/test/resources/input/typedAstFeatureTests/CorrectTest.java b/src/test/resources/input/typedAstFeatureTests/CorrectTest.java new file mode 100644 index 0000000..a83dbbf --- /dev/null +++ b/src/test/resources/input/typedAstFeatureTests/CorrectTest.java @@ -0,0 +1,8 @@ +public class If { + public If() { + int intValue = 5; + if(intValue == 5) { + intValue--; + } + } +} \ No newline at end of file diff --git a/src/test/resources/input/typedAstFeaturesTests/FullTest.java b/src/test/resources/input/typedAstFeatureTests/FullTest.java similarity index 50% rename from src/test/resources/input/typedAstFeaturesTests/FullTest.java rename to src/test/resources/input/typedAstFeatureTests/FullTest.java index 5c3a97b..2faec6b 100644 --- a/src/test/resources/input/typedAstFeaturesTests/FullTest.java +++ b/src/test/resources/input/typedAstFeatureTests/FullTest.java @@ -1,5 +1,5 @@ -public class AllFeaturesClassExample { +public class FullTest { int a; boolean b; char c; @@ -17,25 +17,8 @@ public class AllFeaturesClassExample { for (int i = 0; i < 5; i++) { } - } -// void logicalOperations() { -// // Logische UND-Operation -// if (b && a > 5) { -//// System.out.println("a ist größer als 5 und b ist wahr"); -// } -// -// // Logische ODER-Operation -// if (b || a < 5) { -//// System.out.println("b ist wahr oder a ist kleiner als 5"); -// } -// } - -// public static void main(String[] args) { -// AllFeaturesClassExample obj = new AllFeaturesClassExample(12, true, 'a'); -// obj.controlStructures(); -// } } public class Test { @@ -60,5 +43,5 @@ public class Car { return speed; } -} +} \ No newline at end of file diff --git a/src/test/resources/input/typedAstFeaturesTests/IfExpressionBoolean.java b/src/test/resources/input/typedAstFeatureTests/IfExpressionBoolean.java similarity index 72% rename from src/test/resources/input/typedAstFeaturesTests/IfExpressionBoolean.java rename to src/test/resources/input/typedAstFeatureTests/IfExpressionBoolean.java index 526a2f2..9d7c120 100644 --- a/src/test/resources/input/typedAstFeaturesTests/IfExpressionBoolean.java +++ b/src/test/resources/input/typedAstFeatureTests/IfExpressionBoolean.java @@ -1,4 +1,4 @@ -public class Car{ +public class IfExpressionBoolean{ public void test(boolean boo){ diff --git a/src/test/resources/input/typedAstFeaturesTests/IfReturn.java b/src/test/resources/input/typedAstFeatureTests/IfReturn.java similarity index 86% rename from src/test/resources/input/typedAstFeaturesTests/IfReturn.java rename to src/test/resources/input/typedAstFeatureTests/IfReturn.java index 00cd263..2051faa 100644 --- a/src/test/resources/input/typedAstFeaturesTests/IfReturn.java +++ b/src/test/resources/input/typedAstFeatureTests/IfReturn.java @@ -1,4 +1,4 @@ -public class Car{ +public class IfReturn{ public int getSpeed(boolean bool, int a, int b){ diff --git a/src/test/resources/input/typedAstFeaturesTests/SelectRightOverloadedMethod.java b/src/test/resources/input/typedAstFeatureTests/SelectRightOverloadedMethod.java similarity index 83% rename from src/test/resources/input/typedAstFeaturesTests/SelectRightOverloadedMethod.java rename to src/test/resources/input/typedAstFeatureTests/SelectRightOverloadedMethod.java index bcb6b9c..eaa82d6 100644 --- a/src/test/resources/input/typedAstFeaturesTests/SelectRightOverloadedMethod.java +++ b/src/test/resources/input/typedAstFeatureTests/SelectRightOverloadedMethod.java @@ -1,4 +1,4 @@ -public class Test{ +public class SelectRightOverloadedMethod{ public int i; public boolean b; diff --git a/src/test/resources/input/typedAstFeaturesTests/ThisDotMethod.java b/src/test/resources/input/typedAstFeatureTests/ThisDotMethod.java similarity index 83% rename from src/test/resources/input/typedAstFeaturesTests/ThisDotMethod.java rename to src/test/resources/input/typedAstFeatureTests/ThisDotMethod.java index 36bcade..dd67f9a 100644 --- a/src/test/resources/input/typedAstFeaturesTests/ThisDotMethod.java +++ b/src/test/resources/input/typedAstFeatureTests/ThisDotMethod.java @@ -1,4 +1,4 @@ -public class Car{ +public class ThisDotMethod{ private int speed; diff --git a/src/test/resources/input/typedAstFeaturesTests/VoidReturnTypeIF.java b/src/test/resources/input/typedAstFeatureTests/VoidReturnTypeIF.java similarity index 78% rename from src/test/resources/input/typedAstFeaturesTests/VoidReturnTypeIF.java rename to src/test/resources/input/typedAstFeatureTests/VoidReturnTypeIF.java index bc31a27..d6ea473 100644 --- a/src/test/resources/input/typedAstFeaturesTests/VoidReturnTypeIF.java +++ b/src/test/resources/input/typedAstFeatureTests/VoidReturnTypeIF.java @@ -1,4 +1,4 @@ -public class Car{ +public class VoidReturnTypeIF{ private int speed; diff --git a/src/test/resources/input/typedAstFeaturesTests/CorrectTest.java b/src/test/resources/input/typedAstFeaturesTests/CorrectTest.java deleted file mode 100644 index 5ef0b26..0000000 --- a/src/test/resources/input/typedAstFeaturesTests/CorrectTest.java +++ /dev/null @@ -1,38 +0,0 @@ -public class AllFeaturesClassExample { - int a; - boolean b; - char c; - - public void controlStructures(int adf, boolean bool) { - if (a > (10 + 8)) { - } else { - } - - - while (a > adf) { - a--; - } - - for (int i = 0; i < 5; i++) { - } - - - } - -// void logicalOperations() { - // Logische UND-Operation -// if (b && a > 5) { -// System.out.println("a ist größer als 5 und b ist wahr"); -// } - - // Logische ODER-Operation -// if (b || a < 5) { -// System.out.println("b ist wahr oder a ist kleiner als 5"); -// } -// } - -// public static void main(String[] args) { -// AllFeaturesClassExample obj = new AllFeaturesClassExample(12, true, 'a'); -// obj.controlStructures(); -// } -} diff --git a/src/test/resources/output/javac/test b/src/test/resources/output/javac/test new file mode 100644 index 0000000..e69de29