Changeset 6eccc9 in git


Ignore:
Timestamp:
Aug 19, 2010, 5:40:53 PM (14 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
adf5b1f333922225f6483b907fd28b473d29cae9
Parents:
da8702a320aa7e72284024c5999bdbd1f6b43ec5
Message:
code cleanup: removed HAVE_FGLM, HAVE_TCL

git-svn-id: file:///usr/local/Singular/svn/trunk@13134 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • kernel/febase.cc

    rda8702 r6eccc9  
    6969int feProt = FALSE;
    7070FILE*   feProtFile;
    71 BOOLEAN tclmode=FALSE;
    72 /* TCL-Protocoll (Singular -x): <char type>:<int length>:<string> \n
    73 *  E:l:s  error
    74 *  W:l:s  warning
    75 *  N:l:s  stdout
    76 *  Q:0:   quit
    77 *  P:l:   prompt > (ring defined)
    78 *  U:l:   prompt > (no ring defined)
    79 *  P:l:   prompt .
    80 *  R:l:<ring-name> ring change
    81 *  L:l:<lib name> library loaded
    82 *  O:l:<list of options(space seperated)> option change
    83 *  M:l:<mem-usage> output from "option(mem)"
    84 */
    8571
    8672
     
    485471        Print("%s %3d%c ",currentVoice->filename,yylineno,prompt_char);
    486472     }
    487     #ifdef HAVE_TCL
    488     if(tclmode)
    489     {
    490       PrintTCL('N',len_s,anf);
    491     }
    492     else
    493     #endif
    494473    {
    495474      fwrite(anf,1,len_s,stdout);
     
    498477    if (traceit&TRACE_SHOW_LINE)
    499478    {
    500       #ifdef HAVE_TCL
    501       if(!tclmode)
    502       #endif
    503479      while(fgetc(stdin)!='\n');
    504480    }
     
    687663  Voice *p = new Voice;
    688664  p->files = stdin;
    689   #ifdef HAVE_TCL
    690   p->sw = (tclmode || isatty(STDIN_FILENO)) ? BI_stdin : BI_file;
    691   #else
    692665  p->sw = (isatty(STDIN_FILENO)) ? BI_stdin : BI_file;
    693   #endif
    694666  if ((pp!=NULL) && (pp->files==stdin))
    695667  {
     
    894866}
    895867
    896 #ifdef HAVE_TCL
    897 extern "C" {
    898 void PrintTCLS(const char c, const char *s)
    899 {
    900   int l=strlen(s);
    901   if (l>0) PrintTCL(c,l,s);
    902 }
    903 }
    904 #endif
    905 
    906868extern "C" {
    907869void WerrorS(const char *s)
     
    930892#endif
    931893  {
    932 #ifdef HAVE_TCL
    933     if (tclmode)
    934     {
    935       PrintTCLS('E',(char *)s);
    936       PrintTCLS('E',"\n");
    937     }
    938     else
    939 #endif
    940894    {
    941895      if (WerrorS_callback == NULL) {
     
    977931{
    978932  #define warn_str "// ** "
    979 #ifdef HAVE_TCL
    980   if (tclmode)
    981   {
    982     PrintTCLS('W',warn_str);
    983     PrintTCLS('W',s);
    984     PrintTCLS('W',"\n");
    985   }
    986   else
    987 #endif
    988933  if (feWarn) /* ignore warnings if option --no-warn was given */
    989934  {
     
    10571002  else if (feOut) /* do not print when option --no-out was given */
    10581003  {
    1059 
    1060 #ifdef HAVE_TCL
    1061     if (tclmode)
    1062     {
    1063       PrintTCLS('N',s);
    1064     }
    1065     else
    1066 #endif
    10671004    {
    10681005      fwrite(s,1,strlen(s),stdout);
  • kernel/febase.h

    rda8702 r6eccc9  
    102102extern char   prompt_char;
    103103extern const char feNotImplemented[];
    104 #ifdef HAVE_TCL
    105 extern BOOLEAN tclmode;
    106 #endif
    107104extern BOOLEAN errorreported;
    108105extern int     feProt;
     
    144141void    PrintNSpaces(const int n);
    145142void    PrintLn();
    146 #ifdef HAVE_TCL
    147 void    PrintTCLS(const char c, const char * s);
    148 #else
    149 #define PrintTCLS(A,B) Print("TCL-ErrS:%s",B)
    150 #endif
    151143void    PrintS(const char* s);
    152144char*   feGetResource(const char id);
     
    286278                int useWerror=FALSE, int path_only=FALSE);
    287279
    288 #ifdef HAVE_TCL
    289 
    290 inline void PrintTCL(const char c, int l,const char *s)
    291 {
    292   if (s!=NULL) printf("%c:%d:%s",c,l,s);
    293   else if(l==0) printf("%c:0:",c);
    294   else printf("%c:1:%c",c,'0'+l);
    295   fflush(stdout);
    296 }
    297 #else
    298 #define PrintTCL(A,B,C) Print("TCL-Err:%s",C)
    299 #endif /* HAVE_TCL */
    300 
    301280char *  StringAppend(const char *fmt, ...);
    302281char *  StringAppendS(const char *s);
     
    384363  char * fe_fgets(const char *pr,char *s, int size);
    385364
    386   #ifdef HAVE_TCL
    387   /* tcl: */
    388   char * fe_fgets_tcl(const char *pr,char *s, int size);
    389   #endif
    390 
    391365  /* dummy (for batch mode): */
    392366  char * fe_fgets_dummy(const char *pr,char *s, int size);
  • kernel/feread.cc

    rda8702 r6eccc9  
    403403
    404404/* ===================================================================*/
    405 /* =                          TCL                                   = */
    406 /* ===================================================================*/
    407 #ifdef HAVE_TCL
    408 /* tcl: */
    409 char * fe_fgets_tcl(const char *pr,char *s, int size)
    410 {
    411   if(currRing!=NULL) PrintTCLS('P',pr);
    412   else               PrintTCLS('U',pr);
    413   mflush();
    414   return fgets(s,size,stdin);
    415 }
    416 
    417 #endif
    418 
    419 /* ===================================================================*/
    420405/* =                      batch mode                                = */
    421406/* ===================================================================*/
  • kernel/fglm.h

    rda8702 r6eccc9  
    1414#define FGLM_H
    1515
    16 #ifdef HAVE_FGLM
     16#ifdef HAVE_FACTORY
    1717#include <factory.h>
    1818
     
    8484fglmzero( ring sourceRing, ideal & sourceIdeal, idhdl destRingHdl, ideal & destideal, BOOLEAN switchBack = TRUE, BOOLEAN deleteIdeal = FALSE );
    8585
    86 BOOLEAN
    87 fglmquot( ideal sourceIdeal, poly quot, ideal & destIdeal );
     86BOOLEAN fglmquot( ideal sourceIdeal, poly quot, ideal & destIdeal );
    8887
    8988// fglmproc(...):
     
    9392// Checks, if the ideal is really a reduced groebner basis of a
    9493// 0-dimensional Ideal. Returns TRUE if an error occoured.
    95 BOOLEAN
    96 fglmProc( leftv result, leftv first, leftv second );
     94BOOLEAN fglmProc( leftv result, leftv first, leftv second );
    9795
    9896// fglmquotproc(...):
     
    104102// 0-dimensional Ideal and if q is really reduced.
    105103//  Returns TRUE if an error occoured.
    106 BOOLEAN
    107 fglmQuotProc( leftv result, leftv first, leftv second );
     104BOOLEAN fglmQuotProc( leftv result, leftv first, leftv second );
    108105
    109106// FindUnivariatePolys (test)
    110 BOOLEAN
    111 FindUnivariateWrapper( ideal source, ideal & dest );
     107BOOLEAN FindUnivariateWrapper( ideal source, ideal & dest );
    112108
    113109// wrapper for FindUnivariatePolys (test)
    114 BOOLEAN
    115 findUniProc( leftv result, leftv first);
     110BOOLEAN findUniProc( leftv result, leftv first);
    116111
    117112// homogeneous FGLM
    118 ideal
    119 fglmhomProc(leftv first, leftv second);
     113ideal fglmhomProc(leftv first, leftv second);
    120114#endif
    121115#endif
  • kernel/fglmcomb.cc

    rda8702 r6eccc9  
    1111#include <kernel/mod2.h>
    1212
    13 #ifdef HAVE_FGLM
     13#ifdef HAVE_FACTORY
    1414#include <kernel/options.h>
    1515#include <kernel/polys.h>
  • kernel/fglmhom.cc

    rda8702 r6eccc9  
    1212
    1313#include <kernel/mod2.h>
    14 #ifdef HAVE_FGLM_HOM
     14#if 0
     15#include <factoryconf.h>
    1516#ifndef NOSTREAMIO
    1617#include <iostream.h>
    1718#endif
    18 #include <kernel/tok.h>
     19#include <Singular/tok.h>
    1920#include <kernel/structs.h>
    2021#include <kernel/subexpr.h>
  • kernel/fglmvec.cc

    rda8702 r6eccc9  
    1515#include <kernel/mod2.h>
    1616
    17 #ifdef HAVE_FGLM
     17#ifdef HAVE_FACTORY
    1818#include <omalloc.h>
    1919#include <kernel/structs.h>
  • kernel/fglmzero.cc

    rda8702 r6eccc9  
    2121#include <kernel/mod2.h>
    2222
    23 #ifdef HAVE_FGLM
     23#ifdef HAVE_FACTORY
    2424#include <kernel/options.h>
    2525#include <kernel/polys.h>
  • kernel/mod2.h.in

    rda8702 r6eccc9  
    172172#define SIQ 1
    173173
    174 /* Define to enable TCL interface */
    175 #undef HAVE_TCL
    176 
    177174/* Undefine to disable Gerhard's and Wilfried's fast and dirty std computations */
    178175#define FAST_AND_DIRTY
     
    224221 * Evaluate the set defines
    225222 ******************************************************************/
    226 /* FGLM needs factory */
    227 #ifdef HAVE_FACTORY
    228 #define HAVE_FGLM
    229 #endif
    230 
    231 /* Define if you want fglm for homogeneous case */
    232 #ifdef HAVE_FGLM
    233 #undef HAVE_FGLM_HOME
    234 #endif
    235 
    236223/* Spectrum needs GMP */
    237224#define HAVE_SPECTRUM 1
     
    410397     #define OM_TRACK 5
    411398     #define OM_KEEP  1
    412      #include <kernel/mod2.h>
    413      #include <omalloc.h>
     399     #include "mod2.h"
     400     #include "omalloc.h"
    414401   ensures that all memory allocs/free in this file are done with
    415402   OM_CHECK==3 and OM_TRACK==5, and that all addresses allocated/freed
     
    438425       #define OM_TRACK 5
    439426       #define OM_KEEP  1
    440        #include <kernel/mod2.h>
    441        #include <omalloc.h>
     427       #include "mod2.h"
     428       #include "omalloc.h"
    442429     Under dynamic scope, do (e.g., from within the debugger):
    443430       om_Opts.MinCheck = 3; om_Opts.MinTrack = 5; omOpts.Keep = LONG_MAX;
  • kernel/ring.cc

    rda8702 r6eccc9  
    30723072  r->VectorOut = (r->order[0] == ringorder_c);
    30733073  r->ShortOut = TRUE;
    3074 #ifdef HAVE_TCL
    3075   if (tcllmode)
    3076   {
    3077     r->ShortOut = FALSE;
    3078   }
    3079   else
    3080 #endif
    30813074  {
    30823075    int i;
Note: See TracChangeset for help on using the changeset viewer.