Changeset 6b5a71 in git

Timestamp:

Dec 10, 2013, 12:37:20 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4996b1238218987656e06c2e9c5713ae68f1a381

Parents:

ffcd1f6fd36e3408dcdc49723af94357e938f0d5

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-12-10 12:37:20+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-12-10 14:41:21+01:00

Message:

introduce ASSUME(<level>,<int expr>)

Conflicts:
	Singular/ipshell.h

Location:

Singular

Files:

• grammar.y (modified) (3 diffs)
• ipshell.cc (modified) (1 diff)
• ipshell.h (modified) (1 diff)
• table.h (modified) (1 diff)

Singular/grammar.y

@@ -315 +315 @@
 /* control */
 %token <i> APPLY
+%token <i> ASSUME_CMD
 %token <i> BREAK_CMD
 %token <i> CONTINUE_CMD
@@ -777 +778 @@
             #endif
           }
+        | assume_start expr ',' expr quote_end
+          {
+            iiTestAssume(&$2,&$4);
+            memset(&$$,0,sizeof($$));
+            $$.rtyp=NONE;
+          }
         | EVAL  '('
           {
@@ -796 +803 @@
 
 quote_start:    QUOTE  '('
+          {
+            #ifdef SIQ
+            siq++;
+            #endif
+          }
+          ;
+
+assume_start:    ASSUME_CMD '('
           {
             #ifdef SIQ

Singular/ipshell.cc

@@ -5813 +5813 @@
   return TRUE;
 }
+
+BOOLEAN iiTestAssume(leftv a, leftv b)
+{
+  // assume a: level
+  if ((a->Typ()==INT_CMD)&&((long)a->Data()>=0))
+  {
+    int lev=(long)a->Data();
+    int startlev=0;
+    idhdl h=ggetid("assumeLevel");
+    if ((h!=NULL)&&(IDTYP(h)==INT_CMD)) startlev=(long)IDINT(h);
+    if(lev <=startlev)
+    {
+      BOOLEAN bo=b->Eval();
+      if (bo) { WerrorS("syntax error in ASSUME");return TRUE;}
+      if (b->Typ()!=INT_CMD) { WerrorS("ASUMME(<level>,<int expr>)");return TRUE; }
+      if (b->Data()==NULL) { WerrorS("ASSUME failed");return TRUE;}
+    }
+  }
+  else
+     b->CleanUp();
+  a->CleanUp();
+  return FALSE;
+}

Singular/ipshell.h

@@ -247 +247 @@
 
 
-#endif
-
+BOOLEAN iiTestAssume(leftv a, leftv b);
+#endif
+

Singular/table.h

@@ -798 +798 @@
 {  // name-string alias tokval          toktype
   { "$INVALID$",   0, -1,                 0},
+  { "ASSUME",      0, ASSUME_CMD,         ASSUME_CMD},
   { "LIB",         0, LIB_CMD ,           SYSVAR},
   { "alias",       0, ALIAS_CMD ,         PARAMETER},