Changeset 144 for trunk/orca/ovalue.h

Timestamp:

05/11/06 14:23:03 (3 years ago)

Author:

krobillard

Message:

Native arguments are now kept on the stack until after the call and the
result is now always put into a1.

Files:

• trunk/orca/ovalue.h (modified) (4 diffs)

trunk/orca/ovalue.h

@@ -292 +292 @@
     int (*open)( OValue* spec, OContext* ctx );
     void (*close)( OContext* );
-    void (*read)( OContext* );
+    void (*read)( OContext*, OValue* a1 );
     void (*write)( OContext*, OValue* a1 );
 }
@@ -457 +457 @@
 #define orSTRINGS       ((OString*) orEnv->strings.buf)
 #define orBLOCKS        ((OBlock*) orEnv->blocks.buf)
-#define orRESULT        (orEnv->dataStack.values + orEnv->dataStack.used)
+#define orTOS           (orEnv->dataStack.values + orEnv->dataStack.used)
 
 #define orSTRING(val)   (orSTRINGS + (val)->index)
@@ -562 +562 @@
 
 #define orResult(t,v) \
-   {OValue* _or_result = orRESULT; \
-    orSetTF(_or_result, t); \
-    _or_result->index = v;}
-
-#define orResultCopy(v) \
-    orEnv->dataStack.values[ orEnv->dataStack.used ] = v
+    orSetTF(a1, t); \
+    a1->index = v;
+
+#define orResultCopy(v)     orCopyV(a1,v)
 
 #define orResultSeries(t,w,idx) \
-   {OValue* _or_result = orRESULT; \
-    orSetTF(_or_result, t); \
-    orSetSeries(_or_result,w,idx);}
+    orSetTF(a1, t); \
+    orSetSeries(a1,w,idx)
 
 #define orResultSTRING(i)   orResultSeries(OT_STRING,i,0)
@@ -584 +581 @@
 
 #define orResultDECIMAL(v) \
-   {OValue* _or_result = orRESULT; \
-    orSetTF( _or_result, OT_DECIMAL ); \
-    _or_result->num.decimal = v;}
+    orSetTF(a1, OT_DECIMAL); \
+    a1->num.decimal = v
 
 #define OR_NATIVE(func)     static void func( OValue* a1 )