Changeset d848cbc in git

Timestamp:

Mar 19, 1999, 3:13:28 PM (25 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

7df2efebb313231238a051a876d8a3dd8d3b1e4c

Parents:

418dbc7afa82b2a0af86b3aef428cc36c46db41f

Message:

*** empty log message ***


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

Location:

modules

Files:

• kernel/misc.cc (modified) (2 diffs)
• kernel/proclist.cc (modified) (1 diff)
• kernel/sscanf.cc (added)
• tools/Makefile.in (modified) (1 diff)
• tools/misc.cc (modified) (12 diffs)
• tools/typmap.h (added)

modules/kernel/misc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: misc.cc,v 1.1 1998-11-19 15:49:24 krueger Exp $ */
+/* $Id: misc.cc,v 1.2 1999-03-19 14:13:27 krueger Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -13 +13 @@
   
   idhdl pck = NULL, id = NULL;
-  iiname2hdl((char *)(h->Data()), &pck, &id);
-  if(pck != NULL) Print("Pack: '%s'\n", pck->id);
-  if(id != NULL)  Print("Rec : '%s'\n", id->id);
-
+  printf("myTest 1\n");
+  if(h==NULL) printf("myTest 2\n");
+  else {
+    iiname2hdl((char *)(h->Data()), &pck, &id);
+    printf("myTest 1\n");
+    if(pck != NULL) Print("Pack: '%s'\n", pck->id);
+    if(id != NULL)  Print("Rec : '%s'\n", id->id);
+  }
+  
   res->rtyp=NONE;
   return FALSE;

modules/kernel/proclist.cc

@@ -3 +3 @@
 extern void piShowProcList();
 
-BOOLEAN kProclist(leftv res, leftv h)
+BOOLEAN kProclist(leftv res)
 {
   piShowProcList();

modules/tools/Makefile.in

@@ -20 +20 @@
         gcc -c ${CFLAGS} $<
 
-modgen: ${OBJS} modgen.h decl.inc
+modgen: ${OBJS} modgen.h decl.inc typmap.h
         gcc -o $@ ${CFLAGS} ${OBJS} ${LIBS}
 

modules/tools/misc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: misc.cc,v 1.2 1999-03-17 12:41:30 krueger Exp $ */
+/* $Id: misc.cc,v 1.3 1999-03-19 14:12:08 krueger Exp $ */
 /*
 * ABSTRACT: lib parsing
@@ -19 +19 @@
 
 #include "modgen.h"
+#include "typmap.h"
+
+#define NEW_PARAM 1
 
 #define SYSTYP_NONE   0
@@ -111 +114 @@
     cmds[i].alias=1;
   }
+#if 0
   if (!expected_parms)
   {
@@ -129 +133 @@
     }
   }
+#endif
+  printf("IsCmd: [%d] %s\n", tok, n);
+  
   if( (cmds[i].toktype==ROOT_DECL) ||
       (cmds[i].toktype==ROOT_DECL_LIST) ||
@@ -231 +238 @@
 void AddParam(procdefv pi, char *name, char *typname, int typ)
 {
+
+#ifdef NEW_PARAM
+  paramdef pnew;
+  pnew.name = (char *)malloc(strlen(name+1));
+  pnew.next = NULL;
+  strcpy(pnew.name, name);
+  pnew.typname = (char *)malloc(strlen(typname+1));
+  strcpy(pnew.typname, typname);
+  pnew.typ = typ;
+
+  if(pi->paramcnt==0) {
+    pi->param = (paramdefv)malloc(sizeof(paramdef));
+  }
+  else {
+    pi->param = (paramdefv)realloc(pi->param,
+                                   (pi->paramcnt+1)*sizeof(paramdef));
+  }
+  memcpy((void *)(&pi->param[pi->paramcnt]), (void *)&pnew, sizeof(paramdef));
+#else
   paramdefv pnew = (paramdefv)malloc(sizeof(paramdef));
   pnew->name = (char *)malloc(strlen(name+1));
@@ -245 +271 @@
     pp->next = pnew;
   }
+#endif
   (pi->paramcnt)++;
 }
@@ -252 +279 @@
 {
   procdefv v = pi;
+#ifdef NEW_PARAM
+  int i;
+  for(v=pi; v!=NULL; v = v->next) {
+    printf("proc: %s(", v->procname);
+    for(i=0; i<v->paramcnt; i++) {
+      printf("%s", v->param[i].name);
+      if(i < (v->paramcnt-1)) printf(",");
+    }
+    
+    printf(")\n");
+  }
+#else
   paramdefv pp;
   for(v=pi; v!=NULL; v = v->next) {
@@ -267 +306 @@
 //    v =v ->next;
   }
+#endif
 }
 
@@ -287 +327 @@
     systyp = SYSTYP_HPUX10;
   }
+  init_type_conv();
   printf("SYSTYP:%d\n", systyp);
   
@@ -333 +374 @@
 void generate_header(procdefv pi, FILE *fp)
 {
-  fprintf(fp, "BOOLEAN %s(leftv res, leftv h);\n", pi->funcname);
-  fprintf(fp, "BOOLEAN mod_%s(leftv res, leftv h);\n\n", pi->funcname);
+  int i;
+  
+  fprintf(fp, "BOOLEAN mod_%s(leftv res, leftv h);\n", pi->funcname);
+#if 1
+  fprintf(fp, "BOOLEAN %s(leftv res", pi->funcname);
+  for (i=0;i<pi->paramcnt; i++)
+    fprintf(fp, ", %s res%d", type_conv[pi->param[i].typ], i);
+  fprintf(fp, ");\n\n");
+#else
+  fprintf(fp, "BOOLEAN %s(leftv res, leftv h);\n\n", pi->funcname);
+#endif
 }
 
@@ -344 +394 @@
   paramdefv pp = pi->param;
   fprintf(fp, "BOOLEAN mod_%s(leftv res, leftv h)\n{\n", pi->funcname);
+#if 1
+  if(pi->paramcnt>0) {
+    if(pi->param[0].typ==SELF_CMD) {
+      fprintf(fp, "  return(%s(res,h));\n", pi->funcname);
+      fprintf(fp, "}\n\n");
+    }
+    else {
+      fprintf(fp, "  leftv v = h;\n");
+      fprintf(fp, "  int tok = NONE, index = 0;\n");
+      for (i=0;i<pi->paramcnt; i++)
+        fprintf(fp, "  leftv res%d = (leftv)Alloc0(sizeof(sleftv));\n", i);
+
+      fprintf(fp, "\n");
+    
+      for (i=0;i<pi->paramcnt; i++) {
+        fprintf(fp, "  if(v==NULL) goto mod_%s_error;\n", pi->funcname);
+        fprintf(fp, "  tok = v->Typ();\n");
+        fprintf(fp, "  printf(\"test %d.1\\n\");\n", i);
+        fprintf(fp, "  if((index=iiTestConvert(tok, %s))==0)\n",
+                pi->param[i].typname);
+        fprintf(fp, "     goto mod_%s_error;\n", pi->funcname);
+        fprintf(fp, "  printf(\"test %d.2\\n\");\n", i);
+        fprintf(fp, "  if(iiConvert(tok, %s, index, v, res%d))\n",
+                pi->param[i].typname, cnt);
+        fprintf(fp, "     goto mod_%s_error;\n", pi->funcname);
+        fprintf(fp, "  printf(\"test %d.3\\n\");\n", i);
+        fprintf(fp, "  v = v->next;\n");
+      }
+      fprintf(fp, "  if(v!=NULL) { tok = v->Typ(); goto mod_%s_error; }\n",
+              pi->funcname);
+      fprintf(fp, "  printf(\"test before return\\n\");\n");
+
+      fprintf(fp, "\n");
+      fprintf(fp, "    return(%s(res", pi->funcname);
+      for (i=0;i<pi->paramcnt; i++)
+        fprintf(fp, ", (%s) res%d->Data()", type_conv[pi->param[i].typ], i);
+      fprintf(fp, "));\n\n");
+      fprintf(fp, "  mod_%s_error:\n", pi->funcname);
+      fprintf(fp, "    Werror(\"%s(`%%s`) is not supported\", Tok2Cmdname(tok));\n",
+              pi->procname);
+      fprintf(fp, "    Werror(\"expected %s(", pi->procname);
+      for (i=0;i<pi->paramcnt; i++) {
+        fprintf(fp, "'%s'", pi->param[i].name);
+        if(i!=pi->paramcnt-1) fprintf(fp, ",");
+      }
+      fprintf(fp, ")\");\n");
+      fprintf(fp, "    return TRUE;\n}\n\n");
+    }
+  } else {
+      fprintf(fp, "  return(%s(res));\n}\n\n", pi->funcname);
+  }
+      
+#else
   if(pp!= NULL && pp->typ!=SELF_CMD) {
     fprintf(fp, "  leftv v = h;\n");
@@ -390 +493 @@
     fprintf(fp, "}\n\n");
   }
+#endif
       
 }