Changeset 5be7db in git

Timestamp:

Apr 7, 2010, 4:46:45 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

7249440a8b31fbbb1b4a4269cdfcf46991bd39bb

Parents:

d6001e1480b48cfaad6b86e836d596cd18983512

Message:

idrec -> idrec.h

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

Location:

kernel

Files:

• ring.h (modified) (1 diff)
• structs.h (modified) (6 diffs)
• syz1.cc (modified) (1 diff)

kernel/ring.h

@@ -11 +11 @@
 /* includes */
 #include "structs.h"
-#include "structs.h"  // we need ABS
 #include "polys-impl.h"
 

kernel/structs.h

@@ -30 +30 @@
 #endif
 
-typedef void * Sy_reference;
-#define ADDRESS Sy_reference
+typedef void * ADDRESS;
 #define BITSET  unsigned int
 
@@ -114 +113 @@
 #ifdef __cplusplus
 class ip_smatrix;
-class idrec;
 class intvec;
 class sleftv;
@@ -164 +162 @@
 typedef char *             char_ptr;
 typedef int  *             int_ptr;
-typedef short *            short_ptr;
 typedef ip_sring *         ring;
-typedef int                idtyp;
 typedef polyrec *          poly;
 typedef poly *             polyset;
@@ -175 +171 @@
 
 #ifdef __cplusplus
-typedef idrec *            idhdl;
 typedef ip_smatrix *       matrix;
 typedef ip_link *          si_link;
@@ -500 +495 @@
 #endif
 
+class idrec;
+typedef idrec *   idhdl;
+
 struct sip_sring
 {
@@ -691 +689 @@
 };
 
-class idrec
-{
-  public:
-  /* !! do not change the first 6 entries !! (see subexpr.h: sleftv) */
-  idhdl      next;
-  const char *id;
-  utypes     data;
-  attr       attribute;
-  BITSET     flag;
-  idtyp      typ;
-
-  short      lev;
-  short      ref;
-  int        id_i;
-
-  idrec() { memset(this,0,sizeof(*this)); }
-  idhdl get(const char * s, int lev);
-  idhdl set(const char * s, int lev, idtyp t, BOOLEAN init=TRUE);
-  char * String();
-//  ~idrec();
-};
-
-#endif
-
-#endif
-
+#endif
+
+#endif
+

kernel/syz1.cc

@@ -26 +26 @@
 #include "kbuckets.h"
 #include "prCopy.h"
+#include "idrec.h"
 
 extern void p_Setm_Syz(poly p, ring r,