Changeset 98123a in git

Timestamp:

Sep 12, 2016, 6:48:06 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6de4f47c2595122ae8162280a8ac90eefcfce27c

Parents:

da4b3223efff0b797045aad67f6bce7fe3596550

Message:

system("sort",<list>)

Location:

Singular

Files:

• extra.cc (modified) (1 diff)
• iparith.cc (modified) (4 diffs)

Singular/extra.cc

@@ -3805 +3805 @@
     else
 #endif
+/*==================== sort =================*/
+    if(strcmp(sys_cmd,"sort")==0)
+    {
+      extern BOOLEAN jjSORTLIST(leftv,leftv);
+      if (h->Typ()==LIST_CMD)
+        return jjSORTLIST(res,h);
+      else
+        return TRUE;
+    }
+    else
 /*==================== Error =================*/
       Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );

Singular/iparith.cc

@@ -8204 +8204 @@
         //Print("test %s\n",Tok2Cmdname(dA1[i].arg));
         if ((dA1[i].valid_for & NO_CONVERSION)==0)
-        {
+        {
           if ((ai=iiTestConvert(at,dA1[i].arg,dConvertTypes))!=0)
           {
@@ -8387 +8387 @@
       {
         if ((dA3[i].valid_for & NO_CONVERSION)==0)
-        {
+        {
           if ((ai=iiTestConvert(at,dA3[i].arg1,dConvertTypes))!=0)
           {
@@ -9152 +9152 @@
         tmp.Copy(v);
         bo=iiExprArith2TabIntern(&res_l->m[i],&c->m[i],CHINREM_CMD,&tmp,TRUE,dArith2+tab_pos,c->m[i].rtyp,tmp.rtyp,dConvertTypes);
-        tmp.CleanUp();
+        tmp.CleanUp();
         if (bo) { Werror("chinrem failed for list entry %d",i+1); break;}
       }
@@ -9313 +9313 @@
   return bo;
 }
+// --------------------------------------------------------------------
+static int jjCOMPARE_ALL(const void * aa, const void * bb)
+{
+  leftv a=(leftv)aa;
+  int at=a->Typ();
+  leftv b=(leftv)bb;
+  int bt=b->Typ();;
+  if (at < bt) return -1;
+  if (at > bt) return 1;
+  int tab_pos=iiTabIndex(dArithTab2,JJTAB2LEN,'<');
+  sleftv tmp;
+  memset(&tmp,0,sizeof(sleftv));
+  iiOp='<';
+  BOOLEAN bo=iiExprArith2TabIntern(&tmp,a,'<',b,FALSE,dArith2+tab_pos,at,bt,dConvertTypes);
+  if (bo)
+  {
+    Werror(" no `<` for %s",Tok2Cmdname(at));
+    return -1;
+  }
+  else if (tmp.data==NULL) /* not < */
+  {
+    iiOp=EQUAL_EQUAL;
+    tab_pos=iiTabIndex(dArithTab2,JJTAB2LEN,EQUAL_EQUAL);
+    bo=iiExprArith2TabIntern(&tmp,a,EQUAL_EQUAL,b,FALSE,dArith2+tab_pos,at,bt,dConvertTypes);
+    if (bo)
+    {
+      Werror(" no `==` for %s",Tok2Cmdname(at));
+      return -1;
+    }
+    else if (tmp.data==NULL) /* not <,== */ return 1;
+    else return 0;
+  }
+  else return -1;
+}
+BOOLEAN jjSORTLIST(leftv, leftv arg)
+{
+  lists l=(lists)arg->Data();
+  if (l->nr>0)
+  {
+    qsort(l->m,l->nr+1,sizeof(sleftv),jjCOMPARE_ALL);
+  }
+  return FALSE;
+}