Changeset 0d6d565 in git


Ignore:
Timestamp:
Feb 26, 2020, 4:18:15 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
3be95907c1d8f21621eacf23da80eaf327484264
Parents:
f4ade8dbbc90c7e928efa1a1e277351516343085
Message:
fix: use of iiCurrProc in nested proc calls
Location:
Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/iplib.cc

    rf4ade8d r0d6d565  
    391391    iiCurrArgs=NULL;
    392392  }
    393   iiCurrProc=pn;
    394393  /* start interpreter ======================================*/
    395394  myynest++;
     
    401400  else
    402401  {
     402    iiCurrProc=pn;
    403403    err=iiAllStart(pi,pi->data.s.body,BT_proc,pi->data.s.body_lineno-(v!=NULL));
     404    iiCurrProc=NULL;
    404405
    405406    if (iiLocalRing[myynest-1] != currRing)
  • Singular/ipshell.cc

    rf4ade8d r0d6d565  
    12491249    // get the proc:
    12501250    iiCurrProc=(idhdl)h->data;
    1251     procinfo * pi=IDPROC(iiCurrProc);
     1251    idhdl currProc=iiCurrProc; /*iiCurrProc may be changed after yyparse*/
     1252    procinfo * pi=IDPROC(currProc);
    12521253    // already loaded ?
    12531254    if( pi->data.s.body==NULL )
     
    12701271               pi, pi->data.s.body_lineno-(iiCurrArgs==NULL) );
    12711272    BOOLEAN err=yyparse();
     1273    iiCurrProc=NULL;
    12721274    si_opt_1=save1;
    12731275    si_opt_2=save2;
     
    12791281    if (iiCurrArgs!=NULL)
    12801282    {
    1281       if (err==0) Warn("too many arguments for %s",IDID(iiCurrProc));
     1283      if (err==0) Warn("too many arguments for %s",IDID(currProc));
    12821284      iiCurrArgs->CleanUp();
    12831285      omFreeBin((ADDRESS)iiCurrArgs, sleftv_bin);
Note: See TracChangeset for help on using the changeset viewer.