[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323
Bernhard R. Link
brlink at debian.org
Tue Apr 24 15:53:19 UTC 2012
The following commit has been merged in the cleanedupstream branch:
commit 6619c3253000ebde696f6374d288043d2a85c7b4
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date: Mon Feb 20 19:43:26 2012 +0100
fix: alias in proc headers (tr. 404)
fix: alias and lists (tr. 404)
diff --git a/Singular/iplib.cc b/Singular/iplib.cc
index 072f265..f646f7a 100644
--- a/Singular/iplib.cc
+++ b/Singular/iplib.cc
@@ -147,6 +147,7 @@ char * iiProcArgs(char *e,BOOLEAN withParenth)
args_found=FALSE;
s=e; // set s to the starting point of the arg
// and search for the end
+ while(*s==' ') s++; e=s;
while ((*e!=',')
&&((par!=0) || (*e!=')'))
&&(*e!='\0'))
diff --git a/Singular/subexpr.cc b/Singular/subexpr.cc
index bba1b6d..e59f274 100644
--- a/Singular/subexpr.cc
+++ b/Singular/subexpr.cc
@@ -941,6 +941,11 @@ int sleftv::Typ()
{
lists l;
if (rtyp==IDHDL) l=IDLIST((idhdl)data);
+ else if (rtyp==ALIAS_CMD)
+ {
+ idhdl h=(idhdl)data;
+ l=(lists)(((idhdl)h->data.ustring)->data.ustring);
+ }
else l=(lists)data;
if ((0<e->start)&&(e->start<=l->nr+1))
{
@@ -1225,8 +1230,13 @@ leftv sleftv::LData()
if (rtyp==LIST_CMD)
l=(lists)data;
- if ((rtyp==IDHDL)&& (IDTYP((idhdl)data)==LIST_CMD))
+ else if ((rtyp==IDHDL)&& (IDTYP((idhdl)data)==LIST_CMD))
l=IDLIST((idhdl)data);
+ else if (rtyp==ALIAS_CMD)
+ {
+ idhdl h=(idhdl)data;
+ l= (lists)(((idhdl)h->data.ustring)->data.ustring);
+ }
if (l!=NULL)
{
if ((0>=e->start)||(e->start>l->nr+1))
--
an open source computer algebra system
More information about the debian-science-commits
mailing list