ChainOfResponsibility: Ensure to start at top of the chain

src/main/java/de/monticore/lang/monticar/generator/BaseMathFunctionFixerHandler.java

@@ -11,15 +11,19 @@ public abstract class BaseMathFunctionFixerHandler extends BaseChainOfResponsibi
 
     protected abstract void doFixMathFunction(MathExpressionSymbol symbol, BluePrintCPP bluePrintCPP);
 
-    public void handleFixMathFunction(MathExpressionSymbol symbol, BluePrintCPP bluePrintCPP) {
+    private void handleFixMathFunction(MathExpressionSymbol symbol, BluePrintCPP bluePrintCPP) {
         if (canFixMathSymbol(symbol)) {
             doFixMathFunction(symbol, bluePrintCPP);
         } else if (getSuccessor() != null) {
-            getSuccessor().handleFixMathFunction(symbol, bluePrintCPP);
+            ((BaseMathFunctionFixerHandler) getSuccessor()).handleFixMathFunction(symbol, bluePrintCPP);
         } else {
             Log.info(symbol.getTextualRepresentation(), "Symbol:");
             Log.debug(getRole(), "Case not handled!");
         }
     }
 
+    public void chainHandleFixMathFunction(MathExpressionSymbol symbol, BluePrintCPP bluePrintCPP) {
+        ((BaseMathFunctionFixerHandler) getChainStart()).handleFixMathFunction(symbol, bluePrintCPP);
+    }
+
 }

src/main/java/de/monticore/lang/monticar/generator/cpp/MathFunctionFixer.java

@@ -112,7 +112,7 @@ public class MathFunctionFixer extends BaseMathFunctionFixerHandler {
     }
 
     public static void fixMathFunctions(MathExpressionSymbol mathExpressionSymbol, BluePrintCPP bluePrintCPP) {
-        getInstance().doFixMathFunction(mathExpressionSymbol, bluePrintCPP);
+        getInstance().chainHandleFixMathFunction(mathExpressionSymbol, bluePrintCPP);
     }
 
     public static void fixMathFunctions(MathPreOperatorExpressionSymbol mathExpressionSymbol, BluePrintCPP bluePrintCPP) {

src/main/java/de/monticore/lang/monticar/generator/cpp/converter/BaseExecuteMethodGeneratorHandler.java

@@ -17,12 +17,12 @@ public abstract class BaseExecuteMethodGeneratorHandler extends BaseChainOfRespo
 
     protected abstract String doGenerateExecuteCode(MathExpressionSymbol symbol, List<String> includeStrings);
 
-    public String handleGenerateExecuteCode(MathExpressionSymbol symbol, List<String> includeStrings) {
+    private String handleGenerateExecuteCode(MathExpressionSymbol symbol, List<String> includeStrings) {
         String result = "";
         if (canHandleSymbol(symbol)) {
             result = doGenerateExecuteCode(symbol, includeStrings);
         } else if (getSuccessor() != null) {
-            result = getSuccessor().handleGenerateExecuteCode(symbol, includeStrings);
+            result = ((BaseExecuteMethodGeneratorHandler) getSuccessor()).handleGenerateExecuteCode(symbol, includeStrings);
         } else {
             Log.info(symbol.getTextualRepresentation(), "Symbol:");
             Log.debug(getRole(), "Case not handled!");
@@ -30,4 +30,8 @@ public abstract class BaseExecuteMethodGeneratorHandler extends BaseChainOfRespo
         return result;
     }
 
+    public String chainHandleGenerateExecuteCode(MathExpressionSymbol symbol, List<String> includeStrings) {
+        return ((BaseExecuteMethodGeneratorHandler) getChainStart()).handleGenerateExecuteCode(symbol, includeStrings);
+    }
+
 }

src/main/java/de/monticore/lang/monticar/generator/cpp/converter/ExecuteMethodGenerator.java

@@ -101,7 +101,7 @@ public class ExecuteMethodGenerator extends BaseExecuteMethodGeneratorHandler {
     }
 
     public static String generateExecuteCode(MathExpressionSymbol mathExpressionSymbol, List<String> includeStrings) {
-        return getInstance().handleGenerateExecuteCode(mathExpressionSymbol, includeStrings);
+        return getInstance().chainHandleGenerateExecuteCode(mathExpressionSymbol, includeStrings);
     }
 
     /**

src/main/java/de/monticore/lang/monticar/pattern/BaseChainOfResponsibility.java

@@ -7,14 +7,28 @@ package de.monticore.lang.monticar.pattern;
  */
 public abstract class BaseChainOfResponsibility<T> {
 
-    private T successor = null;
+    private BaseChainOfResponsibility<T> predecessor = null;
 
-    public T getSuccessor() {
+    private BaseChainOfResponsibility<T> successor = null;
+
+    public BaseChainOfResponsibility<T> getSuccessor() {
         return successor;
     }
 
-    public void setSuccessor(T successor) {
+    protected BaseChainOfResponsibility<T> getPredecessor() {
+        return predecessor;
+    }
+
+    public void setSuccessor(BaseChainOfResponsibility<T> successor) {
         this.successor = successor;
+        successor.predecessor = this;
+    }
+
+    protected BaseChainOfResponsibility<T> getChainStart() {
+        if (predecessor == null)
+            return this;
+        else
+            return predecessor.getChainStart();
     }
 
     public abstract String getRole();