Changeset 49abe32 in git

Timestamp:

Apr 27, 2010, 4:17:56 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

0e051f7f753a1b83c52767ff9ee1a7406bfd8da1

Parents:

82bd705ae7c3ac65c0ab783ad29a7e19bf743bfb

Message:

structs.h simplified

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

Location:

kernel

Files:

• Makefile.in (modified) (1 diff)
• clapsing.h (modified) (1 diff)
• idrec.h (modified) (1 diff)
• longalg.h (modified) (1 diff)
• structs.h (modified) (5 diffs)

kernel/Makefile.in

@@ -160 +160 @@
         ffields.h khstd.h sparsmat.h gnumpfl.h gnumpc.h \
         fglm.h kstd1.h \
-        rmodulo2m.h rmodulon.h rintegers.h modulop.h sing_dbm.h weight.h \
+        rmodulo2m.h rmodulon.h rintegers.h modulop.h weight.h \
         fglmgauss.h fglmvec.h \
         kstdfac.h kmatrix.h\

kernel/clapsing.h

@@ -17 +17 @@
 #include "intvec.h"
 #include "matpol.h"
+#include "longalg.h"
 
 poly singclap_gcd ( poly f, poly g );

kernel/idrec.h

@@ -10 +10 @@
 
 #include "structs.h"
+
+typedef union uutypes      utypes;
+union uutypes
+{
+  int           i;
+  ring          uring;
+  poly          p;
+  number        n;
+  ideal         uideal;
+  map           umap;
+  matrix        umatrix;
+  char *        ustring;
+  intvec *      iv;
+  lists         l;
+  si_link       li;
+  package       pack;
+  procinfo *    pinf;
+};
 
 class idrec

kernel/longalg.h

@@ -11 +11 @@
 #include "longrat.h"
 #include "polys-impl.h"
+
+typedef polyrec *   napoly;
 
 struct slnumber;

kernel/structs.h

@@ -131 +131 @@
 struct sip_link;
 struct spolynom;
-struct _ssubexpr;
-struct _sssym;
-struct sip_command;
+
 struct sip_package;
-struct s_si_link_extension;
+typedef struct sip_package ip_package;
+typedef ip_package *       package;
 
 // forward for ideals.h:
@@ -151 +150 @@
 // #endif
 
-typedef struct _ssubexpr   sSubexpr;
-typedef struct _sssym      ssym;
 typedef struct spolyrec    polyrec;
 typedef struct sip_sring   ip_sring;
 typedef struct sip_link    ip_link;
-typedef struct sip_command ip_command;
-typedef struct sip_package ip_package;
 
 /* the pointer types */
@@ -165 +160 @@
 typedef polyrec *          poly;
 typedef poly *             polyset;
-typedef union uutypes      utypes;
-typedef ip_command *       command;
-typedef struct s_si_link_extension *si_link_extension;
-typedef polyrec *   napoly;
 
 #ifdef __cplusplus
@@ -175 +166 @@
 typedef sleftv *           leftv;
 typedef slists *           lists;
-typedef sSubexpr *         Subexpr;
 typedef sattr *            attr;
 typedef skStrategy *       kStrategy;
-typedef ip_package *       package;
 typedef ssyStrategy *      syStrategy;
 typedef procinfo *         procinfov;
@@ -671 +660 @@
 extern struct omBin_s* sleftv_bin;
 
-#ifdef __cplusplus
-union uutypes
-{
-  int           i;
-  ring          uring;
-  poly          p;
-  number        n;
-  ideal         uideal;
-  map           umap;
-  matrix        umatrix;
-  char *        ustring;
-  intvec *      iv;
-  lists         l;
-  si_link       li;
-  package       pack;
-  procinfo *    pinf;
-};
-
-#endif
-
-#endif
-
+#endif
+