- Make string escaping also handle Windows-style newlines

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12132 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/Template/AbsynDumpTpl.mo

@@ -791,8 +791,9 @@ public function escapedString
 "Because list() requires escape-sequences to be in the AST, we need to be
 able to unescape them in some places of the code."
   input String unescapedString;
+  input Boolean unescapeNewline;
   output String escapedString;
-  external "C" escapedString=System_escapedString(unescapedString) annotation(Library = "omcruntime");
+  external "C" escapedString=System_escapedString(unescapedString,unescapeNewline) annotation(Library = "omcruntime");
 end escapedString;
 
 public function unescapedString

Compiler/Util/System.mo

@@ -2043,7 +2043,7 @@ public function escapeModelicaStringToCString
   output String cString;
 algorithm
   // C cannot handle newline in string constants
-  cString := System.stringReplace(System.escapedString(modelicaString), "\n", "\\n");
+  cString := System.escapedString(modelicaString,true);
 end escapeModelicaStringToCString;
 
 public function escapeModelicaStringToXmlString

Compiler/Util/Util.mo

@@ -579,9 +579,9 @@ extern void* System_regex(const char* str, const char* re, int maxn, int extende
   return res;
 }
 
-extern char* System_escapedString(char* str)
+extern char* System_escapedString(char* str, int nl)
 {
-  char *res = SystemImpl__escapedString(str);
+  char *res = SystemImpl__escapedString(str,nl);
   if (res == NULL) return str;
   return res;
 }

Compiler/runtime/System_omc.cpp

@@ -1910,7 +1910,7 @@ RML_END_LABEL
 
 RML_BEGIN_LABEL(System__escapedString)
 {
-  char *str = SystemImpl__escapedString(RML_STRINGDATA(rmlA0));
+  char *str = SystemImpl__escapedString(RML_STRINGDATA(rmlA0),RML_UNTAGFIXNUM(rmlA1));
   if (str == NULL) {
     RML_TAILCALLK(rmlSC);
   } else {

Compiler/runtime/System_rml.c

@@ -1168,7 +1168,7 @@ extern char* SystemImpl__unescapedString(const char* str)
   return res;
 }
 
-extern int SystemImpl__escapedStringLength(const char* str)
+extern int SystemImpl__escapedStringLength(const char* str, int nl)
 {
   int i=0;
   while (*str) {
@@ -1179,20 +1179,25 @@ extern int SystemImpl__escapedStringLength(const char* str)
       case '\b':
       case '\f':
       case '\v': i++;
+      case '\r': i++; if (nl && str[1] == '\n') str++;
+      case '\n': i++; if (nl && str[1] == '\r') str++;
       default: i++;
     }
     str++;
   }
   return i;
 }
 
-extern char* SystemImpl__escapedString(const char* str)
+/* "\b",_ => "\\b"
+ * "\n",true => "\\n"
+ */
+extern char* SystemImpl__escapedString(const char* str, int nl)
 {
   int len1,len2;
   char *res;
   int i=0;
   len1 = strlen(str);
-  len2 = SystemImpl__escapedStringLength(str);
+  len2 = SystemImpl__escapedStringLength(str,nl);
   if (len1 == len2) return NULL;
   res = (char*) malloc(len2+1);
   while (*str) {
@@ -1203,6 +1208,8 @@ extern char* SystemImpl__escapedString(const char* str)
       case '\b': res[i++] = '\\'; res[i++] = 'b'; break;
       case '\f': res[i++] = '\\'; res[i++] = 'f'; break;
       case '\v': res[i++] = '\\'; res[i++] = 'v'; break;
+      case '\r': if (nl) {res[i++] = '\\'; res[i++] = 'n'; if (str[1] == '\n') str++;} else {res[i++] = *str;} break;
+      case '\n': if (nl) {res[i++] = '\\'; res[i++] = 'n'; if (str[1] == '\r') str++;} else {res[i++] = *str;} break;
       default: res[i++] = *str;
     }
     str++;

Compiler/runtime/systemimpl.c

@@ -409,7 +409,7 @@ template globalDataVarInfoArray(String _name, list<SimVar> items, Integer offset
   case items then
     <<
     const struct VAR_INFO <%_name%>[<%listLength(items)%>] = {
-      <%items |> var as SIMVAR(source=SOURCE(info=info as INFO(__))) => '{<%System.tmpTick()%>,"<%escapedString(crefStr(var.name))%>","<%Util.escapeModelicaStringToCString(var.comment)%>",{<%infoArgs(info)%>}}'; separator=",\n"%>
+      <%items |> var as SIMVAR(source=SOURCE(info=info as INFO(__))) => '{<%System.tmpTick()%>,"<%escapedString(crefStr(var.name),true)%>","<%Util.escapeModelicaStringToCString(var.comment)%>",{<%infoArgs(info)%>}}'; separator=",\n"%>
     };
     <%items |> var as SIMVAR(source=SOURCE(info=info as INFO(__))) hasindex i0 => '#define <%cref(var.name)%>__varInfo <%_name%>[<%i0%>]'; separator="\n"%>
     >>

Compiler/susan_codegen/SimCode/CodegenC.tpl

@@ -746,6 +746,7 @@ end Expression;
 package System
   function escapedString
     input String unescapedString;
+    input Boolean escapeNewline;
     output String escapedString;
   end escapedString;
 end System;

Compiler/susan_codegen/SimCode/ExpressionDumpTV.mo

@@ -10,7 +10,7 @@ match exp
   case ICONST(__) then integer
   case RCONST(__) then real
   case SCONST(__) then 
-    let str = escapedString(string)
+    let str = escapedString(string,false)
     '<%stringDelimiter%><%str%><%stringDelimiter%>'
   case BCONST(__) then bool
   case ENUM_LITERAL(__) then AbsynDumpTpl.dumpPath(name)

Compiler/susan_codegen/SimCode/ExpressionDumpTpl.tpl

@@ -702,6 +702,7 @@ package System
 
   function escapedString
     input String unescapedString;
+    input Boolean unescapeNewline;
     output String escapedString;
   end escapedString;