From 0e6351523ba28def719fe44f1c994764ea57ac02 Mon Sep 17 00:00:00 2001 From: tavmem Date: Thu, 10 Aug 2017 23:43:44 -0400 Subject: [PATCH] suppress display on amend --- src/kc.c | 3 +-- src/kx.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kc.c b/src/kc.c index 69509167..8e329a62 100644 --- a/src/kc.c +++ b/src/kc.c @@ -291,8 +291,7 @@ I line(FILE*f, S*a, I*n, PDA*p) { //just starting or just executed: *a=*n=*p=0, if(o&&k)O("Elapsed: %.7f\n",d); #endif - //if(o && fam)show(k); cd(k); fam=1; //fam checking suppressed to fix issue #433 - if(o)show(k); cd(k); fam=1; + if(o && fam)show(k); cd(k); fam=1; cleanup: if(fCheck && (strlen(s)==0 || s[strlen(s)-1]<0)) exit(0); S ptr=0; diff --git a/src/kx.c b/src/kx.c index 86c42761..50adc11a 100644 --- a/src/kx.c +++ b/src/kx.c @@ -669,6 +669,7 @@ Z V ex_(V a, I r)//Expand wd()->7-0 types, expand and evaluate brackets K ex(K a) { //Input is (usually, but not always) 7-0 type from wd() U(a); if(a->t==7 && kVC(a)>(K)DT_SIZE && 7==kVC(a)->t && 6==kVC(a)->n)fwh=1; + if(a->t==7 && kI(kK(a)[CODE])[1]==0x3c) fam=0; K z=ex_(&a,0); cd(a); if(fer==1)fer=fer1=0; fwh=stk=stk1=prj=prj2=fsf=0; if(prnt)cd(prnt); prnt=0; @@ -687,7 +688,7 @@ Z K ex0(V*v,K k,I r) //r: {0,1,2} -> {code, (code), [code]} { CS(0, for(i=-1;i0 && strcmp(errmsg,"undescribed")) R t2; + t2=ex2(v+2+i,k); if(fer>0 && strcmp(errmsg,"undescribed")) R t2; //these cannot be placed into single function call b/c order of eval is unspecified t3=ex_(v[1],1); if(t3>(K)DT_SIZE && t3->t==7 && t3->n==3) {