Changeset 13714

Timestamp:

Oct 9, 2019 2:24:19 PM (2 months ago)

Author:

Jesper Mattsson

Message:

Updated error message for variability of format argument of String, and added additional tests. (#5835)

Location:

branches/dev-mj-5835/Compiler

Files:

• ModelicaCBackEnd/test/modelica/CCodeGenTests.mo (modified) (1 diff)
• ModelicaFrontEnd/src/jastadd/errorcheck/ComplianceCheck.jadd (modified) (2 diffs)
• ModelicaFrontEnd/test/modelica/ComplianceTests.mo (modified) (1 diff)

branches/dev-mj-5835/Compiler/ModelicaCBackEnd/test/modelica/CCodeGenTests.mo

@@ -16262 +16262 @@
 end StringOperations11;
 
+
+model StringOperations12
+    type E = enumeration(Alice, Bob, Eve);
+
+    function f
+        input Integer x;
+        input E e;
+        output Real y;
+    protected
+        String s;
+    algorithm
+        s := String(x, format="7u") + 
+             String(x, format="-3d") + 
+             String(e);
+        y := x + .5;
+    end f;
+    
+    Real y = f(integer(time), if time < 1 then E.Alice else E.Eve);
+
+annotation(__JModelica(UnitTesting(tests={
+    CCodeGenTestCase(
+        name="StringOperations12",
+        description="Check that integer-typed format strings generate the correct casts",
+        template="$C_functions$",
+        generatedCode="
+void func_CCodeGenTests_StringOperations12_f_def0(jmi_real_t x_v, jmi_real_t e_v, jmi_real_t* y_o) {
+    JMI_DYNAMIC_INIT()
+    JMI_DEF(REA, y_v)
+    JMI_DEF(STR, s_v)
+    JMI_DEF_STR_STAT(tmp_1, 37)
+    JMI_INI(STR, s_v)
+    JMI_INI_STR_STAT(tmp_1)
+    snprintf(JMI_STR_END(tmp_1), JMI_STR_LEFT(tmp_1), \"%7u\", (unsigned int) x_v);
+    snprintf(JMI_STR_END(tmp_1), JMI_STR_LEFT(tmp_1), \"%-3d\", (int) x_v);
+    snprintf(JMI_STR_END(tmp_1), JMI_STR_LEFT(tmp_1), \"%-s\", E_0_e[(int) e_v]);
+    JMI_ASG(STR, s_v, tmp_1)
+    y_v = x_v + 0.5;
+    JMI_RET(GEN, y_o, y_v)
+    JMI_DYNAMIC_FREE()
+    return;
+}
+
+jmi_real_t func_CCodeGenTests_StringOperations12_f_exp0(jmi_real_t x_v, jmi_real_t e_v) {
+    JMI_DEF(REA, y_v)
+    func_CCodeGenTests_StringOperations12_f_def0(x_v, e_v, &y_v);
+    return y_v;
+}
+
+")})));
+end StringOperations12;
+
 package TestTerminate
 

branches/dev-mj-5835/Compiler/ModelicaFrontEnd/src/jastadd/errorcheck/ComplianceCheck.jadd

@@ -284 +284 @@
     public static final SimpleProblemProducer ASTNode.UNSUPPORTED_NON_FIXED_STRING_ARGUMENT =
             new SimpleErrorProducer("UNSUPPORTED_NON_FIXED_STRING_ARGUMENT", ProblemKind.COMPLIANCE, 
-                    "Argument %s of String operator is only supported as parameter expression.");
+                    "Argument %s of String operator is only supported as a fixed parameter expression.");
 
     public void FStringExp.complianceCheck(ErrorCheckType checkType) {
@@ -290 +290 @@
         if (hasFormat()) {
             getFormat().markAsStructuralParameter(checkType);
-            // TODO: need to cover functions as well
             if (!getFormat().variability().parameterOrLess())
                 UNSUPPORTED_NON_FIXED_STRING_ARGUMENT.invoke(getFormat(), "format");

branches/dev-mj-5835/Compiler/ModelicaFrontEnd/test/modelica/ComplianceTests.mo

@@ -537 +537 @@
     Integer len = if time < 0 then 4 else 3;
     Integer digits = if time < 0 then 5 else 2;
-    String s = f(time, "g");
+    String s1 = String(time, format = fmt1);
+    String s2 = String(time, format = fmt2);
+    String s3 = f(time, "g");
+    parameter String fmt1 = if selFmt1 == 1 then "u" else "g";
+    parameter String fmt2 = "f";
+    parameter Integer selFmt1(fixed = false);
+initial equation
+    selFmt1 = if len == 4 then 1 else 2;
 equation
     assert(time>2.0, String(time, significantDigits=digits, minimumLength=len, leftJustified=time<1));
     assert(time>2.0, String(time, format=String(len)+"."+String(digits)+"f"));
-    annotation(__JModelica(UnitTesting(tests={
-        ComplianceErrorTestCase(
-            name="StringOperator1",
-            description="Test compliance warnings for non fixed string operator format argument",
-            errorMessage="
-2 errors found:
-  
-Compliance error at line 7, column 31, in file 'Compiler/ModelicaFrontEnd/test/modelica/ComplianceTests.mo', UNSUPPORTED_NON_FIXED_STRING_ARGUMENT:
- Argument format of String operator is only supported as parameter expression.
-  
-Compliance error at line 15, column 42, in file 'Compiler/ModelicaFrontEnd/test/modelica/ComplianceTests.mo', UNSUPPORTED_NON_FIXED_STRING_ARGUMENT:
- Argument format of String operator is only supported as parameter expression.
-   ")})));
+annotation(__JModelica(UnitTesting(tests={
+    ComplianceErrorTestCase(
+        name="StringOperator1",
+        description="Test compliance warnings for non fixed string operator format argument",
+        errorMessage="
+
+
+Compliance error at line 7, column 31, in file '...', UNSUPPORTED_NON_FIXED_STRING_ARGUMENT:
+  Argument format of String operator is only supported as a fixed parameter expression.
+
+Compliance error at line 15, column 5, in file '...':
+  Parameters with fixed=false can not be used as structural parameters
+
+Compliance error at line 22, column 42, in file '...', UNSUPPORTED_NON_FIXED_STRING_ARGUMENT:
+  Argument format of String operator is only supported as a fixed parameter expression.
+")})));
 end StringOperator1;