Changeset 835d83 in git

Timestamp:

Jan 5, 2010, 2:12:51 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

c1b19ccf41e1037d164be1cd878738e7b2cdfaec

Parents:

460c65ff7087c9b69ec5def1374562ed1b518f80

Message:

move stuff from structs.h

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

Location:

kernel

Files:

• clapconv.h (modified) (1 diff)
• febase.h (modified) (1 diff)
• fglmgauss.cc (modified) (1 diff)
• ideals.h (modified) (1 diff)
• kstd1.h (modified) (1 diff)
• misc.cc (modified) (2 diffs)
• ncSAFormula.h (modified) (1 diff)
• ring.h (modified) (1 diff)
• sbuckets.h (modified) (1 diff)
• structs.h (modified) (7 diffs)
• syz.cc (modified) (1 diff)
• syz.h (modified) (1 diff)
• weight.h (modified) (1 diff)

kernel/clapconv.h

@@ -14 +14 @@
 #include "structs.h"
 #include "longalg.h"
+#include "ring.h"
 #include <factory.h>
 

kernel/febase.h

@@ -106 +106 @@
 #define TRACE_BREAKPOINT  32
 #define TRACE_TMP_BREAKPOINT  64
-extern int  myynest;
-
-
+extern int myynest;
+extern int yylineno;
+extern char     my_yylinebuf[80];
 
 #define PROT_NONE 0

kernel/fglmgauss.cc

@@ -15 +15 @@
 #include "structs.h"
 #include "numbers.h"
+#include "ring.h"
 #include "omalloc.h"
 

kernel/ideals.h

@@ -9 +9 @@
 */
 #include "structs.h"
+#include "ring.h"
 
 #ifdef PDEBUG

kernel/kstd1.h

@@ -9 +9 @@
 */
 #include "structs.h"
+#include "ring.h"
 
 ideal mora (ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat);

kernel/misc.cc

@@ -47 +47 @@
 /* init bins from structs.h */
 
-omBin MP_INT_bin = omGetSpecBin(sizeof(MP_INT));
 omBin char_ptr_bin = omGetSpecBin(sizeof(char_ptr));
 omBin ideal_bin = omGetSpecBin(sizeof(ideal));
 omBin int_bin = omGetSpecBin(sizeof(int));
 omBin poly_bin = omGetSpecBin(sizeof(poly));
-omBin void_ptr_bin = omGetSpecBin(sizeof(void_ptr));
 omBin indlist_bin = omGetSpecBin(sizeof(indlist));
 omBin naIdeal_bin = omGetSpecBin(sizeof(naIdeal));
@@ -62 +60 @@
 omBin sip_sring_bin = omGetSpecBin(sizeof(sip_sring));
 omBin ip_sideal_bin = omGetSpecBin(sizeof(ip_sideal));
-omBin ip_smap_bin = omGetSpecBin(sizeof(ip_smap));
 omBin ip_sring_bin = omGetSpecBin(sizeof(ip_sring));
 

kernel/ncSAFormula.h

@@ -12 +12 @@
 
 #include <structs.h>
+#include <ring.h>
 
 bool ncInitSpecialPowersMultiplication(ring r);

kernel/ring.h

@@ -15 +15 @@
 
 #define SHORT_REAL_LENGTH 6 // use short reals for real <= 6 digits
+
+extern ring      currRing;
+extern ideal     currQuotient;
+extern idhdl      currRingHdl;
 
 

kernel/sbuckets.h

@@ -16 +16 @@
 
 #include "structs.h"
+#include "ring.h"
 
 

kernel/structs.h

@@ -183 +183 @@
 typedef int  *             int_ptr;
 typedef short *            short_ptr;
-typedef void *             void_ptr;
 typedef ip_sring *         ring;
 typedef int                idtyp;
@@ -315 +314 @@
    BOOLEAN (*nDBTest)(number a, const char *f,const int l);
 #endif
-//extern number  (*nMap)(number from);
 
    number nNULL; /* the 0 as constant */
@@ -323 +321 @@
    n_coeffType type;
 };
-/* current ring stuff */
-
-extern ring      currRing;
-extern ideal     currQuotient;
-extern idhdl      currRingHdl;
 
 extern idhdl currPackHdl;
@@ -789 +782 @@
 #endif
 #endif
-
-extern int      yylineno;
-extern char     my_yylinebuf[80];
 
 #define loop for(;;)
@@ -913 +903 @@
 #endif /* HAVE_LIBPARSER */
 
-extern struct omBin_s* MP_INT_bin;
 extern struct omBin_s* char_ptr_bin;
 extern struct omBin_s* ideal_bin;
 extern struct omBin_s* int_bin;
 extern struct omBin_s* poly_bin;
-extern struct omBin_s* void_ptr_bin;
 extern struct omBin_s* indlist_bin;
 extern struct omBin_s* naIdeal_bin;
@@ -928 +916 @@
 extern struct omBin_s* sip_sring_bin;
 extern struct omBin_s* ip_sideal_bin;
-extern struct omBin_s* ip_smap_bin;
 extern struct omBin_s* ip_sring_bin;
 extern struct omBin_s* sleftv_bin;
@@ -997 +984 @@
 };
 
-class proc_singular
-{
-public:
-  long   proc_start;       // position where proc is starting
-  long   def_end;          // position where proc header is ending
-  long   help_start;       // position where help is starting
-  long   help_end;         // position where help is starting
-  long   body_start;       // position where proc-body is starting
-  long   body_end;         // position where proc-body is ending
-  long   example_start;    // position where example is starting
-  long   proc_end;         // position where proc is ending
-  int    proc_lineno;
-  int    body_lineno;
-  int    example_lineno;
-  char   *body;
-  long help_chksum;
-};
-
-struct proc_object
-{
-//public:
-  BOOLEAN (*function)(leftv res, leftv v);
-};
-
-union uprocinfodata;
-
-union uprocinfodata
-{
-public:
-  proc_singular  s;        // data of Singular-procedure
-  struct proc_object    o; // pointer to binary-function
-};
-
-typedef union uprocinfodata procinfodata;
-
-typedef enum { LANG_NONE, LANG_TOP, LANG_SINGULAR, LANG_C, LANG_MAX} language_defs;
-// LANG_TOP     : Toplevel package only
-// LANG_SINGULAR:
-// LANG_C       :
-class procinfo
-{
-public:
-  char          *libname;
-  char          *procname;
-  package       pack;
-  language_defs language;
-  short         ref;
-  char          is_static;        // if set, proc not accessible for user
-  char          trace_flag;
-  procinfodata  data;
-};
-
-#endif
-
-#endif
-
+#endif
+
+#endif
+

kernel/syz.cc

@@ -655 +655 @@
   if (w!=NULL)
   {
-    result->weights = (intvec**)omAlloc0Bin(void_ptr_bin);
+    result->weights = (intvec**)omAlloc0Bin(char_ptr_bin);
     (result->weights)[0] = ivCopy(w);
     result->length = 1;

kernel/syz.h

@@ -9 +9 @@
 */
 #include "structs.h"
+#include "ring.h"
 
 // Logarithm of estimate of maximal number of new components

kernel/weight.h

@@ -10 +10 @@
 
 #include "structs.h"
+#include "ring.h"
 
 extern short * ecartWeights;