Changeset 9d864a in git
- Timestamp:
- Nov 18, 2013, 7:03:55 PM (10 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- 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
- Location:
- Singular
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/grammar.cc
r5a097e r9d864a 3645 3645 if (basePack!=(yyvsp[(2) - (2)].lv).req_packhdl) 3646 3646 { 3647 if(iiExport(&(yyvsp[(2) - (2)].lv),0,currPack Hdl)) YYERROR;3647 if(iiExport(&(yyvsp[(2) - (2)].lv),0,currPack)) YYERROR; 3648 3648 } 3649 3649 else -
Singular/grammar.y
r5a097e r9d864a 1174 1174 if (basePack!=$2.req_packhdl) 1175 1175 { 1176 if(iiExport(&$2,0,currPack Hdl)) YYERROR;1176 if(iiExport(&$2,0,currPack)) YYERROR; 1177 1177 } 1178 1178 else -
Singular/iparith.cc
r5a097e r9d864a 2066 2066 { 2067 2067 //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)); 2069 2069 } 2070 2070 static BOOLEAN jjERROR(leftv, leftv u) -
Singular/ipshell.cc
r5a097e r9d864a 1331 1331 } 1332 1332 1333 BOOLEAN iiInternalExport (leftv v, int toLev, idhdl roothdl)1333 BOOLEAN iiInternalExport (leftv v, int toLev, package rootpack) 1334 1334 { 1335 1335 idhdl h=(idhdl)v->data; … … 1341 1341 package frompack=v->req_packhdl; 1342 1342 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());1345 1343 if ((RingDependend(IDTYP(h))) 1346 1344 || ((IDTYP(h)==LIST_CMD) … … 1381 1379 BOOLEAN iiExport (leftv v, int toLev) 1382 1380 { 1383 #ifndef NDEBUG1384 checkall();1385 #endif1386 1381 BOOLEAN nok=FALSE; 1387 1382 leftv r=v; … … 1404 1399 } 1405 1400 r->CleanUp(); 1406 #ifndef NDEBUG1407 checkall();1408 #endif1409 1401 return nok; 1410 1402 } 1411 1403 1412 1404 /*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); 1405 BOOLEAN iiExport (leftv v, int toLev, package pack) 1406 { 1420 1407 BOOLEAN nok=FALSE; 1421 1408 leftv rv=v; … … 1454 1441 } 1455 1442 //Print("iiExport: pack=%s\n",IDID(root)); 1456 if(iiInternalExport(v, toLev, root))1443 if(iiInternalExport(v, toLev, pack)) 1457 1444 { 1458 1445 rv->CleanUp(); … … 1463 1450 } 1464 1451 rv->CleanUp(); 1465 #ifndef NDEBUG1466 checkall();1467 #endif1468 1452 return nok; 1469 1453 } -
Singular/ipshell.h
r5a097e r9d864a 57 57 BOOLEAN iiWRITE(leftv res,leftv exprlist); 58 58 BOOLEAN iiExport(leftv v, int toLev); 59 BOOLEAN iiExport(leftv v, int toLev, idhdl roothdl);60 BOOLEAN iiInternalExport (leftv v, int toLev, idhdl roothdl);59 BOOLEAN iiExport(leftv v, int toLev, package pack); 60 BOOLEAN iiInternalExport (leftv v, int toLev, package pack); 61 61 char * iiGetLibName(procinfov v); 62 62 char * iiGetLibProcBuffer( procinfov pi, int part=1 );
Note: See TracChangeset
for help on using the changeset viewer.