Changeset 96

Timestamp:

03/19/06 16:15:13 (3 years ago)

Author:

krobillard

Message:

Implemented mold/only refinement.
Added save (as function).

Location:

trunk/orca

Files:

• boot.c (modified) (2 diffs)
• boot.r (modified) (2 diffs)
• print.c (modified) (15 diffs)

trunk/orca/boot.c

@@ -71 +71 @@
   "mold: native [\n"
   "    value\n"
+  "    /only\n"
   "]\n"
   "not: native [value]\n"
@@ -517 +518 @@
   "    [insert tail series reduce :value]\n"
   "]\n"
+  "save: func [\n"
+  "    file [file!]\n"
+  "    data\n"
+  "] [\n"
+  "    write file mold/only data\n"
+  "]\n"
   "dirize: func [path [file! string!] /local end]\n"
   "[\n"

trunk/orca/boot.r

@@ -98 +98 @@
     mold: native [
         value
-        ;/only "Omit outer braces of a block value"
-        ;/all  "Mold in serialized format"
-        ;/flat "Don't indent"
+        /only
+        ;/all
+        ;/flat
     ]
 
@@ -695 +695 @@
     ]
 
+    save: func [
+        file [file!]
+        data
+    ][
+        write file mold/only data
+    ]
+
     dirize: func [path [file! string!] /local end]
     [

trunk/orca/print.c

@@ -23 +23 @@
 #include "ovalue.h"
 #include "internal.h"
+
+
+#define MOLD_NO_BRACES      1
+
+
+static void form( OString* out, const OValue* val, int depth );
+static void mold( OString* out, const OValue* val, int depth, int flags );
+
 
 
@@ -60 +68 @@
 static void indent( OString* str, int depth )
 {
-    while( depth-- )
+    while( depth > 0 )
+    {
         append(str,"    ",4);
-}
-
-
-static void form( OString* out, const OValue* val, int depth );
-static void mold( OString* out, const OValue* val, int depth );
+        --depth;
+    }
+}
 
 
@@ -248 +255 @@
             else
                 append1( ' ', out );
-            mold( out, it + 1, 0 );
+            mold( out, it + 1, 0, 0 );
 
             orListNextNode( blk, it );
@@ -398 +405 @@
         // Mold gives us quotes around empty strings.
         // Need to check correct behavior of nested objects.
-        mold( out, it, depth );
+        mold( out, it, depth, 0 );
 
         append1( '\n', out );
@@ -429 +436 @@
             {
                 append1( ' ', out );
-                mold( out, it, 0 );
+                mold( out, it, 0, 0 );
                 ++it;
                 if( it == end )
@@ -674 +681 @@
 
 
-static void mold( OString* out, const OValue* val, int depth )
+static void mold( OString* out, const OValue* val, int depth, int mflags )
 {
     /*
@@ -928 +935 @@
                 if( vp != path->values )
                     append1( '/', out );
-                mold( out, vp, 0 );
+                mold( out, vp, 0, 0 );
             }
             if( val->type == OT_SETPATH )
@@ -947 +954 @@
             bval.index = val->func.specBlk;
             bval.series.it = 0;
-            mold( out, &bval, depth );
+            mold( out, &bval, depth, 0 );
         }
             break;
@@ -964 +971 @@
             {
                 bval.series.n = val->func.specBlk;
-                mold( out, &bval, depth );
+                mold( out, &bval, depth, 0 );
             }
             else
@@ -972 +979 @@
 
             bval.index = val->func.bodyBlk;
-            mold( out, &bval, depth );
+            mold( out, &bval, depth, 0 );
         }
             break;
@@ -987 +994 @@
             //    append1( '\n', out );
 
-            append1( (val->type == OT_BLOCK) ? '[' : '(', out );
+            if( ! (mflags & MOLD_NO_BRACES) )
+            {
+                append1( (val->type == OT_BLOCK) ? '[' : '(', out );
+                ++depth;
+            }
 
             if( vp != end )
             {
-                ++depth;
                 for( ; vp != end; ++vp )
                 {
@@ -1003 +1013 @@
                         append1( ' ', out );
                     }
-                    mold( out, vp, depth );
+                    mold( out, vp, depth, 0 );
                 }
+            }
+
+            if( ! (mflags & MOLD_NO_BRACES) )
+            {
                 --depth;
-            }
-
-            if( val->flags & OR_FLAG_BEOL )
-            {
-                append1( '\n', out );
-                indent(out, depth);
-            }
-
-            append1( (val->type == OT_BLOCK) ? ']' : ')', out );
+                if( val->flags & OR_FLAG_BEOL )
+                {
+                    append1( '\n', out );
+                    indent(out, depth);
+                }
+                append1( (val->type == OT_BLOCK) ? ']' : ')', out );
+            }
         }
             break;
@@ -1051 +1063 @@
                     orAtomStr( orAtom(it), out );
                     append( out, ": ", 2 );
-                    mold( out, vit, depth + 1 );
+                    mold( out, vit, depth + 1, 0 );
                     append1( '\n', out );
                 }
@@ -1110 +1122 @@
 void orMold( OString* out, const OValue* val )
 {
-    mold( out, val, 0 );
+    mold( out, val, 0, 0 );
     if( out->used )
     {
@@ -1134 +1146 @@
 OR_NATIVE_PUB( orMoldNative )
 {
+#define REF_MOLD_ONLY    a1+1
     OString* str = orMakeString( 0 );
-    orMold( str, a1 );
+    mold( str, a1, 0, orRefineSet(REF_MOLD_ONLY) ? MOLD_NO_BRACES : 0 );
+    if( str->used )
+    {
+        orTermCStr( str );
+    }
     orResultSTRING( orStringN(str) );
 }