sync

Author: Hendrik7889

monticore-test/01.experiments/interpreter/src/main/grammars/SimpleEquations.mc4

@@ -2,8 +2,8 @@
 
 grammar SimpleEquations extends Numerals, de.monticore.symbols.BasicSymbols {
 
-  symbol scope SimpleEquationCompilationUnit = Name "{" (ProgramBlock | FunctionDefinition )+ "}";
-  scope ProgramBlock = (Statement ";" | FunctionCall ";")* (Expression ";")? ;
+  symbol scope SimpleEquationCompilationUnit = Name "{" (ProgramBlock | FunctionDefinition)+ "}";
+  scope ProgramBlock = (Statement ";" | FunctionCall ";")+ (Expression ";")? ;
 
   interface Statement;
   interface Expression;

monticore-test/01.experiments/interpreter/src/main/java/simpleequations/_symboltable/SimpleEquationsScopesGenitorDelegator.java

@@ -0,0 +1,20 @@
+package simpleequations._symboltable;
+
+public class SimpleEquationsScopesGenitorDelegator extends SimpleEquationsScopesGenitorDelegatorTOP{
+
+  @Override
+  public simpleequations._symboltable.ISimpleEquationsArtifactScope createFromAST (simpleequations._ast.ASTSimpleEquationCompilationUnit rootNode) {
+    simpleequations._symboltable.ISimpleEquationsArtifactScope as =  symbolTable.createFromAST(rootNode);
+    //only add this here
+    as.setName(rootNode.getName());
+    //until here
+    if (as.isPresentName()){
+      if (!as.getPackageName().isEmpty()){
+        globalScope.addLoadedFile(as.getPackageName() + "." + as.getName());
+      } else {
+        globalScope.addLoadedFile(as.getName());
+      }
+    }
+    return as;
+  }
+}

monticore-test/01.experiments/interpreter/src/main/java/simpleequations/_visitor/SimpleEquationsInterpreter.java

@@ -27,12 +27,20 @@ public SimpleEquationsInterpreter() {
     super();
   }
 
-  public MIValue interpret(ASTProgramBlock node) {
-    MIValue result = new ErrorMIValue("Error ASTProgram node");
 
+  public MIValue interpret(ASTSimpleEquationCompilationUnit node) {
+    MIValue result = new ErrorMIValue("Error ASTSimpleEquationCompilationUnit node");
     for (ASTFunctionDefinition funcDef : node.getFunctionDefinitionList()) {
       funcDef.evaluate(getRealThis());
     }
+    for(ASTProgramBlock progBlock : node.getProgramBlockList()){
+      progBlock.evaluate(getRealThis());
+    }
+    return result;
+  }
+
+  public MIValue interpret(ASTProgramBlock node) {
+    MIValue result = new ErrorMIValue("Error ASTProgram node");
 
     for (ASTStatement s : node.getStatementList()) {
       result = s.evaluate(getRealThis());

monticore-test/01.experiments/interpreter/src/test/java/simpleequations/_visitor/SimpleEquationsInterpreterTest.java

@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Test;
 import simpleequations.SimpleEquationsMill;
 import simpleequations._ast.ASTProgramBlock;
+import simpleequations._ast.ASTSimpleEquationCompilationUnit;
 import simpleequations._parser.SimpleEquationsParser;
 import simpleequations._symboltable.SimpleEquationsScopesGenitorDelegator;
 
@@ -22,30 +23,33 @@ public void test() throws IOException {
     SimpleEquationsInterpreter interpreter = new SimpleEquationsInterpreter();
     SimpleEquationsScopesGenitorDelegator delegator = SimpleEquationsMill.scopesGenitorDelegator();
 
-    ASTProgramBlock program = parser.parse_StringProgramBlock("" +
-        "int a = 3; " +
-        "int b = 3; " +
-        "int func func1(int a, int b){ " +
-        " int c = a; " +
-        " if( b > 0 ){ " +
-        "   b = b - 1; " +
-        "   a = a;" +
-        "   c = a * 3; " +
-        "   int d = func1(c, b);" +
-        "   return d;" +
-        " } else { " +
-        "   return a;" +
-        " };" +
-        "}"+
-        "int result = func1(a, b);" +
-        "print(result);").get();
+    ASTSimpleEquationCompilationUnit program = parser.parse_StringSimpleEquationCompilationUnit("" +
+        "Program {" +
+        " int a = 3; " +
+        " int b = 3; " +
+        " int func func1(int a, int b){ " +
+        "  int c = a; " +
+        "  if( b > 0 ){ " +
+        "    b = b - 1; " +
+        "    a = a;" +
+        "    c = a * 3; " +
+        "    int d = func1(c, b);" +
+        "    return d;" +
+        "  } else { " +
+        "    return a;" +
+        "  };" +
+        " }"+
+        " int result = func1(a, b);" +
+        " print(result);" +
+        "}").get();
     delegator.createFromAST(program);
     MIValue functionResult = interpreter.interpret(program);
     assertTrue(functionResult.isInt());
     assertEquals(81, functionResult.asInt());
 
     //test recursive method definition
-    //program = parser.parse_StringProgramBlock("" +
+    //program = parser.parse_StringSimpleEquationCompilationUnit("" +
+    //    "Program {" +
     //    "int a = 3;" +
     //    "int b = 3;" +
     //    "int func func1(int a, int  b){" +
@@ -57,14 +61,22 @@ public void test() throws IOException {
     //    " return func1(a,b);" +
     //    "};" +
     //    "int result = func1(a,b); " +
-    //    "print(result);").get();
+    //    "print(result);"
+    //    "}").get();
     //delegator.createFromAST(program);
     //MIValue recursiveResult = interpreter.interpret(program);
     //assertTrue(recursiveResult.isInt());
     //assertEquals(18, recursiveResult.asInt() );
 
 
-    program = parser.parse_StringProgramBlock("var a=3.5; var b=4; print(a); var c=a+b; c;").get();
+    program = parser.parse_StringSimpleEquationCompilationUnit("" +
+        "Program {" +
+        " var a=3.5; " +
+        " var b=4; " +
+        " print(a); " +
+        " var c=a+b; " +
+        " c;" +
+        "}").get();
 
     delegator.createFromAST(program);
     MIValue result = interpreter.interpret(program);
@@ -75,10 +87,12 @@ public void test() throws IOException {
     SimpleEquationsMill.reset();
     SimpleEquationsMill.init();
     interpreter = new SimpleEquationsInterpreter();
-    program = parser.parse_StringProgramBlock(
-        "var a = 40; " +
-        "a = 45;" +
-            "a;").get();
+    program = parser.parse_StringSimpleEquationCompilationUnit(
+        "Program {" +
+        " var a = 40; " +
+        " a = 45;" +
+        " a;" +
+        "}").get();
 
     delegator.createFromAST(program);
     result = interpreter.interpret(program);