Changeset 73d7b5 in git

Timestamp:

May 12, 2000, 2:24:44 PM (24 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

034ce12c4d5c236b70e0d93d3dd39cefcbe60268

Parents:

d18870bf915431bbbed064042d13fe3ecb292569

Message:

*** empty log message ***


git-svn-id: file:///usr/local/Singular/svn/trunk@4321 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

modules/modgen

Files:

• grammar.y (modified) (2 diffs)
• proc.cc (modified) (7 diffs)
• proc_setup.cc (modified) (2 diffs)

modules/modgen/grammar.y

@@ -1 +1 @@
 /*
- * $Id: grammar.y,v 1.13 2000-05-01 19:14:48 krueger Exp $
+ * $Id: grammar.y,v 1.14 2000-05-12 12:24:43 krueger Exp $
  */
 
@@ -690 +690 @@
 sect4:  SECT4START codeline SECT4END
         {
-          fprintf(module_def.modfp, "'%s'", $2);
+          fprintf(module_def.modfp, "%s", $2);
         };
 

modules/modgen/proc.cc

@@ -1 +1 @@
 /*
- * $Id: proc.cc,v 1.13 2000-05-01 19:14:48 krueger Exp $
+ * $Id: proc.cc,v 1.14 2000-05-12 12:24:44 krueger Exp $
  */
 
@@ -67 +67 @@
         
       case LANG_SINGULAR:
+        fprintf(module->modfp,"#if 0\n");
         fprintf(module->modfp,
                 "  h = add_singular_proc(\"%s\", %d, %ld, %ld, %s);\n",
@@ -218 +219 @@
   )
 {
-  fprintf(module->fmtfp, "  res->data =%s\n", arg);
+  fprintf(module->fmtfp, "  __res->data =%s\n", arg);
   pi->flags.result_done = 1;
   write_procedure_return(module, pi, module->fmtfp);
@@ -450 +451 @@
 
         case NONE:
-          if(!pi->flags.result_done) fprintf(fmtfp, "  res->data = NULL;\n");
-          fprintf(fmtfp, "  res->rtyp = %s;\n", pi->return_val.typname);
+          if(!pi->flags.result_done) fprintf(fmtfp, "  __res->data = NULL;\n");
+          fprintf(fmtfp, "  __res->rtyp = %s;\n", pi->return_val.typname);
           fprintf(fmtfp, "  return(%s(", pi->funcname);
           for (i=0;i<pi->paramcnt; i++) {
@@ -462 +463 @@
           
         default:
-          fprintf(fmtfp, "  res->rtyp = %s;\n", pi->return_val.typname);
-          fprintf(fmtfp, "  res->data = (void *)%s(", pi->funcname);
+          fprintf(fmtfp, "  __res->rtyp = %s;\n", pi->return_val.typname);
+          fprintf(fmtfp, "  __res->data = (void *)%s(", pi->funcname);
           for (i=0;i<pi->paramcnt; i++) {
             fprintf(fmtfp, "%s", pi->param[i].varname);
@@ -471 +472 @@
           }
           fprintf(fmtfp, ");\n");
-          fprintf(fmtfp, "  if(res->data != NULL) return FALSE;\n");
+          fprintf(fmtfp, "  if(__res->data != NULL) return FALSE;\n");
           fprintf(fmtfp, "  else return TRUE;\n\n");
     }
@@ -502 +503 @@
             if(trace)printf("\n\t\terror handling..."); fflush(stdout);
             fprintf(module->fmtfp, "  mod_%s_error:\n", pi->procname);
-            fprintf(module->fmtfp, "    Werror(\"%s(`%%s`) is not supported\", Tok2Cmdname(tok));\n",
+            fprintf(module->fmtfp, "    Werror(\"%s(`%%s`) is not supported\", Tok2Cmdname(__tok));\n",
                     pi->procname);
             fprintf(module->fmtfp, "    Werror(\"expected %s(", pi->procname);

modules/modgen/proc_setup.cc

@@ -1 +1 @@
 /*
- * $Id: proc_setup.cc,v 1.6 2000-05-01 19:14:49 krueger Exp $
+ * $Id: proc_setup.cc,v 1.7 2000-05-12 12:24:44 krueger Exp $
  */
 
@@ -214 +214 @@
 /*========================================================================*/
 char *ReservedVarnames[] = {
-  "v",
-  "h"
-  "res",
-  "v_save"
-  "tok",
-  "index",
+  "__v",
+  "__h"
+  "__res",
+  "__v_save"
+  "__tok",
+  "__index",
   NULL 
 };