Changeset bb0dee in git

Timestamp:

Feb 25, 2015, 5:56:55 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

35058d42beb8679a99a513c3c1a33a98be61d591

Parents:

d080fa0e344c37082afc24da1889088d17305646

Message:

code cleanup: interpreter

Location:

Singular

Files:

• iparith.cc (modified) (1 diff)
• ipshell.cc (modified) (1 diff)
• links/ssiLink.cc (modified) (1 diff)
• subexpr.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -7983 +7983 @@
       {
         //Print("test %s %s\n",Tok2Cmdname(dA2[i].arg1),Tok2Cmdname(dA2[i].arg2));
-        if ((ai=iiTestConvert(at,dA2[i].arg1))!=0)
+        if ((ai=iiTestConvert(at,dA2[i].arg1,dConvertTypes))!=0)
         {
-          if ((bi=iiTestConvert(bt,dA2[i].arg2))!=0)
+          if ((bi=iiTestConvert(bt,dA2[i].arg2,dConvertTypes))!=0)
           {
             res->rtyp=dA2[i].res;

Singular/ipshell.cc

@@ -1247 +1247 @@
   {
     omFree(t);
-    Werror("last arg is not a proc",i);
+    Werror("last arg (%d) is not a proc",i);
     return TRUE;
   }

Singular/links/ssiLink.cc

@@ -1888 +1888 @@
 **/
 /*---------------------------------------------------------------------*/
-void sig_chld_hdl(int sig)
+void sig_chld_hdl(int)
 {
   pid_t kidpid;

Singular/subexpr.cc

@@ -986 +986 @@
   int t=rtyp;
   void *d=data;
-  if (t==IDHDL) t=IDTYP((idhdl)data);
+  if (t==IDHDL) t=IDTYP((idhdl)d);
   else if (t==ALIAS_CMD)
   { idhdl h=(idhdl)IDDATA((idhdl)data); t=IDTYP(h);d=IDDATA(h); }
@@ -1029 +1029 @@
       {
         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 (rtyp==IDHDL) l=IDLIST((idhdl)d);
+        else             l=(lists)d;
         if ((0<e->start)&&(e->start<=l->nr+1))
         {