Detect type pun when fixing name~

Author: HenryHRich

jsrc/af.c

@@ -124,12 +124,14 @@ static A jtfixa(J jt,A a,A w){A f,g,h,wf,x,y,z=w;V*v;fauxblock(fauxself); A aa;
  case CVDOT:
   R REFIXA(ai,JT(jt,implocref)[1]);
  case CTILDE:
-  if(f&&NAME&AT(f)){
+  if(f&&NAME&AT(f)){  // f is the name in name~
    RZ(y=sfn(0,f));
    if(all1(eps(box(y),(A)IAV0(aa)[1])))R w;  // break out of loop if recursive name lookup
    ASSERT(AN((A)IAV0(aa)[1])<248,EVLIMIT);  // error if too many names in expansion
    // recursion check finished.  Now replace the name with its value
    if(x=symbrdlock(f)){   // locked returns a ref to the same name
+    // since the name is supposed to be executable, we have to guard against a type pun on the name
+    ASSERT(PARTOFSPEECHEQACV(AT(w),AT(x)),EVDOMAIN);   // make sure its part of speech has not changed since the name was parsed
     if(unlikely(AFLAG(x)&AFRO))R w;  // If name has readonly value (like cocurrent), leave it as a reference
     // if this is an implicit locative, we have to switch the environment before we recur on the name for subsequent lookups
     // The value we get from the lookup must be interpreted in the environment of the higher level

jsrc/jtype.h

@@ -565,7 +565,7 @@ typedef I SI;
 #define TYPESGT(x,y)    ((UI)(x)>(UI)(y)) // type x > type y
 
 #define PARTOFSPEECHEQ(x,y) (((((x)|(LPAR&-((x)&NOUN)))^((y)|(LPAR&-((y)&NOUN))))&LPAR+CONJ+VERB+ADV)==0)  // using LPAR to hold NOUN status, verify parts-of-speech the same
-#define PARTOFSPEECHEQACV(x,y) ((((x)^(y))&CONJ+VERB+ADV)==0)  // verify known-nonnoun parts-of-speech the same
+#define PARTOFSPEECHEQACV(x,y) ((((x)^(y))&CONJ+VERB+ADV)==0)  // verify known-nonnoun parts-of-speech the same - enough is either value known to be ACV
 
 // Utility: keep the lowest 1 only
 #define LOWESTBIT(x)    ((x)&-(x))

test/g310r.ijs

@@ -275,6 +275,11 @@ assert. 101 -: 100 [&.c 0
 )
 f ''
 
+NB. verify puns detected when replacing implicit locatives
+'domain error' -:  ". etx '1 {{ 0 + v. }} 2 ]3'
+'domain error' -:  ". etx '+ {{ 0 + v. }} 2 ]3'
+_3 -:+ {{ 0 + v. }} - ]3
+
 4!:55 ;:'a aa q a_z_ c_z_ d_yyy_ d_xxx_ g_z_ j j_xxx_ dou F f F1 f1 F2 f2 G g G1 g1 G2 g2 nameinxxx_xxx_ nln nm nn sum v'
 (271828) 18!:55 ;:'xxx yyy'