Browse Source

Switch to maven and Java 1.6

pull/1/head
Malte Schmitz 9 years ago
parent
commit
0d14afa496
23 changed files with 42 additions and 7 deletions
  1. +1
    -1
      .gitignore
  2. +35
    -0
      pom.xml
  3. +0
    -0
      src/main/java/Main.java
  4. +0
    -0
      src/main/java/expression/Addition.java
  5. +0
    -0
      src/main/java/expression/Expression.java
  6. +0
    -0
      src/main/java/expression/Identifier.java
  7. +0
    -0
      src/main/java/expression/Int.java
  8. +0
    -0
      src/main/java/expression/Subtraction.java
  9. +1
    -1
      src/main/java/interpreter/Evaluator.java
  10. +2
    -2
      src/main/java/interpreter/Interpreter.java
  11. +0
    -0
      src/main/java/interpreter/InterpreterException.java
  12. +0
    -0
      src/main/java/interpreter/Visitor.java
  13. +2
    -2
      src/main/java/parser/Parser.java
  14. +0
    -0
      src/main/java/parser/SyntaxException.java
  15. +0
    -0
      src/main/java/program/Assignment.java
  16. +0
    -0
      src/main/java/program/Call.java
  17. +0
    -0
      src/main/java/program/Composition.java
  18. +0
    -0
      src/main/java/program/Conditional.java
  19. +0
    -0
      src/main/java/program/Loop.java
  20. +0
    -0
      src/main/java/program/Program.java
  21. +1
    -1
      src/test/java/interpreter/EvaluatorTest.java
  22. +0
    -0
      src/test/java/interpreter/InterpreterTest.java
  23. +0
    -0
      src/test/java/parser/ParserTest.java

+ 1
- 1
.gitignore View File

@@ -1,3 +1,3 @@
.idea/
*.iml
/out
/target

+ 35
- 0
pom.xml View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>de.uni_luebeck.isp</groupId>
<artifactId>WhileInterpreter</artifactId>
<version>1.0</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
</dependencies>
</project>

src/Main.java → src/main/java/Main.java View File


src/expression/Addition.java → src/main/java/expression/Addition.java View File


src/expression/Expression.java → src/main/java/expression/Expression.java View File


src/expression/Identifier.java → src/main/java/expression/Identifier.java View File


src/expression/Int.java → src/main/java/expression/Int.java View File


src/expression/Subtraction.java → src/main/java/expression/Subtraction.java View File


src/interpreter/Evaluator.java → src/main/java/interpreter/Evaluator.java View File

@@ -8,7 +8,7 @@ import java.util.Map;
public class Evaluator extends Visitor<Integer> {

final Expression expression;
final Map<String, Integer> valuation = new HashMap<>();
final Map<String, Integer> valuation = new HashMap<String, Integer>();

public Evaluator(Expression expression, Map<String, Integer> valuation) {
this.expression = expression;

src/interpreter/Interpreter.java → src/main/java/interpreter/Interpreter.java View File

@@ -7,10 +7,10 @@ import java.util.Map;

public class Interpreter extends Visitor {
final Program program;
final Map<String, Integer> valuation = new HashMap<>();
final Map<String, Integer> valuation = new HashMap<String, Integer>();

public Map<String, Integer> getValuation() {
Map<String, Integer> result = new HashMap<>();
Map<String, Integer> result = new HashMap<String, Integer>();
result.putAll(valuation);
return result;
}

src/interpreter/InterpreterException.java → src/main/java/interpreter/InterpreterException.java View File


src/interpreter/Visitor.java → src/main/java/interpreter/Visitor.java View File


src/parser/Parser.java → src/main/java/parser/Parser.java View File

@@ -28,7 +28,7 @@ public class Parser {

Program program() {
Program firstStatement = statement();
List<Program> moreStatements = new ArrayList<>();
List<Program> moreStatements = new ArrayList<Program>();
while (test(";")) {
consume(";");
Program statement = statement();
@@ -148,7 +148,7 @@ public class Parser {

Expression expression() {
Expression firstAtom = atom();
List<OperatorWithExpression> moreAtoms = new ArrayList<>();
List<OperatorWithExpression> moreAtoms = new ArrayList<OperatorWithExpression>();
while(testOperator()) {
Operator operator = operator();
Expression expression = atom();

src/parser/SyntaxException.java → src/main/java/parser/SyntaxException.java View File


src/program/Assignment.java → src/main/java/program/Assignment.java View File


src/program/Call.java → src/main/java/program/Call.java View File


src/program/Composition.java → src/main/java/program/Composition.java View File


src/program/Conditional.java → src/main/java/program/Conditional.java View File


src/program/Loop.java → src/main/java/program/Loop.java View File


src/program/Program.java → src/main/java/program/Program.java View File


test/interpreter/EvaluatorTest.java → src/test/java/interpreter/EvaluatorTest.java View File

@@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals;
public class EvaluatorTest {
@Test
public void testEval() {
Map<String, Integer> valuation = new HashMap<>();
Map<String, Integer> valuation = new HashMap<String, Integer>();
valuation.put("x", 7);
valuation.put("y", 2);
Expression expression = new Addition(new Identifier("x"), new Subtraction(new Identifier("y"), new Int(-4)));

test/interpreter/InterpreterTest.java → src/test/java/interpreter/InterpreterTest.java View File


test/parser/ParserTest.java → src/test/java/parser/ParserTest.java View File


Loading…
Cancel
Save