Changeset daa036 in git

Timestamp:

Jun 10, 2014, 4:37:04 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9b0e1a1147ae276a71f7e5bce7beb59c9ef90534

Parents:

c12ec63afae5364ad41ce47666ac5ea44c9feccb

Message:

gentable: prototype for doc.

File:

• Singular/gentable.cc (modified) (4 diffs)

Singular/gentable.cc

@@ -564 +564 @@
   fclose(outfile);
 }
+int is_ref_cmd(cmdnames *c)
+{
+  if( c->tokval==0) return 0;
+  if (c->alias > 0) return 0;
+  if  ((c->toktype==CMD_1)
+        || (c->toktype==CMD_2)
+        || (c->toktype==CMD_3)
+        || (c->toktype==CMD_M)
+        || (c->toktype==CMD_12)
+        || (c->toktype==CMD_13)
+        || (c->toktype==CMD_23)
+        || (c->toktype==CMD_123)) return 1;
+  return 0;
+}
 void ttGen2c()
 {
@@ -577 +591 @@
   {
     // assume that cmds[0].tokval== -1 and all others with tokval -1 at the end
-    if(cmds[m].tokval>0)
+    if(is_ref_cmd(&(cmds[m])))
     {
       fprintf(outfile,"* %s::\n",cmds[m].name);
@@ -586 +600 @@
   {
     // assume that cmds[0].tokval== -1 and all others with tokval -1 at the end
-    if(cmds[m].tokval>0)
+    if(is_ref_cmd(&(cmds[m])))
     {
       fprintf(outfile,"@node %s,",cmds[m].name);
       // next:
-      if (cmds[m+1].tokval>0)
-        fprintf(outfile,"%s,",cmds[m+1].name);
+      int mm=m-1;
+      while((mm>0)&& (is_ref_cmd(&cmds[mm]))) mm--;
+      if((mm>0)&& (is_ref_cmd(&cmds[mm])))
+        fprintf(outfile,"%s,",cmds[mm].name);
       else
         fprintf(outfile,",");
       // prev:
-      if (cmds[m-1].tokval>0)
+      mm=m+1;
+      while((mm>0)&& (is_ref_cmd(&cmds[mm]))) mm++;
+      if((mm>0)&& (is_ref_cmd(&cmds[mm])))
         fprintf(outfile,"%s,",cmds[m-1].name);
       else
@@ -871 +889 @@
 /*-------------------------------------------------------------------*/
 
-int main()
-{
-  //ttGen4();
-  ttGen1();
-  ttGen2b();
-  //ttGen2c();
-  rename(iparith_inc,"iparith.inc");
+int main(int argc, char** argv)
+{
+  if (argc>1)
+  {
+    ttGen4();
+    ttGen2c();
+  }
+  else
+  {
+    ttGen1();
+    ttGen2b();
+    rename(iparith_inc,"iparith.inc");
+  }
   return 0;
 }