Changeset 1c28ff5 in OpenModelica for OMCompiler/Compiler/Script/CevalScriptBackend.mo

Timestamp:

2021-04-06T15:14:58+02:00 (3 years ago)

Author:

Martin Sjölund <martin@…>

Parents:

f33851b5

git-author:

Martin Sjölund <martin@…> (03/16/21 08:57:25)

git-committer:

Martin Sjölund <martin@…> (04/06/21 15:14:58)

Message:

Handle UTF8 BOM in the diff API

File:

• OMCompiler/Compiler/Script/CevalScriptBackend.mo (modified) (4 diffs)

OMCompiler/Compiler/Script/CevalScriptBackend.mo

@@ -655 +655 @@
              platform,usercflags,senddata,res,workdir,gcc,confcmd,touch_file,uname,filenameprefix,compileDir,libDir,exeDir,configDir,from,to,
              gridStr, logXStr, logYStr, x1Str, x2Str, y1Str, y2Str, curveWidthStr, curveStyleStr, legendPosition, footer, autoScaleStr,scriptFile,logFile, simflags2, outputFile,
-             systemPath, gccVersion, gd, strlinearizeTime, suffix,cname, modeldescriptionfilename, tmpDir, tmpFile;
+             systemPath, gccVersion, gd, strlinearizeTime, suffix,cname, modeldescriptionfilename, tmpDir, tmpFile, bom;
       list<DAE.Exp> simOptions;
       list<Values.Value> vals;
@@ -1098 +1098 @@
         ExecStat.execStatReset();
 
+        (s1, bom) := StringUtil.stripBOM(s1);
         (tokens1, errorTokens) := scanString(s1);
         reportErrors(errorTokens);
@@ -1121 +1122 @@
         end if;
 
-        tokens2 := scanString(s2);
+        (s2, bom) := StringUtil.stripBOM(s2);
+        (tokens2, errorTokens) := scanString(s2);
         reportErrors(errorTokens);
         ExecStat.execStat("diffModelicaFileListings scan string 2");
@@ -1186 +1188 @@
             then fail();
         end matchcontinue;
-      then (cache,Values.STRING(str));
+      then (cache,Values.STRING(bom + str));
 
     case (cache,_,"diffModelicaFileListings",_,_) then (cache,Values.STRING(""));