Changeset 139 for NEWT0/trunk

Timestamp:

02/20/09 06:17:39 (3 years ago)

Author:

matthiasm

Message:

Printing a symbol with a vertical bar inside needs to escpae the bars (Newton Scrip Programming Language, Page 2-12.

File:

• NEWT0/trunk/src/newt_core/NewtPrint.c (modified) (6 diffs)

NEWT0/trunk/src/newt_core/NewtPrint.c

@@ -33 +33 @@
 
 static void         NIOPrintIndent(newtStream_t * f, int32_t level);
-static void         NIOPrintEscapeStr(newtStream_t * f, char * str, int len);
+static void         NIOPrintEscapeStr(newtStream_t * f, char * str, int len, char bar);
 static void         NIOPrintRef(newtStream_t * f, newtRefArg r);
 static void         NIOPrintSpecial(newtStream_t * f, newtRefArg r);
@@ -217 +217 @@
 
 /*------------------------------------------------------------------------*/
+/** Convert a bunch characters into their escaped variant.
+ *  This is required when printing symbols containing vertical bars.
+ *
+ * @param c         [in] unicode character
+ *
+ * @return          ASCII string or NULL
+ */
+
+char * NewtCharAndBarToEscape(int c)
+{   
+    if (c=='|') {
+        return "\\|";
+    } else if (c=='\\') { 
+        return "\\\\";
+    } else {
+        return NewtCharToEscape(c);
+    }
+}
+
+
+/*------------------------------------------------------------------------*/
 /** 文字をエスケープ文字列に変換する
  *
@@ -277 +298 @@
 /** 文字列をエスケープでプリントする
  *
- * @param f         [in] 出力ファイル
+ * @param f     [in] 出力ファイル
  * @param str       [in] 文字列
  * @param len       [in] 文字列の長さ
- *
- * @return          なし
- *
- * @note            newtStream_t を使用
- */
-
-void NIOPrintEscapeStr(newtStream_t * f, char * str, int len)
+ * @param bar       [in] set to 1 to also create an escape sequence 
+ *               for the vertical bar character
+ *
+ * @return          なし
+ *
+ * @note            newtStream_t を使用
+ */
+
+void NIOPrintEscapeStr(newtStream_t * f, char * str, int len, char bar)
 {
     bool    unicode = false;
@@ -297 +320 @@
         c = str[i];
 
-        s = NewtCharToEscape(c);
+        if (bar)
+            s = NewtCharAndBarToEscape(c);
+        else
+            s = NewtCharToEscape(c);
 
         if (s != NULL)
@@ -567 +593 @@
     {
         NIOFputc('|', f);
-        NIOPrintEscapeStr(f, sym->name, len);
+        NIOPrintEscapeStr(f, sym->name, len, 1);
         NIOFputc('|', f);
     }
@@ -602 +628 @@
     {
         NIOFputc('"', f);
-        NIOPrintEscapeStr(f, s, len);
+        NIOPrintEscapeStr(f, s, len, 0);
         NIOFputc('"', f);
     }