Changeset 27

Timestamp:

02/07/06 16:12:19 (3 years ago)

Author:

krobillard

Message:

Added orResetEnv().

Location:

trunk/orca

Files:

• console.c (modified) (3 diffs)
• ovalue.c (modified) (1 diff)
• ovalue.h (modified) (1 diff)
• qt/main.cpp (modified) (2 diffs)

trunk/orca/console.c

@@ -79 +79 @@
             if( ! orErrorIsType(OR_ERROR_QUIT) )
             {
-                orPrintNative( orErrorThrown );
-                ret = -1;
+                if( ! orErrorIsType(OR_ERROR_HALT) )
+                    orPrintNative( orErrorThrown );
+                orResetEnv( &env );
+                goto halt;
+                //ret = -1;
             }
         }
@@ -87 +90 @@
     {
         printf( "ORCA-Core %s (%s)\n", VERSION_STR, __DATE__ );
-
+halt:
         while( 1 )
         {
@@ -119 +122 @@
                     if( ! orErrorIsType(OR_ERROR_HALT) )
                         orPrintNative( orErrorThrown );
-                    orErrorClear;
+                    orResetEnv( &env );
                 }
                 else

trunk/orca/ovalue.c

@@ -523 +523 @@
     memReport( 1 );
 #endif
+}
+
+
+/**
+  Recover from an error.  It does not modify any existing values; nothing
+  is freed and no files are closed.
+  This should only be used from outside a top-level eval call.
+*/
+void orResetEnv( OEnv* env )
+{
+    env->callStack.used = 0;
+    env->dataStack.used = 0;
+    env->quickHoldsTop = env->quickHolds;
+    env->error = 0;      //orErrorClear;
 }
 

trunk/orca/ovalue.h

@@ -384 +384 @@
 void    orInitEnv( OEnv*, int dataStackSize, int callStackSize );
 void    orFreeEnv( OEnv* );
+void    orResetEnv( OEnv* );
 void    orAtomStr( OAtom, OString* );
 OAtom   orInternAtom( const char* str, int len );

trunk/orca/qt/main.cpp

@@ -60 +60 @@
                 OPEN_CONSOLE
 
-                if( orErrorIsType(OR_ERROR_HALT) )
+                if( ! orErrorIsType(OR_ERROR_HALT) )
                 {
-                    orErrorClear;
-                    // Reset stack.
-                    orEnv->dataStack.used = 0;
-                    orEnv->callStack.used = 0;
+                    orResetEnv( &env );
                     goto halt;
                 }
@@ -111 +108 @@
                     if( ! orErrorIsType(OR_ERROR_HALT) )
                         orPrintNative( orErrorThrown );
-                    orErrorClear;
+                    orResetEnv( &env );
                 }
                 else