name:: final

Author: HenryHRich

jsrc/j.h

@@ -1606,7 +1606,7 @@ if(likely(z<3)){_zzt+=z; z=(I)&oneone; _zzt=_i&3?_zzt:(I*)z; z=_i&2?(I)_zzt:z; z
 #endif
 #define REPSGN(x) ((x)>>(BW-1))  // replicate sign bit of x to entire word (assuming x is signed type - if unsigned, just move sign to bit 0)
 #define SGNTO0(x) ((UI)(x)>>(BW-1))  // move sign bit to bit 0, clear other bits
-#define SGNTO0I4(x) ((UI4)(x)>>(32-1))  // move sign bit to bit 0, clear other bits
+#define SGNTO0US(x) ((US)(x)>>(16-1))  // move sign bit to bit 0, clear other bits
 // In the original JE many verbs returned a clone of the input, i. e. R ca(w).  We have changed these to avoid the clone, but we preserve the memory in case we need to go back
 #define RCA(w)          R w
 #define RE(exp)         {if(unlikely(((exp),jt->jerr!=0)))R 0;}

jsrc/ja.h

@@ -769,6 +769,7 @@
 #define ovs0(x0,x1,x2,x3)           jtovs0(jt,(x0),(x1),(x2),(x3))
 #define pad(x,y,z)                  jtpad(jt,(x),(y),(z))
 #define parse(x)                    jtparse(jt,(x))
+#define parseforexec(x)             jtparse((J)((I)jt|JTFROMEXEC),(x))
 #define parsea(x,y)                 jtparsea(jt,(x),(y))
 #define parsex(x0,x1,x2,x3)         jtparsex(jt,(x0),(x1),(x2),(x3))
 #define partfscan(x0,x1,x2,x3,x4,x5)  jtpartfscan(jt,(x0),(x1),(x2),(x3),(x4),(x5))

jsrc/jtype.h

@@ -76,6 +76,9 @@ typedef AD *A;
 #define JTINPLACEW      (((I)1)<<JTINPLACEWX)
 #define JTINPLACEAX     1   // turn this on in jt to indicate that a can be inplaced.  Must be 1+JTINPLACEWX
 #define JTINPLACEA      (((I)1)<<JTINPLACEAX)
+// following bit used as arg to parse
+#define JTFROMEXECX    0   // parser call from ". - makes some features unavailable
+#define JTFROMEXEC      (((I)1)<<JTFROMEXECX)
 // following bit used as arg to jtfolk
 #define JTFOLKNOHFNX    2   // set to get the generic fork that does not expect the hfn in localuse
 #define JTFOLKNOHFN      (((I)1)<<JTFOLKNOHFNX)
@@ -1044,12 +1047,13 @@ typedef struct {DX re;DX im;} ZX;
 /* im - imaginary part                                                     */
 
 
-// parser stack - this MUST have size equal a power of 2!!
+// parser stack - should be a qword for fast copying
 typedef struct {
   // Because the parse decode looks mostly at pt, make that the first thing so that it is always aligned to the beginning
   // of whatever block is usd to copy one stack element to another.
  UI4 pt;  // parser type: code for one of the 9 variants recognized.
- UI4 t;  // token number for this block
+ S filler;
+ US t;  // token number for this block - 16 bits of token.  After assignment, set to -1 if final assignment
  A a;  // pointer to block
 } PSTK;