mark error forwarded from pyx, and don't call eformat for it

Author: HenryHRich

jsrc/ct.c

@@ -241,7 +241,7 @@ A jtpyxval(J jt,A pyx){ UI4 state;PYXBLOK *blok=(PYXBLOK*)AAV0(pyx);
  CLRFUTEXWT;   // wait till pending wakealls complete before we allow this block to be deleted
 done:  // pyx has been filled in.  jt->futexwt must be 0
  if(likely(blok->pyxvalue!=NULL))R blok->pyxvalue; // valid value, use it
- ASSERT(0,blok->errcode); // if error, return the error code
+ ASSERTPYX(blok->errcode); // if error, return the error code, noting that it was extenally generated
 fail:
  CLRFUTEXWT;ASSERT(0,err);}
 

jsrc/d.c

@@ -338,18 +338,6 @@ R 0;
 // this routine also does the work for jtjsigd (domain error with message text), jtjsignal (old-fashioned terse display),
 // jtjsignal3 (terse display for lines known to be from an explicit definition, giving line#/column), and
 // x 13!:8 y (display text x, set error# y) 
-// Encoded as follows using upper bits of e:
-#define EMSGE 0xff  // the error-code part
-#define EMSGNOEVM 0x200  // set to suppress moving the terse message
-#define EMSGLINEISA 0x400  // line contains A block for message (otherwise it points to string if any and info has the length of the string)
-#define EMSGCXINFO 0x800  // info contains line#/col# of error
-#define EMSGSPACEAFTEREVM 0x1000 // set if terse message should be followed by a space 
-#define EMSGLINEISTERSE 0x2000 // set if line has the text for the terse message (13!:8)
-#define EMSGLINEISNAME 0x4000 // set if line has the name to use in place of jt->curname
-//   no bits set  means terse display (jsignal)
-//   bit 9 set: line=failing line, info=failing line#/column for jsignal3
-//   bit 10 set: line=A text for message (sigstr)
-//   bit 11 set: line->text as C string (sigd)
 //
 // we look at emsgstate and do as little as possible if the user isn't going to see the message
 //
