Skip to content

Commit

Permalink
Fixed #write and Delete Storage
Browse files Browse the repository at this point in the history
The bugfix for fortran90 (or another one) had a bad sideeffect with
  #write " (%e)",expr
in that it forced a return after the %e and the ) came on a new line....
There were problems with Delete Storage. Not enough variables were
moved.
  • Loading branch information
vermaseren authored and tueda committed Oct 30, 2013
1 parent bd1d7c6 commit 44cf65f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion sources/pre.c
Original file line number Diff line number Diff line change
Expand Up @@ -5872,7 +5872,7 @@ nodollar: MesPrint("@$-variable expected in #write instruction");
}
else if ( *fstring == 'e' || *fstring == 'E' ) {
if ( *fstring == 'E' ) nosemi = 1;
else nosemi = 0;
else nosemi = 1;
fstring++;
while ( *s == ',' || *s == ' ' || *s == '\t' ) s++;
if ( chartype[*s] != 0 && *s != '[' ) {
Expand Down
16 changes: 15 additions & 1 deletion sources/store.c
Original file line number Diff line number Diff line change
Expand Up @@ -698,10 +698,24 @@ WORD DeleteStore(WORD par)
AC.exprnames->namebuffer+e_in->name);
node->number = (WORD)(e_out - Expressions);
e_out->onfile = e_in->onfile;
e_out->prototype = e_in->prototype;
e_out->printflag = 0;
e_out->status = e_in->status;
e_out->name = e_in->name;
e_out->inmem = e_in->inmem;
e_out->counter = e_in->counter;
e_out->numfactors = e_in->numfactors;
e_out->numdummies = e_in->numdummies;
e_out->compression = e_in->compression;
e_out->namesize = e_in->namesize;
e_out->whichbuffer = e_in->whichbuffer;
e_out->hidelevel = e_in->hidelevel;
e_out->node = e_in->node;
e_out->replace = e_in->replace;
e_out->vflags = e_in->vflags;
#ifdef PARALLELCODE
e_out->partodo = e_in->partodo;
#endif
}
e_out++;
j++;
Expand Down Expand Up @@ -899,10 +913,10 @@ WORD GetTerm(PHEAD WORD *term)
if ( AR.KeptInHold ) {
r = AR.CompressBuffer;
i = *r;
AR.KeptInHold = 0;
if ( i <= 0 ) { *term = 0; goto RegRet; }
m = term;
NCOPY(m,r,i);
AR.KeptInHold = 0;
goto RegRet;
}
if ( AR.DeferFlag ) {
Expand Down

0 comments on commit 44cf65f

Please sign in to comment.