Changeset eeaeffb in git

Timestamp:

Jul 1, 2014, 1:07:05 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

491e80d5863c880870541275ea8e25bc3775e67c

Parents:

68ca413b32be2764e9beed001e3515c6ff600db1

Message:

seperate gneration of .inc and doc files in gentable

Location:

Singular

Files:

• Makefile.am (modified) (1 diff)
• gentable.cc (modified) (5 diffs)

Singular/Makefile.am

@@ -237 +237 @@
                 gftables MOD
 
-CLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS) convert_table.texi
+CLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS)
 
 clean-local:

Singular/gentable.cc

@@ -22 +22 @@
 
 // to produce convert_table.texi for doc:
-#define CONVERT_TABLE 1
+int produce_convert_table=0;
 
 // bits 0,1 for PLURAL
@@ -223 +223 @@
   }
   /* pCmdR->tokval==-1, pCmdR goes at the end */
-  if(pCmdR->tokval==-1) 
+  if(pCmdR->tokval==-1)
   { free(ls);free(rs);return -1;}
 
@@ -395 +395 @@
 /*-------------------------------------------------------------------*/
   fprintf(outfile,"/*---------------------------------------------*/\n");
-  #ifdef CONVERT_TABLE
-  FILE *doctable=fopen("convert_table.texi","w");
-  fprintf(doctable,"@multitable @columnfractions .05 .18 .81\n");
+  FILE *doctable;
+  if (produce_convert_table)
+  {
+    doctable=fopen("convert_table.texi","w");
+    fprintf(doctable,"@multitable @columnfractions .05 .18 .81\n");
+  }
   int doc_nr=1;
-  #endif
   for (j=257;j<=MAX_TOK+1;j++)
   {
@@ -409 +411 @@
         fprintf(outfile,"// convert %s -> %s\n",
           Tok2Cmdname(i), Tok2Cmdname(j));
-  #ifdef CONVERT_TABLE
-        fprintf(doctable,
-        "@item\n@   %d. @tab @code{%s}  @tab @expansion{} @code{%s}\n",
-        doc_nr,Tok2Cmdname(i),Tok2Cmdname(j));
-        doc_nr++;
-  #endif
+        if (produce_convert_table)
+        {
+          fprintf(doctable,
+          "@item\n@   %d. @tab @code{%s}  @tab @expansion{} @code{%s}\n",
+          doc_nr,Tok2Cmdname(i),Tok2Cmdname(j));
+          doc_nr++;
+        }
         if (j==ANY_TYPE) break;
       }
     }
   }
-  #ifdef CONVERT_TABLE
-  fprintf(doctable,"@end multitable\n");
-  fclose(doctable);
-  #endif
+  if (produce_convert_table)
+  {
+    fprintf(doctable,"@end multitable\n");
+    fclose(doctable);
+  }
   fprintf(outfile,"/*---------------------------------------------*/\n");
   char ops[]="=><+*/[.^,%(;";
@@ -893 +897 @@
   if (argc>1)
   {
+    produce_convert_table=1; /* for ttGen1 */
+    ttGen1();
+    unlink(iparith_inc);
     ttGen4();
     ttGen2c();