Changeset 14236

Timestamp:

Nov 29, 2019 4:36:18 PM (12 days ago)

Author:

Jonathan Kämpe

Message:

#1753 Refactoring

Location:

branches/dev-jk-2733/Compiler/ModelicaCBackEnd/src/jastadd/CCodeGen

Files:

• CCodeGenBlocks.jrag (modified) (1 diff)
• CGenerator.jrag (modified) (2 diffs)

branches/dev-jk-2733/Compiler/ModelicaCBackEnd/src/jastadd/CCodeGen/CCodeGenBlocks.jrag

@@ -27 +27 @@
     public CodePrinter AbstractEquationBlock.blockPrinter() {
         return new CPrettyPrinter(this);
+    }
+
+    public void FClass.generateEquationBlocks_C(CodePrinter p, CodeStream str, String indent, String functionName) {
+        Collection<AbstractEquationBlock> blocks;
+        if (p.inInitialSystem()) {
+            blocks = myOptions().getBooleanOption("generate_ode") ?
+                getDAEInitBLT().getAllBlocks() : Collections.<AbstractEquationBlock>emptySet();
+        } else {
+            blocks = !onlyInitBLT() && myOptions().getBooleanOption("generate_ode") ?
+                getDAEStructuredBLT().getAllBlocks() : Collections.<AbstractEquationBlock>emptySet();
+        }
+        generateEquationBlocks_C(p, str, indent, functionName, blocks);
+    }
+    
+    public void FClass.generateEquationBlocks_C(CodePrinter p, CodeStream str, String indent, String functionName,
+            Collection<AbstractEquationBlock> blocks) {
+        final String next = p.indent(indent);
+        
+        CodeSplitter<AbstractEquationBlock> cs = new CodeSplitter<AbstractEquationBlock>(p, str, next, true, functionName, myOptions()) {
+            @Override
+            public void genDecl(AbstractEquationBlock element) {
+                element.genVarDecls(p, str, indent);
+            }
+            @Override
+            public void genPre(AbstractEquationBlock element) {
+                element.genReinitTempInits_C(p, str, indent);
+            }
+            @Override
+            public void gen(AbstractEquationBlock element) {
+                element.genSolvedInBLT(p, str, indent);
+            }
+            @Override
+            public void genPost(AbstractEquationBlock element) {
+                //element.genReinitWritebacks_C(p, indent, str);
+            }
+        };
+        
+        cs.add(blocks);
+        
+        cs.genFuncImpls();
+        
+        cs.genFuncHeads();
+        
+        str.print("int " + functionName + "_base(jmi_t* jmi) {\n");
+        cs.printStatusDecl();
+        if (!p.inInitialSystem() && onlyInitBLT()) {
+            str.print(next + "ef = model_ode_initialize(jmi);\n");
+        } else {
+            cs.genFuncCalls();
+        }
+        cs.printStatusReturn();
+        str.print("}\n");
     }
 

branches/dev-jk-2733/Compiler/ModelicaCBackEnd/src/jastadd/CCodeGen/CGenerator.jrag

@@ -707 +707 @@
             CodePrinter p = ASTNode.printer_C;
             String indent = "";
-            String next = p.indent(indent);
-            
-            CodeSplitter<AbstractEquationBlock> cs = new CodeSplitter<AbstractEquationBlock>(p, str, next, true,
-                    "model_ode_derivatives", fclass.myOptions()) {
-                @Override
-                public void genDecl(AbstractEquationBlock element) {
-                    element.genVarDecls(p, str, indent);
-                }
-                @Override
-                public void genPre(AbstractEquationBlock element) {
-                    element.genReinitTempInits_C(p, str, indent);
-                }
-                @Override
-                public void gen(AbstractEquationBlock element) {
-                    element.genSolvedInBLT(p, str, indent);
-                }
-                @Override
-                public void genPost(AbstractEquationBlock element) {
-                    //element.genReinitWritebacks_C(p, indent, str);
-                }
-            };
-            
-            if (!fclass.onlyInitBLT() && fclass.myOptions().getBooleanOption("generate_ode")) {
-                cs.add(fclass.getDAEStructuredBLT().getAllBlocks());
-            }
-            
-            cs.genFuncImpls();
-            
-            cs.genFuncHeads();
-            
-            str.print("int model_ode_derivatives_base(jmi_t* jmi) {\n");
-            cs.printStatusDecl();
-            if (fclass.onlyInitBLT()) {
-                str.print(next + "ef = model_ode_initialize(jmi);\n");
-            } else {
-                cs.genFuncCalls();
-            }
-            cs.printStatusReturn();
-            str.print("}\n");
+            fclass.generateEquationBlocks_C(p, str, indent, "model_ode_derivatives");
         }
     }
@@ -762 +724 @@
 
         public void generate(CodeStream str) {
-            
             CodePrinter p = ASTNode.printer_C.initialSystemPrinter();
             String indent = "";
-            String next = p.indent(indent);
-            
-            CodeSplitter<AbstractEquationBlock> cs = new CodeSplitter<AbstractEquationBlock>(p, str, next, true,
-                    "model_ode_initialize", fclass.myOptions()) {
-                @Override
-                public void genDecl(AbstractEquationBlock element) {
-                    element.genVarDecls(p, str, indent);
-                }
-                @Override
-                public void genPre(AbstractEquationBlock element) {
-                    element.genReinitTempInits_C(p, str, indent);
-                }
-                @Override
-                public void gen(AbstractEquationBlock element) {
-                    element.genSolvedInBLT(p, str, indent);
-                }
-                @Override
-                public void genPost(AbstractEquationBlock element) {
-                    //element.genReinitWritebacks_C(p, indent, str);
-                }
-            };
-            
-            if (fclass.myOptions().getBooleanOption("generate_ode")) {
-                cs.add(fclass.getDAEInitBLT());
-            }
-            
-            cs.genFuncImpls();
-            
-            cs.genFuncHeads();
-            
-            str.print("int model_ode_initialize_base(jmi_t* jmi) {\n");
-            cs.printStatusDecl();
-            cs.genFuncCalls();
-            cs.printStatusReturn();
-            str.print("}\n");
+            fclass.generateEquationBlocks_C(p, str, indent, "model_ode_initialize");
         }
     }