Changeset d9e7af7 in OpenModelica for Compiler/Script/CevalScriptBackend.mo

Timestamp:

2016-02-03T14:22:33+01:00 (8 years ago)

Author:

Martin Sjölund <martin.sjolund@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

8d53fa9

Parents:

521a5df

Message:

Add a sanity check to the Modelica diff tool

File:

• Compiler/Script/CevalScriptBackend.mo (modified) (5 diffs)

Compiler/Script/CevalScriptBackend.mo

@@ -103 +103 @@
 import Settings;
 import SimulationResults;
+import StringUtil;
 import SymbolicJacobian;
 import TaskGraphResults;
@@ -667 +668 @@
   (outCache,outValue,outInteractiveSymbolTable) := matchcontinue (inCache,inEnv,inFunctionName,inVals,inSt,msg)
     local
-      String omdev,simflags,s1,s2,s3,str,str1,str2,str3,token,varid,cmd,executable,executable1,encoding,method_str,
+      String omdev,simflags,s1,s2,s3,s4,str,str1,str2,str3,token,varid,cmd,executable,executable1,encoding,method_str,
              outputFormat_str,initfilename,pd,executableSuffixedExe,sim_call,result_file,filename_1,filename,
              call,str_1,mp,pathstr,name,cname,errMsg,errorStr,
@@ -714 +715 @@
       GlobalScript.Statements istmts;
       list<GlobalScript.Statements> istmtss;
-      Boolean have_corba, bval, anyCode, b, b1, b2, externalWindow, logX, logY, autoScale, forceOMPlot, gcc_res, omcfound, rm_res, touch_res, uname_res,  ifcpp, ifmsvc,sort, builtin, showProtected, inputConnectors, outputConnectors;
+      Boolean have_corba, bval, anyCode, b, b1, b2, externalWindow, logX, logY, autoScale, forceOMPlot, gcc_res, omcfound, rm_res, touch_res, uname_res,  ifcpp, ifmsvc,sort, builtin, showProtected, inputConnectors, outputConnectors, sanityCheckFailed;
       FCore.Cache cache;
       list<GlobalScript.LoadedFile> lf;
@@ -876 +877 @@
         SimCodeFunctionUtil.execStat("treeDiff");
 
+        sanityCheckFailed := false;
+
+        if true then
+          // Do a sanity check
+          s3 := Dump.unparseStr(Parser.parsestring(s2));
+          s4 := Dump.unparseStr(Parser.parsestring(printActual(treeDiffs, SimpleModelicaParser.parseTreeNodeStr)));
+          if not StringUtil.equalIgnoreSpace(s3, s4) then
+            Error.addInternalError("After merging the strings, the semantics changed for some reason (will simply return s2):\n"+s3+"\n"+s4, sourceInfo());
+            sanityCheckFailed := true;
+          end if;
+        end if;
+
         /*
         diffs := diff(tokens1, tokens2, modelicaDiffTokenEq, modelicaDiffTokenWhitespace, tokenContent);
@@ -893 +906 @@
         SimCodeFunctionUtil.execStat("diffModelicaFileListings filter diff 2");
         */
-        str := matchcontinue Absyn.pathLastIdent(path)
+        str := if sanityCheckFailed then s2 else matchcontinue Absyn.pathLastIdent(path)
           case "plain" then printActual(treeDiffs, SimpleModelicaParser.parseTreeNodeStr);
           case "color" then printDiffTerminalColor(treeDiffs, SimpleModelicaParser.parseTreeNodeStr);