Changeset 835d83 in git


Ignore:
Timestamp:
Jan 5, 2010, 2:12:51 PM (14 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
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:
13 edited

Legend:

Unmodified
Added
Removed
  • kernel/clapconv.h

    r460c65f r835d83  
    1414#include "structs.h"
    1515#include "longalg.h"
     16#include "ring.h"
    1617#include <factory.h>
    1718
  • kernel/febase.h

    r460c65f r835d83  
    106106#define TRACE_BREAKPOINT  32
    107107#define TRACE_TMP_BREAKPOINT  64
    108 extern int  myynest;
    109 
    110 
     108extern int myynest;
     109extern int yylineno;
     110extern char     my_yylinebuf[80];
    111111
    112112#define PROT_NONE 0
  • kernel/fglmgauss.cc

    r460c65f r835d83  
    1515#include "structs.h"
    1616#include "numbers.h"
     17#include "ring.h"
    1718#include "omalloc.h"
    1819
  • kernel/ideals.h

    r460c65f r835d83  
    99*/
    1010#include "structs.h"
     11#include "ring.h"
    1112
    1213#ifdef PDEBUG
  • kernel/kstd1.h

    r460c65f r835d83  
    99*/
    1010#include "structs.h"
     11#include "ring.h"
    1112
    1213ideal mora (ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat);
  • kernel/misc.cc

    r460c65f r835d83  
    4747/* init bins from structs.h */
    4848
    49 omBin MP_INT_bin = omGetSpecBin(sizeof(MP_INT));
    5049omBin char_ptr_bin = omGetSpecBin(sizeof(char_ptr));
    5150omBin ideal_bin = omGetSpecBin(sizeof(ideal));
    5251omBin int_bin = omGetSpecBin(sizeof(int));
    5352omBin poly_bin = omGetSpecBin(sizeof(poly));
    54 omBin void_ptr_bin = omGetSpecBin(sizeof(void_ptr));
    5553omBin indlist_bin = omGetSpecBin(sizeof(indlist));
    5654omBin naIdeal_bin = omGetSpecBin(sizeof(naIdeal));
     
    6260omBin sip_sring_bin = omGetSpecBin(sizeof(sip_sring));
    6361omBin ip_sideal_bin = omGetSpecBin(sizeof(ip_sideal));
    64 omBin ip_smap_bin = omGetSpecBin(sizeof(ip_smap));
    6562omBin ip_sring_bin = omGetSpecBin(sizeof(ip_sring));
    6663
  • kernel/ncSAFormula.h

    r460c65f r835d83  
    1212
    1313#include <structs.h>
     14#include <ring.h>
    1415
    1516bool ncInitSpecialPowersMultiplication(ring r);
  • kernel/ring.h

    r460c65f r835d83  
    1515
    1616#define SHORT_REAL_LENGTH 6 // use short reals for real <= 6 digits
     17
     18extern ring      currRing;
     19extern ideal     currQuotient;
     20extern idhdl      currRingHdl;
    1721
    1822
  • kernel/sbuckets.h

    r460c65f r835d83  
    1616
    1717#include "structs.h"
     18#include "ring.h"
    1819
    1920
  • kernel/structs.h

    r460c65f r835d83  
    183183typedef int  *             int_ptr;
    184184typedef short *            short_ptr;
    185 typedef void *             void_ptr;
    186185typedef ip_sring *         ring;
    187186typedef int                idtyp;
     
    315314   BOOLEAN (*nDBTest)(number a, const char *f,const int l);
    316315#endif
    317 //extern number  (*nMap)(number from);
    318316
    319317   number nNULL; /* the 0 as constant */
     
    323321   n_coeffType type;
    324322};
    325 /* current ring stuff */
    326 
    327 extern ring      currRing;
    328 extern ideal     currQuotient;
    329 extern idhdl      currRingHdl;
    330323
    331324extern idhdl currPackHdl;
     
    789782#endif
    790783#endif
    791 
    792 extern int      yylineno;
    793 extern char     my_yylinebuf[80];
    794784
    795785#define loop for(;;)
     
    913903#endif /* HAVE_LIBPARSER */
    914904
    915 extern struct omBin_s* MP_INT_bin;
    916905extern struct omBin_s* char_ptr_bin;
    917906extern struct omBin_s* ideal_bin;
    918907extern struct omBin_s* int_bin;
    919908extern struct omBin_s* poly_bin;
    920 extern struct omBin_s* void_ptr_bin;
    921909extern struct omBin_s* indlist_bin;
    922910extern struct omBin_s* naIdeal_bin;
     
    928916extern struct omBin_s* sip_sring_bin;
    929917extern struct omBin_s* ip_sideal_bin;
    930 extern struct omBin_s* ip_smap_bin;
    931918extern struct omBin_s* ip_sring_bin;
    932919extern struct omBin_s* sleftv_bin;
     
    997984};
    998985
    999 class proc_singular
    1000 {
    1001 public:
    1002   long   proc_start;       // position where proc is starting
    1003   long   def_end;          // position where proc header is ending
    1004   long   help_start;       // position where help is starting
    1005   long   help_end;         // position where help is starting
    1006   long   body_start;       // position where proc-body is starting
    1007   long   body_end;         // position where proc-body is ending
    1008   long   example_start;    // position where example is starting
    1009   long   proc_end;         // position where proc is ending
    1010   int    proc_lineno;
    1011   int    body_lineno;
    1012   int    example_lineno;
    1013   char   *body;
    1014   long help_chksum;
    1015 };
    1016 
    1017 struct proc_object
    1018 {
    1019 //public:
    1020   BOOLEAN (*function)(leftv res, leftv v);
    1021 };
    1022 
    1023 union uprocinfodata;
    1024 
    1025 union uprocinfodata
    1026 {
    1027 public:
    1028   proc_singular  s;        // data of Singular-procedure
    1029   struct proc_object    o; // pointer to binary-function
    1030 };
    1031 
    1032 typedef union uprocinfodata procinfodata;
    1033 
    1034 typedef enum { LANG_NONE, LANG_TOP, LANG_SINGULAR, LANG_C, LANG_MAX} language_defs;
    1035 // LANG_TOP     : Toplevel package only
    1036 // LANG_SINGULAR:
    1037 // LANG_C       :
    1038 class procinfo
    1039 {
    1040 public:
    1041   char          *libname;
    1042   char          *procname;
    1043   package       pack;
    1044   language_defs language;
    1045   short         ref;
    1046   char          is_static;        // if set, proc not accessible for user
    1047   char          trace_flag;
    1048   procinfodata  data;
    1049 };
    1050 
    1051 #endif
    1052 
    1053 #endif
    1054 
     986#endif
     987
     988#endif
     989
  • kernel/syz.cc

    r460c65f r835d83  
    655655  if (w!=NULL)
    656656  {
    657     result->weights = (intvec**)omAlloc0Bin(void_ptr_bin);
     657    result->weights = (intvec**)omAlloc0Bin(char_ptr_bin);
    658658    (result->weights)[0] = ivCopy(w);
    659659    result->length = 1;
  • kernel/syz.h

    r460c65f r835d83  
    99*/
    1010#include "structs.h"
     11#include "ring.h"
    1112
    1213// Logarithm of estimate of maximal number of new components
  • kernel/weight.h

    r460c65f r835d83  
    1010
    1111#include "structs.h"
     12#include "ring.h"
    1213
    1314extern short * ecartWeights;
Note: See TracChangeset for help on using the changeset viewer.