Changeset 46 for trunk/orca

Timestamp:

02/13/06 17:46:20 (3 years ago)

Author:

krobillard

Message:

Cleaned up parse code a bit.

Location:

trunk/orca

Files:

• ovalue.h (modified) (1 diff)
• parse.c (modified) (20 diffs)
• tests/run_test (modified) (1 diff)

trunk/orca/ovalue.h

@@ -485 +485 @@
 
 #define orType(val)     (val)->type
-#define orInteger(val)  (val)->integer
+#define orAtom(val)     (val)->word.atom
+#define orInt(val)      (val)->integer
 #define orLogic(val)    (val)->integer
 #define orDecimal(val)  (val)->num.decimal

trunk/orca/parse.c

@@ -24 +24 @@
 
 
+#define OR_ATOM_OPT     orEnv->atom_opt
+#define OR_ATOM_SOME    orEnv->atom_some
+#define OR_ATOM_ANY     orEnv->atom_any
+#define OR_ATOM_BREAK   orEnv->atom_break
+#define OR_ATOM_SKIP    orEnv->atom_skip
+#define OR_ATOM_SET     orEnv->atom_set
+#define OR_ATOM_COPY    orEnv->atom_copy
+#define OR_ATOM_BAR     orEnv->atom_bar
+#define OR_ATOM_TO      orEnv->atom_to
+#define OR_ATOM_THRU    orEnv->atom_thru
+
+
 extern int orMatchString( const OString* strA, int iA,
                           const OString* strB, int iB );
@@ -37 +49 @@
     while( it != end )
     {
-        if( (it->type == OT_WORD) &&
-            (it->word.atom == orEnv->atom_bar) )
+        if( orIs(it, OT_WORD) && (orAtom(it) == OR_ATOM_BAR) )
         {
             return it + 1;
@@ -85 +96 @@
         {
             case OT_WORD:
-                if( rit->word.atom == orEnv->atom_opt )
+                if( orAtom(rit) == OR_ATOM_OPT )
                 {
                     const OValue* r2 = rit + 1;
@@ -97 +108 @@
                     rit += 2;
                 }
-                else if( rit->word.atom == orEnv->atom_any )
+                else if( orAtom(rit) == OR_ATOM_ANY )
                 {
                     //until [not eval-pstr second it]
@@ -107 +118 @@
                         return 0;
 
-                    if( r2->type == OT_WORD )
+                    if( orIs(r2, OT_WORD) )
                     {
                         OBlock* ctxBlk;
@@ -113 +124 @@
                     }
 
-                    if( r2->type == OT_BITSET )
+                    if( orIs(r2, OT_BITSET) )
                     {
                         const uint8_t* it  = str->byteArray + pos;
@@ -129 +140 @@
                     }
                 }
-                else if( rit->word.atom == orEnv->atom_some )
+                else if( orAtom(rit) == OR_ATOM_SOME )
                 {
                     const OValue* found;
@@ -138 +149 @@
                         return 0;
 
-                    if( r2->type == OT_WORD )
+                    if( orIs(r2, OT_WORD) )
                     {
                         OBlock* ctxBlk;
@@ -144 +155 @@
                     }
 
-                    if( r2->type == OT_BLOCK )
+                    if( orIs(r2, OT_BLOCK) )
                     {
                         OBlock* blk2;
@@ -169 +180 @@
                         }
                     }
-                    else if( r2->type == OT_BITSET )
+                    else if( orIs(r2, OT_BITSET) )
                     {
                         const uint8_t* it  = str->byteArray + pos;
@@ -193 +204 @@
                     }
                 }
-                else if( rit->word.atom == orEnv->atom_break )
+                else if( orAtom(rit) == OR_ATOM_BREAK )
                 {
                     return rit;
                 }
-                else if( rit->word.atom == orEnv->atom_bar )
+                else if( orAtom(rit) == OR_ATOM_BAR )
                 {
                     goto complete;
                 }
-                else if( rit->word.atom == orEnv->atom_to )
+                else if( orAtom(rit) == OR_ATOM_TO )
                 {
                     int si;
@@ -224 +235 @@
                 }
                 /*
-                else if( rit->word.atom == orEnv->atom_thru )
-                {
-                }
-                else if( rit->word.atom == orEnv->atom_skip )
-                {
-                }
-                else if( rit->word.atom == orEnv->atom_set )
-                {
-                }
-                else if( rit->word.atom == orEnv->atom_copy )
+                else if( orAtom(rit) == OR_ATOM_THRU )
+                {
+                }
+                else if( orAtom(rit) == OR_ATOM_SKIP )
+                {
+                }
+                else if( orAtom(rit) == OR_ATOM_SET )
+                {
+                }
+                else if( orAtom(rit) == OR_ATOM_COPY )
                 {
                 }
@@ -244 +255 @@
                     orWordVal( rit, cblk, wval );
 
-                    if( wval->type == OT_BLOCK )
+                    if( orIs(wval, OT_BLOCK) )
                     {
                         cblk = orBLOCK( wval );
@@ -255 +266 @@
                             goto failed_eval;
                     }
-                    else if( wval->type == OT_BITSET )
+                    else if( orIs(wval, OT_BITSET) )
                     {
                         OString* bin = orSTRING( wval );
@@ -296 +307 @@
                     return 0;
 
-                if( r2->type == OT_INTEGER )
+                if( orIs(r2, OT_INTEGER) )
                 {
                     int count = 0;
-                    int maxCount = r2->integer;
+                    int maxCount = orInt(r2);
 
                     ++r2;
@@ -314 +325 @@
                     if( orErrorThrown )
                         return 0;
-                    if( (count >= rit->integer) && (count <= maxCount) )
+                    if( (count >= orInt(rit)) && (count <= maxCount) )
                         rit += 3;
                     else
@@ -323 +334 @@
 
             case OT_CHAR:
-                if( str->charArray[ pos ] == rit->integer )
+                if( str->charArray[ pos ] == orInt(rit) )
                 {
                     ++rit;
@@ -443 +454 @@
     (void) useCase;
 
+    orRefAvailErr( 2 );
     orRefPush( OT_STRING, ser->index );
 
@@ -450 +462 @@
     orRefPush( OT_BLOCK, rblkN );
 
-    if( rules->type == OT_STRING )
+    if( orIs(rules, OT_STRING) )
     {
         custom = orMakeCharset( orSTRING(rules), rules->series.it );
@@ -533 +545 @@
 {
     OValue* rules = a1 + 1;
-    if( a1->type == OT_STRING )
+    if( orIs(a1, OT_STRING) )
     {
         int all     = orRefineSet(REF_PARSE_ALL) ? 1 : 0;
         int useCase = orRefineSet(REF_PARSE_CASE) ? 1 : 0;
 
-        if( rules->type == OT_BLOCK )
+        if( orIs(rules, OT_BLOCK) )
             parseStringRules( a1, rules, all, useCase );
         else
             parseString( a1, rules, all, useCase );
     }
-    else if( a1->type == OT_BLOCK )
+    else if( orIs(a1, OT_BLOCK) )
     {
         parseBlock( a1, rules );

trunk/orca/tests/run_test

@@ -4 +4 @@
 REBOL=rebol
 #REBOL=./rebol
+#REBOL=./rebol_view_1.2.47
 
 #DIFF='diff -w --ignore-blank-lines'