Changeset 144 for trunk/orca/files.c

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/files.c (modified) (6 diffs)

trunk/orca/files.c

@@ -26 +26 @@
 extern int orIsDir( const char* path );
 extern int orFileModified( const char* path, OValue* res );
-extern void orReadDir( const char* filename );
+extern void orReadDir( OValue*, const char* filename );
 extern void orNowNative( OValue* a1 );
 extern void orChangeDirNative( OValue* a1 );
@@ -126 +126 @@
     OString* str = orSTRING(a1);
     orTermCStr( str );
-    status = orFileModified( str->charArray + a1->series.it, orRESULT );
+    status = orFileModified( str->charArray + a1->series.it, a1 );
     if( status < 0 )
     {
@@ -248 +248 @@
 #define REF_READ_SIZE       a1+6
 
+/*
+    read: native [
+        source [file! port!]
+        /binary
+        /lines
+        /skip length [number!]
+        /part size [number!]
+    ]
+*/
 OR_NATIVE( orReadNative )
 {
@@ -257 +266 @@
 
         orTermCStr( str );
-
         fn = str->charArray + a1->series.it;
+
         n = orIsDir( fn );
         if( n < 0 )
@@ -266 +275 @@
         else if( n == 1 )
         {
-            orReadDir( fn );
+            // TODO: Hold a1 from GC (or copy fn).
+            orReadDir( a1, fn );
         }
         else
@@ -361 +371 @@
 
         assert( (devID > -1) && (devID < arr->used) );
-        ((OPortDevice**) arr->buf)[ devID ]->read( &a1->ctx );
+        ((OPortDevice**) arr->buf)[ devID ]->read( &a1->ctx, a1 );
     }
 }