Changeset 13800 for branches/dev-5819/Compiler/ModelicaCBackEnd/src/jastadd/CCodeGen/CCodeGenExternalCeval.jrag

Timestamp:

Oct 22, 2019 11:31:16 AM (6 weeks ago)

Author:

randersson

Message:

#5819 Merged trunk into branch

Location:

branches/dev-5819

Files:

• . (modified) (1 prop)
• Compiler/ModelicaCBackEnd/src/jastadd/CCodeGen/CCodeGenExternalCeval.jrag (modified) (3 diffs)

branches/dev-5819/Compiler/ModelicaCBackEnd/src/jastadd/CCodeGen/CCodeGenExternalCeval.jrag

@@ -248 +248 @@
         Collection<ExternalArgument> res = new LinkedHashSet<>();
         if (hasReturnVar()) {
-            res.add(getReturnVar().externalArgument());
-        }
+            res.add(returnVarToSerialize());
+        }
+        res.addAll(argVarsToSerialize());
+        return res;
+    }
+    
+    syn ExternalArgument FExternalStmt.returnVarToSerialize() = getReturnVar().externalArgument();
+    syn Collection<ExternalArgument> FExternalStmt.argVarsToSerialize() {
+        Collection<ExternalArgument> res = new LinkedHashSet<>();
         for (FExp e : getArgs()) {
             res.add(e.externalArgument());
@@ -288 +295 @@
         }
         return functionArgs;
+    }
+    
+
+    syn String FType.cMappedTypeString() = cMappedTypeStringScalar() + (isArray() ? "v" : "");
+
+    syn String FType.cMappedTypeStringScalar() {
+        throw new InternalCompilerError("cMappedTypeStringScalar() is not supported for class type " + getClass().getSimpleName());
+    }
+    eq FArrayType.cMappedTypeStringScalar() = getFPrimitiveType().cMappedTypeStringScalar();
+    eq FIntegerType.cMappedTypeStringScalar() = "i";
+    eq FEnumType.cMappedTypeStringScalar() = "i";
+    eq FBooleanType.cMappedTypeStringScalar() = "i";
+    eq FRealType.cMappedTypeStringScalar() = "d";
+    eq FStringType.cMappedTypeStringScalar() = "s";
+    eq FRecordType.cMappedTypeStringScalar() {
+        String o = "R[";
+        for (FRecordComponentType rType: getComponents()) {
+                o = o.concat(rType.getFType().cMappedTypeStringScalar());
+                o = o.concat(",");
+        }
+        return o.concat("]");
+    }
+    
+    syn String FExternalStmt.functionReturnArgSerialized() {
+        if (hasReturnVar()) {
+            return returnVarToSerialize().type().cMappedTypeString();
+        } else {
+            return "void";
+        }
+    }
+    
+    syn String FExternalStmt.functionArgsSerialized() {
+        String input = "";
+        for (ExternalArgument var : argVarsToSerialize()) {
+            if (var.isOutput()) {
+               input = input.concat("*");
+            }
+            input += var.type().cMappedTypeString() + ",";
+        }
+        return input;
     }
     
@@ -347 +394 @@
             }
         }
+    }
+    
+    public String FClass.externalCTypes() {
+        StringBuilder sb = new StringBuilder();
+        for (FExternalStmt stmt : myExternals()) {
+            if (stmt.dynamicEvaluatorEnabled()) {
+                sb.append(stmt.getName());
+                sb.append("\n");
+                sb.append(stmt.functionReturnArgSerialized());
+                sb.append("\n");
+                sb.append(stmt.functionArgsSerialized());
+                sb.append("\n");
+            }
+        }
+        return sb.toString();
     }