commit 4daab9a3add3ddf5c7d49f3a60f9e1e32e5eb42f
author Zesstra <zesstra@zesstra.de> Wed Nov 06 22:38:18 2019 +0100
committer Zesstra <zesstra@zesstra.de> Tue Nov 26 20:03:09 2019 +0100
tree f53de3b3576c8f579a6cbaecf3fe33e9f861d4f3
parent 5ce9117cffce819fd246190017c17636c1c54e8d

Sonderzeichenliterale durch Escapesequenzen ersetzt

Das MGtool wandelt einige Zeichen in eine Art eigene
Escapesequenzen um, welche mit einem ° eingeleitet
werden. Diese wurden jetzt im Code als Escapesequenzen
zur Kodierung des Zeichens in UTF-8 geschrieben.

Change-Id: Ieb7cc906ca7619984d4e0a62edd0362e25e60e98

obj/tools/MGtool.c

diff --git a/obj/tools/MGtool.c b/obj/tools/MGtool.c
index 2699960..c67989b 100644
--- a/obj/tools/MGtool.c
+++ b/obj/tools/MGtool.c
@@ -156,9 +156,9 @@
     return NULL;
   TK("XFindObj: str: "+(str?str:"(NULL)"));
   env=ENV(cloner);
-  str=string_replace(str, "\\.","°01");
-  str=string_replace(str, "\\^", "°02");
-  str=string_replace(str, "\\$", "°03");
+  str=string_replace(str, "\\.","\u00B0" "01");
+  str=string_replace(str, "\\^", "\u00B0" "02");
+  str=string_replace(str, "\\$", "\u00B0" "03");
   str=string_replace(str, "\\\\", "\\");
   if (find_object(str)) return find_object(str);
   if (file_size(str)>1) {
@@ -187,15 +187,15 @@
   
   if (!stringp(str) || !sizeof(str) || !objectp(env))
     return NULL;
-  str=string_replace(str, "°01", ".");
+  str=string_replace(str, "\u00B0" "01", ".");
   while(str[e++]=='^')
     ;
   str=str[--e..<1];
-  str=string_replace(str, "°02", "^");
+  str=string_replace(str, "\u00B0" "02", "^");
   if(obj=VarToObj(str))
     ;
   else if(str[0]=='')
-    str=string_replace(str, "°03", "$");
+    str=string_replace(str, "\u00B0" "03", "$");
   else if(sscanf(str, "%d", num)&&(inv=all_inventory(env)))
   {
     if(num>0&&num<=sizeof(inv))
@@ -1419,13 +1419,13 @@
   string *tmp,*tmp2;
   int i, i2, len, len2, qd, qs;
 
-  str=string_replace(str,"\\\\","°BSHL");
-  str=string_replace(str,"\\\"","°DBLQ");
-  str=string_replace(str,"\\\'","°SGLQ");
-  str=string_replace(str,"\\|","°PIPE");
-  str=string_replace(str,"||","°OROR");
-  str=string_replace(str,"->","°LARR");
-  str=string_replace(str,"\\$","°DOLR");
+  str=string_replace(str,"\\\\","\u00B0""BSHL");
+  str=string_replace(str,"\\\"","\u00B0""DBLQ");
+  str=string_replace(str,"\\\'","\u00B0""SGLQ");
+  str=string_replace(str,"\\|","\u00B0""PIPE");
+  str=string_replace(str,"||","\u00B0""OROR");
+  str=string_replace(str,"->","\u00B0""LARR");
+  str=string_replace(str,"\\$","\u00B0""DOLR");
   tmp=regexplode(str,"(\"|')");
   len=sizeof(tmp);
   qd=qs=0;
@@ -1464,15 +1464,15 @@
 
 static string UnquoteLine(string str)
 {
-  str=string_replace(str,"°BSHL","\\");
-  str=string_replace(str,"°DBLQ","\"");
-  str=string_replace(str,"°SGLQ","\'");
-  str=string_replace(str,"°DQUO","");
-  str=string_replace(str,"°SQUO","");
-  str=string_replace(str,"°PIPE","|");
-  str=string_replace(str,"°OROR","||");
-  str=string_replace(str,"°LARR","->");
-  str=string_replace(str,"°DOLR","$");
+  str=string_replace(str,"\u00B0""BSHL","\\");
+  str=string_replace(str,"\u00B0""DBLQ","\"");
+  str=string_replace(str,"\u00B0""SGLQ","\'");
+  str=string_replace(str,"\u00B0""DQUO","");
+  str=string_replace(str,"\u00B0""SQUO","");
+  str=string_replace(str,"\u00B0""PIPE","|");
+  str=string_replace(str,"\u00B0""OROR","||");
+  str=string_replace(str,"\u00B0""LARR","->");
+  str=string_replace(str,"\u00B0""DOLR","$");
   TK("UnquoteLine: str: "+str);
   return str;
 }