Changeset 98 for NEWT0/trunk

Timestamp:

04/12/07 20:49:40 (20 months ago)

Author:

matthiasm

Message:

Added flag that allows indenting and newlines when printing an object with NewtPrintObject. Set NEWT_INDENT to any positive number and that number of tab's will be used per indent. Set NEWT_INDENT to a negative number and spaces will be used for indenting. The default behavior of NewtPrintObject is not changed. The recommended value for NEWT_INDENT is 1 for a good result in any decent text editor. This is great for analysing deep object hierarchies.

Location:

NEWT0/trunk/src

Files:

• main.c (modified) (1 diff)
• newt_core/NewtPkg.c (modified) (1 diff)
• newt_core/NewtPrint.c (modified) (8 diffs)
• newt_core/incs/NewtEnv.h (modified) (2 diffs)

NEWT0/trunk/src/main.c

@@ -296 +296 @@
                 break;
 
+            case 'I':
+                NEWT_INDENT = 1;
+                break;
+
             case 'v':
                 newt_show_version();

NEWT0/trunk/src/newt_core/NewtPkg.c

@@ -658 +658 @@
 
         // the original file has this (c) message embedded
-        {   char msg[] = "Newtonｪ ToolKit Package ｩ 1992-1997, Apple Computer, Inc.";
+        {   
+#ifdef _MSC_VER
+            char msg[] = "Newton� ToolKit Package � 1992-1997, Apple Computer, Inc.";
+#else
+            char msg[] = "Newtonｪ ToolKit Package ｩ 1992-1997, Apple Computer, Inc.";
+#endif
             PkgWriteData(&pkg, pkg.header_size + pkg.var_data_size, msg, sizeof(msg));
             pkg.var_data_size += sizeof(msg);

NEWT0/trunk/src/newt_core/NewtPrint.c

@@ -30 +30 @@
 static char *       NewtCharToEscape(int c);
 
+static void         NIOPrintIndent(newtStream_t * f, int32_t level);
 static void         NIOPrintEscapeStr(newtStream_t * f, char * str, int len);
 static void         NIOPrintRef(newtStream_t * f, newtRefArg r);
@@ -103 +104 @@
 
 #pragma mark -
+
 /*------------------------------------------------------------------------*/
 /** シンボル文字列が表示可能か調べる
@@ -201 +203 @@
 
     return s;
+}
+
+
+/*------------------------------------------------------------------------*/
+/** Print a NewLine character and some spaces to indent the following text. 
+ * @param f         [in] destination stream
+ * @param depth     [in] max indent level minus current indent level
+ */
+void NIOPrintIndent(newtStream_t * f, int32_t depth)
+{
+    int32_t i, n = newt_env._indentDepth - depth;
+    NIOFputc('\n', f);
+    if (NEWT_INDENT>0) {
+        n *= NEWT_INDENT;
+        for (i=0; i<n; i++) {
+            NIOFputc('\t', f);
+        }
+    } else {
+        n *= -NEWT_INDENT;
+        for (i=0; i<n; i++) {
+            NIOFputc(' ', f);
+        }
+    }
 }
 
@@ -568 +593 @@
         if (NewtRefIsNotNIL(klass) && ! NewtRefEqual(klass, NSSYM0(array)))
         {
+            if (NEWT_INDENT) NIOPrintIndent(f, depth-1);
             NIOPrintObj2(f, klass, 0, true);
             NIOFputs(": ", f);
@@ -594 +620 @@
                 }
 
+                if (NEWT_INDENT) NIOPrintIndent(f, depth);
                 NIOPrintObj2(f, slots[i], depth, literal);
             }
+            depth++;
         }
 
+        if (NEWT_INDENT) NIOPrintIndent(f, depth);
         NIOFputs("]", f);
     }
@@ -712 +741 @@
         for (i = 0; i < len; i++)
         {
-            if (0 < i)
+            if (0 < i) {
                 NIOFputs(", ", f);
+            }
 
             if (printLength <= i)
             {
                 NIOFputs("...", f);
+                if (NEWT_INDENT) NIOPrintIndent(f, depth);
                 break;
             }
+            if (NEWT_INDENT) NIOPrintIndent(f, depth);
 
             slot = NewtGetMapIndex(obj->as.map, i, &index);
@@ -727 +759 @@
             NIOFputs(": ", f);
             NIOPrintObj2(f, slots[i], depth, literal);
+
         }
+        if (NEWT_INDENT) NIOPrintIndent(f, depth+1);
     }
 
@@ -870 +904 @@
 void NIOPrintObj(newtStream_t * f, newtRefArg r)
 {
-    NIOPrintObj2(f, r, NewtGetPrintDepth(), false);
+    int32_t depth = NewtGetPrintDepth();
+    newt_env._indentDepth = depth;
+    NIOPrintObj2(f, r, depth, false);
 }
 

NEWT0/trunk/src/newt_core/incs/NewtEnv.h

@@ -26 +26 @@
 #define NEWT_DUMPSYNTAX     (newt_env._dumpSyntax)          ///< ダンプ構文木フラグ
 #define NEWT_DUMPBC         (newt_env._dumpBC)              ///< ダンプバイトコードフラグ
+#define NEWT_INDENT         (newt_env._indent)              ///< Enable indenting when printing
 #define NEWT_POOL           (newt_env.pool)                 ///< メモリプール
 #define NEWT_SWEEP          (newt_env.sweep)                ///< SWEEPフラグ
@@ -96 +97 @@
     bool        _dumpSyntax;    ///< 構文木ダンプフラグ
     bool        _dumpBC;        ///< バイトコードダンプフラグ
+    int32_t     _indent;        ///< number of tabs for indenting a printout
+    int32_t     _indentDepth;   ///< base for calculating the indent depth
 } newt_env_t;