Skip to content

Commit

Permalink
suppress display on amend
Browse files Browse the repository at this point in the history
  • Loading branch information
tavmem committed Aug 11, 2017
1 parent 041e932 commit 0e63515
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/kc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/kx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;i<n;i++) // c:9;a+b;c:1
if(-1==i||bk(v[i])){
cd(z); frg++; fam=1; x=ex1(v+1+i,0,&i,n,1); frg--;
cd(z); frg++; x=ex1(v+1+i,0,&i,n,1); frg--;
if(!frg){encp=0;
if(encf){cd(encf); encf=0;}
if(grnt){cd(grnt); grnt=0;}}
Expand Down Expand Up @@ -948,7 +949,7 @@ Z K ex2(V*v, K k) //execute words --- all returns must be Ks. v: word list, k:
while(v[1] && adverbClass(v[2+i])) i++;
//TODO: Catch 0-returned-errors here and below
if(!sva(v[0]) && (i || 2==sva(v[1]))) { //na+. or nv. case (n noun, a adverb, + means regex one+ and . means regex anything )
t2=ex2(v+2+i,k); fam=1; if(fer>0 && 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) {
Expand Down

0 comments on commit 0e63515

Please sign in to comment.