Changeset 162 for trunk/thune/console.c

Timestamp:

05/27/06 21:22:22 (3 years ago)

Author:

krobillard

Message:

Thune -

Opcode selector is now preserved by infuse & ur_toStr().
Added ur_makeBinaryFrom() & ur_encodingCharSize[].
Command line arguments now passed to script in 'args.
Switched order of 'iter arguments.

Files:

• trunk/thune/console.c (modified) (4 diffs)

trunk/thune/console.c

@@ -92 +92 @@
     UrlanEnv env;
     char cmd[ 512 ];
-    char* file = 0;
+    int fileN = 0;
     int ret = 0;
 
@@ -121 +121 @@
             else
             {
-                file = argv[i];
+                fileN = i;
                 break;
             }
@@ -127 +127 @@
     }
 
-    if( file )
+    if( fileN )
     {
         char* pos;
-        if( argc > 2 )
+
+        pos = cmd;
+
+        if( (argc - fileN) > 1 )
         {
             int i;
-            pos = strCopy( cmd, "do/args %" );
-            pos = strCopy( pos, argv[1] );
-            *pos++ = ' ';
             *pos++ = '[';
-            for( i = 2; i < argc; ++i )
+            for( i = fileN + 1; i < argc; ++i )
             {
                 if( i > 2 )
@@ -145 +145 @@
                 *pos++ = '"';
             }
-            *pos++ = ']';
+            pos = strCopy( pos, "] :args " );
         }
         else
         {
-            /*
-            pos = strCopy( cmd, "do %" );
-            pos = strCopy( pos, argv[1] );
-            */
-
-            pos = cmd;
-            *pos++ = '"';
-            pos = strCopy( pos, argv[1] );
-            *pos++ = '"';
-            pos = strCopy( pos, " load do" );
-
-            //pos = strCopy( cmd, argv[1] );
-        }
+            pos = strCopy( pos, "none :args " );
+        }
+
+        *pos++ = '"';
+        pos = strCopy( pos, argv[fileN] );
+        *pos++ = '"';
+        pos = strCopy( pos, " load do" );
 
         switch( ur_evalCStr( &env.mainThread, cmd, pos - cmd ) )