Changeset e8a9f3 in git

Timestamp:

Sep 26, 2011, 3:39:15 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

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:

• feOpt.cc (modified) (2 diffs)
• feOpt.h (modified) (1 diff)
• gentable.cc (modified) (1 diff)
• gentable2.cc (modified) (7 diffs)
• iparith.cc (modified) (1 diff)
• janet.cc (modified) (1 diff)

Singular/feOpt.cc

@@ -9 +9 @@
 #include <string.h>
 #include <stdlib.h>
+
 #include <kernel/mod2.h>
+
 #ifdef HAVE_FACTORY
 #define SI_DONT_HAVE_GLOBAL_VARS
 #include <factory/factory.h>
 #endif
+
 #include "feOpt.h"
+
 #if !defined(GENERATE_OPTION_INDEX) && !defined(ESINGULAR) && !defined(TSINGULAR)
 #include <misc/options.h>
@@ -294 +298 @@
 #include <omalloc/omalloc.h>
 #include <kernel/febase.h>
-#include <Singular/ipshell.h>
-#include <Singular/tok.h>
-#include <Singular/sdb.h>
-#include <Singular/cntrlc.h>
 #include <kernel/timer.h>
+
+#include "ipshell.h"
+#include "tok.h"
+#include "sdb.h"
+#include "cntrlc.h"
 
 #include <errno.h>

Singular/feOpt.h

@@ -21 +21 @@
 /* provides feOptIndex enum type for fast accesses to feOptSpec */
 #if ! defined(GENTABLE) && ! defined(GENERATE_DEPEND)
-#ifdef ESINGULAR
-#include <Singular/feOptES.inc>
-#elif defined(TSINGULAR)
-#include <Singular/feOptTS.inc>
-#else
-#include <Singular/feOpt.inc>
-#endif
+
+# ifdef ESINGULAR
+#  include <Singular/feOptES.inc>
+# elif defined(TSINGULAR)
+#  include <Singular/feOptTS.inc>
+# else
+#  include <Singular/feOpt.inc>
+# endif
+
 #else
 typedef enum {FE_OPT_UNDEF}  feOptIndex;

Singular/gentable.cc

@@ -16 +16 @@
 
 #include <kernel/mod2.h>
-#include <Singular/tok.h>
-#include <Singular/grammar.h>
+#include "tok.h"
+#include "grammar.h"
 
 // to produce convert_table.texi for doc:

Singular/gentable2.cc

@@ -16 +16 @@
 
 #include <kernel/mod2.h>
-#include <Singular/tok.h>
-#include <Singular/grammar.h>
+
+#include "tok.h"
+#include "grammar.h"
 
   #define ALLOW_PLURAL     1
@@ -204 +205 @@
 }
 
+char *touch_mpsr_Tok_inc = "touch mpsr_Tok.xxxxxxxx\0";
+char *mpsr_Tok_inc = touch_mpsr_Tok_inc + 6; // mpsr_Tok.xxxxxxxx!
+
 #ifdef HAVE_MPSR
-#include <Singular/mpsr.h>
-#include <Singular/mpsr_Tok.h>
+
+#include "mpsr.h"
+#include "mpsr_Tok.h"
 #define MAX_COP 256 // there may be at most 256 cops
 
@@ -499 +504 @@
 
 // This actually generates the tables of mpsr_tok.inc
-char *mpsr_Tok_inc;
 void mpsr_ttGen()
 {
@@ -544 +548 @@
 
   // Generate the template file
-  mpsr_Tok_inc=strdup("mpsr_Tok.xxxxxxxx");
   int pid=getpid();
   mpsr_Tok_inc[8]=(pid %10)+'0'; pid/=10;
@@ -556 +559 @@
   if (outfile == NULL)
   {
-    fprintf(stderr, "Error: mpsr_ttGen: Cannot open file mpsr_Tok.inc\n");
+    fprintf(stderr, "Error: mpsr_ttGen: Cannot open file [%s]\n", mpsr_Tok_inc);
     exit(1);
   }
@@ -624 +627 @@
 void mpsr_ttGen()
 {
-  system("touch mpsr_Tok.xx");
+  system(touch_mpsr_Tok_inc);
 }
 #endif
@@ -631 +634 @@
 {
   mpsr_ttGen();
-  #ifdef HAVE_MPSR
   rename(mpsr_Tok_inc,"mpsr_Tok.inc");
-  #endif
   return 0;
 }

Singular/iparith.cc

@@ -7409 +7409 @@
 #include "table.h"
 
-#include <iparith.inc>
+#include "iparith.inc"
 
 /*=================== operations with 2 args. ============================*/

Singular/janet.cc

@@ -968 +968 @@
 
   Define(&G);
-};
+}
 
 static Poly *h,*f;