===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/ox.sm1,v
retrieving revision 1.49
retrieving revision 1.54
diff -u -p -r1.49 -r1.54
--- OpenXM/src/kan96xx/Doc/ox.sm1	2006/02/02 05:15:45	1.49
+++ OpenXM/src/kan96xx/Doc/ox.sm1	2006/03/03 00:43:02	1.54
@@ -1,4 +1,4 @@
-%%%%%%%%%%%  $OpenXM: OpenXM/src/kan96xx/Doc/ox.sm1,v 1.48 2006/02/02 04:16:49 takayama Exp $
+%%%%%%%%%%%  $OpenXM: OpenXM/src/kan96xx/Doc/ox.sm1,v 1.53 2006/02/25 09:11:10 takayama Exp $
 
 /ox.sm1.myname (ox-new.sm1) def
 
@@ -1847,7 +1847,9 @@ oxasir.verbose {
 
 [[(lines),[10,-1]],
  [(where),[(shell), (length)]],
- [(reason_of_error), (invalid argument)]]
+ [(reason_of_error), (invalid argument)],
+ [(asir_where),[[(toplevel),10],[(string),(foo),3],[(string),(hoge),-1]]
+]
 /i1 set
 %% /translateErrorForCfep.sampleInput  set
 
@@ -1858,19 +1860,27 @@ oxasir.verbose {
 ] putUsages
 /translateErrorForCfep {
   /arg1 set
-  [/ee /ans /tt /lf] pushVariables
+  [/ee /ans /tt /lf /i /nn /ee.orig /tt2] pushVariables
   [
    /ee arg1 def
    {
     ee etag 257 eq {
-      ee (body) dc 1 get /ee set
+      ee (body) dc 1 get /ee set  ee /ee.orig set
       ee length 3 gt {
         ee 3 get /ee set
-      }{ /ee [ ] def } ifelse
+        ee [[(reason_of_error) ee.orig 2 get toString ]] join /ee set
+      }{ 
+        %% nn should be 2, [serial, common error no, short message]
+        ee length /nn set
+        nn 0 gt {
+          /ee [(reason_of_error) ee nn 1 sub get toString ] def
+        } {  /ee [ ] def } ifelse
+      } ifelse
     }{ } ifelse
     ee etag 6 eq not { /ans [ ] def exit } { } ifelse
     /ans [ ] def
-    /lf 12 (string) dc def  % line feed.  it is not necessary. 
+    /lf 12 (string) dc def  % line feed.
+    ans [(Begin) nl lf] join /ans set
 
     ee (lines) getNode  /tt set
     tt tag 0 eq { 
@@ -1879,19 +1889,24 @@ oxasir.verbose {
     tt isArray {
       tt length 0 gt { 
          ans
-         [(gotoLine, ) tt 0 get toString  nl] join /ans set
+         [(gotoLine, ) tt 0 get toString  nl lf] join /ans set
       }{ } ifelse
     } { } ifelse
     tt isInteger {
-      [(gotoLine, ) tt toString  nl] join /ans set
+      [(gotoLine, ) tt toString  nl lf] join /ans set
     } { } ifelse
 
     ee (where) getNode  /tt set
     tt isArray {
       tt length 0 gt { 
          ans
-         [(findAndSelect, ) tt 0 get (string) dc  nl] join /ans set
+         [(findAndSelect, ) tt 0 get (string) dc  nl lf] join /ans set
       }{ } ifelse
+      1 1, tt length 1 sub {
+        /i set
+         ans
+         [(findAndShow, ) tt i get (string) dc  nl lf] join /ans set
+      } for
     } { } ifelse
 
     ee (reason_of_error) getNode  /tt set
@@ -1899,12 +1914,39 @@ oxasir.verbose {
       ee (reason_of_parse_error) getNode /tt set
     } { } ifelse
     tt tag 0 eq not {
-      ans [(printErrorMessage, ) tt (string) dc  nl] join /ans set
-                            %% translation and encoding is necessary.
+      ans [(printErrorMessage, ) 
+           tt (string) dc localizedString  % for translation.
+           nl lf] join /ans set
     }{ } ifelse
 
+%% Keyword from asir.  [(asir_where) [[(toplevel),3],[(string),(foo),3],[(filename),(func),4]]]
+    ee (asir_where) getNode  /tt set
+    tt (toplevel) getNode /tt2 set
+    tt2 isInteger, tt2 tag 15 eq, or {
+      ans [(gotoLine, ) tt2 toString  nl lf] join /ans set
+    } { } ifelse
+    tt isArray {
+      0 1 tt length 1 sub {
+         /i set
+        tt i get /tt2 set
+        tt2 (string) getNode tag 0 eq { }
+        {  
+           tt2 length 2 gt {
+              tt2 2 get /tt2 set
+              tt2 isInteger, tt2 tag 15 eq, or {
+                tt2 toString .. /tt2 set
+                tt2 (-1).. gt, tt2 (4294967295).. lt, and { 
+                  ans [(gotoLine, ) tt2 toString  nl lf] join /ans set
+                } { } ifelse
+              } { } ifelse
+           }{ } ifelse
+        } ifelse
+      } for 
+    }{ } ifelse
+
     exit
    } loop
+   ans [(End) nl lf] join /ans set
    ans cat /arg1 set
   ] pop
   popVariables