Changeset e8a9f3 in git


Ignore:
Timestamp:
Sep 26, 2011, 3:39:15 AM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
4eda6b65c2db80cbc41423154ff8397975bb2cd5
Parents:
151a068bd3e07893f81b6da40f4e2b2944437dbe
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-26 03:39:15+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:31+01:00
Message:
CHG: minor fixes + cleanup of *.inc generation in Singular/
Location:
Singular
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/feOpt.cc

    r151a06 re8a9f3  
    99#include <string.h>
    1010#include <stdlib.h>
     11
    1112#include <kernel/mod2.h>
     13
    1214#ifdef HAVE_FACTORY
    1315#define SI_DONT_HAVE_GLOBAL_VARS
    1416#include <factory/factory.h>
    1517#endif
     18
    1619#include "feOpt.h"
     20
    1721#if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
    1822#include <misc/options.h>
     
    294298#include <omalloc/omalloc.h>
    295299#include <kernel/febase.h>
    296 #include <Singular/ipshell.h>
    297 #include <Singular/tok.h>
    298 #include <Singular/sdb.h>
    299 #include <Singular/cntrlc.h>
    300300#include <kernel/timer.h>
     301
     302#include "ipshell.h"
     303#include "tok.h"
     304#include "sdb.h"
     305#include "cntrlc.h"
    301306
    302307#include <errno.h>
  • Singular/feOpt.h

    r151a06 re8a9f3  
    2121/* provides feOptIndex enum type for fast accesses to feOptSpec */
    2222#if ! defined(GENTABLE) && ! defined(GENERATE_DEPEND)
    23 #ifdef ESINGULAR
    24 #include <Singular/feOptES.inc>
    25 #elif defined(TSINGULAR)
    26 #include <Singular/feOptTS.inc>
    27 #else
    28 #include <Singular/feOpt.inc>
    29 #endif
     23
     24# ifdef ESINGULAR
     25#  include <Singular/feOptES.inc>
     26# elif defined(TSINGULAR)
     27#  include <Singular/feOptTS.inc>
     28# else
     29#  include <Singular/feOpt.inc>
     30# endif
     31
    3032#else
    3133typedef enum {FE_OPT_UNDEF}  feOptIndex;
  • Singular/gentable.cc

    r151a06 re8a9f3  
    1616
    1717#include <kernel/mod2.h>
    18 #include <Singular/tok.h>
    19 #include <Singular/grammar.h>
     18#include "tok.h"
     19#include "grammar.h"
    2020
    2121// to produce convert_table.texi for doc:
  • Singular/gentable2.cc

    r151a06 re8a9f3  
    1616
    1717#include <kernel/mod2.h>
    18 #include <Singular/tok.h>
    19 #include <Singular/grammar.h>
     18
     19#include "tok.h"
     20#include "grammar.h"
    2021
    2122  #define ALLOW_PLURAL     1
     
    204205}
    205206
     207char *touch_mpsr_Tok_inc = "touch mpsr_Tok.xxxxxxxx\0";
     208char *mpsr_Tok_inc = touch_mpsr_Tok_inc + 6; // mpsr_Tok.xxxxxxxx!
     209
    206210#ifdef HAVE_MPSR
    207 #include <Singular/mpsr.h>
    208 #include <Singular/mpsr_Tok.h>
     211
     212#include "mpsr.h"
     213#include "mpsr_Tok.h"
    209214#define MAX_COP 256 // there may be at most 256 cops
    210215
     
    499504
    500505// This actually generates the tables of mpsr_tok.inc
    501 char *mpsr_Tok_inc;
    502506void mpsr_ttGen()
    503507{
     
    544548
    545549  // Generate the template file
    546   mpsr_Tok_inc=strdup("mpsr_Tok.xxxxxxxx");
    547550  int pid=getpid();
    548551  mpsr_Tok_inc[8]=(pid %10)+'0'; pid/=10;
     
    556559  if (outfile == NULL)
    557560  {
    558     fprintf(stderr, "Error: mpsr_ttGen: Cannot open file mpsr_Tok.inc\n");
     561    fprintf(stderr, "Error: mpsr_ttGen: Cannot open file [%s]\n", mpsr_Tok_inc);
    559562    exit(1);
    560563  }
     
    624627void mpsr_ttGen()
    625628{
    626   system("touch mpsr_Tok.xx");
     629  system(touch_mpsr_Tok_inc);
    627630}
    628631#endif
     
    631634{
    632635  mpsr_ttGen();
    633   #ifdef HAVE_MPSR
    634636  rename(mpsr_Tok_inc,"mpsr_Tok.inc");
    635   #endif
    636637  return 0;
    637638}
  • Singular/iparith.cc

    r151a06 re8a9f3  
    74097409#include "table.h"
    74107410
    7411 #include <iparith.inc>
     7411#include "iparith.inc"
    74127412
    74137413/*=================== operations with 2 args. ============================*/
  • Singular/janet.cc

    r151a06 re8a9f3  
    968968
    969969  Define(&G);
    970 };
     970}
    971971
    972972static Poly *h,*f;
Note: See TracChangeset for help on using the changeset viewer.