Interpreter 2

monticore-generator/src/main/java/de/monticore/MontiCoreScript.java

@@ -806,12 +806,14 @@ protected void decorateWithTraverser(ASTCDCompilationUnit cd,
   public void decorateWithInterpreter(List<ASTCDCompilationUnit> cds,
                                       ASTCDCompilationUnit decoratedCD,
                                       GlobalExtensionManagement glex) {
+
+    ASTService astService = new ASTService(cds.get(0));
     VisitorService visitorService = new VisitorService(cds.get(0));
 
     InterpreterInterfaceDecorator interpreterInterfaceDecorator = new InterpreterInterfaceDecorator(glex, visitorService);
     interpreterInterfaceDecorator.decorate(cds.get(0), decoratedCD);
 
-    InterpreterDecorator interpreterDecorator = new InterpreterDecorator(glex, visitorService);
+    InterpreterDecorator interpreterDecorator = new InterpreterDecorator(glex, astService, visitorService);
     interpreterDecorator.decorate(cds.get(0), decoratedCD);
 
     ASTEvaluateDecorator evaluateDecorator = new ASTEvaluateDecorator(glex, visitorService);

monticore-generator/src/main/java/de/monticore/codegen/cd2java/_symboltable/SymbolTableConstants.java

@@ -88,7 +88,7 @@ private SymbolTableConstants() {
 
   public static final String I_STEREOTYPE_REFERENCE = "de.monticore.symboltable.stereotypes.IStereotypeReference";
 
-  public static final String INTERPRETER_VALUE = "de.monticore.interpreter.Value";
+  public static final String INTERPRETER_VALUE = "de.monticore.interpreter.MIValue";
 
   /**
    * attribute names

monticore-generator/src/main/java/de/monticore/codegen/cd2java/interpreter/ASTEvaluateDecorator.java

@@ -1,6 +1,8 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.codegen.cd2java.interpreter;
 
+import de.monticore.cd4code.CD4CodeMill;
+import de.monticore.cd4code._util.ICD4CodeTypeDispatcher;
 import de.monticore.cd4codebasis._ast.ASTCDMethod;
 import de.monticore.cd4codebasis._ast.ASTCDParameter;
 import de.monticore.cdbasis._ast.*;
@@ -35,9 +37,10 @@ public ASTEvaluateDecorator(GlobalExtensionManagement glex,
 
   public void decorate(ASTCDCompilationUnit input, ASTCDCompilationUnit decoratedCD) {
     ASTCDPackage astPackage = getPackage(input, decoratedCD, ASTConstants.AST_PACKAGE);
+    ICD4CodeTypeDispatcher dispatcher = CD4CodeMill.typeDispatcher();
     astPackage.streamCDElements()
-        .filter(e -> e instanceof ASTCDClass)
-        .map(e -> (ASTCDClass) e)
+        .filter(dispatcher::isCDBasisASTCDClass)
+        .map(dispatcher::asCDBasisASTCDClass)
         .forEach(t -> t.addAllCDMembers(decorate(t)));
   }
 
@@ -74,7 +77,7 @@ protected ASTCDMethod createEvaluateInterpreterMethod(ASTCDType cdType) {
 
   protected ASTCDMethod createEvaluateInterpreterSuperMethod(ASTCDType cdType) {
     ASTCDParameter parameter = cdParameterFacade.createParameter(
-        mcTypeFacade.createQualifiedType(InterpreterConstants.MODELINTERPRETER_FULLNAME),
+        mcTypeFacade.createQualifiedType(InterpreterConstants.IMODELINTERPRETER_FULLNAME),
         "interpreter");
     ASTCDMethod method = cdMethodFacade.createMethod(
         PUBLIC.build(), InterpreterConstants.VALUE_FULLNAME, "evaluate", parameter);

monticore-generator/src/main/java/de/monticore/codegen/cd2java/interpreter/InterpreterConstants.java

@@ -8,15 +8,20 @@ public final class InterpreterConstants {
   public static final String INTERPRET_METHOD_NAME = "interpret";
 
   public static final String MODELINTERPRETER_FULLNAME = "de.monticore.interpreter.ModelInterpreter";
+  public static final String IMODELINTERPRETER_FULLNAME = "de.monticore.interpreter.IModelInterpreter";
+
+  public static final String INTERPRETER_SCOPE_FULLNAME = "de.monticore.interpreter.MIScope";
 
-  public static final String VALUE_FULLNAME = "de.monticore.interpreter.Value";
+  public static final String VALUE_FULLNAME = "de.monticore.interpreter.MIValue";
+  public static final String FUNCTION_VALUE_FULLNAME = "de.monticore.interpreter.values.FunctionMIValue";
 
-  public static final String NOT_A_VALUE_FULLNAME = "de.monticore.interpreter.values.NotAValue";
 
   public static final String NODE_TYPE = "de.monticore.ast.ASTNode";
 
   public static final String NODE_PARAMETER = "node";
 
   public static final String SYMBOL_FULLNAME = "de.monticore.symboltable.ISymbol";
+  public static final String VARIABLE_SYMBOL_FULLNAME = "de.monticore.symbols.basicsymbols._symboltable.VariableSymbol";
+  public static final String FUNCTION_SYMBOL_FULLNAME = "de.monticore.symbols.basicsymbols._symboltable.FunctionSymbol";
 
 }

monticore-generator/src/main/java/de/monticore/codegen/cd2java/interpreter/InterpreterDecorator.java

@@ -9,6 +9,7 @@
 import de.monticore.cdbasis._ast.*;
 import de.monticore.cdbasis._symboltable.CDTypeSymbol;
 import de.monticore.codegen.cd2java.AbstractCreator;
+import de.monticore.codegen.cd2java._ast.ast_class.ASTService;
 import de.monticore.codegen.cd2java._visitor.VisitorConstants;
 import de.monticore.codegen.cd2java._visitor.VisitorService;
 import de.monticore.codegen.cd2java.methods.MethodDecorator;
@@ -17,6 +18,7 @@
 import de.monticore.generating.templateengine.TemplateHookPoint;
 import de.monticore.symbols.basicsymbols._symboltable.DiagramSymbol;
 import de.monticore.types.mcbasictypes._ast.ASTMCReturnType;
+import de.monticore.types.mcbasictypes._ast.ASTMCType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,13 +30,17 @@
 
 public class InterpreterDecorator
     extends AbstractCreator<ASTCDCompilationUnit, ASTCDClass> {
+
+  protected final ASTService astService;
 
-  protected final VisitorService service;
+  protected final VisitorService visitorService;
 
   public InterpreterDecorator(GlobalExtensionManagement glex,
-                              VisitorService service) {
+                              ASTService astService,
+                              VisitorService visitorService) {
     super(glex);
-    this.service = service;
+    this.astService = astService;
+    this.visitorService = visitorService;
   }
 
   public void decorate(ASTCDCompilationUnit input,
@@ -48,7 +54,7 @@ public void decorate(ASTCDCompilationUnit input,
   public ASTCDClass decorate(ASTCDCompilationUnit input) {
     return CD4CodeMill.cDClassBuilder()
         .setModifier(PUBLIC.build())
-        .setName(service.getInterpreterSimpleName())
+        .setName(visitorService.getInterpreterSimpleName())
         .setCDInterfaceUsage(getSuperInterface())
         .addAllCDMembers(getInterpreterAttributes())
         .addAllCDMembers(getConstructors())
@@ -62,7 +68,7 @@ public List<ASTCDConstructor> getConstructors() {
     ASTCDParameter parameter = cdParameterFacade.createParameter(
         MODELINTERPRETER_FULLNAME, "realThis");
 
-    String interpreterName = service.getInterpreterSimpleName();
+    String interpreterName = visitorService.getInterpreterSimpleName();
     ASTCDConstructor constructorNoParams = cdConstructorFacade
         .createConstructor(PUBLIC.build(), interpreterName);
     ASTCDConstructor constructorRealThis = cdConstructorFacade
@@ -71,9 +77,9 @@ public List<ASTCDConstructor> getConstructors() {
     List<String> names = new ArrayList<>();
     List<String> types = new ArrayList<>();
 
-    for (DiagramSymbol symbol : service.getSuperCDsTransitive()) {
-      names.add(service.getInterpreterSimpleName(symbol));
-      types.add(service.getInterpreterFullName(symbol));
+    for (DiagramSymbol symbol : visitorService.getSuperCDsTransitive()) {
+      names.add(visitorService.getInterpreterSimpleName(symbol));
+      types.add(visitorService.getInterpreterFullName(symbol));
     }
 
     replaceTemplate(EMPTY_BODY, constructorRealThis,
@@ -90,25 +96,29 @@ public List<ASTCDMethod> getInterpretMethods() {
     ASTMCReturnType returnType = CD4CodeMill.mCReturnTypeBuilder()
         .setMCType(mcTypeFacade.createQualifiedType(VALUE_FULLNAME)).build();
 
-    for (CDTypeSymbol typeSymbol : service.getAllCDTypes()) {
+    for (CDTypeSymbol typeSymbol : visitorService.getAllCDTypes()) {
       if (typeSymbol.isIsClass() || typeSymbol.isIsInterface()) {
         ASTCDParameter parameter = cdParameterFacade
-            .createParameter(service.createASTFullName(typeSymbol), NODE_PARAMETER);
+            .createParameter(visitorService.createASTFullName(typeSymbol), NODE_PARAMETER);
         ASTCDMethod method = cdMethodFacade.createMethod(
             PUBLIC.build(), returnType, "interpret", parameter);
-        this.replaceTemplate(
-            EMPTY_BODY, method, new StringHookPoint("return node.evaluate(getRealThis());"));
+
+        String errorCode = astService.getGeneratedErrorCode(typeSymbol.getFullName());
+
+        this.replaceTemplate(EMPTY_BODY, method,
+            new TemplateHookPoint("interpreter.NoImplementation",
+                typeSymbol.getFullName(), errorCode));
         methods.add(method);
       }
     }
 
-    for (DiagramSymbol diagramSymbol : service.getSuperCDsTransitive()) {
-      if (diagramSymbol != service.getCDSymbol()) {
-        String interpreterName = uncapFirst(service.getInterpreterSimpleName(diagramSymbol));
-        for (CDTypeSymbol typeSymbol : service.getAllCDTypes(diagramSymbol)) {
+    for (DiagramSymbol diagramSymbol : visitorService.getSuperCDsTransitive()) {
+      if (diagramSymbol != visitorService.getCDSymbol()) {
+        String interpreterName = uncapFirst(visitorService.getInterpreterSimpleName(diagramSymbol));
+        for (CDTypeSymbol typeSymbol : visitorService.getAllCDTypes(diagramSymbol)) {
           if (typeSymbol.isIsClass() || typeSymbol.isIsInterface()) {
             ASTCDParameter parameter = cdParameterFacade
-                .createParameter(service.createASTFullName(typeSymbol), NODE_PARAMETER);
+                .createParameter(visitorService.createASTFullName(typeSymbol), NODE_PARAMETER);
             ASTCDMethod method = cdMethodFacade.createMethod(
                 PUBLIC.build(), returnType, "interpret", parameter);
             this.replaceTemplate(
@@ -126,29 +136,55 @@ EMPTY_BODY, method, new StringHookPoint(
 
   public List<ASTCDMember> createMapMembers() {
     List<ASTCDMember> members = new ArrayList<>();
-
-    members.add(cdAttributeFacade.createAttribute(
-        PROTECTED.build(),
-        mcTypeFacade.createMapTypeOf(SYMBOL_FULLNAME, VALUE_FULLNAME),
-        "contextMap"));
-
-    ASTCDParameter symbolParameter = cdParameterFacade.createParameter(SYMBOL_FULLNAME, "symbol");
-    ASTCDParameter valueParameter = cdParameterFacade.createParameter(VALUE_FULLNAME, "value");
-    ASTCDMethod storeMethod = cdMethodFacade.createMethod(
-        PUBLIC.build(), "store", symbolParameter, valueParameter);
-    this.replaceTemplate(EMPTY_BODY, storeMethod, new StringHookPoint("getRealThis().getContextMap().put(symbol, value);"));
-    members.add(storeMethod);
-
-    ASTCDMethod loadMethod = cdMethodFacade.createMethod(PUBLIC.build(), VALUE_FULLNAME, "load", symbolParameter);
-    this.replaceTemplate(EMPTY_BODY, loadMethod, new StringHookPoint("return getRealThis().getContextMap().get(symbol);"));
-    members.add(loadMethod);
-
-    ASTCDMethod getter = cdMethodFacade.createMethod(
-        PUBLIC.build(),
-        mcTypeFacade.createMapTypeOf(SYMBOL_FULLNAME, VALUE_FULLNAME),
-        "getContextMap");
-    this.replaceTemplate(EMPTY_BODY, getter, new StringHookPoint("return this.contextMap;"));
-    members.add(getter);
+
+    ASTMCType scopeStackType = mcTypeFacade.createBasicGenericTypeOf("java.util.Stack", INTERPRETER_SCOPE_FULLNAME);
+
+    members.add(cdAttributeFacade.createAttribute(PROTECTED.build(), scopeStackType, "scopeCallstack"));
+
+//    ASTCDMethod declareFuncMethod = cdMethodFacade.createMethod(
+//        PUBLIC.build(), "declareFunction", functionSymbolParameter, functionValueParameter);
+//    this.replaceTemplate(EMPTY_BODY, declareFuncMethod, new StringHookPoint("getRealThis().getCurrentScope().declareFunction(symbol, value);"));
+//    members.add(declareFuncMethod);
+//
+//    ASTCDMethod loadFuncMethod = cdMethodFacade.createMethod(PUBLIC.build(), VALUE_FULLNAME, "loadFunction", functionSymbolParameter);
+//    this.replaceTemplate(EMPTY_BODY, loadFuncMethod, new StringHookPoint("return getRealThis().getCurrentScope().loadFunction(symbol);"));
+//    members.add(loadFuncMethod);
+//
+//    ASTCDMethod declareVarMethod = cdMethodFacade.createMethod(
+//        PUBLIC.build(), "declareVariable", variableSymbolParameter, optionalValueParameter);
+//    this.replaceTemplate(EMPTY_BODY, declareVarMethod, new StringHookPoint("getRealThis().getCurrentScope().declareVariable(symbol, value);"));
+//    members.add(declareVarMethod);
+//
+//    ASTCDMethod loadVarMethod = cdMethodFacade.createMethod(PUBLIC.build(), VALUE_FULLNAME,
+//        "loadVariable", variableSymbolParameter);
+//    this.replaceTemplate(EMPTY_BODY, loadVarMethod, new StringHookPoint("return getRealThis().getCurrentScope().loadVariable(symbol);"));
+//    members.add(loadVarMethod);
+//
+//    ASTCDMethod storeVarMethod = cdMethodFacade.createMethod(
+//        PUBLIC.build(), "storeVariable", variableSymbolParameter, valueParameter);
+//    this.replaceTemplate(EMPTY_BODY, storeVarMethod, new StringHookPoint("getRealThis().getCurrentScope().storeVariable(symbol, value);"));
+//    members.add(storeVarMethod);
+//
+//    ASTCDMethod getter = cdMethodFacade.createMethod(
+//        PUBLIC.build(),
+//        mcTypeFacade.createQualifiedType(INTERPRETER_SCOPE_FULLNAME),
+//        "getCurrentScope");
+//    this.replaceTemplate(EMPTY_BODY, getter, new StringHookPoint("return getRealThis().scopeCallstack.peek();"));
+//    members.add(getter);
+//
+//    ASTCDParameter scopeParameter = cdParameterFacade.createParameter(INTERPRETER_SCOPE_FULLNAME, "scope");
+//    ASTCDMethod pushScopeMethod = cdMethodFacade.createMethod(PUBLIC.build(), "pushScope", scopeParameter);
+//    this.replaceTemplate(EMPTY_BODY, pushScopeMethod, new StringHookPoint("getRealThis().scopeCallstack.push(scope);"));
+//    members.add(pushScopeMethod);
+//
+//    ASTCDMethod popScopeMethod = cdMethodFacade.createMethod(PUBLIC.build(), "popScope");
+//    this.replaceTemplate(EMPTY_BODY, popScopeMethod, new StringHookPoint("getRealThis().scopeCallstack.pop();"));
+//    members.add(popScopeMethod);
+
+    ASTCDMethod getScopeCallstackMethod = cdMethodFacade.createMethod(PUBLIC.build(), scopeStackType,
+            "getScopeCallstack");
+    this.replaceTemplate(EMPTY_BODY, getScopeCallstackMethod, new StringHookPoint("return scopeCallstack;"));
+    members.add(getScopeCallstackMethod);
 
     return members;
   }
@@ -163,24 +199,24 @@ public List<ASTCDMember> getRealThisComponents() {
             "realThis");
     components.add(realThisAttribute);
 
-    MethodDecorator methodDecorator = new MethodDecorator(glex, service);
+    MethodDecorator methodDecorator = new MethodDecorator(glex, visitorService);
     components.addAll(methodDecorator.decorate(realThisAttribute));
 
     return components;
   }
 
   public List<ASTCDAttribute> getInterpreterAttributes() {
-    return service.getSuperCDsTransitive()
+    return visitorService.getSuperCDsTransitive()
         .stream()
         .map(s -> cdAttributeFacade.createAttribute(
-            PROTECTED.build(), service.getInterpreterType(s),
-            uncapFirst(service.getInterpreterSimpleName(s))))
+            PROTECTED.build(), visitorService.getInterpreterType(s),
+            uncapFirst(visitorService.getInterpreterSimpleName(s))))
         .collect(Collectors.toList());
   }
 
   public ASTCDInterfaceUsage getSuperInterface() {
     return CDInterfaceUsageFacade.getInstance()
-        .createCDInterfaceUsage(service.getInterpreterInterfaceSimpleName());
+        .createCDInterfaceUsage(visitorService.getInterpreterInterfaceSimpleName());
   }
 
   protected String uncapFirst(String s) {

monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Deserialize4SymbolDeSer.ftl

@@ -11,7 +11,7 @@ ${tc.signature("symTabMill", "symbolFullName", "symbolSimpleName","symbolRuleAtt
   }
   if (symbolJson.hasArrayMember(de.monticore.symboltable.serialization.JsonDeSers.STEREO_INFO)) {
     for (de.monticore.symboltable.serialization.json.JsonElement stereoinfoJson : symbolJson.getArrayMember(de.monticore.symboltable.serialization.JsonDeSers.STEREO_INFO)) {
-      java.util.Map.Entry<de.monticore.symboltable.stereotypes.IStereotypeReference, java.util.Optional<de.monticore.interpreter.Value>> stereoinfo = de.monticore.symboltable.stereotypes.StereoinfoDeSer.deserialize(stereoinfoJson, scope);
+      java.util.Map.Entry<de.monticore.symboltable.stereotypes.IStereotypeReference, java.util.Optional<de.monticore.interpreter.MIValue>> stereoinfo = de.monticore.symboltable.stereotypes.StereoinfoDeSer.deserialize(stereoinfoJson, scope);
       if (stereoinfo.getValue().isPresent()) {
         builder.addStereoinfo(stereoinfo.getKey(), stereoinfo.getValue().get());
       } else {

monticore-generator/src/main/resources/interpreter/ConstructorNoParams.ftl

@@ -1,7 +1,8 @@
 <#-- (c) https://github.com/MontiCore/monticore -->
 ${tc.signature("names", "types")}
 
-this.contextMap = new java.util.HashMap<>();
+this.scopeCallstack = new Stack<de.monticore.interpreter.MIScope>();
+this.scopeCallstack.push(new de.monticore.interpreter.MIScope());
 this.setRealThis(this);
 <#list names as name>
     this.${name?uncap_first} = new ${types[name?index]}(this);

monticore-generator/src/main/resources/interpreter/NoImplementation.ftl

@@ -0,0 +1,6 @@
+<#-- (c) https://github.com/MontiCore/monticore -->
+${tc.signature("name", "errorCode")}
+
+String errorMsg = "0x57086${errorCode} Interpreter was not implemented for ${name}";
+de.se_rwth.commons.logging.Log.error(errorMsg, node.get_SourcePositionStart(), node.get_SourcePositionEnd());
+return new de.monticore.interpreter.values.ErrorMIValue(errorMsg);

monticore-generator/src/test/java/de/monticore/codegen/cd2java/_symboltable/symbol/SymbolBuilderDecoratorTest.java

@@ -48,7 +48,7 @@ public class SymbolBuilderDecoratorTest extends DecoratorTestCase {
 
   private static final String I_STEREOTYPE_REF = "de.monticore.symboltable.stereotypes.IStereotypeReference";
 
-  private static final String VALUE = "de.monticore.interpreter.Value";
+  private static final String VALUE = "de.monticore.interpreter.MIValue";
 
   @BeforeEach
   public void setup() {

monticore-generator/src/test/java/de/monticore/codegen/cd2java/_symboltable/symbol/SymbolDecoratorTest.java

@@ -65,7 +65,7 @@ public class SymbolDecoratorTest extends DecoratorTestCase {
 
   private static final String I_STEREOTYPE_REF = "de.monticore.symboltable.stereotypes.IStereotypeReference";
 
-  private static final String VALUE = "de.monticore.interpreter.Value";
+  private static final String VALUE = "de.monticore.interpreter.MIValue";
 
   private static final String I_AUTOMATON_SCOPE = "de.monticore.codegen.symboltable.automatonsymbolcd._symboltable.IAutomatonSymbolCDScope";
 

monticore-generator/src/test/java/de/monticore/codegen/cd2java/_symboltable/symbol/SymbolSurrogateBuilderDecoratorTest.java

@@ -44,7 +44,7 @@ public class SymbolSurrogateBuilderDecoratorTest extends DecoratorTestCase {
 
   private static final String I_STEREOTYPE_REF = "de.monticore.symboltable.stereotypes.IStereotypeReference";
 
-  private static final String VALUE = "de.monticore.interpreter.Value";
+  private static final String VALUE = "de.monticore.interpreter.MIValue";
 
   @BeforeEach
   public void setUp() {

monticore-generator/src/test/java/de/monticore/codegen/cd2java/_symboltable/symbol/SymbolSurrogateDecoratorTest.java

@@ -50,7 +50,7 @@ public class SymbolSurrogateDecoratorTest extends DecoratorTestCase {
 
   private static final String I_STEREOTYPE_REF = "de.monticore.symboltable.stereotypes.IStereotypeReference";
 
-  private static final String VALUE = "de.monticore.interpreter.Value";
+  private static final String VALUE = "de.monticore.interpreter.MIValue";
 
   private static final String I_AUTOMATON_SCOPE = "de.monticore.codegen.symboltable.automatonsymbolcd._symboltable.IAutomatonSymbolCDScope";