Changeset 9d864a in git


Ignore:
Timestamp:
Nov 18, 2013, 7:03:55 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
60110589ad662f73a8d1ce726f2441e594383bfd
Parents:
5a097ed0e22afe4b66b603eb41164323d4d60430
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-18 19:03:55+01:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-18 19:05:08+01:00
Message:
fix: run mod_init in the package of the library
Location:
Singular
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Singular/grammar.cc

    r5a097e r9d864a  
    36453645          if (basePack!=(yyvsp[(2) - (2)].lv).req_packhdl)
    36463646          {
    3647             if(iiExport(&(yyvsp[(2) - (2)].lv),0,currPackHdl)) YYERROR;
     3647            if(iiExport(&(yyvsp[(2) - (2)].lv),0,currPack)) YYERROR;
    36483648          }
    36493649          else
  • Singular/grammar.y

    r5a097e r9d864a  
    11741174          if (basePack!=$2.req_packhdl)
    11751175          {
    1176             if(iiExport(&$2,0,currPackHdl)) YYERROR;
     1176            if(iiExport(&$2,0,currPack)) YYERROR;
    11771177          }
    11781178          else
  • Singular/iparith.cc

    r5a097e r9d864a  
    20662066{
    20672067  //Print("exportto %s -> %s\n",v->Name(),u->Name() );
    2068   return iiExport(v,0,(idhdl)u->data);
     2068  return iiExport(v,0,IDPACKAGE((idhdl)u->data));
    20692069}
    20702070static BOOLEAN jjERROR(leftv, leftv u)
  • Singular/ipshell.cc

    r5a097e r9d864a  
    13311331}
    13321332
    1333 BOOLEAN iiInternalExport (leftv v, int toLev, idhdl roothdl)
     1333BOOLEAN iiInternalExport (leftv v, int toLev, package rootpack)
    13341334{
    13351335  idhdl h=(idhdl)v->data;
     
    13411341  package frompack=v->req_packhdl;
    13421342  if (frompack==NULL) frompack=currPack;
    1343   package rootpack = IDPACKAGE(roothdl);
    1344 //  Print("iiInternalExport('%s',%d,%s->%s) typ:%d\n", v->name, toLev, IDID(currPackHdl),IDID(roothdl),v->Typ());
    13451343  if ((RingDependend(IDTYP(h)))
    13461344  || ((IDTYP(h)==LIST_CMD)
     
    13811379BOOLEAN iiExport (leftv v, int toLev)
    13821380{
    1383 #ifndef NDEBUG
    1384   checkall();
    1385 #endif
    13861381  BOOLEAN nok=FALSE;
    13871382  leftv r=v;
     
    14041399  }
    14051400  r->CleanUp();
    1406 #ifndef NDEBUG
    1407   checkall();
    1408 #endif
    14091401  return nok;
    14101402}
    14111403
    14121404/*assume root!=idroot*/
    1413 BOOLEAN iiExport (leftv v, int toLev, idhdl root)
    1414 {
    1415 #ifndef NDEBUG
    1416   checkall();
    1417 #endif
    1418   //  Print("iiExport1: pack=%s\n",IDID(root));
    1419   package pack=IDPACKAGE(root);
     1405BOOLEAN iiExport (leftv v, int toLev, package pack)
     1406{
    14201407  BOOLEAN nok=FALSE;
    14211408  leftv rv=v;
     
    14541441      }
    14551442      //Print("iiExport: pack=%s\n",IDID(root));
    1456       if(iiInternalExport(v, toLev, root))
     1443      if(iiInternalExport(v, toLev, pack))
    14571444      {
    14581445        rv->CleanUp();
     
    14631450  }
    14641451  rv->CleanUp();
    1465 #ifndef NDEBUG
    1466   checkall();
    1467 #endif
    14681452  return nok;
    14691453}
  • Singular/ipshell.h

    r5a097e r9d864a  
    5757BOOLEAN iiWRITE(leftv res,leftv exprlist);
    5858BOOLEAN iiExport(leftv v, int toLev);
    59 BOOLEAN iiExport(leftv v, int toLev, idhdl roothdl);
    60 BOOLEAN iiInternalExport (leftv v, int toLev, idhdl roothdl);
     59BOOLEAN iiExport(leftv v, int toLev, package pack);
     60BOOLEAN iiInternalExport (leftv v, int toLev, package pack);
    6161char *  iiGetLibName(procinfov v);
    6262char *  iiGetLibProcBuffer( procinfov pi, int part=1 );
Note: See TracChangeset for help on using the changeset viewer.