Changeset 72a01e in git


Ignore:
Timestamp:
Apr 23, 2014, 12:19:21 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
Children:
bb506bf3a0a0ac42333f7f5150453aa276562b39
Parents:
4676d5eca0f4ac138d3c85099b1c244a3d695016
Message:
removed unused febase.h, moved parts to ipshell.h/subexpr.h/structs.h
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • Singular/blackbox.h

    r4676d5 r72a01e  
    66
    77#include <kernel/structs.h>
    8 #include <Singular/febase.h>
    98
    109#include <Singular/lists.h>

  • Singular/calcSVD.cc

    r4676d5 r72a01e  
    1212#include <polys/matpol.h>
    1313#include <Singular/lists.h>
    14 #include <Singular/febase.h>
    1514
    1615template class std::vector< amp::mpfr_record* >;

  • Singular/countedref.h

    r4676d5 r72a01e  
    2323#include <omalloc/omalloc.h>
    2424#include <kernel/structs.h>
    25 #include <Singular/febase.h>
    2625#include "subexpr.h"
    2726#include "idrec.h"

  • Singular/eigenval_ip.cc

    r4676d5 r72a01e  
    1313#ifdef HAVE_EIGENVAL
    1414
    15 #include <Singular/febase.h>
    1615#include <Singular/tok.h>
    1716#include <Singular/ipid.h>

  • Singular/extra.cc

    r4676d5 r72a01e  
    5454
    5555
     56#include <resources/feResource.h>
    5657#include <polys/monomials/ring.h>
    5758#include <kernel/polys.h>
    … …  
    6869#include <kernel/digitech.h>
    6970#include <kernel/GBEngine/stairc.h>
    70 #include <Singular/febase.h>
    7171#include <kernel/ideals.h>
    7272#include <kernel/GBEngine/kstd1.h>

  • Singular/febase.h

    r4676d5 r72a01e  
    1313
    1414#include <kernel/structs.h>
    15 
    16 enum   feBufferTypes
    17 {
    18   BT_none  = 0,  // entry level
    19   BT_break = 1,  // while, for
    20   BT_proc,       // proc
    21   BT_example,    // example
    22   BT_file,       // <"file"
    23   BT_execute,    // execute
    24   BT_if,         // if
    25   BT_else        // else
    26 };
    2715
    2816enum   feBufferInputs
    … …  
    4331};  /* for scanner.l */
    4432
    45 extern int myynest;
    4633extern int yylineno;
    4734extern char     my_yylinebuf[80];
    4835extern char    prompt_char; /*1 either '>' or '.'*/
    49 extern int    si_echo;
    50 extern int    printlevel;
    5136
    5237#ifdef __cplusplus
    … …  
    5439/* the C++-part: */
    5540
    56 typedef enum { LANG_NONE, LANG_TOP, LANG_SINGULAR, LANG_C, LANG_MAX} language_defs;
    5741// LANG_TOP     : Toplevel package only
    5842// LANG_SINGULAR:
    5943// LANG_C       :
    6044//
    61 
    62 class proc_singular
    63 {
    64 public:
    65   long   proc_start;       // position where proc is starting
    66   long   def_end;          // position where proc header is ending
    67   long   help_start;       // position where help is starting
    68   long   help_end;         // position where help is starting
    69   long   body_start;       // position where proc-body is starting
    70   long   body_end;         // position where proc-body is ending
    71   long   example_start;    // position where example is starting
    72   long   proc_end;         // position where proc is ending
    73   int    proc_lineno;
    74   int    body_lineno;
    75   int    example_lineno;
    76   char   *body;
    77   long help_chksum;
    78 };
    79 
    80 struct proc_object
    81 {
    82 //public:
    83   BOOLEAN (*function)(leftv res, leftv v);
    84 };
    85 union uprocinfodata
    86 {
    87 public:
    88   proc_singular  s;        // data of Singular-procedure
    89   struct proc_object    o; // pointer to binary-function
    90 };
    91 
    92 typedef union uprocinfodata procinfodata;
    93 
    94 class procinfo;
    95 typedef procinfo *         procinfov;
    96 
    97 class procinfo
    98 {
    99 public:
    100   char          *libname;
    101   char          *procname;
    102   package       pack;
    103   language_defs language;
    104   short         ref;
    105   char          is_static;        // if set, proc not accessible for user
    106   char          trace_flag;
    107   procinfodata  data;
    108 };
    10945
    11046class Voice

  • Singular/fevoices.cc

    r4676d5 r72a01e  
    1414#include <reporter/reporter.h>
    1515#include <Singular/febase.h>
     16#include <Singular/subexpr.h>
     17#include <Singular/ipshell.h>
    1618
    1719#include <stdlib.h>

  • Singular/fglm.cc

    r4676d5 r72a01e  
    2727#include <polys/monomials/maps.h>
    2828
    29 #include <Singular/febase.h>
    3029#include <kernel/polys.h>
    3130#include <kernel/ideals.h>

  • Singular/gms.cc

    r4676d5 r72a01e  
    1717#include <coeffs/numbers.h>
    1818#include <kernel/polys.h>
    19 #include <Singular/febase.h>
    2019
    2120#include "ipid.h"

  • Singular/ipassign.cc

    r4676d5 r72a01e  
    3737#include <polys/nc/sca.h>
    3838
    39 #include <Singular/febase.h>
    4039#include <kernel/polys.h>
    4140#include <kernel/ideals.h>

  • Singular/ipconv.cc

    r4676d5 r72a01e  
    1515#include <misc/options.h>
    1616#include <omalloc/omalloc.h>
    17 #include <Singular/febase.h>
    1817#include <kernel/polys.h>
    1918#include <kernel/ideals.h>

  • Singular/ipid.cc

    r4676d5 r72a01e  
    2424#include <polys/monomials/ring.h>
    2525
    26 #include <Singular/febase.h>
    2726#include <libpolys/coeffs/longrat.h>
    2827#include <kernel/polys.h>
    … …  
    3231#include <Singular/tok.h>
    3332#include <Singular/ipshell.h>
     33#include <Singular/febase.h>
    3434#include <Singular/lists.h>
    3535#include <Singular/attrib.h>

  • Singular/iplib.cc

    r4676d5 r72a01e  
    1616#include <Singular/ipid.h>
    1717#include <omalloc/omalloc.h>
    18 #include <Singular/febase.h>
    1918#include <polys/monomials/ring.h>
    2019#include <Singular/subexpr.h>
    2120#include <Singular/ipshell.h>
     21#include <Singular/febase.h>
    2222#include <Singular/lists.h>
    2323

  • Singular/ipprint.cc

    r4676d5 r72a01e  
    1616#include <polys/matpol.h>
    1717
    18 #include <Singular/febase.h>
    1918#include <kernel/polys.h>
    2019#include <kernel/ideals.h>

  • Singular/ipshell.cc

    r4676d5 r72a01e  
    2323#include <misc/intvec.h>
    2424#include <omalloc/omalloc.h>
    25 #include <Singular/febase.h>
    2625#include <kernel/polys.h>
    2726#include <coeffs/numbers.h>
    … …  
    3231#include <polys/monomials/ring.h>
    3332#include <Singular/subexpr.h>
     33#include <Singular/febase.h>
    3434#include <polys/monomials/maps.h>
    3535#include <kernel/GBEngine/syz.h>

  • Singular/ipshell.h

    r4676d5 r72a01e  
    3434extern const char *lastreserved;
    3535extern const char *singular_date; /* tesths.cc, set by final compile */
     36extern int myynest;
     37extern int printlevel;
     38extern int si_echo;
     39
    3640
    3741extern BOOLEAN yyInRingConstruction; /* 1: during ring construction */

  • Singular/libparse.cc

    r4676d5 r72a01e  
    10731073  #include <Singular/tok.h>
    10741074  #include <misc/options.h>
    1075   #include <Singular/febase.h>
    10761075  #include <omalloc/omalloc.h>
    10771076#endif

  • Singular/libparse.h

    r4676d5 r72a01e  
    7171  procinfodata  data;
    7272};
    73 #else
    74 #include <Singular/febase.h>
    7573#endif
    7674

  • Singular/libparse.ll

    r4676d5 r72a01e  
    2121  #include <Singular/tok.h>
    2222  #include <misc/options.h>
    23   #include <Singular/febase.h>
    2423  #include <omalloc/omalloc.h>
    2524#endif

  • Singular/links/asciiLink.cc

    r4676d5 r72a01e  
    1010#include <misc/options.h>
    1111#include <omalloc/omalloc.h>
    12 #include <Singular/febase.h>
    1312
    1413#include <Singular/tok.h>
    … …  
    1615#include <Singular/ipshell.h>
    1716#include <Singular/ipid.h>
     17#include <Singular/febase.h>
     18#include <Singular/ipshell.h>
    1819#include <Singular/links/silink.h>
    1920

  • Singular/links/silink.cc

    r4676d5 r72a01e  
    1818#include <polys/monomials/ring.h>
    1919
    20 #include <Singular/febase.h>
    2120#include <kernel/ideals.h>
    2221

  • Singular/links/sing_dbm.cc

    r4676d5 r72a01e  
    1818
    1919#  include <omalloc/omalloc.h>
    20 #  include <Singular/febase.h>
    2120#  include <Singular/tok.h>
    2221#  include <Singular/ipid.h>

  • Singular/links/ssiLink.cc

    r4676d5 r72a01e  
    3535#include <Singular/lists.h>
    3636#include <Singular/blackbox.h>
     37#include <Singular/febase.h>
    3738#include <Singular/links/ssiLink.h>
    3839

  • Singular/lists.cc

    r4676d5 r72a01e  
    1313#include <kernel/mod2.h>
    1414#include <Singular/tok.h>
    15 #include <Singular/febase.h>
    1615//#include "ipid.h"
    1716#include <kernel/polys.h>

  • Singular/locals.h

    r4676d5 r72a01e  
    77#include <Singular/ipid.h>
    88//#include <mmemory.h>
    9 #include <Singular/febase.h>
    109#include <Singular/subexpr.h>
    1110//#include <utils.h>

  • Singular/maps_ip.cc

    r4676d5 r72a01e  
    2525// #include <kernel/longalg.h>
    2626
    27 #include <Singular/febase.h>
    2827#include <kernel/GBEngine/kstd1.h>
    2928

  • Singular/misc_ip.cc

    r4676d5 r72a01e  
    384384#include <polys/templates/p_Procs.h>
    385385
    386 #include <Singular/febase.h>
    387386#include <kernel/GBEngine/kstd1.h>
    388387#include <Singular/timer.h>
     388#include <Singular/febase.h>
    389389
    390390

  • Singular/pcv.cc

    r4676d5 r72a01e  
    2121#include <Singular/lists.h>
    2222#include <polys/matpol.h>
    23 #include <Singular/febase.h>
    2423#include <Singular/pcv.h>
    2524

  • Singular/pyobject.cc

    r4676d5 r72a01e  
    1919#include <misc/intvec.h>
    2020
    21 #include <Singular/febase.h>
    22 
    2321#include <Singular/subexpr.h>
    2422#include <Singular/ipid.h>
    … …  
    2826#include <Singular/ipshell.h>
    2927#include <Singular/newstruct.h>
     28#include <Singular/febase.h>
    3029
    3130#include <Singular/mod_lib.h>

  • Singular/pyobject_setup.cc

    r4676d5 r72a01e  
    1818
    1919#include <kernel/mod2.h>
    20 #include <Singular/febase.h>
    2120#include <Singular/blackbox.h>
    2221#include <Singular/ipshell.h>

  • Singular/sdb.cc

    r4676d5 r72a01e  
    1111#include <reporter/si_signals.h>
    1212
    13 #include <Singular/febase.h>
    14 
    1513#include <Singular/tok.h>
    1614#include <Singular/ipshell.h>
    1715#include <Singular/ipid.h>
     16#include <Singular/febase.h>
    1817#include <Singular/sdb.h>
    1918

  • Singular/sdb.h

    r4676d5 r72a01e  
    1111
    1212#ifdef HAVE_SDB
    13 #include <Singular/febase.h>
    1413#include <kernel/structs.h>
    1514

  • Singular/singmathic.cc

    r4676d5 r72a01e  
    66#include <misc/options.h>
    77
    8 #include <Singular/febase.h>
    98#include <kernel/ideals.h>
    109#include <kernel/polys.h>

  • Singular/subexpr.cc

    r4676d5 r72a01e  
    2626// #include <coeffs/longrat.h>
    2727
    28 #include <Singular/febase.h>
    2928#include <kernel/ideals.h>
    3029#include <kernel/GBEngine/kstd1.h>

  • Singular/subexpr.h

    r4676d5 r72a01e  
    1212#include <polys/monomials/ring.h>
    1313
    14 #include <Singular/febase.h>
    15 //#include <kernel/structs.h>
     14//#include <Singular/ipid.h>
    1615
    1716#include <Singular/grammar.h>
    1817#include <Singular/tok.h>
    1918#include <Singular/attrib.h>
     19
     20typedef enum { LANG_NONE, LANG_TOP, LANG_SINGULAR, LANG_C, LANG_MAX} language_defs;
     21class proc_singular
     22{
     23public:
     24  long   proc_start;       // position where proc is starting
     25  long   def_end;          // position where proc header is ending
     26  long   help_start;       // position where help is starting
     27  long   help_end;         // position where help is starting
     28  long   body_start;       // position where proc-body is starting
     29  long   body_end;         // position where proc-body is ending
     30  long   example_start;    // position where example is starting
     31  long   proc_end;         // position where proc is ending
     32  int    proc_lineno;
     33  int    body_lineno;
     34  int    example_lineno;
     35  char   *body;
     36  long help_chksum;
     37};
     38struct proc_object
     39{
     40//public:
     41  BOOLEAN (*function)(leftv res, leftv v);
     42};
     43
     44union uprocinfodata
     45{
     46public:
     47  proc_singular  s;        // data of Singular-procedure
     48  struct proc_object    o; // pointer to binary-function
     49};
     50typedef union uprocinfodata procinfodata;
     51
     52class procinfo
     53{
     54public:
     55  char          *libname;
     56  char          *procname;
     57  package       pack;
     58  language_defs language;
     59  short         ref;
     60  char          is_static;        // if set, proc not accessible for user
     61  char          trace_flag;
     62  procinfodata  data;
     63};
     64
     65typedef procinfo *         procinfov;
    2066
    2167struct _ssubexpr

  • Singular/timer.cc

    r4676d5 r72a01e  
    5252
    5353
     54#include <libpolys/reporter/reporter.h>
    5455#include <Singular/timer.h>
    55 #include <Singular/febase.h>
    5656
    5757/*3

  • Singular/walk.cc

    r4676d5 r72a01e  
    4040#include <misc/options.h>
    4141#include <omalloc/omalloc.h>
    42 #include <Singular/febase.h>
    4342#include <Singular/ipshell.h>
    4443#include <Singular/ipconv.h>
    … …  
    6261#include <Singular/ipid.h>
    6362#include <Singular/tok.h>
    64 #include <Singular/febase.h>
    6563#include <coeffs/numbers.h>
    6664#include <Singular/ipid.h>

  • Singular/walk_ip.cc

    r4676d5 r72a01e  
    1212#include <misc/intvec.h>
    1313#include <omalloc/omalloc.h>
    14 #include <Singular/febase.h>
    1514#include <kernel/polys.h>
    1615#include <kernel/ideals.h>

  • Singular/wrapper.cc

    r4676d5 r72a01e  
    22#include <polys/monomials/ring.h>
    33
    4 #include <Singular/febase.h>
    54#include <kernel/polys.h>
    65#include <kernel/GBEngine/kstd1.h>

  • dyn_modules/bigintm/bigintm.cc

    r4676d5 r72a01e  
    88#include <coeffs/coeffs.h>
    99#include <coeffs/longrat.h>
    10 
    11 #include <Singular/febase.h>
    1210
    1311#include <Singular/ipid.h>

  • dyn_modules/syzextra/DebugPrint.cc

    r4676d5 r72a01e  
    2727#include <polys/monomials/p_polys.h>
    2828
    29 #include <Singular/febase.h>
    3029#include <kernel/ideals.h>
    3130

  • dyn_modules/syzextra/myNF.cc

    r4676d5 r72a01e  
    3434
    3535#include <kernel/structs.h>
    36 #include <Singular/febase.h>
    3736
    3837

  • kernel/structs.h

    r4676d5 r72a01e  
    2929#include <polys/coeffrings.h>
    3030
     31class Voice;
    3132class sleftv;
    3233class procinfo;
    … …  
    4445  isHomog    = TRUE,
    4546  testHomog
     47};
     48
     49enum   feBufferTypes
     50{
     51  BT_none  = 0,  // entry level
     52  BT_break = 1,  // while, for
     53  BT_proc,       // proc
     54  BT_example,    // example
     55  BT_file,       // <"file"
     56  BT_execute,    // execute
     57  BT_if,         // if
     58  BT_else        // else
    4659};
    4760
Note: See TracChangeset for help on using the changeset viewer.