Changeset 9b12fce in git

Timestamp:

Jul 22, 2014, 7:16:59 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9a6f8c15b898f962115ce36f094aaa7f9dc0be1f

Parents:

39ed94e4ba176b9cdda63c31fb26f14e2627ad3c

Message:

prepare for singular 4-1: cring (currently inactive)

Files:

• Singular/Makefile.am (modified) (2 diffs)
• Singular/gentable.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (7 diffs)
• Singular/ipassign.cc (modified) (1 diff)
• Singular/ipid.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (8 diffs)
• Singular/misc_ip.cc (modified) (1 diff)
• Singular/subexpr.cc (modified) (5 diffs)
• Singular/table.h (modified) (2 diffs)
• kernel/mod2.h (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (1 diff)
• libpolys/coeffs/numbers.cc (modified) (2 diffs)

Singular/Makefile.am

@@ -48 +48 @@
    links/ndbm.cc\
    newstruct.cc\
+   number2.cc\
    pcv.cc\
    links/pipeLink.cc\
@@ -96 +97 @@
    mmalloc.h \
    mod_lib.h \
+   number2.h \
    omSingularConfig.h \
    links/ndbm.h \

Singular/gentable.cc

@@ -141 +141 @@
   //if (tok==PRINT_EXPR) return "print_expr";
   if (tok==IDHDL) return "identifier";
+  if (tok==CRING_CMD) return "ring(cf)";
   // we do not blackbox objects during table generation:
   //if (tok>MAX_TOK) return getBlackboxName(tok);

Singular/iparith.cc

@@ -127 +127 @@
 
 static BOOLEAN check_valid(const int p, const int op);
+
+#ifdef SINGULAR_4_1
+// helper routine to catch all library/test parts which need to be changed
+// shall go away after the transition
+static void iiReWrite(const char *s)
+{
+  Print("please rewrite the use of >>%s<< in >>%s<<\n"
+        "%s is depreciated or changed in Singular 4-1\n",s,my_yylinebuf,s);
+}
+#endif
 
 /*=============== types =====================*/
@@ -5094 +5104 @@
   switch (t)
   {
+    case CRING_CMD:
     case INT_CMD:
     case POLY_CMD:
@@ -5306 +5317 @@
 static BOOLEAN jjrCharStr(leftv res, leftv v)
 {
+#ifdef SINGULAR_4_1
+  iiReWrite("charstr");
+#endif
   res->data = rCharStr((ring)v->Data());
   return FALSE;
@@ -5346 +5360 @@
 static BOOLEAN jjrOrdStr(leftv res, leftv v)
 {
+#ifdef SINGULAR_4_1
+  iiReWrite("ordstr");
+#endif
   res->data = rOrdStr((ring)v->Data());
   return FALSE;
@@ -5351 +5368 @@
 static BOOLEAN jjrVarStr(leftv res, leftv v)
 {
+#ifdef SINGULAR_4_1
+  iiReWrite("varstr");
+#endif
   res->data = rVarStr((ring)v->Data());
   return FALSE;
@@ -5356 +5376 @@
 static BOOLEAN jjrParStr(leftv res, leftv v)
 {
+#ifdef SINGULAR_4_1
+  iiReWrite("varstr");
+#endif
   res->data = rParStr((ring)v->Data());
   return FALSE;
@@ -8508 +8531 @@
   //if (tok==PRINT_EXPR) return "print_expr";
   if (tok==IDHDL) return "identifier";
+  if (tok==CRING_CMD) return "ring(cf)";
   if (tok>MAX_TOK) return getBlackboxName(tok);
   for(i=0; i<sArithBase.nCmdUsed; i++)

Singular/ipassign.cc

@@ -872 +872 @@
   return FALSE;
 }
+#ifdef SINGULAR_4_1
+static BOOLEAN jiA_CRING(leftv res, leftv a, Subexpr e)
+{
+  res->data=(void *)a->CopyD(CRING_CMD);
+  jiAssignAttr(res,a);
+  return FALSE;
+}
+#endif
+
 /*=================== table =================*/
 #define IPASSIGN

Singular/ipid.cc

@@ -172 +172 @@
       return  (void *)omAlloc0(sizeof(ssyStrategy));
     //other types: without init (int,script,poly,def,package)
+    case CRING_CMD:
     case INT_CMD:
     case DEF_CMD:

Singular/ipshell.cc

@@ -455 +455 @@
   while (h!=NULL)
   {
-    if ((all && (IDTYP(h)!=PROC_CMD) &&(IDTYP(h)!=PACKAGE_CMD))
+    if ((all
+      && (IDTYP(h)!=PROC_CMD)
+      &&(IDTYP(h)!=PACKAGE_CMD)
+      && (IDTYP(h)!=CRING_CMD))
     || (typ == IDTYP(h))
+    || ((typ==RING_CMD) &&(IDTYP(h)==CRING_CMD))
     || ((IDTYP(h)==QRING_CMD) && (typ==RING_CMD)))
     {
@@ -1206 +1210 @@
   switch(pp->typ)
   {
+#ifdef SINGULAR_4_1
+      case CRING_CMD:
+        nKillChar((coeffs)pp);
+        break;
+#endif
       case INT_CMD:
         break;
@@ -1755 +1764 @@
   // ----------------------------------------
   // 0: char/ cf - ring
+#ifdef SINGULAR_4_1
+  // 0: char/ cf - ring
+  L->m[0].rtyp=CRING_CMD;
+  L->m[0].data=(char*)r->cf; r->cf->ref++;
+#else
   if (rField_is_numeric(r))
   {
@@ -1812 +1826 @@
     L->m[0].data=(void *)(long)r->cf->ch;
   }
+#endif
   // ----------------------------------------
   // 1: list (var)
@@ -2111 +2126 @@
   // ------------------------------------------------------------------
   // 0: char:
+#ifdef SINGULAR_4_1
+  if (L->m[0].Typ()==CRING_CMD)
+  {
+    R->cf=(coeffs)L->m[0].Data();
+    R->cf->ref++;
+  }
+  else
+#endif  
   if (L->m[0].Typ()==INT_CMD)
   {
@@ -5027 +5050 @@
   const int P = pn->listLength();
 
-  if (pn->Typ()==INT_CMD)
+  if ((pn->Typ()==CRING_CMD)&&(P==1))
+  {
+    cf=(coeffs)pn->CopyD();
+    assume( cf != NULL );
+  }
+  else if (pn->Typ()==INT_CMD)
   {
     int ch = (int)(long)pn->Data();
@@ -5884 +5912 @@
 {
   int t=arg->Typ();
+  char* ring_name=(char*)r->Name();
+  ring_name=omStrDup(ring_name);
   if ((t==RING_CMD) ||(t==QRING_CMD))
   {
-    char* ring_name=omStrDup(r->Name());
     sleftv tmp;
     memset(&tmp,0,sizeof(tmp));
@@ -5902 +5931 @@
       return TRUE;
   }
-  //Print("create %s\n",r->Name());
-  //Print("from %s(%d)\n",Tok2Cmdname(arg->Typ()),arg->Typ());
+  else if (t==CRING_CMD)
+  {
+    sleftv tmp;
+    sleftv n;
+    memset(&n,0,sizeof(n));
+    n.name=ring_name;
+    if (iiDeclCommand(&tmp,&n,myynest,CRING_CMD,&IDROOT)) return TRUE;
+    if (iiAssign(&tmp,arg)) return TRUE;
+    //Print("create %s\n",r->Name());
+    //Print("from %s(%d)\n",Tok2Cmdname(arg->Typ()),arg->Typ());
+    return FALSE;
+  }
   return TRUE;// not handled -> error for now
 }

Singular/misc_ip.cc

@@ -1255 +1255 @@
   feSetOptValue(FE_OPT_CPUS, cpus);
 
+#ifdef SINGULAR_4_1
+// default coeffs
+  {
+  idhdl h;
+  h=enterid(omStrDup("QQ"),0/*level*/, CRING_CMD,&(basePack->idroot),FALSE /*init*/,FALSE /*search*/);
+  IDDATA(h)=(char*)nInitChar(n_Q,NULL);
+  h=enterid(omStrDup("ZZ"),0/*level*/, CRING_CMD,&(basePack->idroot),FALSE /*init*/,FALSE /*search*/);
+  IDDATA(h)=(char*)nInitChar(n_Z,NULL);
+  //h=enterid(omStrDup("RR"),0/*level*/, CRING_CMD,&(basePack->idroot),FALSE /*init*/,FALSE /*search*/);
+  //IDDATA(h)=(char*)nInitChar(n_R,NULL);
+  //h=enterid(omStrDup("CC"),0/*level*/, CRING_CMD,&(basePack->idroot),FALSE /*init*/,FALSE /*search*/);
+  //IDDATA(h)=(char*)nInitChar(n_long_C,NULL);
+  }
+#endif  
 // loading standard.lib -----------------------------------------------
   if (! feOptValue(FE_OPT_NO_STDLIB))

Singular/subexpr.cc

@@ -40 +40 @@
 #include <Singular/subexpr.h>
 #include <Singular/blackbox.h>
+#include <Singular/number2.h>
 
 #include <stdlib.h>
@@ -108 +109 @@
     switch (t /*=Typ()*/)
       {
+#ifdef SINGULAR_4_1
+        case CRING_CMD:
+          crPrint((coeffs)d);
+          break;
+#endif
         case UNKNOWN:
         case DEF_CMD:
@@ -385 +391 @@
   switch (t)
   {
+#ifdef SINGULAR_4_1
+    case CRING_CMD:
+      {
+        coeffs cf=(coeffs)d;
+        cf->ref++;
+        return (void*)d;
+      }
+#endif
     case INTVEC_CMD:
     case INTMAT_CMD:
@@ -454 +468 @@
   switch (t)
   {
+#ifdef SINGULAR_4_1
+    case CRING_CMD:
+      nKillChar((coeffs)d);
+      break;
+#endif
     case INTVEC_CMD:
     case INTMAT_CMD:
@@ -1232 +1251 @@
           Werror("wrong range[%d,%d] in matrix %s(%dx%d)",
                   index,e->next->start,
-                  this->Name(),
+                  this->Name(),
                   MATROWS((matrix)d),MATCOLS((matrix)d));
       }

Singular/table.h

@@ -790 +790 @@
 // this table MUST be order alphabetically by its first entry:
 cmdnames cmds[] =
+// alias: 0: real name, 1: this is an alias, 2: this is an outdated alias
 {  // name-string alias tokval          toktype
   { "$INVALID$",   0, -1,                 0},
@@ -1166 +1167 @@
 ,{D(jiA_PACKAGE),  PACKAGE_CMD,    PACKAGE_CMD }
 ,{D(jiA_DEF),      DEF_CMD,        DEF_CMD }
+#ifdef SINGULAR_4_1
+,{D(jiA_CRING),    CRING_CMD,      CRING_CMD }
+#endif
 ,{NULL_VAL,        0,              0 }
 };

kernel/mod2.h

@@ -16 +16 @@
 
 #define SINGULAR_MAJOR_VERSION 4
+
+/*#define SINGULAR_4_1*/
+
+#ifdef SINGULAR_4_1
+#define SINGULAR_MINOR_VERSION 1
+#define SINGULAR_SUB_VERSION 0
+#else
 #define SINGULAR_MINOR_VERSION 0
 #define SINGULAR_SUB_VERSION 0
+#endif
 #define S_ROOT_DIR ""
 

libpolys/coeffs/coeffs.h

@@ -137 +137 @@
    /// string output of coeff description
    char* (*cfCoeffString)(const coeffs r);
+
+   /// default name of cf, should substitue cfCoeffWrite, cfCoeffString
+   char* (*cfCoeffName)(const coeffs r);
 
    // ?

libpolys/coeffs/numbers.cc

@@ -149 +149 @@
 int ndSize(number a, const coeffs r) { return (int)n_IsZero(a,r)==FALSE; }
 
+char * ndCoeffName(const coeffs r)
+{
+  return r->cfCoeffString(r);
+}
 void ndClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs r)
 {
@@ -356 +360 @@
     n->cfMPZ = ndMPZ;
     n->cfPower = ndPower;
+    n->cfCoeffName = ndCoeffName;
 
     // n->cfKillChar = ndKillChar; /* dummy */