Changeset 54 for trunk/orca/util

Timestamp:

02/17/06 15:30:01 (3 years ago)

Author:

krobillard

Message:

Now using orDecimal() & orInt() where appropriate.

Files:

• trunk/orca/util/cbparse.c (modified) (3 diffs)

trunk/orca/util/cbparse.c

@@ -1 +1 @@
 /*============================================================================
     ORCA - CBParser
-    Copyright (C) 2005  Karl Robillard
+    Copyright (C) 2005-2006  Karl Robillard
 
     This library is free software; you can redistribute it and/or
@@ -97 +97 @@
             //    continue;
 
-            if( vmatch->type == OT_LITWORD )
+            if( orIs(vmatch, OT_LITWORD) )
             {
-                if( (stream->type != OT_WORD) ||
-                    (vmatch->word.atom != stream->word.atom) )
+                if( (orType(stream) != OT_WORD) ||
+                    (orAtom(vmatch) != orAtom(stream)) )
                     break;
             }
-            else if( vmatch->type == OT_WORD )
+            else if( orIs(vmatch, OT_WORD) )
             {
 #if 0
@@ -111 +111 @@
                 orWordVal( vmatch, ctx, wval );
 
-                if( wval->type == OT_DATATYPE )
+                if( orIs(wval, OT_DATATYPE) )
 #else
-                if( vmatch->word.atom < OT_COUNT )
+                if( orAtom(vmatch) < OT_COUNT )
 #endif
                 {
 #if 0
-                    int dt = wval->integer;
+                    int dt = orInt(wval);
 #else
-                    int dt = vmatch->word.atom;
+                    int dt = orAtom(vmatch);
 #endif
                     if( dt == OT_NUMBER )
                     {
-                        if( (stream->type != OT_INTEGER) &&
-                            (stream->type != OT_DECIMAL) )
+                        if( (orType(stream) != OT_INTEGER) &&
+                            (orType(stream) != OT_DECIMAL) )
                             break;
                     }