@@ -375,6 +363,7 @@ A jtjsignale(J jt,I eflg,A line,I info){
      jteputlnolf(jt,msg);  // header of first line: terse string
      A nameblok=jt->curname; nameblok=eflg&EMSGLINEISNAME?line:nameblok;  // if user overrides the name, use the user's name
      if(nameblok){if(!jt->glock){eputs(": "); ep(AN(nameblok),NAV(nameblok)->s);}}  // ...followed by name of running entity
+     if(eflg&EMSGFROMPYX)eputs(" (from pyx)");   // if the message came from a pyx, mark it as such
      eputc(eflg&EMSGSPACEAFTEREVM?' ':CLF);  // ... that's the first line, unless user wants added text on the same line
      if(!jt->glock){  // suppress detail if locked
       if((line!=0) && !(eflg&EMSGLINEISTERSE) && !(jt->emsgstate&EMSGSTATENOLINE)){  // if there is a user line, and its display not suppressed
@@ -397,6 +386,8 @@ A jtjsignale(J jt,I eflg,A line,I info){
     jt->etxn1=jt->etxn;  // save length of finished message
    }
   }
+  // if this error was forwarded from a pyx, we can't eformat it - we have no self/arguments.  Set that we have tried formatting already to suppress further formatting
+  if(eflg&EMSGFROMPYX)jt->emsgstate|=EMSGSTATEFORMATTED;
 // obsolete    jt->curname=0;  // clear the name always
  R 0;
 }

jsrc/j.h

@@ -709,6 +709,20 @@ struct jtimespec jmtfclk(void); //'fast clock'; maybe less inaccurate; intended
 #define NTSTACK         (1LL<<(AUDITEXECRESULTS?24:14))          // number of BYTES in an allocated block of tstack - pointers to allocated blocks - allocation is bigger to leave this many bytes on boundary
 #define NTSTACKBLOCK    2048            // boundary for beginning of stack block
 
+// flags for jteformat
+#define EMSGE 0xff  // the error-code part
+#define EMSGNOEVM 0x200  // set to suppress moving the terse message
+#define EMSGLINEISA 0x400  // line contains A block for message (otherwise it points to string if any and info has the length of the string)
+#define EMSGCXINFO 0x800  // info contains line#/col# of error
+#define EMSGSPACEAFTEREVM 0x1000 // set if terse message should be followed by a space 
+#define EMSGLINEISTERSE 0x2000 // set if line has the text for the terse message (13!:8)
+#define EMSGLINEISNAME 0x4000 // set if line has the name to use in place of jt->curname
+#define EMSGFROMPYX 0x8000  // set if this error is being copied from a pyx (it can't be analyzed, and it should be marked specially
+//   no bits set  means terse display (jsignal)
+//   bit 9 set: line=failing line, info=failing line#/column for jsignal3
+//   bit 10 set: line=A text for message (sigstr)
+//   bit 11 set: line->text as C string (sigd)
+
 #ifndef PYXES
 #define PYXES 1
 #endif
@@ -819,8 +833,9 @@ struct jtimespec jmtfclk(void); //'fast clock'; maybe less inaccurate; intended
 // #define ASSERT(b,e)     {if(unlikely(!(b))){fprintf(stderr,"error code: %i : file %s line %d\n",(int)(e),__FILE__,__LINE__); jsignal(e); R 0;}}
 #define ASSERTD(b,s)    {if(unlikely(!(b))){jsigd((s)); R 0;}}
 #define ASSERTMTV(w)    {ARGCHK1(w); ASSERT(1==AR(w),EVRANK); ASSERT(!AN(w),EVLENGTH);}
-#define ASSERTN(b,e,nm) {if(unlikely(!(b))){jtjsignale(jt,e|0x4000,(nm),0); R 0;}}  // signal error, overriding the running name with a different one
-#define ASSERTNGOTO(b,e,nm,lbl) {if(unlikely(!(b))){jtjsignale(jt,e|0x4000,(nm),0); goto lbl;}}  // same, but without the exit
+#define ASSERTN(b,e,nm) {if(unlikely(!(b))){jtjsignale(jt,e|EMSGLINEISNAME,(nm),0); R 0;}}  // signal error, overriding the running name with a different one
+#define ASSERTNGOTO(b,e,nm,lbl) {if(unlikely(!(b))){jtjsignale(jt,e|EMSGLINEISNAME,(nm),0); goto lbl;}}  // same, but without the exit
+#define ASSERTPYX(e)   {jsignal((e)|EMSGFROMPYX); R 0;}
 #define ASSERTSYS(b,s)  {if(unlikely(!(b))){fprintf(stderr,"system error: %s : file %s line %d\n",s,__FILE__,__LINE__); jsignal(EVSYSTEM); jtwri(JJTOJ(jt),MTYOSYS,"",(I)strlen(s),s); R 0;}}
 #define ASSERTSYSV(b,s)  {if(unlikely(!(b))){fprintf(stderr,"system error: %s : file %s line %d\n",s,__FILE__,__LINE__); jsignal(EVSYSTEM); jtwri(JJTOJ(jt),MTYOSYS,"",(I)strlen(s),s);}}
 #define ASSERTW(b,e)    {if(unlikely(!(b))){if((e)<=NEVM)jsignal(e); else jt->jerr=(e); R;}}

jsrc/v0.c

@@ -226,7 +226,7 @@ static F1(jtrfc){A r,w1;I m=0,n,t;
  n=AN(w); t=AT(w);  // n=#coeffs, t=type
  if(n){
   ASSERT(ISDENSETYPE(t,NUMERIC),EVDOMAIN);  // coeffs must be dense numeric
-  RZ(r=jico2(ne(w,num(0)),num(1))); m=AV(r)[0]; m=(m==n)?0:m;  // r=block for index of last nonzero; m=degree of polynomial (but 0 if all zeros)
+  RZ(r=jico2(ne(w,num(0)),num(1))); RZ(r=mkwris(r)) m=AV(r)[0]; m=(m==n)?0:m;  // r=block for index of last nonzero; m=degree of polynomial (but 0 if all zeros)
   ASSERT(m||equ(num(0),head(w)),EVDOMAIN);  // error if unsolvable constant polynomial
  }
  // switch based on degree of polynomial

test/gtdot.ijs

@@ -237,7 +237,8 @@ wthr N
 amv =. 16 T. 0  NB. AMV with value 0
 (>: i. 3000) -: /:~ ; amv f t. ''"0 ] 3 $ 1000
 
-
+'|ill-formed name (from pyx)' -: LF taketo  (>@[ 9!:59@0) :: ((13!:12)@(0$0) )  13!:8 t. 'worker' 4  NB. pyx error is so flagged
+'|ill-formed name (from pyx)' -: LF taketo  (>@[ 9!:59@0) :: ((13!:12)@(0$0) )  13!:8 t. '' 4  NB. pyx error is so flagged
 
 'domain error' -: ". etx '0 t. ($0)'
 'domain error' -: ". etx '+ t. 1.5'