Changeset 54 for trunk/orca/error.c

Timestamp:

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

Author:

krobillard

Message:

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

Files:

• trunk/orca/error.c (modified) (6 diffs)

trunk/orca/error.c

@@ -68 +68 @@
                 OBlock* vblk = orBlockPtr( ctx.vblkN );
                 val = vblk->values + wrd;
-                if( val->type == OT_OBJECT )
+                if( orIs(val, OT_OBJECT) )
                 {
                     ctx = val->ctx;
                     blk = 0;
                 }
-                else if( val->type == OT_BLOCK )
+                else if( orIs(val, OT_BLOCK) )
                 {
                     orGlobalCtx( ctx );
@@ -111 +111 @@
 void orDisarmNative( OValue* a1 )
 {
-    if( a1->type == OT_ERROR )
+    if( orIs(a1, OT_ERROR) )
     {
         OValue* val;
@@ -119 +119 @@
                             OT_WORD, orEnv->atom_error,
                             OR_LPATH_END );
-        if( val && (val->type == OT_OBJECT) )
+        if( val && orIs(val, OT_OBJECT) )
         {
             int errType;
@@ -155 +155 @@
                                  OR_LPATH_END );
             ++val;
-            if( tval && tval->type == OT_BLOCK )
+            if( tval && orIs(tval, OT_BLOCK) )
             {
                 OBlock* blk = orBLOCK(tval);
@@ -165 +165 @@
             }
             orSetTF( val, OT_INTEGER );
-            val->integer = errType;
+            orInt(val) = errType;
 end_type:
 
@@ -171 +171 @@
             ++val;
             orSetTF( val, OT_INTEGER );
-            val->integer = a1->error.msg;
+            orInt(val) = a1->error.msg;
             */