Changeset 0e051f in git

Timestamp:

Apr 27, 2010, 4:19:36 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

4bfe6536b8ffa51f49472c1c71acd83d84b61915

Parents:

49abe32113946584967f7bc6a8d3edfd9b6f848c

Message:

structs.h simplified

git-svn-id: file:///usr/local/Singular/svn/trunk@12750 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• ipid.h (modified) (1 diff)
• ipshell.h (modified) (1 diff)
• silink.h (modified) (1 diff)
• sing_dbm.h (modified) (1 diff)
• subexpr.cc (modified) (8 diffs)
• subexpr.h (modified) (2 diffs)

Singular/ipid.h

@@ -18 +18 @@
 extern package basePack;
 #define IDROOT (currPack->idroot)
+
+struct sip_command;
+typedef struct sip_command ip_command;
+typedef ip_command *       command;
 
 struct sip_command

Singular/ipshell.h

@@ -11 +11 @@
 #include "structs.h"
 #include "ideals.h"
+
+struct _ssubexpr;
+typedef struct _ssubexpr *Subexpr;
 
 

Singular/silink.h

@@ -10 +10 @@
 
 #include "structs.h"
+#include "sing_dbm.h"
 
 // extension links:

Singular/sing_dbm.h

@@ -9 +9 @@
 */
 
-#include "structs.h"
+struct s_si_link_extension;
+typedef struct s_si_link_extension *si_link_extension;
 
 si_link_extension slInitDBMExtension(si_link_extension s);

Singular/subexpr.cc

@@ -39 +39 @@
 #include "subexpr.h"
 
-
-omBin sSubexpr_bin = omGetSpecBin(sizeof(sSubexpr));
+omBin sSubexpr_bin = omGetSpecBin(sizeof(_ssubexpr));
 omBin sleftv_bin = omGetSpecBin(sizeof(sleftv));
 omBin procinfo_bin = omGetSpecBin(sizeof(procinfo));
@@ -1255 +1254 @@
   }
 #endif
+  idhdl save_ring=currRingHdl;
   v->Init();
   if(packhdl != NULL)
@@ -1312 +1312 @@
       }
     }
+    if (yyInRingConstruction)
+    {
+      currRingHdl=NULL;
+    }
     /* 4. local ring: ringvar */
     if ((currRingHdl!=NULL) && (IDLEV(currRingHdl)==myynest)
-    && (!yyInRingConstruction))
+    /*&& (!yyInRingConstruction)*/)
     {
       int vnr;
@@ -1338 +1342 @@
     {
       BOOLEAN ok=FALSE;
-      poly p = (!yyInRingConstruction) ? pmInit(id,ok) : (poly)NULL;
+      /*poly p = (!yyInRingConstruction) ? pmInit(id,ok) : (poly)NULL;*/
+      poly p = pmInit(id,ok);
       if (ok)
       {
@@ -1352 +1357 @@
           #endif
         }
-        else
-        if (pIsConstant(p))
+        else if (pIsConstant(p))
         {
           v->data = pGetCoeff(p);
@@ -1375 +1379 @@
       poly p = ((currRing!=NULL)     /* ring required */
                && (currRingHdl!=NULL)
-               && (!yyInRingConstruction) /* not in decl */
+               /*&& (!yyInRingConstruction) - not in decl */
                && (IDLEV(currRingHdl)!=myynest)) /* already in case 4/6 */
                      ? pmInit(id,ok) : (poly)NULL;
@@ -1446 +1450 @@
     v->name = id;
   }
+  currRingHdl=save_ring;
   return;
 id_found: // we have an id (in h) found, to set the data in from h
@@ -1453 +1458 @@
   v->name = IDID(h);
   v->attribute=IDATTR(h);
+  currRingHdl=save_ring;
 }
 

Singular/subexpr.h

@@ -22 +22 @@
 };
 
-typedef struct _ssubexpr sSubexpr;
-typedef sSubexpr * Subexpr;
+typedef struct _ssubexpr *Subexpr;
 
 extern const char sNoName[];
@@ -90 +89 @@
 extern sleftv sLastPrinted;
 
-struct _sssym
-{
-  idhdl   h;
-  Subexpr e;
-};
-typedef struct _sssym ssym;
-typedef ssym * sym;
-
 void syMake(leftv v,const char * name, idhdl packhdl = NULL);
 BOOLEAN assumeStdFlag(leftv h);