Changeset 97f271 in git

Timestamp:

Nov 14, 2000, 5:08:25 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

76871f4bc4d0ed14486ba3123e4415306c836586

Parents:

dd01bf0ef5b6855f827f233d0f446456025e361f

Message:

* hannes: iiLibCmd stuff


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

Location:

Singular

Files:

• grammar.y (modified) (5 diffs)
• iparith.cc (modified) (3 diffs)

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.85 2000-11-10 15:00:02 Singular Exp $ */
+/* $Id: grammar.y,v 1.86 2000-11-14 16:08:23 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -53 +53 @@
 
 /* From the bison docu:
-   
+
      By defining the macro `YYMAXDEPTH', you can control how deep the
 parser stack can become before a stack overflow occurs.  Define the
@@ -70 +70 @@
 */
 #define YYMAXDEPTH INT_MAX
-    
+
 extern int   yylineno;
 extern FILE* yyin;
@@ -1040 +1040 @@
         '<' stringexpr
           { if ($<i>1 != '<') YYERROR;
-            if((feFilePending=feFopen($2,"r",NULL,TRUE))==NULL) YYERROR; }
+            if((feFilePending=feFopen($2,"r",NULL,TRUE))==NULL) YYERROR; }
         ';'
           { newFile($2,feFilePending); }
@@ -1371 +1371 @@
 
 scriptcmd:
-         SYSVAR elemexpr
-          {
-            sleftv dummy;
-            if (($1!=LIB_CMD)
-            ||(iiExprArith1(&dummy,&$2,LIB_CMD)))
-              YYERROR;
+         SYSVAR stringexpr
+          {
+            if (($1!=LIB_CMD)||(iiLibCmd($2))) YYERROR;
           }
         ;

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.229 2000-10-26 11:58:35 Singular Exp $ */
+/* $Id: iparith.cc,v 1.230 2000-11-14 16:08:25 Singular Exp $ */
 
 /*
@@ -2888 +2888 @@
   return FALSE;
 }
-static BOOLEAN jjKLAMMER_LIB(leftv res, leftv u)
-{
-  char * s=(char *)u->Data();
-  return iiLibCmd(s);
-}
 #ifdef MDEBUG
 static BOOLEAN jjpHead(leftv res, leftv v)
@@ -3553 +3548 @@
 ,{jjUMINUS_IV,  '-',             INTMAT_CMD,     INTMAT_CMD }
 ,{jjPROC1,      '(',             ANY_TYPE/*set by p*/,PROC_CMD }
-,{jjKLAMMER_LIB,'(',             NONE,           STRING_CMD }
+,{jjLIB,        '(',             NONE,           STRING_CMD }
 // and the procedures with 1 argument:
 ,{atATTRIB1,    ATTRIB_CMD,      NONE,           DEF_CMD }