Changeset 468 for trunk/thune/console.c

Timestamp:

09/03/07 02:29:05 (15 months ago)

Author:

krobillard

Message:

Squashed commit of master.

Files:

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

trunk/thune/console.c

@@ -21 +21 @@
 #include <assert.h>
 #include <stdio.h>
-#include "env.h"
+#include "urlan.h"
 
 
@@ -113 +113 @@
 int main( int argc, char** argv )
 {
-    UrlanEnv env;
+    UrlanEnv* env;
+    UThread* ut;
     char cmd[ 2048 ];
     int fileN = 0;
@@ -119 +120 @@
 
 
-    if( ur_startup( &env, CUSTOM_DT, CUSTOM_DT_COUNT ) != UR_EVAL_OK )
-    {
-        printf( "ur_startup failed\n" );
+    env = ur_makeEnv( CUSTOM_DT, CUSTOM_DT_COUNT );
+    if( ! env )
+    {
+        printf( "ur_makeEnv failed\n" );
         return -1;
     }
 
 #ifdef THUNE_GL
-    if( gx_startup( &env ) != UR_EVAL_OK )
+    if( gx_startup( env ) != UR_EVAL_OK )
     {
         printf( "gx_startup failed\n" );
@@ -133 +135 @@
 #endif
 
-    ur_freezeEnv( env.threads, 128, 256 );
+    ur_freezeEnv( env, 128, 256 );
+    ut = ur_thread( env );
 
     if( argc > 1 )
@@ -148 +151 @@
                 {
                     case 's':
-                        ur_disable( &env, UR_ENV_SECURE );
+                        ur_disable( env, UR_ENV_SECURE );
                         break;
 
@@ -204 +207 @@
         assert( cmd[ sizeof(cmd) - 1 ] == -1 && "cmd buffer overflow" );
 
-        switch( ur_evalCStr( env.threads, cmd, pos - cmd ) )
+        switch( ur_evalCStr( ut, cmd, pos - cmd ) )
         {
             case UR_EVAL_HALT:
@@ -210 +213 @@
 
             case UR_EVAL_ERROR:
-                reportError( env.threads );
+                reportError( ut );
                 goto prompt;
         }
@@ -243 +246 @@
             else if( cmd[0] != '\n' )
             {
-                switch( ur_evalCStr( env.threads, cmd, -1 ) )
+                switch( ur_evalCStr( ut, cmd, -1 ) )
                 {
                     case UR_EVAL_OK:
@@ -250 +253 @@
                         UString str;
 
-                        val = ur_result( env.threads, 0 );
+                        val = ur_result( ut, 0 );
                         if( ur_is(val, UT_UNSET) ||
                             ur_is(val, UT_CONTEXT) ||
@@ -257 +260 @@
 
                         ur_arrayInit( &str, 1, 0 );
-                        ur_toStrT( env.threads, val, &str, 0 );
+                        ur_toStrT( ut, val, &str, 0 );
                         if( str.ptr.c )
                         {
@@ -284 +287 @@
 
                     case UR_EVAL_ERROR:
-                        reportError( env.threads );
-                        ur_threadReset( env.threads );
+                        reportError( ut );
+                        ur_threadReset( ut );
                         break;
                 }
@@ -295 +298 @@
 
 #ifdef THUNE_GL
-    gx_shutdown( &env );
-#endif
-
-    ur_shutdown( &env );
+    gx_shutdown( env );
+#endif
+
+    ur_freeEnv( env );
 
     return ret;