Changeset 297 for trunk/orca

Timestamp:

10/10/06 15:47:19 (2 years ago)

Author:

krobillard

Message:

Orca - Added /return refinement to 'quit.

Location:

trunk/orca

Files:

• boot.c (modified) (1 diff)
• boot.r (modified) (1 diff)
• console.c (modified) (2 diffs)
• ovalue.c (modified) (1 diff)

trunk/orca/boot.c

@@ -309 +309 @@
   "recycle: native [/off /on]\n"
   "halt: native []\n"
-  "quit: native []\n"
+  "quit: native [/return code]\n"
   "protect: native [\n"
   "    value [word! block!]\n"

trunk/orca/boot.r

@@ -415 +415 @@
 
     halt: native []
-    quit: native []
+    quit: native [/return code]
 
     protect: native [

trunk/orca/console.c

@@ -76 +76 @@
         if( orErrorThrown )
         {
-            if( ! orErrorIsType(OR_ERROR_QUIT) )
+            if( orErrorIsType(OR_ERROR_QUIT) )
+            {
+                ret = orErrorThrown->error.msg;
+            }
+            else
             {
                 if( ! orErrorIsType(OR_ERROR_HALT) )
@@ -118 +122 @@
                 {
                     if( orErrorIsType(OR_ERROR_QUIT) )
+                    {
+                        ret = orErrorThrown->error.msg;
                         break;
+                    }
                     if( ! orErrorIsType(OR_ERROR_HALT) )
                         orPrintNative( orErrorThrown );

trunk/orca/ovalue.c

@@ -1841 +1841 @@
 OR_NATIVE( orQuitNative )
 {
+#define REF_QUIT_RETURN  a1
+    OValue* a2 = a1 + 1;
+    int code = 0;
+
+    if( orRefineSet(REF_QUIT_RETURN) )
+    {
+        if( orIs(a2, OT_INTEGER) )
+            code = orInt(a2);
+        else if( orIs(a2, OT_LOGIC) )
+            code = orLogic(a2) ? 0 : -1;
+    }
+
     orSetError( a1, OR_ERROR_QUIT );
 
-    a1->error.msg     = 0;
+    a1->error.msg     = code;
     a1->error.block   = 0;
     a1->error.nearVal = 0;