Changeset 0f987ab in git

Timestamp:

May 8, 2018, 3:03:58 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

0dc748aa220932595ba06044cb85807f30b3c2fe

Parents:

458174a01ed388fe1f5bcb6624bc7f13f0223860e734084ec7bec9299f110c52697b1fd638b90bec

Message:

Merge branch 'spielwiese' into stable

Files:

• Singular/LIB/fpaprops.lib (modified) (11 diffs)
• Singular/LIB/freegb.lib (modified) (2 diffs)
• Singular/dyn_modules/cohomo/cohomo.cc (modified) (1 diff)
• Singular/dyn_modules/syzextra/mod_main.cc (modified) (9 diffs)
• Singular/dyn_modules/syzextra/singularxx_defs.h (modified) (2 diffs)
• Singular/dyn_modules/syzextra/syzextra.cc (modified) (4 diffs)
• Singular/dyn_modules/syzextra/syzextra.h (modified) (2 diffs)
• Singular/gentable.cc (modified) (1 diff)
• Singular/grammar.cc (modified) (167 diffs)
• Singular/grammar.h (modified) (1 diff)
• Singular/grammar.y (modified) (1 diff)
• Singular/iparith.cc (modified) (8 diffs)
• Singular/ipassign.cc (modified) (3 diffs)
• Singular/ipconv.cc (modified) (3 diffs)
• Singular/ipid.cc (modified) (2 diffs)
• Singular/links/ssiLink.cc (modified) (1 diff)
• Singular/make_grammar (modified) (1 diff)
• Singular/maps_ip.cc (modified) (1 diff)
• Singular/newstruct.cc (modified) (2 diffs)
• Singular/pcv.cc (modified) (5 diffs)
• Singular/subexpr.cc (modified) (5 diffs)
• Singular/table.h (modified) (9 diffs)
• Tst/Old/intmat.res.gz.uu (modified) (1 diff)
• Tst/Old/intmat.stat (modified) (1 diff)
• kernel/GBEngine/tgb_internal.h (modified) (18 diffs)
• kernel/polys.cc (modified) (1 diff)
• libpolys/coeffs/modulop.cc (modified) (1 diff)
• libpolys/coeffs/modulop.h (modified) (3 diffs)
• libpolys/polys/nc/summator.cc (modified) (1 diff)
• libpolys/polys/sbuckets.cc (modified) (5 diffs)
• libpolys/polys/sbuckets.h (modified) (2 diffs)
• omalloc/omBinPage.c (modified) (1 diff)

Singular/LIB/fpaprops.lib

@@ -18 +18 @@
 
 PROCEDURES:
-  lpNoetherian(<GB>);     check whether A/<GB> is (left/right) noetherian
+  lpNoetherian(<GB>);     check whether A/<LM(GB)> is (left/right) Noetherian
   lpIsSemiPrime(<GB>);    check whether A/<LM(GB)> is semi prime
   lpIsPrime(<GB>);        check whether A/<LM(GB)> is prime
@@ -33 +33 @@
 "USAGE: lpNoetherian(G); G an ideal in a Letterplace ring
 RETURN: int
-@*      0 not noetherian
-@*      1 left noetherian
-@*      2 right noetherian
-@*      3 noetherian
-PURPOSE: Check whether A/<G> is (left/right) noetherian
+@*      0 not Noetherian
+@*      1 left Noetherian
+@*      2 right Noetherian
+@*      3 Noetherian
+@*      4 weak Noetherian
+PURPOSE: Check whether the monomial algebra A/<LM(G)> is (left/right) noetherian
 ASSUME: - basering is a Letterplace ring
 @*      - G is a Groebner basis
+THEORY: lpNoetherian works with the monomial algebra A/<LM(G)>.
+If it gives an affirmative answer for one of the properties, then it 
+holds for both A/<LM(G)> and A/<G>. However, a negative answer applies 
+only to A/<LM(G)> and not necessarily to A/<G>.
+NOTE: Weak Noetherian means that two-sided ideals in A/<LM(G)> satisfy
+the acc (ascending chain condition).
 "
 {
@@ -91 +98 @@
   intvec visited;
   visited[ncols(UG)] = 0;
-  int inFlag, outFlag;
+  int inFlag, outFlag, inOutFlag;
   for (int v = 1; v <= ncols(UG) && (inFlag + outFlag) != 3; v++) {
-    int inOutFlags = inOrOutCommingEdgeInCycle(UG, v, visited, 0);
+    int inOutFlags = inOutCommingEdgesInCycles(UG, v, visited, 0);
     if (inOutFlags == 1) {
       inFlag = 1;
     }
     if (inOutFlags == 2) {
-      outFlag = 2;
+      outFlag = 1;
     }
     if (inOutFlags == 3) {
       inFlag = 1;
-      outFlag = 2;
+      outFlag = 1;
+    }
+    if (inOutFlags == 4) {
+      inOutFlag = 1;
+    }
+    if (inOutFlags == 5) {
+      inFlag = 1;
+      inOutFlag = 1;
+    }
+    if (inOutFlags == 6) {
+      outFlag = 1;
+      inOutFlag = 1;
+    }
+    if (inOutFlags == 7) {
+      inFlag = 1;
+      outFlag = 1;
+      inOutFlag = 1;
     }
     kill inOutFlags;
   } kill v;
-  return (3 - inFlag - outFlag);
+  int noetherian = 3 - 1*inFlag - 2*outFlag;
+  if (noetherian == 0) {
+    return (4 - 4*inOutFlag); // weak noetherian
+  }
+  return (noetherian);
 }
 example
@@ -118 +145 @@
 }
 
-static proc inOrOutCommingEdgeInCycle(intmat G, int v, intvec visited, intvec path) {
+static proc inOutCommingEdgesInCycles(intmat G, int v, intvec visited, intvec path) {
   // Mark the current vertex as visited
   visited[v] = 1;
@@ -129 +156 @@
   }
 
-  int inFlag, outFlag;
+  int inFlag, outFlag, inOutFlag;
 
   for (int w = 1; w <= ncols(G) && (inFlag + outFlag) != 3; w++) {
     if (G[v,w] == 1) {
-      if (visited[w] == 1) {
-        // new cycle
-        if (v == w) {
+      if (visited[w] == 1) { // new cycle
+        int tmpInFlag;
+        int tmpOutFlag;
+        if (v == w) { // cycle is a loop
           for (int u = 1; u <= ncols(G); u++) {
             if (G[v,u] && u != v) {
-              outFlag = 2;
+              outFlag = 1;
+              tmpOutFlag = 1;
             }
             if (G[u,v] && u != v) {
               inFlag = 1;
+              tmpInFlag = 1;
             }
           } kill u;
@@ -151 +181 @@
                 if (path[i] != v) {
                   if (u != path[i+1]) { // and u is not the next element in the cycle
-                    outFlag = 2;
+                    outFlag = 1;
+                    tmpOutFlag = 1;
                   }
                 } else {
                   if (u != w) {
-                    outFlag = 2;
+                    outFlag = 1;
+                    tmpOutFlag = 1;
                   }
                 }
@@ -163 +195 @@
                   if (u != path[i-1]) { // and u is not the previous element in the cylce
                     inFlag = 1;
+                    tmpInFlag = 1;
                   }
                 } else {
                   if (u != v) {
                     inFlag = 1;
+                    tmpInFlag = 1;
                   }
                 }
@@ -176 +210 @@
           } kill i;
         }
+        if (tmpInFlag > 0 && tmpOutFlag > 0) {
+          // there are both in and outcomming edges in this cycle
+          inOutFlag = 1;
+        }
+        kill tmpInFlag;
+        kill tmpOutFlag;
       } else {
-        int inOutFlags = inOrOutCommingEdgeInCycle(G, w, visited, path);
+        int inOutFlags = inOutCommingEdgesInCycles(G, w, visited, path);
         if (inOutFlags == 1) {
           inFlag = 1;
         }
         if (inOutFlags == 2) {
-          outFlag = 2;
+          outFlag = 1;
         }
         if (inOutFlags == 3) {
           inFlag = 1;
-          outFlag = 2;
+          outFlag = 1;
+        }
+        if (inOutFlags == 4) {
+          inOutFlag = 1;
+        }
+        if (inOutFlags == 5) {
+          inFlag = 1;
+          inOutFlag = 1;
+        }
+        if (inOutFlags == 6) {
+          outFlag = 1;
+          inOutFlag = 1;
+        }
+        if (inOutFlags == 7) {
+          inFlag = 1;
+          outFlag = 1;
+          inOutFlag = 1;
         }
         kill inOutFlags;
@@ -193 +249 @@
   } kill w;
 
-  return (inFlag + outFlag);
+  return (1*inFlag + 2*outFlag + 4*inOutFlag);
 }
 
@@ -202 +258 @@
 ASSUME: - basering is a Letterplace ring
       - G is a Groebner basis
+THEORY: lpIsSemiPrime works with the monomial algebra A/<LM(G)>.
+A positive answer holds for both A/<LM(G)> and A/<G>, while 
+a negative answer applies only to A/<LM(G)> and not necessarily to 
+A/<G>.
 "
 {
@@ -303 +363 @@
 ASSUME: - basering is a Letterplace ring
       - G is a Groebner basis
+THEORY: lpIsPrime works with the monomial algebra A/<LM(G)>.
+A positive answer holds for both A/<LM(G)> and A/<G>, while
+a negative answer applies only to A/<LM(G)> and not necessarily to A/<G>.
 "
 {

Singular/LIB/freegb.lib

@@ -2478 +2478 @@
   if (N >1)
   {
-    for(i=1; i<=N; i++)
+    for(i=1; i<=N-1; i++)
     {
       q = lieBracket(a,q);
@@ -2830 +2830 @@
   setring RS; fsRel;
 }
+
+/* intmat A[2][2] =
+    2, -1,
+    -3, 2; // G_2 Cartan matrix
+*/
+
 
 static proc varIdeal2intvec(ideal I)

Singular/dyn_modules/cohomo/cohomo.cc

@@ -3136 +3136 @@
 
 
-extern "C" int SI_MOD_INIT(stanleyreisnerlib)(SModulFunctions* p)
+extern "C" int SI_MOD_INIT(cohomo)(SModulFunctions* p)
 {
   firstorderdef_setup(p);

Singular/dyn_modules/syzextra/mod_main.cc

@@ -36 +36 @@
 
 #include "Singular/mod_lib.h"
-
-
-#if GOOGLE_PROFILE_ENABLED
-#include <google/profiler.h>
-#endif // #if GOOGLE_PROFILE_ENABLED
 
 
@@ -258 +253 @@
 }
 
-// proc SchreyerSyzygyNF(vector syz_lead, vector syz_2, def L, def T, list #)
-static BOOLEAN _SchreyerSyzygyNF(leftv res, leftv h)
-{
-  const SchreyerSyzygyComputationFlags attributes(currRingHdl);
-
-//   const BOOLEAN OPT__SYZCHECK   = attributes.OPT__SYZCHECK;
-//   const BOOLEAN OPT__LEAD2SYZ   = attributes.OPT__LEAD2SYZ;
-  const BOOLEAN OPT__HYBRIDNF   = attributes.OPT__HYBRIDNF;
-  const BOOLEAN OPT__TAILREDSYZ = attributes.OPT__TAILREDSYZ;
-
-  const char* usage = "`SchreyerSyzygyNF(<vector>, <vector>, <ideal/module>, <ideal/module>[,<module>])` expected";
-  const ring r = attributes.m_rBaseRing;
-
-  NoReturn(res);
-
-  assume( OPT__HYBRIDNF ); // ???
-
-  if ((h==NULL) || (h->Typ() != VECTOR_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const poly syz_lead = (poly) h->Data(); assume (syz_lead != NULL);
-
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ() != VECTOR_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const poly syz_2 = (poly) h->Data(); assume (syz_2 != NULL);
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const ideal L = (ideal) h->Data(); assume( IDELEMS(L) > 0 );
-
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const ideal T = (ideal) h->Data();
-
-  assume( IDELEMS(L) == IDELEMS(T) );
-
-  ideal LS = NULL;
-
-  h = h->Next();
-  if ((h != NULL) && (h->Typ() ==MODUL_CMD) && (h->Data() != NULL))
-  {
-    LS = (ideal)h->Data();
-    h = h->Next();
-  }
-
-#ifndef SING_NDEBUG
-  if( LIKELY( OPT__TAILREDSYZ) )
-    assume (LS != NULL);
-#endif
-
-  assume( h == NULL );
-
-  res->rtyp = VECTOR_CMD;
-  res->data = SchreyerSyzygyNF(syz_lead,
-                               (syz_2!=NULL)? p_Copy(syz_2, r): syz_2, L, T, LS, attributes);
-
-  return FALSE;
-}
-
-
-
-/// proc SSReduceTerm(poly m, def t, def syzterm, def L, def T, list #)
-static BOOLEAN _ReduceTerm(leftv res, leftv h)
-{
-  const SchreyerSyzygyComputationFlags attributes(currRingHdl);
-
-//  const BOOLEAN OPT__SYZCHECK   = attributes.OPT__SYZCHECK;
-//   const BOOLEAN OPT__LEAD2SYZ   = attributes.OPT__LEAD2SYZ;
-//   const BOOLEAN OPT__HYBRIDNF   = attributes.OPT__HYBRIDNF;
-  const BOOLEAN OPT__TAILREDSYZ = attributes.OPT__TAILREDSYZ;
-
-  const char* usage = "`ReduceTerm(<poly>, <poly/vector>, <vector/0>, <ideal/module>, <ideal/module>[,<module>])` expected";
-  const ring r = attributes.m_rBaseRing;
-
-  NoReturn(res);
-
-  if ((h==NULL) || (h->Typ() !=POLY_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const poly multiplier = (poly) h->Data(); assume (multiplier != NULL);
-
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=VECTOR_CMD && h->Typ() !=POLY_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const poly term4reduction = (poly) h->Data(); assume( term4reduction != NULL );
-
-
-  poly syztermCheck = NULL;
-
-  h = h->Next();
-  if ((h==NULL) || !((h->Typ()==VECTOR_CMD) || (h->Data() == NULL)) )
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  if(h->Typ()==VECTOR_CMD)
-    syztermCheck = (poly) h->Data();
-
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const ideal L = (ideal) h->Data(); assume( IDELEMS(L) > 0 );
-
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const ideal T = (ideal) h->Data();
-
-  assume( IDELEMS(L) == IDELEMS(T) );
-
-  ideal LS = NULL;
-
-  h = h->Next();
-  if ((h != NULL) && (h->Typ() ==MODUL_CMD) && (h->Data() != NULL))
-  {
-    LS = (ideal)h->Data();
-    h = h->Next();
-  }
-
-#ifndef SING_NDEBUG
-  if( LIKELY( OPT__TAILREDSYZ) )
-    assume (LS != NULL);
-#endif
-
-  assume( h == NULL );
-
-  res->rtyp = VECTOR_CMD;
-  res->data = ReduceTerm(multiplier, term4reduction, syztermCheck, L, T, LS, attributes);
-
-  return FALSE;
-}
-
-
-
-
-// proc SSTraverseTail(poly m, def @tail, def L, def T, list #)
-static BOOLEAN _TraverseTail(leftv res, leftv h)
-{
-  const SchreyerSyzygyComputationFlags attributes(currRingHdl);
-
-//   const BOOLEAN OPT__SYZCHECK   = attributes.OPT__SYZCHECK;
-//   const BOOLEAN OPT__LEAD2SYZ   = attributes.OPT__LEAD2SYZ;
-//   const BOOLEAN OPT__HYBRIDNF   = attributes.OPT__HYBRIDNF;
-  const BOOLEAN OPT__TAILREDSYZ = attributes.OPT__TAILREDSYZ;
-
-  const char* usage = "`TraverseTail(<poly>, <poly/vector>, <ideal/module>, <ideal/module>[,<module>])` expected";
-  const ring r = attributes.m_rBaseRing;
-
-  NoReturn(res);
-
-  if ((h==NULL) || (h->Typ() !=POLY_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const poly multiplier = (poly) h->Data(); assume (multiplier != NULL);
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=VECTOR_CMD && h->Typ() !=POLY_CMD))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const poly tail = (poly) h->Data();
-
-  h = h->Next();
-
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const ideal L = (ideal) h->Data();
-
-  assume( IDELEMS(L) > 0 );
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const ideal T = (ideal) h->Data();
-
-  assume( IDELEMS(L) == IDELEMS(T) );
-
-  h = h->Next();
-
-  ideal LS = NULL;
-
-  if ((h != NULL) && (h->Typ() ==MODUL_CMD) && (h->Data() != NULL))
-  {
-    LS = (ideal)h->Data();
-    h = h->Next();
-  }
-
-#ifndef SING_NDEBUG
-  if( LIKELY( OPT__TAILREDSYZ) )
-    assume (LS != NULL);
-#endif
-
-  assume( h == NULL );
-
-  res->rtyp = VECTOR_CMD;
-  res->data = TraverseTail(multiplier, tail, L, T, LS, attributes);
-
-  return FALSE;
-}
-
-
-static BOOLEAN _ComputeResolution(leftv res, leftv h)
-{
-  const SchreyerSyzygyComputationFlags attributes(currRingHdl);
-
-  const char* usage = "`ComputeResolution(<ideal/module>, <same as before>, <same as before>[,int])` expected";
-  const ring r = attributes.m_rBaseRing;
-
-  NoReturn(res);
-
-  // input
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const int type = h->Typ();
-  ideal M = (ideal)(h->CopyD()); // copy for resolution...!???
-  int size = IDELEMS(M);
-
-  assume( size >= 0 );
-
-  h = h->Next();
-
-  // lead
-  if ((h==NULL) || (h->Typ()!=type) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  ideal L = (ideal)(h->CopyD()); // no copy!
-  assume( IDELEMS(L) == size );
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=type) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  ideal T = (ideal)(h->CopyD()); // no copy!
-  assume( IDELEMS(T) == size );
-
-  h = h->Next();
-
-  // length..?
-  long length = 0;
-
-  if ((h!=NULL) && (h->Typ()==INT_CMD))
-  {
-    length = (long)(h->Data());
-    h = h->Next();
-  }
-
-  assume( h == NULL );
-
-  if( length <= 0 )
-    length = 1 + rVar(r);
-
-  syStrategy _res=(syStrategy)omAlloc0(sizeof(ssyStrategy));
-
-//  class ssyStrategy; typedef ssyStrategy * syStrategy;
-//  typedef ideal *            resolvente;
-
-  _res->length = length + 1; // index + 1;
-  _res->fullres = (resolvente)omAlloc0((_res->length+1)*sizeof(ideal));
-  int index = 0;
-  _res->fullres[index++] = M;
-
-//  if (UNLIKELY(attributes.OPT__TREEOUTPUT))
-//    Print("{ \"RESOLUTION: HYBRIDNF:%d, TAILREDSYZ: %d, LEAD2SYZ: %d, IGNORETAILS: %d\": [\n", attributes.OPT__HYBRIDNF, attributes.OPT__TAILREDSYZ, attributes.OPT__LEAD2SYZ, attributes.OPT__IGNORETAILS);
-
-  while( (!idIs0(L)) && (index < length))
-  {
-    attributes.nextSyzygyLayer();
-    ideal LL, TT;
-
-    ComputeSyzygy(L, T, LL, TT, attributes);
-
-    size = IDELEMS(LL);
-
-    assume( size == IDELEMS(TT) );
-
-    id_Delete(&L, r); id_Delete(&T, r);
-
-    L = LL; T = TT;
-
-    // id_Add(T, L, r);
-    M = idInit(size, 0);
-    for( int i = size-1; i >= 0; i-- )
-    {
-      M->m[i] = p_Add_q(p_Copy(T->m[i], r), p_Copy(L->m[i], r), r); // TODO: :(((
-    }
-    M->rank = id_RankFreeModule(M, r);
-
-    _res->fullres[index++] = M; // ???
-  }
-//  if ( UNLIKELY(attributes.OPT__TREEOUTPUT) )
-//    PrintS("] }\n");
-
-  id_Delete(&L, r); id_Delete(&T, r);
-
-  res->data = _res;
-  res->rtyp = RESOLUTION_CMD;
-
-//  omFreeSize(_res, sizeof(ssyStrategy));
-
-  return FALSE;
-
-}
-
-
-/// module (LL, TT) = SSComputeSyzygy(L, T);
-/// Compute Syz(L ++ T) = N = LL ++ TT
-// proc SSComputeSyzygy(def L, def T)
-static BOOLEAN _ComputeSyzygy(leftv res, leftv h)
-{
-  const SchreyerSyzygyComputationFlags attributes(currRingHdl);
-
-//   const BOOLEAN OPT__SYZCHECK   = attributes.OPT__SYZCHECK;
-//   const BOOLEAN OPT__LEAD2SYZ   = attributes.OPT__LEAD2SYZ;
-//   const BOOLEAN OPT__HYBRIDNF   = attributes.OPT__HYBRIDNF;
-//   const BOOLEAN OPT__TAILREDSYZ = attributes.OPT__TAILREDSYZ;
-
-  const char* usage = "`ComputeSyzygy(<ideal/module>, <ideal/module>)` expected";
-  const ring r = attributes.m_rBaseRing;
-
-  NoReturn(res);
-
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const ideal L = (ideal) h->Data();
-
-  assume( IDELEMS(L) > 0 );
-
-  h = h->Next();
-  if ((h==NULL) || (h->Typ()!=IDEAL_CMD && h->Typ() !=MODUL_CMD) || (h->Data() == NULL))
-  {
-    WerrorS(usage);
-    return TRUE;
-  }
-
-  const ideal T = (ideal) h->Data();
-  assume( IDELEMS(L) == IDELEMS(T) );
-
-
-  h = h->Next(); assume( h == NULL );
-
-  ideal LL, TT;
-
-  ComputeSyzygy(L, T, LL, TT, attributes);
-
-  lists l = (lists)omAllocBin(slists_bin); l->Init(2);
-
-  l->m[0].rtyp = MODUL_CMD; l->m[0].data = reinterpret_cast<void *>(LL);
-
-  l->m[1].rtyp = MODUL_CMD; l->m[1].data = reinterpret_cast<void *>(TT);
-
-  res->data = l; res->rtyp = LIST_CMD;
-
-  return FALSE;
-
-}
-
 /// Get leading component
 static BOOLEAN leadcomp(leftv res, leftv h)
 {
-  NoReturn(res);
-
   if ((h!=NULL) && (h->Typ()==VECTOR_CMD || h->Typ()==POLY_CMD))
   {
@@ -701 +272 @@
 
       res->data = reinterpret_cast<void *>(jjLONG2N(iComp));
-    } else
+    }
+    else
       res->data = reinterpret_cast<void *>(jjLONG2N(0));
 
@@ -716 +288 @@
 static BOOLEAN MakeInducedSchreyerOrdering(leftv res, leftv h)
 {
-
-  NoReturn(res);
-
   int sign = 1;
   if ((h!=NULL) && (h->Typ()==INT_CMD))
@@ -744 +313 @@
 static BOOLEAN GetInducedData(leftv res, leftv h)
 {
-  NoReturn(res);
-
   const ring r = currRing;
 
@@ -802 +369 @@
 static BOOLEAN SetInducedReferrence(leftv res, leftv h)
 {
+  res->Init();
   NoReturn(res);
 
@@ -839 +407 @@
     return TRUE;
   }
-
-
 
   // F & componentWeights belong to that ordering block of currRing now:
@@ -947 +513 @@
 
 
-// #define ADD(A,B,C,D,E) ADD0(iiAddCproc, "", C, D, E)
-
-//#define ADD0(A,B,C,D,E) A(B, (char*)C, D, E)
-// #define ADD(A,B,C,D,E) ADD0(A->iiAddCproc, B, C, D, E)
   ADD("ClearContent", FALSE, _ClearContent);
   ADD("ClearDenominators", FALSE, _ClearDenominators);
@@ -964 +526 @@
   ADD("Tail", FALSE, Tail);
 
-  ADD("ReduceTerm", FALSE, _ReduceTerm);
-  ADD("TraverseTail", FALSE, _TraverseTail);
-
-
-  ADD("SchreyerSyzygyNF", FALSE, _SchreyerSyzygyNF);
-  ADD("ComputeSyzygy", FALSE, _ComputeSyzygy);
-
-  ADD("ComputeResolution", FALSE, _ComputeResolution);
-
-  //  ADD("", FALSE, );
-
 #undef ADD
   return MAX_TOK;

Singular/dyn_modules/syzextra/singularxx_defs.h

@@ -24 +24 @@
 
 
-//#ifdef HAVE_NAMESPACES
-//
-//#define BEGIN_NAMESPACE(a) namespace a {
-//#define END_NAMESPACE }
-//
-//#define USING_NAMESPACE(a) using namespace a;
-//#define FROM_NAMESPACE(a, s) a :: s
-//
-//#else
-//
-//#define BEGIN_NAMESPACE(a)
-//#define END_NAMESPACE
-//
-//#define USING_NAMESPACE(a)
 #define FROM_NAMESPACE(a, s) s
-
-//#endif
-
-
-//#define SINGULARXXNAME Singular
-//
-//#define BEGIN_NAMESPACE_SINGULARXX BEGIN_NAMESPACE(SINGULARXXNAME)
-//#define END_NAMESPACE_SINGULARXX END_NAMESPACE
-//
-//#define USING_NAMESPACE_SINGULARXX USING_NAMESPACE(SINGULARXXNAME)
-//#define FROM_NAMESPACE_SINGULARXXNAME(s) FROM_NAMESPACE(SINGULARXXNAME, s)
-//
-//#define BEGIN_NAMESPACE_NONAME BEGIN_NAMESPACE()
-//
-
 
 #ifndef HAVE_THROW
@@ -61 +32 @@
 #endif
 
-// #include "CSingularTypes.h"
-
 #endif /* SINGULAR_singular_defs_h_ */

Singular/dyn_modules/syzextra/syzextra.cc

@@ -27 +27 @@
 
 #include "misc/intvec.h"
-#include "misc/options.h"
 
 #include "coeffs/coeffs.h"
@@ -35 +34 @@
 #include "polys/simpleideals.h"
 
-#include "polys/kbuckets.h" // for kBucket*
-#include "polys/sbuckets.h" // for sBucket*
-//#include "polys/nc/summator.h" // for CPolynomialSummator
-#include "polys/operations/p_Mult_q.h" // for MIN_LENGTH_BUCKET
-
-#include "kernel/GBEngine/kstd1.h"
 #include "kernel/polys.h"
-#include "kernel/GBEngine/syz.h"
 #include "kernel/ideals.h"
-
-#include "kernel/oswrapper/timer.h"
-
-#include "Singular/tok.h"
-#include "Singular/ipid.h"
-#include "Singular/lists.h"
-#include "Singular/attrib.h"
-
-#include "Singular/ipid.h"
-#include "Singular/ipshell.h" // For iiAddCproc
 
 #include <stdio.h>
 #include <stdlib.h>
-
-#ifndef RTIMER_BENCHMARKING
-# define RTIMER_BENCHMARKING 0
-#endif
-
-SBucketFactory::Bucket SBucketFactory::_CreateBucket(const ring r)
-{
-  const Bucket bt = sBucketCreate(r);
-
-  assume( bt != NULL );
-  return bt;
-}
-
-void SBucketFactory::_DestroyBucket(SBucketFactory::Bucket & bt)
-{
-  if( bt != NULL )
-  {
-    sBucketDestroy( &bt );
-    bt = NULL;
-  }
-}
-
-class SBucketWrapper
-{
-  typedef SBucketFactory::Bucket Bucket;
-
-  private:
-    Bucket m_bucket;
-
-    SBucketFactory& m_factory;
-  public:
-    SBucketWrapper(const ring r, SBucketFactory& factory):
-        m_bucket( factory.getBucket(r) ),
-        m_factory( factory )
-    {}
-
-    ~SBucketWrapper()
-    {
-      m_factory.putBucket( m_bucket );
-    }
-
-  public:
-
-    /// adds p to the internal bucket
-    /// destroys p, l == length(p)
-    inline void Add( poly p, const int l )
-    {
-      assume( pLength(p) == l );
-      sBucket_Add_p( m_bucket, p, l );
-    }
-
-    /// adds p to the internal bucket
-    /// destroys p
-    inline void Add( poly p ){ Add(p, pLength(p)); }
-
-    poly ClearAdd()
-    {
-      poly p; int l;
-      sBucketClearAdd(m_bucket, &p, &l);
-      assume( pLength(p) == l );
-      return p;
-    }
-};
-
-static FORCE_INLINE poly pp_Add_qq( const poly a, const poly b, const ring R)
-{
-  return p_Add_q( p_Copy(a, R), p_Copy(b, R), R );
-}
-
-static FORCE_INLINE poly p_VectorProductLT( poly s,  const ideal& L, const ideal& T, const ring& R)
-{
-  assume( IDELEMS(L) == IDELEMS(T) );
-  poly vp = NULL; // resulting vector product
-
-  while( s != NULL )
-  {
-    const poly nxt = pNext(s);
-    pNext(s) = NULL;
-
-    if( !n_IsZero( pGetCoeff(s), R->cf) )
-    {
-      const int i = p_GetComp(s, R) - 1;
-      assume( i >= 0 ); assume( i < IDELEMS(L) );
-      p_SetComp(s, 0, R); p_SetmComp(s, R);
-
-      vp = p_Add_q( vp, pp_Mult_qq( s, L->m[i], R ), R);
-      vp = p_Add_q( vp, pp_Mult_qq( s, T->m[i], R ), R);
-    }
-
-    p_Delete(&s, R);
-
-    s = nxt;
-  };
-
-  assume( s == NULL );
-
-  return vp;
-}
-
-static FORCE_INLINE int atGetInt(idhdl rootRingHdl, const char* attribute, long def)
-{
-  return ((int)(long)(atGet(rootRingHdl, attribute, INT_CMD, (void*)def)));
-}
-
-#if (defined(HAVE_QSORT_R) && (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || defined __FreeBSD__ || defined __BSD__ || defined OpenBSD3_1 || defined OpenBSD3_9))
-static int cmp_c_ds(void *R, const void *p1, const void *p2){
-#elif (defined(HAVE_QSORT_R) && (defined _GNU_SOURCE || defined __GNU__ || defined __linux__))
-static int cmp_c_ds(const void *p1, const void *p2, void *R){
-#else
-static int cmp_c_ds(const void *p1, const void *p2){ void *R = currRing;
-#endif
-  assume(R != NULL);
-  const int YES = 1;
-  const int NO = -1;
-
-  const ring r =  (const ring) R; // TODO/NOTE: the structure is known: C, lp!!!
-
-  assume( r == currRing ); // for now...
-
-  const poly a = *(const poly*)p1;
-  const poly b = *(const poly*)p2;
-
-  assume( a != NULL );
-  assume( b != NULL );
-
-  p_LmTest(a, r);
-  p_LmTest(b, r);
-
-
-  const signed long iCompDiff = p_GetComp(a, r) - p_GetComp(b, r);
-
-  // TODO: test this!!!!!!!!!!!!!!!!
-
-  //return -( compare (c, qsorts) )
-
-  if( iCompDiff > 0 )
-    return YES;
-
-  if( iCompDiff < 0 )
-    return  NO;
-
-  assume( iCompDiff == 0 );
-
-  const signed long iDegDiff = p_Totaldegree(a, r) - p_Totaldegree(b, r);
-
-  if( iDegDiff > 0 )
-    return YES;
-
-  if( iDegDiff < 0 )
-    return  NO;
-
-  assume( iDegDiff == 0 );
-
-  for (int v = rVar(r); v > 0; v--)
-  {
-    assume( v > 0 );
-    assume( v <= rVar(r) );
-
-    const signed int d = p_GetExp(a, v, r) - p_GetExp(b, v, r);
-
-    if( d > 0 )
-      return YES;
-
-    if( d < 0 )
-      return NO;
-
-    assume( d == 0 );
-  }
-
-  return 0;
-}
-
-/*
-static int cmp_poly(const poly &a, const poly &b)
-{
-  const int YES = 1;
-  const int NO = -1;
-
-  const ring r =  (const ring) currRing; // TODO/NOTE: the structure is known: C, lp!!!
-
-  assume( r == currRing );
-
-  assume( a != NULL );
-  assume( b != NULL );
-
-  p_LmTest(a, r);
-  p_LmTest(b, r);
-  assume( p_GetComp(a, r) == 0 );
-  assume( p_GetComp(b, r) == 0 );
-
-  for (int v = rVar(r); v > 0; v--)
-  {
-    assume( v > 0 );
-    assume( v <= rVar(r) );
-
-    const signed int d = p_GetExp(a, v, r) - p_GetExp(b, v, r);
-
-    if( d > 0 )
-      return YES;
-
-    if( d < 0 )
-      return NO;
-
-    assume( d == 0 );
-  }
-
-  return 0;
-}
-*/
-
-/* namespace SORT_c_ds */
-
-static FORCE_INLINE poly myp_Head(const poly p, const bool bIgnoreCoeff, const ring r)
-{
-  assume( p != NULL ); p_LmCheckPolyRing1(p, r);
-
-  poly np; omTypeAllocBin(poly, np, r->PolyBin);
-  p_SetRingOfLm(np, r);
-  memcpy(np->exp, p->exp, r->ExpL_Size*sizeof(long));
-  pNext(np) = NULL;
-  pSetCoeff0(np, (bIgnoreCoeff)? NULL : n_Copy(pGetCoeff(p), r->cf));
-
-  p_LmCheckPolyRing1(np, r);
-  return np;
-}
-
-
-/// return a new term: leading coeff * leading monomial of p
-/// with 0 leading component!
-poly leadmonom(const poly p, const ring r, const bool bSetZeroComp)
-{
-  if( UNLIKELY(p == NULL ) )
-     return NULL;
-
-    assume( p != NULL );
-    p_LmTest(p, r);
-
-    poly m = p_LmInit(p, r);
-    p_SetCoeff0(m, n_Copy(pGetCoeff(p), r->cf), r);
-
-    if( bSetZeroComp )
-      p_SetComp(m, 0, r);
-
-    p_Setm(m, r);
-
-    assume( m != NULL );
-    assume( pNext(m) == NULL );
-    p_LmTest(m, r);
-
-    if( bSetZeroComp )
-      assume( p_GetComp(m, r) == 0 );
-
-  return m;
-}
-
-
 
 poly p_Tail(const poly p, const ring r)
@@ -321 +47 @@
     return p_Copy( pNext(p), r );
 }
-
 
 ideal id_Tail(const ideal id, const ring r)
@@ -338 +63 @@
 }
 
-
-
-void Sort_c_ds(const ideal id, const ring r)
-{
-  const int sizeNew = IDELEMS(id);
-
-#if ( (defined(HAVE_QSORT_R)) && (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || defined __FreeBSD__ || defined __BSD__ || defined OpenBSD3_1 || defined OpenBSD3_9) )
-#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, r, cmp)
-#elif ( (defined(HAVE_QSORT_R)) && (defined _GNU_SOURCE || defined __GNU__ || defined __linux__))
-#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, cmp, r)
-#else
-#define qsort_my(m, s, ss, r, cmp) qsort(m, s, ss, cmp)
-#endif
-
-  if( sizeNew >= 2 )
-    qsort_my(id->m, sizeNew, sizeof(poly), r, FROM_NAMESPACE(SORT_c_ds, cmp_c_ds));
-
-#undef qsort_my
-
-  id->rank = id_RankFreeModule(id, r);
-}
-
-/// Clean up all the accumulated data
-void SchreyerSyzygyComputation::CleanUp()
-{
-  id_Delete(const_cast<ideal*>(&m_idTails), m_rBaseRing); // TODO!!!
-
-/*if( m_sum_bucket != NULL )
-  {
-    assume ( sIsEmpty(m_sum_bucket) );
-    sBucketDestroy(&m_sum_bucket);
-    m_sum_bucket = NULL;
-  }*/
-
-  if( m_spoly_bucket != NULL )
-  {
-    kBucketDestroy(&m_spoly_bucket);
-    m_spoly_bucket = NULL;
-  }
-
-  for( TCache::iterator it = m_cache.begin(); it != m_cache.end(); it++ )
-  {
-    TP2PCache& T = it->second;
-
-    for(TP2PCache::iterator vit = T.begin(); vit != T.end(); vit++ )
-    {
-      p_Delete( (&(vit->second)), m_rBaseRing);
-      p_Delete( const_cast<poly*>(&(vit->first)), m_rBaseRing);
-    }
-  }
-}
-  /*
-  for( TTailTerms::const_iterator it = m_idTailTerms.begin(); it != m_idTailTerms.end(); it++ )
-  {
-    const TTail& v = *it;
-    for(TTail::const_iterator vit = v.begin(); vit != v.end(); vit++ )
-      delete const_cast<CTailTerm*>(*vit);
-  }
-  */
-
-
-
-int CReducerFinder::PreProcessTerm(const poly t, CReducerFinder& syzChecker) const
-{
-  assume( t != NULL );
-
-  const ring r = m_rBaseRing;
-
-
-  if( LIKELY(OPT__TAILREDSYZ) )
-    if( p_LmIsConstant(t, r) ) // most basic case of baing coprime with L, whatever that is...
-      return 1; // TODO: prove this...?
-
-  //   return false; // appears to be fine
-
-  const long comp = p_GetComp(t, r);
-
-  CReducersHash::const_iterator itr = m_hash.find(comp);
-
-  if ( itr == m_hash.end() )
-    return 2; // no such leading component!!!
-
-  assume( itr->first == comp );
-
-  const bool bIdealCase = (comp == 0);
-  const bool bSyzCheck = syzChecker.IsNonempty(); // need to check even in ideal case????? proof?  "&& !bIdealCase"
-
-  if( LIKELY(OPT__TAILREDSYZ && (bIdealCase || bSyzCheck)) )
-  {
-    const TReducers& v = itr->second;
-    const int N = rVar(r);
-    // TODO: extract exps of t beforehand?!
-    bool coprime = true;
-    for(TReducers::const_iterator vit = v.begin(); (vit != v.end()) && coprime; ++vit )
-    {
-      assume( (*vit)->CheckLT( m_L ) );
-
-      const poly p = (*vit)->lt();
-
-      assume( p_GetComp(p, r) == comp );
-
-      // TODO: check if coprime with Leads... if OPT__TAILREDSYZ !
-      for( int var = N; var > 0; --var )
-        if( (p_GetExp(p, var, r) != 0) && (p_GetExp(t, var, r) != 0) )
-        {
-          coprime = false; // t not coprime with p!
-          break;
-        }
-
-      if( bSyzCheck && coprime )
-      {
-        poly ss = p_LmInit(t, r);
-        p_SetCoeff0(ss, n_Init(1, r->cf), r); // for delete & printout only!...
-        p_SetComp(ss, (*vit)->label() + 1, r); // coeff?
-        p_Setm(ss, r);
-
-        coprime = ( syzChecker.IsDivisible(ss) );
-
-        p_LmDelete(&ss, r); // deletes coeff as well???
-      }
-
-      assume( p == (*vit)->lt() );
-      assume( (*vit)->CheckLT( m_L ) );
-    }
-
-    return coprime? 3: 0; // t was coprime with all of leading terms!!!
-
-  }
-  //   return true; // delete the term
-
-  return 0;
-}
-
-
-void SchreyerSyzygyComputation::SetUpTailTerms()
-{
-  const ideal idTails = m_idTails;
-  assume( idTails != NULL );
-  assume( idTails->m != NULL );
-  const ring r = m_rBaseRing;
-
-  unsigned long pp[4] = {0,0,0,0}; // count preprocessed terms...
-
-  for( int p = IDELEMS(idTails) - 1; p >= 0; --p )
-    for( poly* tt = &(idTails->m[p]); (*tt) != NULL;  )
-    {
-      const poly t = *tt;
-      const int k = m_div.PreProcessTerm(t, m_checker); // 0..3
-      assume( 0 <= k && k <= 3 );
-
-      pp[k]++; // collect stats
-
-      if( k )
-      {
-        (*tt) = p_LmDeleteAndNext(t, r); // delete the lead and next...
-      }
-      else
-        tt = &pNext(t); // go next?
-
-    }
-
-  if( UNLIKELY(OPT__PROT) )
-  {
-    Print("(PP/ST: {c: %lu, C: %lu, P: %lu} + %lu)", pp[1], pp[2], pp[3], pp[0]);
-    m_stat[0] += pp [0]; m_stat[1] += pp [1]; m_stat[2] += pp [2]; m_stat[3] += pp [3];
-  }
-}
-
-/*
-  m_idTailTerms.resize( IDELEMS(idTails) );
-
-  for( unsigned int p = IDELEMS(idTails) - 1; p >= 0; p -- )
-  {
-    TTail& v = m_idTailTerms[p];
-    poly t = idTails->m[p];
-    v.resize( pLength(t) );
-
-    unsigned int pp = 0;
-
-    while( t != NULL )
-    {
-      assume( t != NULL );
-      // TODO: compute L:t!
-//      ideal reducers;
-//      CReducerFinder m_reducers
-
-      CTailTerm* d = v[pp] = new CTailTerm();
-
-      ++pp; pIter(t);
-    }
-  }
-*/
-
-void SchreyerSyzygyComputation::PrintStats() const
-{
-  Print("SchreyerSyzygyComputation Stats: (PP/ST: {c: %lu, C: %lu, P: %lu} + %lu, LOT: %lu, LCM: %lu, ST:%lu, LK: %lu {*: %lu})\n",
-        m_stat[1], m_stat[2], m_stat[3], m_stat[0],
-        m_stat[4], m_stat[5],
-        m_stat[8],
-        m_stat[6] + m_stat[7], m_stat[7]
-       );
-}
-
-
-ideal SchreyerSyzygyComputation::Compute1LeadingSyzygyTerms()
-{
-  const ideal& id = m_idLeads;
-  const ring& r = m_rBaseRing;
-//  const SchreyerSyzygyComputationFlags& attributes = m_atttributes;
-
-  assume(!OPT__LEAD2SYZ);
-
-  // 1. set of components S?
-  // 2. for each component c from S: set of indices of leading terms
-  // with this component?
-  // 3. short exp. vectors for each leading term?
-
-  const int size = IDELEMS(id);
-
-  if( size < 2 )
-  {
-    const ideal newid = idInit(1, 0); newid->m[0] = NULL; // zero ideal...
-    return newid;
-  }
-
-  // TODO/NOTE: input is supposed to be (reverse-) sorted wrt "(c,ds)"!??
-
-  // components should come in groups: count elements in each group
-  // && estimate the real size!!!
-
-
-  // use just a vector instead???
-  const ideal newid = idInit( (size * (size-1))/2, size); // maximal size: ideal case!
-
-  int k = 0;
-
-  for (int j = 0; j < size; j++)
-  {
-    const poly p = id->m[j];
-    assume( p != NULL );
-    const int  c = p_GetComp(p, r);
-
-    for (int i = j - 1; i >= 0; i--)
-    {
-      const poly pp = id->m[i];
-      assume( pp != NULL );
-      const int  cc = p_GetComp(pp, r);
-
-      if( c != cc )
-        continue;
-
-      const poly m = p_Init(r); // p_New???
-
-      // m = LCM(p, pp) / p! // TODO: optimize: knowing the ring structure: (C/lp)!
-      for (int v = rVar(r); v > 0; v--)
-      {
-        assume( v > 0 );
-        assume( v <= rVar(r) );
-
-        const short e1 = p_GetExp(p , v, r);
-        const short e2 = p_GetExp(pp, v, r);
-
-        if( e1 >= e2 )
-          p_SetExp(m, v, 0, r);
-        else
-          p_SetExp(m, v, e2 - e1, r);
-
-      }
-
-      assume( (j > i) && (i >= 0) );
-
-      p_SetComp(m, j + 1, r);
-      pNext(m) = NULL;
-      p_SetCoeff0(m, n_Init(1, r->cf), r); // for later...
-
-      p_Setm(m, r); // should not do anything!!!
-
-      newid->m[k++] = m;
-    }
-  }
-
-  // the rest of newid is assumed to be zeroes...
-
-  // simplify(newid, 2 + 32)??
-  // sort(newid, "C,ds")[1]???
-  id_DelDiv(newid, r); // #define SIMPL_LMDIV 32
-
-  idSkipZeroes(newid); // #define SIMPL_NULL 2
-
-  Sort_c_ds(newid, r);
-
-  return newid;
-}
-
-ideal SchreyerSyzygyComputation::Compute2LeadingSyzygyTerms()
-{
-  const ideal& id = m_idLeads;
-  const ring& r = m_rBaseRing;
-//  const SchreyerSyzygyComputationFlags& attributes = m_atttributes;
-
-  // 1. set of components S?
-  // 2. for each component c from S: set of indices of leading terms
-  // with this component?
-  // 3. short exp. vectors for each leading term?
-
-  const int size = IDELEMS(id);
-
-  if( size < 2 )
-  {
-    const ideal newid = idInit(1, 1); newid->m[0] = NULL; // zero module...
-    return newid;
-  }
-
-
-  // TODO/NOTE: input is supposed to be sorted wrt "C,ds"!??
-
-  // components should come in groups: count elements in each group
-  // && estimate the real size!!!
-
-
-  // use just a vector instead???
-  ideal newid = idInit( (size * (size-1))/2, size); // maximal size: ideal case!
-
-  int k = 0;
-
-  for (int j = 0; j < size; j++)
-  {
-    const poly p = id->m[j];
-    assume( p != NULL );
-    const int  c = p_GetComp(p, r);
-
-    for (int i = j - 1; i >= 0; i--)
-    {
-      const poly pp = id->m[i];
-      assume( pp != NULL );
-      const int  cc = p_GetComp(pp, r);
-
-      if( c != cc )
-        continue;
-
-        // allocate memory & zero it out!
-      const poly m = p_Init(r); const poly mm = p_Init(r);
-
-
-        // m = LCM(p, pp) / p! mm = LCM(p, pp) / pp!
-        // TODO: optimize: knowing the ring structure: (C/lp)!
-
-      for (int v = rVar(r); v > 0; v--)
-      {
-        assume( v > 0 );
-        assume( v <= rVar(r) );
-
-        const short e1 = p_GetExp(p , v, r);
-        const short e2 = p_GetExp(pp, v, r);
-
-        if( e1 >= e2 )
-          p_SetExp(mm, v, e1 - e2, r); //            p_SetExp(m, v, 0, r);
-        else
-          p_SetExp(m, v, e2 - e1, r); //            p_SetExp(mm, v, 0, r);
-
-      }
-
-      assume( (j > i) && (i >= 0) );
-
-      p_SetComp(m, j + 1, r);
-      p_SetComp(mm, i + 1, r);
-
-      const number& lc1 = p_GetCoeff(p , r);
-      const number& lc2 = p_GetCoeff(pp, r);
-
-#if NODIVISION
-      assume( n_IsOne(lc1, r->cf) );
-      assume( n_IsOne(lc2, r->cf) );
-
-      p_SetCoeff0( m, n_Init( 1, r->cf), r );
-      p_SetCoeff0(mm, n_Init(-1, r->cf), r );
-#else
-      number g = n_Lcm( lc1, lc2, r->cf );
-      p_SetCoeff0(m ,       n_Div(g, lc1, r), r);
-      p_SetCoeff0(mm, n_InpNeg(n_Div(g, lc2, r), r), r);
-      n_Delete(&g, r);
-#endif
-
-      p_Setm(m, r); // should not do anything!!!
-      p_Setm(mm, r); // should not do anything!!!
-
-      pNext(m) = mm; //        pNext(mm) = NULL;
-
-      newid->m[k++] = m;
-    }
-  }
-
-  if( UNLIKELY(!OPT__TAILREDSYZ) )
-  {
-      // simplify(newid, 2 + 32)??
-      // sort(newid, "C,ds")[1]???
-    id_DelDiv(newid, r); // #define SIMPL_LMDIV 32
-  }
-  else
-  {
-      //      option(redSB); option(redTail);
-      //      TEST_OPT_REDSB
-      //      TEST_OPT_REDTAIL
-    assume( r == currRing );
-
-    BITSET _save_test; SI_SAVE_OPT1(_save_test);
-    SI_RESTORE_OPT1(Sy_bit(OPT_REDTAIL) | Sy_bit(OPT_REDSB) | _save_test);
-
-    intvec* w=new intvec(IDELEMS(newid));
-    ideal tmp = kStd(newid, currRing->qideal, isHomog, &w);
-    delete w;
-
-    SI_RESTORE_OPT1(_save_test)
-
-    id_Delete(&newid, r);
-    newid = tmp;
-  }
-
-  idSkipZeroes(newid);
-
-  Sort_c_ds(newid, r);
-
-  return newid;
-}
-
-poly SchreyerSyzygyComputation::TraverseNF(const poly a, const poly a2) const
-{
-  const ideal& L = m_idLeads;
-  const ideal& T = m_idTails;
-
-  const ring& R = m_rBaseRing;
-
-  const int r = p_GetComp(a, R) - 1;
-
-  assume( r >= 0 && r < IDELEMS(T) );
-  assume( r >= 0 && r < IDELEMS(L) );
-
-  assume( a != NULL );
-
-  poly aa = leadmonom(a, R); assume( aa != NULL); // :(
-
-  poly t = TraverseTail(aa, r);
-
-  if( a2 != NULL )
-  {
-    assume( OPT__LEAD2SYZ );
-
-    // replace the following... ?
-    const int r2 = p_GetComp(a2, R) - 1; poly aa2 = leadmonom(a2, R); // :(
-
-    assume( r2 >= 0 && r2 < IDELEMS(T) );
-
-    poly s =  TraverseTail(aa2, r2);
-
-    p_Delete(&aa2, R);
-
-    t = p_Add_q(a2, p_Add_q(t, s, R), R);
-
-  } else
-    t = p_Add_q(t, ReduceTerm(aa, L->m[r], a), R); // should be identical to bove with a2
-
-  p_Delete(&aa, R);
-
-  return t;
-}
-
-void SchreyerSyzygyComputation::ComputeSyzygy()
-{
-  assume( m_idLeads != NULL );
-  assume( m_idTails != NULL );
-
-  const ideal& L = m_idLeads;
-  const ideal& T = m_idTails;
-
-  ideal& TT = m_syzTails;
-  const ring& R = m_rBaseRing;
-
-//  if( m_sum_bucket == NULL )
-//    m_sum_bucket = sBucketCreate(R);
-//  assume ( sIsEmpty(m_sum_bucket) );
-
-  if( m_spoly_bucket == NULL )
-    m_spoly_bucket = kBucketCreate(R);
-
-
-  assume( IDELEMS(L) == IDELEMS(T) );
-
-#ifdef SING_NDEBUG
-  int t, r; // for rtimer benchmarking in prot realease mode
-#endif
-
-  if( UNLIKELY(OPT__TREEOUTPUT) )
-    Print("\n{ \"syzygylayer\": \"%d\", \"hybridnf\": \"%d\", \"diagrams\": \n[", OPT__SYZNUMBER, OPT__HYBRIDNF );
-
-  if( UNLIKELY(OPT__PROT) ) Print("\n[%d]", OPT__SYZNUMBER );
-
-  if( m_syzLeads == NULL )
-  {
-#ifdef SING_NDEBUG
-    if( UNLIKELY(OPT__PROT & RTIMER_BENCHMARKING) )
-    {
-      t = getTimer(); r = getRTimer();
-      Print("\n%% %5d **!TIME4!** SchreyerSyzygyComputation::ComputeSyzygy::ComputeLeadingSyzygyTerms: t: %d, r: %d\n", r, t, r);
-    }
-#endif
-
-    ComputeLeadingSyzygyTerms( OPT__LEAD2SYZ && !OPT__IGNORETAILS ); // 2 terms OR 1 term!
-
-#ifdef SING_NDEBUG
-    if( UNLIKELY(OPT__PROT & RTIMER_BENCHMARKING) )
-    {
-      t = getTimer() - t; r = getRTimer() - r;
-      Print("\n%% %5d **!TIME4!** SchreyerSyzygyComputation::ComputeSyzygy::ComputeLeadingSyzygyTerms: dt: %d, dr: %d\n", getRTimer(), t, r);
-    }
-#endif
-
-  }
-
-  assume( m_syzLeads != NULL );
-  ideal& LL = m_syzLeads;
-  const int size = IDELEMS(LL);
-
-  TT = idInit(size, 0);
-
-  if( size == 1 && LL->m[0] == NULL )
-  {
-     if( UNLIKELY(OPT__TREEOUTPUT) )
-       PrintS("]},");
-     return;
-  }
-
-
-  // use hybrid (Schreyer NF) method?
-  const bool method = (OPT__HYBRIDNF  == 1); //  || (OPT__HYBRIDNF == 2 && OPT__SYZNUMBER < 3);
-
-  if( UNLIKELY(OPT__PROT) ) Print("[%s NF|%s]",(method) ? "PR" : "TT", (NOPRODUCT == 1)? "_,_": "^*^" );
-
-
-  if(  LIKELY(!OPT__IGNORETAILS) )
-  {
-    if( T != NULL )
-    {
-#ifdef SING_NDEBUG
-      if( UNLIKELY(OPT__PROT & RTIMER_BENCHMARKING) )
-      {
-        t = getTimer(); r = getRTimer();
-        Print("\n%% %5d **!TIME4!** SchreyerSyzygyComputation::ComputeSyzygy::SetUpTailTerms(): t: %d, r: %d\n", r, t, r);
-      }
-#endif
-
-      SetUpTailTerms();
-
-#ifdef SING_NDEBUG
-      if( UNLIKELY(OPT__PROT & RTIMER_BENCHMARKING) )
-      {
-        t = getTimer() - t; r = getRTimer() - r;
-        Print("\n%% %5d **!TIME4!** SchreyerSyzygyComputation::ComputeSyzygy::SetUpTailTerms(): dt: %d, dr: %d\n", getRTimer(), t, r);
-      }
-#endif
-    }
-  }
-
-#ifdef SING_NDEBUG
-  if( UNLIKELY(OPT__PROT & RTIMER_BENCHMARKING) )
-  {
-    t = getTimer(); r = getRTimer();
-    Print("\n%% %5d **!TIME4!** SchreyerSyzygyComputation::ComputeSyzygy::SyzygyLift: t: %d, r: %d\n", r, t, r);
-  }
-#endif
-
-//  for( int k = 0; k < size; ++k ) // TODO: should be fine now!
-  for( int k = size - 1; k >= 0; --k )
-  {
-    const poly a = LL->m[k]; assume( a != NULL );
-
-    poly a2 = pNext(a);
-
-    // Splitting 2-terms Leading syzygy module
-    if( a2 != NULL )
-      pNext(a) = NULL;
-
-    if( UNLIKELY(OPT__IGNORETAILS) )
-    {
-      TT->m[k] = NULL;
-
-      assume( a2 != NULL );
-
-      if( a2 != NULL )
-        p_Delete(&a2, R);
-
-      continue;
-    }
-
-    //    TT->m[k] = a2;
-
-    poly nf;
-
-    if( method )
-      nf = SchreyerSyzygyNF(a, a2);
-    else
-      nf = TraverseNF(a, a2);
-
-    TT->m[k] = nf;
-
-    if( UNLIKELY(OPT__SYZCHECK) )
-    {
-      // TODO: check the correctness (syzygy property): a + TT->m[k] should be a syzygy!!!
-
-      poly s = pp_Add_qq( a, TT->m[k], R); // current syzygy
-
-      poly vp = p_VectorProductLT(s, L, T, R);
-
-      assume( vp == NULL );
-
-      if( UNLIKELY( OPT__PROT && (vp != NULL) ) ) Warn("ERROR: SyzCheck failed, wrong tail: [%d]\n\n", k); // check k'th syzygy failed
-
-      p_Delete(&vp, R);
-    }
-  }
-
-#ifdef SING_NDEBUG
-  if( UNLIKELY( OPT__PROT & RTIMER_BENCHMARKING ) )
-  {
-    t = getTimer() - t; r = getRTimer() - r;
-    Print("\n%% %5d **!TIME4!** SchreyerSyzygyComputation::ComputeSyzygy::SyzygyLift: dt: %d, dr: %d\n", getRTimer(), t, r);
-  }
-#endif
-
-  TT->rank = id_RankFreeModule(TT, R);
-
-  if( UNLIKELY(OPT__TREEOUTPUT) )
-    PrintS("\n]},");
-
-  if( UNLIKELY(OPT__PROT) ) PrintLn();
-}
-
-void SchreyerSyzygyComputation::ComputeLeadingSyzygyTerms(bool bComputeSecondTerms)
-{
-//  const SchreyerSyzygyComputationFlags& attributes = m_atttributes;
-
-//  const BOOLEAN OPT__LEAD2SYZ   = attributes.OPT__LEAD2SYZ;
-//  const BOOLEAN OPT__TAILREDSYZ = attributes.OPT__TAILREDSYZ;
-
-  assume( m_syzLeads == NULL );
-
-  if( UNLIKELY(bComputeSecondTerms) )
-  {
-    assume( OPT__LEAD2SYZ );
-//    m_syzLeads = FROM_NAMESPACE(INTERNAL, _Compute2LeadingSyzygyTerms(m_idLeads, m_rBaseRing, m_atttributes));
-    m_syzLeads = Compute2LeadingSyzygyTerms();
-  }
-  else
-  {
-    assume( !OPT__LEAD2SYZ );
-
-    m_syzLeads = Compute1LeadingSyzygyTerms();
-  }
-//    m_syzLeads = FROM_NAMESPACE(INTERNAL, _ComputeLeadingSyzygyTerms(m_idLeads, m_rBaseRing, m_atttributes));
-
-  // NOTE: set m_LS if tails are to be reduced!
-  assume( m_syzLeads!= NULL );
-
-  if ( LIKELY( OPT__TAILREDSYZ && !OPT__IGNORETAILS && (IDELEMS(m_syzLeads) > 0) && !((IDELEMS(m_syzLeads) == 1) && (m_syzLeads->m[0] == NULL)) ) )
-  {
-    m_LS = m_syzLeads;
-    m_checker.Initialize(m_syzLeads);
-    assume( m_checker.IsNonempty() ); // TODO: this always fails... BUG????
-  }
-
-  if( UNLIKELY( OPT__PROT ) ) Print("(L%dS:%d)", bComputeSecondTerms ? 2 : 1, IDELEMS(m_syzLeads));
-
-}
-
-poly SchreyerSyzygyComputation::SchreyerSyzygyNF(const poly syz_lead, poly syz_2) const
-{
-  assume( !OPT__IGNORETAILS );
-
-  const ideal& L = m_idLeads;
-  const ideal& T = m_idTails;
-  const ring& r = m_rBaseRing;
-
-  assume( syz_lead != NULL );
-
-  if( syz_2 == NULL )
-  {
-    const int rr = p_GetComp(syz_lead, r) - 1;
-
-    assume( rr >= 0 && rr < IDELEMS(T) );
-    assume( rr >= 0 && rr < IDELEMS(L) );
-
-#if NOPRODUCT
-    syz_2 = m_div.FindReducer(syz_lead, L->m[rr], syz_lead, m_checker);
-    p_Test(syz_2, r);
-
-#else
-    poly aa = leadmonom(syz_lead, r); assume( aa != NULL); // :(
-    aa = p_Mult_mm(aa, L->m[rr], r);
-
-    syz_2 = m_div.FindReducer(aa, syz_lead, m_checker);
-    p_Test(syz_2, r);
-
-    p_Delete(&aa, r);
-#endif
-
-  }
-
-  assume( syz_2 != NULL ); // by construction of S-Polynomial
-
-  assume( L != NULL );
-  assume( T != NULL );
-
-  assume( IDELEMS(L) == IDELEMS(T) );
-
-  int  c = p_GetComp(syz_lead, r) - 1;
-
-  assume( c >= 0 && c < IDELEMS(T) );
-
-  if( m_spoly_bucket == NULL )
-    m_spoly_bucket = kBucketCreate(r);
-
-  SBucketWrapper tail(r, m_sum_bucket_factory);
-
-
-  kBucket_pt bucket = m_spoly_bucket; assume( bucket != NULL ); kbTest(bucket); m_spoly_bucket = NULL;
-
-//  kBucketInit(bucket, NULL, 0); // not needed!?
-
-  poly p = leadmonom(syz_lead, r); // :(
-//  poly spoly = pp_Mult_qq(p, T->m[c], r);
-  kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], 0); // TODO: store pLength(T->m[c]) separately!?
-  p_Delete(&p, r);
-
-  kbTest(bucket);
-
-  c = p_GetComp(syz_2, r) - 1;
-  assume( c >= 0 && c < IDELEMS(T) );
-
-  p = leadmonom(syz_2, r); // :(
-//  spoly = p_Add_q(spoly, pp_Mult_qq(p, T->m[c], r), r);
-  kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], 0); // pLength(T->m[c])?!
-  kbTest(bucket);
-  p_Delete(&p, r);
-
-//  const bool bUsePolynomial = TEST_OPT_NOT_BUCKETS; //  || (pLength(spoly) < MIN_LENGTH_BUCKET);
-//  CPolynomialSummator tail(r, bUsePolynomial);
-  tail.Add(syz_2, 1);
-
-  kbTest(bucket);
-  for( poly spoly = kBucketExtractLm(bucket); spoly != NULL; p_LmDelete(&spoly, r), spoly = kBucketExtractLm(bucket))
-  {
-    kbTest(bucket);
-    poly t = m_div.FindReducer(spoly, NULL, m_checker);
-    p_Test(t, r);
-
-    if( t != NULL )
-    {
-      p = leadmonom(t, r); // :(
-      c = p_GetComp(t, r) - 1;
-
-      assume( c >= 0 && c < IDELEMS(T) );
-
-      kBucket_Plus_mm_Mult_pp(bucket, p, T->m[c], 0); // pLength(T->m[c])?
-//      spoly = p_Add_q(spoly, pp_Mult_qq(p, T->m[c], r), r);
-
-      p_Delete(&p, r);
-
-      tail.Add(t, 1);
-    } // otherwise discard that leading term altogether!
-    else
-      if( UNLIKELY(OPT__PROT) ) ++ m_stat[4]; // PrintS("$"); // LOT
-
-    kbTest(bucket);
-  }
-
-  kbTest(bucket);
-
-  // now bucket must be empty!
-  assume( kBucketClear(bucket) == NULL );
-
-  const poly result = tail.ClearAdd(); // TODO: use Merge with sBucket???
-
-
-  if( m_spoly_bucket == NULL )
-    m_spoly_bucket = bucket;
-  else
-    kBucketDestroy(&bucket);
-
-
-  if( UNLIKELY(OPT__TREEOUTPUT) )
-  {
-    PrintS("]},");
-  }
-  return result;
-}
-
-// namespace     {
-
-// };
-
-
-bool my_p_LmCmp (poly a, poly b, const ring r) { return p_LmCmp(a, b, r) == -1; } // TODO: change to simple lex. memory compare!
-
-// NOTE: need p_Copy?????? for image + multiplier!!???
-// NOTE: better store complete syz. terms!!?
-poly SchreyerSyzygyComputation::TraverseTail(poly multiplier, const int tail) const
-{
-  const ring& r = m_rBaseRing;
-
-  assume(m_idTails !=  NULL && m_idTails->m != NULL);
-  assume( tail >= 0 && tail < IDELEMS(m_idTails) );
-
-  p_Test(multiplier, r);
-
-  if( UNLIKELY(OPT__NOCACHING) )
-    return ComputeImage(multiplier, tail);
-
-  // TODO: store (multiplier, tail) -.-^-.-^-.--> !
-  TCache::iterator top_itr = m_cache.find(tail);
-
-  if ( top_itr != m_cache.end() )
-  {
-     assume( top_itr->first == tail );
-
-     TP2PCache& T = top_itr->second;
-
-     TP2PCache::iterator itr = T.find(multiplier);
-
-     if( itr != T.end() ) // Yey - Reuse!!!
-     {
-       assume( p_LmEqual(itr->first, multiplier, r) );
-
-       if( itr->second == NULL ) // leadcoeff plays no role if value is NULL!
-         return (NULL);
-
-       poly p = p_Copy(itr->second, r); // COPY!!!
-
-       p_Test(multiplier, r);
-
-       if( !n_Equal( pGetCoeff(multiplier), pGetCoeff(itr->first), r->cf) ) // normalize coeffs!?
-       {
-         number n = n_Div( pGetCoeff(multiplier), pGetCoeff(itr->first), r->cf); // new number
-
-         if( UNLIKELY( OPT__TREEOUTPUT ) )
-         {
-           StringSetS("");
-           n_Write(n, r->cf);
-           char* s = StringEndS();
-           Print("\"recale\": \"%s\", ", s);
-           omFree(s);
-         }
-
-         if( UNLIKELY( OPT__PROT ) ) ++ m_stat[7]; // PrintS("l*"); // lookup & rescale
-
-         p = p_Mult_nn(p, n, r); // !
-         n_Delete(&n, r->cf);
-       } else
-         if( UNLIKELY( OPT__PROT ) ) ++ m_stat[6]; // PrintS("l"); // lookup no rescale
-
-       p_Test(multiplier, r);
-
-       return p;
-     }
-
-
-     p_Test(multiplier, r);
-
-     const poly p = ComputeImage(multiplier, tail);
-
-     if( UNLIKELY(OPT__PROT) ) ++ m_stat[8]; // PrintS("S"); // store
-
-     p_Test(multiplier, r);
-
-     T.insert( TP2PCache::value_type(myp_Head(multiplier, (p==NULL), r), p) ); //     T[ multiplier ] = p;
-
-     p_Test(multiplier, r);
-
-//     if( p == NULL )
-//        return (NULL);
-
-     return p_Copy(p, r);
-  }
-
-  CCacheCompare o(r); TP2PCache T(o);
-
-  const poly p = ComputeImage(multiplier, tail);
-
-  if( UNLIKELY( OPT__PROT ) ) ++ m_stat[8]; // PrintS("S"); // store // %d", tail + 1);
-
-  T.insert( TP2PCache::value_type(myp_Head(multiplier, (p==NULL), r), p) );
-
-  m_cache.insert( TCache::value_type(tail, T) );
-
-//  if( p == NULL )
-//    return (NULL);
-
-  return p_Copy(p, r);
-}
-
-poly SchreyerSyzygyComputation::ComputeImage(poly multiplier, const int tail) const
-{
-  const ring& r = m_rBaseRing;
-
-  assume(m_idTails !=  NULL && m_idTails->m != NULL);
-  assume( tail >= 0 && tail < IDELEMS(m_idTails) );
-
-  p_Test(multiplier, r);
-
-  const poly t = m_idTails->m[tail]; // !!!
-
-  if(t != NULL)
-  {
-    const poly p = TraverseTail(multiplier, t);
-
-    p_Test(multiplier, r);
-    return p;
-  }
-
-  return NULL;
-}
-
-
-poly SchreyerSyzygyComputation::TraverseTail(poly multiplier, poly tail) const
-{
-  assume( !OPT__IGNORETAILS );
-
-  const ideal& L = m_idLeads;
-  const ideal& T = m_idTails;
-  const ring& r = m_rBaseRing;
-
-  assume( multiplier != NULL );
-
-  assume( L != NULL );
-  assume( T != NULL );
-
-  p_Test(multiplier, r);
-
-  if( UNLIKELY( !(  (!OPT__TAILREDSYZ)   ||   m_lcm.Check(multiplier)     )) )
-  {
-    if( UNLIKELY(OPT__TAILREDSYZ && OPT__PROT) )
-    {
-      ++ m_stat[5]; // PrintS("%"); // check LCM !
-    }
-    return NULL;
-  }
-
-  //    const bool bUsePolynomial = TEST_OPT_NOT_BUCKETS; //  || (pLength(tail) < MIN_LENGTH_BUCKET);
-
-  SBucketWrapper sum(r, m_sum_bucket_factory);
-/*
-  sBucket_pt sum;
-
-  if( m_sum_bucket == NULL )
-    sum = sBucketCreate(r);
-  else
-  {
-    if( !sIsEmpty(m_sum_bucket) )
-      sum = sBucketCreate(r);
-    else
-    {
-      sum = m_sum_bucket;
-      m_sum_bucket = NULL;
-    }
-  }
-
-
-  assume( sum != NULL ); assume ( sIsEmpty(sum) );
-  assume( r == sBucketGetRing(sum) );
-*/
-
-//  poly s; int len;
-
-  //    CPolynomialSummator sum(r, bUsePolynomial);
-  //    poly s = NULL;
-
-  // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
-  {
-    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    const poly rt = ReduceTerm(multiplier, p, NULL); // TODO: also return/store length?
-    sum.Add(rt);
-    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-//    const int lp = pLength(rt);
-//    if( rt != NULL && lp != 0 )
-//      sBucket_Add_p(sum, rt, lp);
-  }
-  // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-//  sBucketClearAdd(sum, &s, &len); // Will Not Clear?!?
-  const poly s = sum.ClearAdd();
-
-//  assume( sum != NULL ); assume ( sIsEmpty(sum) );
-/*
-  if( m_sum_bucket == NULL )
-    m_sum_bucket = sum;
-  else
-    sBucketDestroy(&sum);
-
-  assume( pLength(s) == len );
-*/
-
-  p_Test(multiplier, r);
-
-  return s;
-}
-
-
-
-
-poly SchreyerSyzygyComputation::ReduceTerm(poly multiplier, poly term4reduction, poly syztermCheck) const
-{
-  assume( !OPT__IGNORETAILS );
-
-  const ideal& L = m_idLeads;
-  const ideal& T = m_idTails;
-  const ring& r = m_rBaseRing;
-
-  assume( multiplier != NULL );
-  assume( term4reduction != NULL );
-
-
-  assume( L != NULL );
-  assume( T != NULL );
-
-  p_Test(multiplier, r);
-
-  // simple implementation with FindReducer:
-  poly s = NULL;
-
-  if( (!OPT__TAILREDSYZ) || m_lcm.Check(multiplier) ) // TODO: UNLIKELY / LIKELY ????
-  {
-#if NOPRODUCT
-    s = m_div.FindReducer(multiplier, term4reduction, syztermCheck, m_checker); // s ????
-    p_Test(s, r);
-
-    p_Test(multiplier, r);
-
-    if( s == NULL ) // No Reducer?
-    {
-      if( UNLIKELY(OPT__PROT) ) ++ m_stat[4]; // PrintS("$"); // LOT
-      return NULL;
-    }
-
-#else
-    // NOTE: only LT(term4reduction) should be used in the following:
-    poly product = pp_Mult_mm(multiplier, term4reduction, r);
-    p_Test(product, r);
-
-    s = m_div.FindReducer(product, syztermCheck, m_checker); // ??
-    p_Test(s, r);
-
-    p_Test(multiplier, r);
-
-    if( s == NULL ) // No Reducer?
-    {
-      if( UNLIKELY(OPT__PROT) ) ++ m_stat[4]; // PrintS("$"); // LOT
-      return NULL;
-    }
-
-    p_Delete(&product, r);
-#endif
-  }
-
-  if( s == NULL ) // No Reducer?
-  {
-    if( UNLIKELY( OPT__TAILREDSYZ && OPT__PROT) )
-    {
-      ++ m_stat[5]; // PrintS("%"); // check LCM !
-    }
-    return NULL;
-  }
-
-  p_Test(multiplier, r);
-  p_Test(s, r);
-
-  poly b = leadmonom(s, r);
-
-  p_Test(b, r);
-
-  const int c = p_GetComp(s, r) - 1;
-  assume( c >= 0 && c < IDELEMS(T) );
-
-
-  if( UNLIKELY( OPT__TREEOUTPUT ) )
-     PrintS("\", \"children\": [");
-
-  const poly t = TraverseTail(b, c); // T->m[c];
-
-  p_Test(multiplier, r);
-
-  if( t != NULL )
-    s = p_Add_q(s, t, r);
-
-  p_Test(multiplier, r);
-
-  return s;
-}
-
-SchreyerSyzygyComputationFlags::SchreyerSyzygyComputationFlags(idhdl rootRingHdl):
-    OPT__DEBUG( atGetInt(rootRingHdl,"DEBUG", 0) ),
-    OPT__LEAD2SYZ( atGetInt(rootRingHdl, "LEAD2SYZ", 0) ),
-    OPT__TAILREDSYZ( atGetInt(rootRingHdl, "TAILREDSYZ", 1) ),
-    OPT__HYBRIDNF( atGetInt(rootRingHdl, "HYBRIDNF", 0) ),
-    OPT__IGNORETAILS( atGetInt(rootRingHdl, "IGNORETAILS", 0) ),
-    OPT__SYZNUMBER( atGetInt(rootRingHdl, "SYZNUMBER", 0) ),
-    OPT__TREEOUTPUT( atGetInt(rootRingHdl, "TREEOUTPUT", 0) ),
-    OPT__SYZCHECK( atGetInt(rootRingHdl, "SYZCHECK", 0) ),
-    OPT__PROT(TEST_OPT_PROT),
-    OPT__NOCACHING( atGetInt(rootRingHdl, "NOCACHING", 0) ),
-    m_rBaseRing( rootRingHdl->data.uring )
-{
-  // TODO: just current setting!
-  assume( rootRingHdl == currRingHdl );
-  assume( rootRingHdl->typ == RING_CMD );
-  assume( m_rBaseRing == currRing );
-  // move the global ring here inside???
-}
-
-
-
-CLeadingTerm::CLeadingTerm(unsigned int _label,  const poly _lt, const ring R):
-    m_sev( p_GetShortExpVector(_lt, R) ),  m_label( _label ),  m_lt( _lt )
-{
-  assume( sev() == p_GetShortExpVector(lt(), R) );
-}
-
-CReducerFinder::~CReducerFinder()
-{
-  for( CReducersHash::const_iterator it = m_hash.begin(); it != m_hash.end(); it++ )
-  {
-    const TReducers& v = it->second;
-    for(TReducers::const_iterator vit = v.begin(); vit != v.end(); vit++ )
-      delete const_cast<CLeadingTerm*>(*vit);
-  }
-}
-
-
-void CReducerFinder::Initialize(const ideal L)
-{
-  assume( m_L == NULL || m_L == L );
-  if( m_L == NULL )
-    m_L = L;
-
-  assume( m_L == L );
-
-  if( L != NULL )
-  {
-    const ring& R = m_rBaseRing;
-    assume( R != NULL );
-
-    for( int k = IDELEMS(L) - 1; k >= 0; k-- )
-    {
-      const poly a = L->m[k]; // assume( a != NULL );
-
-      // NOTE: label is k \in 0 ... |L|-1!!!
-      if( a != NULL )
-        m_hash[p_GetComp(a, R)].push_back( new CLeadingTerm(k, a, R) );
-    }
-  }
-}
-
-CReducerFinder::CReducerFinder(const ideal L, const SchreyerSyzygyComputationFlags& flags):
-    SchreyerSyzygyComputationFlags(flags),
-    m_L(const_cast<ideal>(L)), // for debug anyway
-    m_hash()
-{
-  assume( flags.m_rBaseRing == m_rBaseRing );
-  if( L != NULL )
-    Initialize(L);
-}
-
-/// _p_LmDivisibleByNoComp for a | b*c
-static inline BOOLEAN _p_LmDivisibleByNoComp(const poly a, const poly b, const poly c, const ring r)
-{
-  int i=r->VarL_Size - 1;
-  unsigned long divmask = r->divmask;
-  unsigned long la, lb;
-
-  if (r->VarL_LowIndex >= 0)
-  {
-    i += r->VarL_LowIndex;
-    do
-    {
-      la = a->exp[i];
-      lb = b->exp[i] + c->exp[i];
-      if ((la > lb) ||
-          (((la & divmask) ^ (lb & divmask)) != ((lb - la) & divmask)))
-      {
-        pDivAssume(p_DebugLmDivisibleByNoComp(a, b, r) == FALSE);
-        return FALSE;
-      }
-      i--;
-    }
-    while (i>=r->VarL_LowIndex);
-  }
-  else
-  {
-    do
-    {
-      la = a->exp[r->VarL_Offset[i]];
-      lb = b->exp[r->VarL_Offset[i]] + c->exp[r->VarL_Offset[i]];
-      if ((la > lb) ||
-          (((la & divmask) ^ (lb & divmask)) != ((lb - la) & divmask)))
-      {
-        pDivAssume(p_DebugLmDivisibleByNoComp(a, b, r) == FALSE);
-        return FALSE;
-      }
-      i--;
-    }
-    while (i>=0);
-  }
-#ifdef HAVE_RINGS
-  assume( !rField_is_Ring(r) ); // not implemented for rings...!
-#endif
-  return TRUE;
-}
-
-
-bool CLeadingTerm::CheckLT( const ideal & L ) const
-{
-//  for( int i = IDELEMS(L); i >= 0; --i) assume( pNext(L->m[i]) == NULL ); // ???
-  return ( L->m[label()] == lt() );
-}
-
-bool CLeadingTerm::DivisibilityCheck(const poly product, const unsigned long not_sev, const ring r) const
-{
-  // may have no coeff yet
-//  assume ( !n_IsZero( p_GetCoeff(product, r), r ) );
-
-  assume ( !n_IsZero( pGetCoeff(lt()), r->cf ) );
-  assume( sev() == p_GetShortExpVector(lt(), r) );
-
-  assume( product != NULL );
-  assume( (p_GetComp(lt(), r) == p_GetComp(product, r)) || (p_GetComp(lt(), r) == 0) );
-
-//  const int k = label();
-//  assume( m_L->m[k] == p );
-
-  return p_LmShortDivisibleByNoComp(lt(), sev(), product, not_sev, r);
-
-}
-
-#if NOPRODUCT
-/// as DivisibilityCheck(multiplier * t, ...) for monomial 'm'
-/// and a module term 't'
-bool CLeadingTerm::DivisibilityCheck(const poly m, const poly t, const unsigned long not_sev, const ring r) const
-{
-  assume ( !n_IsZero( pGetCoeff(lt()), r->cf ) );
-  assume( sev() == p_GetShortExpVector(lt(), r) );
-
-  assume( m != NULL );
-  assume( t != NULL );
-  assume ( !n_IsZero( pGetCoeff(m), r->cf ) );
-  assume ( !n_IsZero( pGetCoeff(t), r->cf ) );
-
-// assume( p_GetComp(m, r) == 0 );
-  assume( (p_GetComp(lt(), r) == p_GetComp(t, r))  || (p_GetComp(lt(), r) == 0)  );
-
-  p_Test(m, r);
-  p_Test(t, r);
-//  const int k = label();
-//  assume( m_L->m[k] == p );
-
-  if (sev() & not_sev)
-    return false;
-
-  return _p_LmDivisibleByNoComp(lt(), m, t, r);
-//  return p_LmShortDivisibleByNoComp(p, p_sev, product, not_sev, r);
-}
-#endif
-
-
-/// TODO:
-class CDivisorEnumerator: public SchreyerSyzygyComputationFlags
-{
-  private:
-    const CReducerFinder& m_reds;
-    const poly m_product;
-    const unsigned long m_not_sev;
-    const long m_comp;
-
-    CReducerFinder::CReducersHash::const_iterator m_itr;
-    CReducerFinder::TReducers::const_iterator m_current, m_finish;
-
-    bool m_active;
-
-  public:
-    CDivisorEnumerator(const CReducerFinder& self, const poly product):
-        SchreyerSyzygyComputationFlags(self),
-        m_reds(self),
-        m_product(product),
-        m_not_sev(~p_GetShortExpVector(product, m_rBaseRing)),
-        m_comp(p_GetComp(product, m_rBaseRing)),
-        m_itr(), m_current(), m_finish(),
-        m_active(false)
-    {
-      assume( m_comp >= 0 );
-      assume( m_reds.m_L != NULL ); /// TODO: m_L should stay the same!!!
-
-      assume( product != NULL ); // may have no coeff yet :(
-//      assume ( !n_IsZero( p_GetCoeff(product, m_rBaseRing), m_rBaseRing ) );
-    }
-
-    inline bool Reset()
-    {
-      m_active = false;
-
-      m_itr = m_reds.m_hash.find(m_comp);
-
-      if( m_itr == m_reds.m_hash.end() )
-        return false;
-
-      assume( m_itr->first == m_comp );
-
-      m_current = (m_itr->second).begin();
-      m_finish = (m_itr->second).end();
-
-      if (m_current == m_finish)
-        return false;
-
-//      m_active = true;
-      return true;
-    }
-
-    const CLeadingTerm& Current() const
-    {
-      assume( m_active );
-      assume( m_current != m_finish );
-
-      return *(*m_current);
-    }
-
-    inline bool MoveNext()
-    {
-      assume( m_current != m_finish );
-
-      if( m_active )
-        ++m_current;
-      else
-        m_active = true; // for Current()
-
-      // looking for the next good entry
-      for( ; m_current != m_finish; ++m_current )
-      {
-        assume( Current().CheckLT( m_reds.m_L ) );
-
-        if( Current().DivisibilityCheck(m_product, m_not_sev, m_rBaseRing) )
-        {
-//          m_active = true;
-          assume( Current().CheckLT( m_reds.m_L ) );
-          return true;
-        }
-        assume( Current().CheckLT( m_reds.m_L ) );
-      }
-
-      // the end... :(
-      assume( m_current == m_finish );
-
-      m_active = false;
-      return false;
-    }
-};
-
-
-bool CReducerFinder::IsDivisible(const poly product) const
-{
-  assume( product != NULL );
-
-  // NOTE: q may have no coeff!!!
-
-  CDivisorEnumerator itr(*this, product);
-  if( !itr.Reset() )
-    return false;
-
-  return itr.MoveNext();
-
-}
-
-#if NOPRODUCT
-
-/// TODO:
-class CDivisorEnumerator2: public SchreyerSyzygyComputationFlags
-{
-  private:
-    const CReducerFinder& m_reds;
-    const poly m_multiplier, m_term;
-    const unsigned long m_not_sev;
-    const long m_comp;
-
-    CReducerFinder::CReducersHash::const_iterator m_itr;
-    CReducerFinder::TReducers::const_iterator m_current, m_finish;
-
-    bool m_active;
-
-  public:
-    CDivisorEnumerator2(const CReducerFinder& self, const poly m, const poly t):
-        SchreyerSyzygyComputationFlags(self),
-        m_reds(self),
-        m_multiplier(m), m_term(t),
-        m_not_sev(~p_GetShortExpVector(m, t, m_rBaseRing)),
-        m_comp(p_GetComp(t, m_rBaseRing)),
-        m_itr(), m_current(), m_finish(),
-        m_active(false)
-    {
-      assume( m_comp >= 0 );
-      assume( m_reds.m_L != NULL );
-      assume( m_multiplier != NULL );
-      assume( m_term != NULL );
-
-      assume( m != NULL );
-      assume( t != NULL );
-      assume ( !n_IsZero( pGetCoeff(m), m_rBaseRing->cf ) );
-      assume ( !n_IsZero( pGetCoeff(t), m_rBaseRing->cf ) );
-
-      p_Test(m, m_rBaseRing);
-
-    }
-
-    inline bool Reset()
-    {
-      m_active = false;
-
-      m_itr = m_reds.m_hash.find(m_comp);
-
-      if( m_itr == m_reds.m_hash.end() )
-        return false;
-
-      assume( m_itr->first == m_comp );
-
-      m_current = (m_itr->second).begin();
-      m_finish = (m_itr->second).end();
-
-      if (m_current == m_finish)
-        return false;
-
-      return true;
-    }
-
-    const CLeadingTerm& Current() const
-    {
-      assume( m_active );
-      assume( m_current != m_finish );
-
-      return *(*m_current);
-    }
-
-    inline bool MoveNext()
-    {
-      assume( m_current != m_finish );
-
-      if( m_active )
-        ++m_current;
-      else
-        m_active = true;
-
-
-      // looking for the next good entry
-      for( ; m_current != m_finish; ++m_current )
-      {
-        assume( Current().CheckLT( m_reds.m_L ) );
-
-        if( Current().DivisibilityCheck(m_multiplier, m_term, m_not_sev, m_rBaseRing) )
-        {
-//          m_active = true;
-          assume( Current().CheckLT( m_reds.m_L ) );
-          return true;
-
-        }
-        assume( Current().CheckLT( m_reds.m_L ) );
-      }
-
-      // the end... :(
-      assume( m_current == m_finish );
-
-      m_active = false;
-      return false;
-    }
-};
-
-poly CReducerFinder::FindReducer(const poly multiplier, const poly t,
-                                 const poly syzterm,
-                                 const CReducerFinder& syz_checker) const
-{
-  const ring& r = m_rBaseRing;
-
-  p_Test(multiplier, r);
-
-  CDivisorEnumerator2 itr(*this, multiplier, t);
-  if( !itr.Reset() )
-    return NULL;
-
-  // don't care about the module component of multiplier (as it may be the syzygy term)
-  // product = multiplier * t?
-
-  assume( multiplier != NULL ); assume( t != NULL );
-
-  const ideal& L = m_L; assume( L != NULL ); // for debug/testing only!
-
-  long c = 0;
-
-  if (syzterm != NULL)
-    c = p_GetComp(syzterm, r) - 1;
-
-  assume( c >= 0 && c < IDELEMS(L) );
-
-  p_Test(multiplier, r);
-
-  const BOOLEAN to_check = (syz_checker.IsNonempty()); // OPT__TAILREDSYZ &&
-
-//  const poly q = p_One(r);
-  const poly q = p_New(r); pNext(q) = NULL;
-
-  assume( pNext(q) == NULL );
-
-  p_Test(multiplier, r);
-  while( itr.MoveNext() )
-  {
-    assume( itr.Current().CheckLT( L ) ); // ???
-
-    const poly p = itr.Current().lt(); // ???
-    const int k  = itr.Current().label();
-
-    p_ExpVectorSum(q, multiplier, t, r); // q == product == multiplier * t // TODO: do it once?
-    p_ExpVectorDiff(q, q, p, r); // (LM(product) / LM(L[k]))
-
-    p_SetComp(q, k + 1, r);
-    p_Setm(q, r);
-
-    p_Test(multiplier, r);
-
-    // cannot allow something like: a*gen(i) - a*gen(i)
-    if (syzterm != NULL && (k == c))
-      if (p_ExpVectorEqual(syzterm, q, r))
-      {
-        assume( itr.Current().CheckLT( L ) ); // ???
-        continue;
-      }
-
-    // while the complement (the fraction) is not reducible by leading syzygies
-    if( to_check && syz_checker.IsDivisible(q) )
-    {
-      assume( itr.Current().CheckLT( L ) ); // ???
-      continue;
-    }
-
-    number n = n_Mult( pGetCoeff(multiplier), pGetCoeff(t), r->cf);
-
-#if NODIVISION
-    // we assume all leading coeffs to be 1!
-    assume( n_IsOne(pGetCoeff(p), r->cf) );
-#else
-    if( !n_IsOne( pGetCoeff(p), r ) )
-      n = n_Div(n, pGetCoeff(p), r->cf);
-#endif
-
-    p_SetCoeff0(q, n_InpNeg(n, r->cf), r);
-//    n_Delete(&n, r);
-
-    p_Test(multiplier, r);
-    p_Test(q, r);
-
-    assume( itr.Current().CheckLT( L ) ); // ???
-    return q;
-  }
-
-  p_LmFree(q, r);
-
-  p_Test(multiplier, r);
-
-  return NULL;
-
-}
-#endif
-
-
-poly CReducerFinder::FindReducer(const poly product, const poly syzterm, const CReducerFinder& syz_checker) const
-{
-  CDivisorEnumerator itr(*this, product);
-  if( !itr.Reset() )
-    return NULL;
-
-
-
-  const ring& r = m_rBaseRing;
-
-  assume( product != NULL );
-
-  const ideal& L = m_L; assume( L != NULL ); // for debug/testing only!
-
-  long c = 0;
-
-  if (syzterm != NULL)
-    c = p_GetComp(syzterm, r) - 1;
-
-  assume( c >= 0 && c < IDELEMS(L) );
-
-  const BOOLEAN to_check = (syz_checker.IsNonempty()); // OPT__TAILREDSYZ &&
-
-  const poly q = p_New(r); pNext(q) = NULL;
-
-  while( itr.MoveNext() )
-  {
-    assume( itr.Current().CheckLT( L ) ); // ???
-
-    const poly p = itr.Current().lt(); // ??
-    const int k  = itr.Current().label();
-
-    p_ExpVectorDiff(q, product, p, r); // (LM(product) / LM(L[k]))
-    p_SetComp(q, k + 1, r);
-    p_Setm(q, r);
-
-    // cannot allow something like: a*gen(i) - a*gen(i)
-    if (syzterm != NULL && (k == c))
-      if (p_ExpVectorEqual(syzterm, q, r))
-      {
-        assume( itr.Current().CheckLT( L ) ); // ???
-        continue;
-      }
-
-    // while the complement (the fraction) is not reducible by leading syzygies
-    if( to_check && syz_checker.IsDivisible(q) ) // ?????
-    {
-      assume( itr.Current().CheckLT( L ) ); // ???
-      continue;
-    }
-
-
-#if NODIVISION
-    assume( n_IsOne(p_GetCoeff(p, r), r->cf) );
-    p_SetCoeff0(q, n_InpNeg( n_Copy(pGetCoeff(product), r->cf), r->cf), r);
-#else
-    p_SetCoeff0(q, n_InpNeg( n_Div( pGetCoeff(product), p_GetCoeff(p), r->cf), r->cf), r);
-#endif
-
-    assume( itr.Current().CheckLT( L ) ); // ???
-    return q;
-  }
-
-
-
-/*
-  const long comp = p_GetComp(product, r);
-  const unsigned long not_sev = ~p_GetShortExpVector(product, r);
-
-  assume( comp >= 0 );
-
-//   for( int k = IDELEMS(L)-1; k>= 0; k-- )
-//   {
-//     const poly p = L->m[k];
-//
-//     if ( p_GetComp(p, r) != comp )
-//       continue;
-//
-//     const unsigned long p_sev = p_GetShortExpVector(p, r); // to be stored in m_hash!!!
-
-   // looking for an appropriate diviser p = L[k]...
-  CReducersHash::const_iterator it = m_hash.find(comp); // same module component
-
-  if( it == m_hash.end() )
-    return NULL;
-
-  assume( m_L != NULL );
-
-  const TReducers& reducers = it->second;
-
-  const BOOLEAN to_check = (syz_checker.IsNonempty()); // OPT__TAILREDSYZ &&
-
-  const poly q = p_New(r); pNext(q) = NULL;
-
-  for(TReducers::const_iterator vit = reducers.begin(); vit != reducers.end(); vit++ )
-  {
-    const poly p = (*vit)->lt(); // ???
-
-    assume( p_GetComp(p, r) == comp );
-
-    const int k = (*vit)->label();
-
-    assume( L->m[k] == p ); // CheckLT
-
-    const unsigned long p_sev = (*vit)->sev();
-
-    assume( p_sev == p_GetShortExpVector(p, r) );
-
-    if( !p_LmShortDivisibleByNoComp(p, p_sev, product, not_sev, r) )
-      continue;
-
-//     // ... which divides the product, looking for the _1st_ appropriate one!
-//     if( !p_LmDivisibleByNoComp(p, product, r) ) // included inside  p_LmShortDivisibleBy!
-//       continue;
-
-    p_ExpVectorDiff(q, product, p, r); // (LM(product) / LM(L[k]))
-    p_SetComp(q, k + 1, r);
-    p_Setm(q, r);
-
-    // cannot allow something like: a*gen(i) - a*gen(i)
-    if (syzterm != NULL && (k == c))
-      if (p_ExpVectorEqual(syzterm, q, r))
-      {
-        continue;
-      }
-
-    // while the complement (the fraction) is not reducible by leading syzygies
-    if( to_check && syz_checker.IsDivisible(q) )
-    {
-      continue;
-    }
-
-    p_SetCoeff0(q, n_InpNeg( n_Div( p_GetCoeff(product, r), p_GetCoeff(p, r), r), r), r);
-    return q;
-  }
-*/
-
-  p_LmFree(q, r);
-  return NULL;
-}
-
-
-CLCM::CLCM(const ideal& L, const SchreyerSyzygyComputationFlags& flags):
-    SchreyerSyzygyComputationFlags(flags), std::vector<bool>(),
-    m_compute(false), m_N(rVar(flags.m_rBaseRing))
-{
-  const ring& R = m_rBaseRing;
-  assume( flags.m_rBaseRing == R );
-  assume( R != NULL );
-
-  assume( L != NULL );
-
-  if( LIKELY( OPT__TAILREDSYZ && !OPT__HYBRIDNF && (L != NULL) )) // TODO: not hybrid!?
-  {
-    const int l = IDELEMS(L);
-
-    assume( l > 0 );
-
-    resize(l, false);
-
-    for( int k = l - 1; k >= 0; k-- )
-    {
-      const poly a = L->m[k]; assume( a != NULL );
-
-      for (unsigned int j = m_N; j > 0; j--)
-        if ( !(*this)[j] )
-          (*this)[j] = (p_GetExp(a, j, R) > 0);
-    }
-
-    m_compute = true;
-  }
-}
-
-
-bool CLCM::Check(const poly m) const
-{
-  assume( m != NULL );
-  if( m_compute && (m != NULL))
-  {
-    const ring& R = m_rBaseRing;
-
-    assume( OPT__TAILREDSYZ && !OPT__HYBRIDNF );
-
-    for (unsigned int j = m_N; j > 0; j--)
-      if ( (*this)[j] )
-        if(p_GetExp(m, j, R) > 0)
-          return true;
-
-    return false;
-
-  } else return true;
-}
-
-
-
-
-
-// Vi-modeline: vim: filetype=c:syntax:shiftwidth=2:tabstop=8:textwidth=0:expandtab

Singular/dyn_modules/syzextra/syzextra.h

@@ -153 +153 @@
 };
 
-
-
-
-
-
-
 /// Computation attribute storage
 struct SchreyerSyzygyComputationFlags
@@ -437 +431 @@
     poly ComputeImage(poly multiplier, const int tail) const;
 
-
-
   public:
     /// just for testing via the wrapper below

Singular/gentable.cc

@@ -16 +16 @@
 #include "kernel/mod2.h"
 // need to include all tokens: *_CMD:
-#include "grammar.h"
-#include "tok.h"
+#include "Singular/tok.h"
 
 #ifdef HAVE_RINGS

Singular/grammar.cc

@@ -281 +281 @@
      RING_CMD = 272,
      BEGIN_RING = 273,
-     IDEAL_CMD = 274,
-     MAP_CMD = 275,
-     MATRIX_CMD = 276,
-     MODUL_CMD = 277,
-     NUMBER_CMD = 278,
-     POLY_CMD = 279,
-     RESOLUTION_CMD = 280,
-     VECTOR_CMD = 281,
-     BETTI_CMD = 282,
-     E_CMD = 283,
-     FETCH_CMD = 284,
-     FREEMODULE_CMD = 285,
-     KEEPRING_CMD = 286,
-     IMAP_CMD = 287,
-     KOSZUL_CMD = 288,
-     MAXID_CMD = 289,
-     MONOM_CMD = 290,
-     PAR_CMD = 291,
-     PREIMAGE_CMD = 292,
-     VAR_CMD = 293,
-     VALTVARS = 294,
-     VMAXDEG = 295,
-     VMAXMULT = 296,
-     VNOETHER = 297,
-     VMINPOLY = 298,
-     END_RING = 299,
-     CMD_1 = 300,
-     CMD_2 = 301,
-     CMD_3 = 302,
-     CMD_12 = 303,
-     CMD_13 = 304,
-     CMD_23 = 305,
-     CMD_123 = 306,
-     CMD_M = 307,
-     ROOT_DECL = 308,
-     ROOT_DECL_LIST = 309,
-     RING_DECL = 310,
-     RING_DECL_LIST = 311,
-     EXAMPLE_CMD = 312,
-     EXPORT_CMD = 313,
-     HELP_CMD = 314,
-     KILL_CMD = 315,
-     LIB_CMD = 316,
-     LISTVAR_CMD = 317,
-     SETRING_CMD = 318,
-     TYPE_CMD = 319,
-     STRINGTOK = 320,
-     BLOCKTOK = 321,
-     INT_CONST = 322,
-     UNKNOWN_IDENT = 323,
-     RINGVAR = 324,
-     PROC_DEF = 325,
-     APPLY = 326,
-     ASSUME_CMD = 327,
-     BREAK_CMD = 328,
-     CONTINUE_CMD = 329,
-     ELSE_CMD = 330,
-     EVAL = 331,
-     QUOTE = 332,
-     FOR_CMD = 333,
-     IF_CMD = 334,
-     SYS_BREAK = 335,
-     WHILE_CMD = 336,
-     RETURN = 337,
-     PARAMETER = 338,
-     SYSVAR = 339,
-     UMINUS = 340
+     BUCKET_CMD = 274,
+     IDEAL_CMD = 275,
+     MAP_CMD = 276,
+     MATRIX_CMD = 277,
+     MODUL_CMD = 278,
+     NUMBER_CMD = 279,
+     POLY_CMD = 280,
+     RESOLUTION_CMD = 281,
+     VECTOR_CMD = 282,
+     BETTI_CMD = 283,
+     E_CMD = 284,
+     FETCH_CMD = 285,
+     FREEMODULE_CMD = 286,
+     KEEPRING_CMD = 287,
+     IMAP_CMD = 288,
+     KOSZUL_CMD = 289,
+     MAXID_CMD = 290,
+     MONOM_CMD = 291,
+     PAR_CMD = 292,
+     PREIMAGE_CMD = 293,
+     VAR_CMD = 294,
+     VALTVARS = 295,
+     VMAXDEG = 296,
+     VMAXMULT = 297,
+     VNOETHER = 298,
+     VMINPOLY = 299,
+     END_RING = 300,
+     CMD_1 = 301,
+     CMD_2 = 302,
+     CMD_3 = 303,
+     CMD_12 = 304,
+     CMD_13 = 305,
+     CMD_23 = 306,
+     CMD_123 = 307,
+     CMD_M = 308,
+     ROOT_DECL = 309,
+     ROOT_DECL_LIST = 310,
+     RING_DECL = 311,
+     RING_DECL_LIST = 312,
+     EXAMPLE_CMD = 313,
+     EXPORT_CMD = 314,
+     HELP_CMD = 315,
+     KILL_CMD = 316,
+     LIB_CMD = 317,
+     LISTVAR_CMD = 318,
+     SETRING_CMD = 319,
+     TYPE_CMD = 320,
+     STRINGTOK = 321,
+     BLOCKTOK = 322,
+     INT_CONST = 323,
+     UNKNOWN_IDENT = 324,
+     RINGVAR = 325,
+     PROC_DEF = 326,
+     APPLY = 327,
+     ASSUME_CMD = 328,
+     BREAK_CMD = 329,
+     CONTINUE_CMD = 330,
+     ELSE_CMD = 331,
+     EVAL = 332,
+     QUOTE = 333,
+     FOR_CMD = 334,
+     IF_CMD = 335,
+     SYS_BREAK = 336,
+     WHILE_CMD = 337,
+     RETURN = 338,
+     PARAMETER = 339,
+     SYSVAR = 340,
+     UMINUS = 341
    };
 #endif
@@ -364 +365 @@
 
 /* Line 264 of yacc.c  */
-#line 367 "grammar.cc"
+#line 368 "grammar.cc"
 
 #ifdef short
@@ -579 +580 @@
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2560
+#define YYLAST   2583
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  102
+#define YYNTOKENS  103
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  44
@@ -592 +593 @@
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   340
+#define YYMAXUTOK   341
 
 #define YYTRANSLATE(YYX)                                                \
@@ -603 +604 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    95,     2,
-      98,    99,     2,    87,    93,    88,   100,    89,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    96,    94,
-      86,    85,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    96,     2,
+      99,   100,     2,    88,    94,    89,   101,    90,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    97,    95,
+      87,    86,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    90,     2,    91,    92,     2,   101,     2,     2,     2,
+       2,    91,     2,    92,    93,     2,   102,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -634 +635 @@
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      97
+      85,    98
 };
 
@@ -665 +666 @@
 static const yytype_int16 yyrhs[] =
 {
-     103,     0,    -1,    -1,   103,   104,    -1,   105,    -1,   107,
-      94,    -1,   119,    94,    -1,   145,    -1,    80,    -1,    94,
-      -1,     1,    94,    -1,   140,    -1,   141,    -1,   106,    -1,
-     142,    -1,   143,    -1,   128,    -1,   129,    -1,   130,    -1,
-      57,    66,    -1,   108,    -1,   131,    -1,   132,    -1,   133,
-      -1,   144,    -1,   135,    -1,   136,    -1,   138,    -1,   139,
-      -1,   117,   110,    -1,    69,    -1,   118,    -1,   109,    11,
-     109,    -1,   111,   100,   109,    -1,   109,    98,    99,    -1,
-     109,    98,   110,    99,    -1,    90,   110,    91,    -1,    67,
-      -1,    84,    -1,   120,    -1,    16,    98,   111,    99,    -1,
-      53,    98,   111,    99,    -1,    54,    98,   110,    99,    -1,
-      54,    98,    99,    -1,    55,    98,   111,    99,    -1,    56,
-      98,   110,    99,    -1,    56,    98,    99,    -1,    45,    98,
-     111,    99,    -1,    48,    98,   111,    99,    -1,    49,    98,
-     111,    99,    -1,    51,    98,   111,    99,    -1,    46,    98,
-     111,    93,   111,    99,    -1,    48,    98,   111,    93,   111,
-      99,    -1,    50,    98,   111,    93,   111,    99,    -1,    51,
-      98,   111,    93,   111,    99,    -1,    47,    98,   111,    93,
-     111,    93,   111,    99,    -1,    49,    98,   111,    93,   111,
-      93,   111,    99,    -1,    50,    98,   111,    93,   111,    93,
-     111,    99,    -1,    51,    98,   111,    93,   111,    93,   111,
-      99,    -1,    52,    98,    99,    -1,    52,    98,   110,    99,
-      -1,   127,    98,   111,    93,   111,    93,   111,    99,    -1,
-     127,    98,   111,    99,    -1,    17,    98,   121,    93,   121,
-      93,   125,    99,    -1,    17,    98,   111,    99,    -1,   118,
-      12,    66,    -1,    98,   110,    99,    -1,   110,    93,   111,
-      -1,   111,    -1,   116,    -1,   109,    -1,   111,    90,   111,
-      93,   111,    91,    -1,   111,    90,   111,    91,    -1,    71,
-      98,   111,    93,    45,    99,    -1,    71,    98,   111,    93,
-      48,    99,    -1,    71,    98,   111,    93,    49,    99,    -1,
-      71,    98,   111,    93,    51,    99,    -1,    71,    98,   111,
-      93,    52,    99,    -1,    71,    98,   111,    93,   111,    99,
-      -1,   113,   111,   115,    -1,   113,   111,    85,   111,   115,
-      -1,   114,   111,    93,   111,   115,    -1,    -1,    76,    98,
-     112,   111,    99,    -1,    77,    98,    -1,    72,    98,    -1,
-      99,    -1,   111,    10,    -1,   111,     7,    -1,   111,    87,
-     111,    -1,   111,    88,   111,    -1,   111,    89,   111,    -1,
-     111,    92,   111,    -1,   111,    86,   111,    -1,   111,    95,
-     111,    -1,   111,     9,   111,    -1,   111,     4,   111,    -1,
-     111,     3,   111,    -1,   111,    96,   111,    -1,     8,   111,
-      -1,    88,   111,    -1,   119,   126,    -1,   110,    85,    -1,
-      68,    -1,   101,   111,   101,    -1,    53,   109,    -1,    54,
-     109,    -1,    55,   109,    -1,    56,   109,    -1,   127,   109,
-      90,   111,    91,    90,   111,    91,    -1,   127,   109,    -1,
-     119,    93,   109,    -1,    16,   109,    -1,    65,    -1,   111,
-      -1,    98,   111,    93,   110,    99,    -1,    68,    -1,   122,
-      -1,   122,    98,   110,    99,    -1,   123,    -1,   123,    93,
-     124,    -1,   123,    -1,    98,   124,    99,    -1,    85,    -1,
-      21,    -1,    15,    -1,    14,    -1,    86,   120,    -1,    59,
-      65,    94,    -1,    59,    94,    -1,    57,    65,    94,    -1,
-      58,   110,    -1,    60,   109,    -1,   132,    93,   109,    -1,
-      62,    98,    53,    99,    -1,    62,    98,    54,    99,    -1,
-      62,    98,    55,    99,    -1,    62,    98,    56,    99,    -1,
-      62,    98,    17,    99,    -1,    62,    98,   127,    99,    -1,
-      62,    98,    16,    99,    -1,    62,    98,   109,    99,    -1,
-      62,    98,   109,    93,    53,    99,    -1,    62,    98,   109,
-      93,    54,    99,    -1,    62,    98,   109,    93,    55,    99,
-      -1,    62,    98,   109,    93,    56,    99,    -1,    62,    98,
-     109,    93,    17,    99,    -1,    62,    98,   109,    93,   127,
-      99,    -1,    62,    98,   109,    93,    16,    99,    -1,    62,
-      98,    99,    -1,    17,    -1,   134,   109,   126,   121,    93,
-     121,    93,   125,    -1,   134,   109,    -1,   134,   109,   126,
-     109,    -1,   134,   109,   126,   109,    90,   110,    91,    -1,
-      84,   120,    -1,    63,    -1,    31,    -1,   137,   111,    -1,
-      64,   111,    -1,   110,    -1,    79,    98,   111,    99,    66,
-      -1,    75,    66,    -1,    79,    98,   111,    99,    73,    -1,
-      73,    -1,    74,    -1,    81,    65,    66,    -1,    78,    65,
-      65,    65,    66,    -1,    16,   118,    66,    -1,    70,    65,
-      66,    -1,    70,    65,    65,    66,    -1,    83,   119,    -1,
-      83,   111,    -1,    82,    98,   110,    99,    -1,    82,    98,
-      99,    -1
+     104,     0,    -1,    -1,   104,   105,    -1,   106,    -1,   108,
+      95,    -1,   120,    95,    -1,   146,    -1,    81,    -1,    95,
+      -1,     1,    95,    -1,   141,    -1,   142,    -1,   107,    -1,
+     143,    -1,   144,    -1,   129,    -1,   130,    -1,   131,    -1,
+      58,    67,    -1,   109,    -1,   132,    -1,   133,    -1,   134,
+      -1,   145,    -1,   136,    -1,   137,    -1,   139,    -1,   140,
+      -1,   118,   111,    -1,    70,    -1,   119,    -1,   110,    11,
+     110,    -1,   112,   101,   110,    -1,   110,    99,   100,    -1,
+     110,    99,   111,   100,    -1,    91,   111,    92,    -1,    68,
+      -1,    85,    -1,   121,    -1,    16,    99,   112,   100,    -1,
+      54,    99,   112,   100,    -1,    55,    99,   111,   100,    -1,
+      55,    99,   100,    -1,    56,    99,   112,   100,    -1,    57,
+      99,   111,   100,    -1,    57,    99,   100,    -1,    46,    99,
+     112,   100,    -1,    49,    99,   112,   100,    -1,    50,    99,
+     112,   100,    -1,    52,    99,   112,   100,    -1,    47,    99,
+     112,    94,   112,   100,    -1,    49,    99,   112,    94,   112,
+     100,    -1,    51,    99,   112,    94,   112,   100,    -1,    52,
+      99,   112,    94,   112,   100,    -1,    48,    99,   112,    94,
+     112,    94,   112,   100,    -1,    50,    99,   112,    94,   112,
+      94,   112,   100,    -1,    51,    99,   112,    94,   112,    94,
+     112,   100,    -1,    52,    99,   112,    94,   112,    94,   112,
+     100,    -1,    53,    99,   100,    -1,    53,    99,   111,   100,
+      -1,   128,    99,   112,    94,   112,    94,   112,   100,    -1,
+     128,    99,   112,   100,    -1,    17,    99,   122,    94,   122,
+      94,   126,   100,    -1,    17,    99,   112,   100,    -1,   119,
+      12,    67,    -1,    99,   111,   100,    -1,   111,    94,   112,
+      -1,   112,    -1,   117,    -1,   110,    -1,   112,    91,   112,
+      94,   112,    92,    -1,   112,    91,   112,    92,    -1,    72,
+      99,   112,    94,    46,   100,    -1,    72,    99,   112,    94,
+      49,   100,    -1,    72,    99,   112,    94,    50,   100,    -1,
+      72,    99,   112,    94,    52,   100,    -1,    72,    99,   112,
+      94,    53,   100,    -1,    72,    99,   112,    94,   112,   100,
+      -1,   114,   112,   116,    -1,   114,   112,    86,   112,   116,
+      -1,   115,   112,    94,   112,   116,    -1,    -1,    77,    99,
+     113,   112,   100,    -1,    78,    99,    -1,    73,    99,    -1,
+     100,    -1,   112,    10,    -1,   112,     7,    -1,   112,    88,
+     112,    -1,   112,    89,   112,    -1,   112,    90,   112,    -1,
+     112,    93,   112,    -1,   112,    87,   112,    -1,   112,    96,
+     112,    -1,   112,     9,   112,    -1,   112,     4,   112,    -1,
+     112,     3,   112,    -1,   112,    97,   112,    -1,     8,   112,
+      -1,    89,   112,    -1,   120,   127,    -1,   111,    86,    -1,
+      69,    -1,   102,   112,   102,    -1,    54,   110,    -1,    55,
+     110,    -1,    56,   110,    -1,    57,   110,    -1,   128,   110,
+      91,   112,    92,    91,   112,    92,    -1,   128,   110,    -1,
+     120,    94,   110,    -1,    16,   110,    -1,    66,    -1,   112,
+      -1,    99,   112,    94,   111,   100,    -1,    69,    -1,   123,
+      -1,   123,    99,   111,   100,    -1,   124,    -1,   124,    94,
+     125,    -1,   124,    -1,    99,   125,   100,    -1,    86,    -1,
+      22,    -1,    15,    -1,    14,    -1,    87,   121,    -1,    60,
+      66,    95,    -1,    60,    95,    -1,    58,    66,    95,    -1,
+      59,   111,    -1,    61,   110,    -1,   133,    94,   110,    -1,
+      63,    99,    54,   100,    -1,    63,    99,    55,   100,    -1,
+      63,    99,    56,   100,    -1,    63,    99,    57,   100,    -1,
+      63,    99,    17,   100,    -1,    63,    99,   128,   100,    -1,
+      63,    99,    16,   100,    -1,    63,    99,   110,   100,    -1,
+      63,    99,   110,    94,    54,   100,    -1,    63,    99,   110,
+      94,    55,   100,    -1,    63,    99,   110,    94,    56,   100,
+      -1,    63,    99,   110,    94,    57,   100,    -1,    63,    99,
+     110,    94,    17,   100,    -1,    63,    99,   110,    94,   128,
+     100,    -1,    63,    99,   110,    94,    16,   100,    -1,    63,
+      99,   100,    -1,    17,    -1,   135,   110,   127,   122,    94,
+     122,    94,   126,    -1,   135,   110,    -1,   135,   110,   127,
+     110,    -1,   135,   110,   127,   110,    91,   111,    92,    -1,
+      85,   121,    -1,    64,    -1,    32,    -1,   138,   112,    -1,
+      65,   112,    -1,   111,    -1,    80,    99,   112,   100,    67,
+      -1,    76,    67,    -1,    80,    99,   112,   100,    74,    -1,
+      74,    -1,    75,    -1,    82,    66,    67,    -1,    79,    66,
+      66,    66,    67,    -1,    16,   119,    67,    -1,    71,    66,
+      67,    -1,    71,    66,    66,    67,    -1,    84,   120,    -1,
+      84,   112,    -1,    83,    99,   111,   100,    -1,    83,    99,
+     100,    -1
 };
 
@@ -741 +742 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   316,   316,   318,   352,   353,   355,   357,   361,   366,
-     368,   419,   420,   421,   422,   423,   424,   425,   426,   430,
-     433,   434,   435,   436,   437,   438,   439,   440,   441,   444,
-     451,   456,   460,   464,   468,   472,   486,   514,   538,   544,
-     550,   554,   558,   562,   566,   570,   574,   578,   582,   586,
-     590,   594,   598,   602,   606,   610,   614,   618,   622,   626,
-     630,   636,   640,   644,   648,   652,   657,   661,   672,   678,
-     683,   684,   688,   692,   696,   700,   704,   708,   712,   716,
-     720,   737,   744,   743,   761,   769,   777,   786,   790,   794,
-     798,   802,   806,   810,   814,   818,   822,   826,   830,   834,
-     846,   853,   854,   873,   874,   886,   891,   896,   900,   904,
-     940,   966,   987,   995,   999,  1000,  1014,  1022,  1031,  1076,
-    1077,  1086,  1087,  1093,  1100,  1102,  1104,  1113,  1118,  1123,
-    1130,  1138,  1150,  1167,  1187,  1191,  1195,  1200,  1204,  1208,
-    1212,  1216,  1221,  1227,  1233,  1239,  1245,  1251,  1257,  1269,
-    1276,  1280,  1317,  1324,  1329,  1342,  1349,  1349,  1352,  1420,
-    1424,  1453,  1466,  1483,  1492,  1497,  1505,  1517,  1536,  1546,
-    1565,  1588,  1594,  1606,  1612
+       0,   317,   317,   319,   353,   354,   356,   358,   362,   367,
+     369,   420,   421,   422,   423,   424,   425,   426,   427,   431,
+     434,   435,   436,   437,   438,   439,   440,   441,   442,   445,
+     452,   457,   461,   465,   469,   473,   487,   515,   539,   545,
+     551,   555,   559,   563,   567,   571,   575,   579,   583,   587,
+     591,   595,   599,   603,   607,   611,   615,   619,   623,   627,
+     631,   637,   641,   645,   649,   653,   658,   662,   673,   679,
+     684,   685,   689,   693,   697,   701,   705,   709,   713,   717,
+     721,   738,   745,   744,   762,   770,   778,   787,   791,   795,
+     799,   803,   807,   811,   815,   819,   823,   827,   831,   835,
+     847,   854,   855,   874,   875,   887,   892,   897,   901,   905,
+     941,   967,   988,   996,  1000,  1001,  1015,  1023,  1032,  1077,
+    1078,  1087,  1088,  1094,  1101,  1103,  1105,  1114,  1119,  1124,
+    1131,  1139,  1151,  1168,  1188,  1192,  1196,  1201,  1205,  1209,
+    1213,  1217,  1222,  1228,  1234,  1240,  1246,  1252,  1258,  1270,
+    1277,  1281,  1318,  1325,  1330,  1343,  1350,  1350,  1353,  1421,
+    1425,  1454,  1467,  1484,  1493,  1498,  1506,  1518,  1537,  1547,
+    1566,  1589,  1595,  1607,  1613
 };
 #endif
@@ -770 +771 @@
   "MINUSMINUS", "NOT", "NOTEQUAL", "PLUSPLUS", "COLONCOLON", "ARROW",
   "GRING_CMD", "BIGINTMAT_CMD", "INTMAT_CMD", "PROC_CMD", "RING_CMD",
-  "BEGIN_RING", "IDEAL_CMD", "MAP_CMD", "MATRIX_CMD", "MODUL_CMD",
-  "NUMBER_CMD", "POLY_CMD", "RESOLUTION_CMD", "VECTOR_CMD", "BETTI_CMD",
-  "E_CMD", "FETCH_CMD", "FREEMODULE_CMD", "KEEPRING_CMD", "IMAP_CMD",
-  "KOSZUL_CMD", "MAXID_CMD", "MONOM_CMD", "PAR_CMD", "PREIMAGE_CMD",
-  "VAR_CMD", "VALTVARS", "VMAXDEG", "VMAXMULT", "VNOETHER", "VMINPOLY",
-  "END_RING", "CMD_1", "CMD_2", "CMD_3", "CMD_12", "CMD_13", "CMD_23",
-  "CMD_123", "CMD_M", "ROOT_DECL", "ROOT_DECL_LIST", "RING_DECL",
+  "BEGIN_RING", "BUCKET_CMD", "IDEAL_CMD", "MAP_CMD", "MATRIX_CMD",
+  "MODUL_CMD", "NUMBER_CMD", "POLY_CMD", "RESOLUTION_CMD", "VECTOR_CMD",
+  "BETTI_CMD", "E_CMD", "FETCH_CMD", "FREEMODULE_CMD", "KEEPRING_CMD",
+  "IMAP_CMD", "KOSZUL_CMD", "MAXID_CMD", "MONOM_CMD", "PAR_CMD",
+  "PREIMAGE_CMD", "VAR_CMD", "VALTVARS", "VMAXDEG", "VMAXMULT", "VNOETHER",
+  "VMINPOLY", "END_RING", "CMD_1", "CMD_2", "CMD_3", "CMD_12", "CMD_13",
+  "CMD_23", "CMD_123", "CMD_M", "ROOT_DECL", "ROOT_DECL_LIST", "RING_DECL",
   "RING_DECL_LIST", "EXAMPLE_CMD", "EXPORT_CMD", "HELP_CMD", "KILL_CMD",
   "LIB_CMD", "LISTVAR_CMD", "SETRING_CMD", "TYPE_CMD", "STRINGTOK",
@@ -808 +809 @@
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,    61,    60,    43,    45,    47,
-      91,    93,    94,    44,    59,    38,    58,   340,    40,    41,
-      46,    96
+     335,   336,   337,   338,   339,   340,    61,    60,    43,    45,
+      47,    91,    93,    94,    44,    59,    38,    58,   341,    40,
+      41,    46,    96
 };
 # endif
@@ -817 +818 @@
 static const yytype_uint8 yyr1[] =
 {
-       0,   102,   103,   103,   104,   104,   104,   104,   104,   104,
-     104,   105,   105,   105,   105,   105,   105,   105,   105,   106,
-     107,   107,   107,   107,   107,   107,   107,   107,   107,   108,
-     109,   109,   109,   109,   109,   109,   109,   109,   109,   109,
-     109,   109,   109,   109,   109,   109,   109,   109,   109,   109,
-     109,   109,   109,   109,   109,   109,   109,   109,   109,   109,
-     109,   109,   109,   109,   109,   109,   109,   110,   110,   111,
-     111,   111,   111,   111,   111,   111,   111,   111,   111,   111,
-     111,   111,   112,   111,   113,   114,   115,   116,   116,   116,
-     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
-     116,   117,   117,   118,   118,   119,   119,   119,   119,   119,
-     119,   119,   119,   120,   121,   121,   122,   123,   123,   124,
-     124,   125,   125,   126,   127,   127,   127,   128,   129,   129,
-     130,   131,   132,   132,   133,   133,   133,   133,   133,   133,
-     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
-     134,   135,   135,   135,   135,   136,   137,   137,   138,   139,
-     139,   140,   140,   140,   140,   140,   141,   142,   143,   143,
-     143,   144,   144,   145,   145
+       0,   103,   104,   104,   105,   105,   105,   105,   105,   105,
+     105,   106,   106,   106,   106,   106,   106,   106,   106,   107,
+     108,   108,   108,   108,   108,   108,   108,   108,   108,   109,
+     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
+     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
+     110,   110,   110,   110,   110,   110,   110,   110,   110,   110,
+     110,   110,   110,   110,   110,   110,   110,   111,   111,   112,
+     112,   112,   112,   112,   112,   112,   112,   112,   112,   112,
+     112,   112,   113,   112,   114,   115,   116,   117,   117,   117,
+     117,   117,   117,   117,   117,   117,   117,   117,   117,   117,
+     117,   118,   118,   119,   119,   120,   120,   120,   120,   120,
+     120,   120,   120,   121,   122,   122,   123,   124,   124,   125,
+     125,   126,   126,   127,   128,   128,   128,   129,   130,   130,
+     131,   132,   133,   133,   134,   134,   134,   134,   134,   134,
+     134,   134,   134,   134,   134,   134,   134,   134,   134,   134,
+     135,   136,   136,   136,   136,   137,   138,   138,   139,   140,
+     140,   141,   141,   141,   141,   141,   142,   143,   144,   144,
+     144,   145,   145,   146,   146
 };
 
@@ -919 +920 @@
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -361
+#define YYPACT_NINF -362
 static const yytype_int16 yypact[] =
 {
-    -361,   383,  -361,   -84,  1874,  -361,  -361,  1939,   -47,  -361,
-    -361,   -34,   -27,   -23,   -19,   -15,     5,    32,    37,  2004,
-    2069,  2134,  2199,   -26,  1874,   -61,  1874,    45,  -361,  1874,
-    -361,  -361,  -361,  -361,    22,    51,    65,  -361,  -361,   100,
-      73,    92,   130,    94,  -361,   139,   118,  2264,   153,   153,
-    1874,  1874,  -361,  1874,  1874,  -361,  -361,  -361,     3,  -361,
-      10,   -73,  1368,  1874,  1874,  -361,  1874,   211,   -48,  -361,
-    2329,  -361,  -361,  -361,  -361,   128,  -361,  1874,  -361,  -361,
-    1874,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
-     131,   -47,   133,   145,   150,   152,  -361,    24,   159,  1874,
-     104,  1368,    -7,  2394,  1874,  1874,  1874,  1874,  1874,  1874,
-    1874,  1484,  1874,   209,  1549,   248,  1874,   258,  1614,   264,
-     187,  -361,   167,   196,  -361,   170,  1679,  1368,   113,  1874,
-    -361,  -361,  -361,  -361,   213,  1874,   227,  1744,  1939,  1368,
-     204,  -361,  -361,    24,   -66,   -69,     4,  -361,  1874,  1809,
-    -361,  1874,  1874,  1874,  -361,  1874,  -361,  1874,  1874,  1874,
-    1874,  1874,  1874,  1874,  1874,  1874,   166,   553,   167,   239,
-    -361,  1874,  -361,  -361,  1874,    -9,  1874,    47,  1368,  1874,
-    1874,  1549,  1874,  1614,  1874,   568,  -361,  1874,   583,   217,
-     677,   692,   707,   184,   235,   722,   399,  -361,   -51,   737,
-    -361,   -50,   752,  -361,   -37,  -361,  -361,    86,   116,   127,
-     135,   138,   142,  -361,     8,   148,   246,  -361,   846,  1874,
-     251,   861,  -361,  -361,   -21,  -361,  -361,  -361,  -361,  -361,
-     -13,  1368,    50,   279,   279,  1397,    31,    31,    24,   414,
-      19,  1383,    31,  -361,  1874,  -361,  -361,  1874,  -361,   287,
-     508,  1874,   280,  2394,   568,   737,   -11,   752,    34,   508,
-    -361,   876,  -361,  2394,  -361,  1874,  1874,  1874,  -361,  1874,
-    -361,  1874,  1874,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
-    -361,  -361,  -361,  -361,  -361,  1367,  -361,  -361,  -361,  2459,
-     891,   252,   -38,  -361,  -361,  -361,  1874,   906,   906,  1874,
-    -361,   921,   206,  1368,   233,  -361,  -361,  1874,   236,  1015,
-    1030,  1045,  1060,   523,   538,   241,   249,   256,   262,   271,
-     288,   289,   189,   210,   240,   255,   261,  1075,  -361,  -361,
-    -361,  -361,  1090,  -361,  -361,  1184,   242,  1874,  2394,    66,
-     -62,  -361,  1874,  -361,  1874,  1874,  -361,  1874,  -361,  -361,
-    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
-    -361,  -361,  -361,  1874,  1874,   -30,   257,  -361,  -361,   277,
-     291,  -361,   295,  1199,  1214,  1229,  1244,  1259,  1353,  -361,
-     -62,   303,   302,  1874,  -361,  -361,  -361,  -361,  -361,  -361,
-    -361,  -361,   277,  -361,    69,  -361,  -361
+    -362,   383,  -362,   -84,  1887,  -362,  -362,  1953,   -75,  -362,
+    -362,   -72,   -58,   -53,   -50,   -43,   -28,   -11,     2,  2019,
+    2085,  2151,  2217,    17,  1887,   -47,  1887,     4,  -362,  1887,
+    -362,  -362,  -362,  -362,    42,    16,    36,  -362,  -362,    92,
+      44,    64,    99,    77,  -362,   115,    88,  2283,   123,   123,
+    1887,  1887,  -362,  1887,  1887,  -362,  -362,  -362,   107,  -362,
+      -2,   -65,  1374,  1887,  1887,  -362,  1887,   192,   -52,  -362,
+    2349,  -362,  -362,  -362,  -362,   129,  -362,  1887,  -362,  -362,
+    1887,  -362,  -362,  -362,  -362,  -362,  -362,  -362,  -362,  -362,
+     121,   -75,   132,   135,   137,   141,  -362,    23,   147,  1887,
+     210,  1374,   -10,  2415,  1887,  1887,  1887,  1887,  1887,  1887,
+    1887,  1491,  1887,   262,  1557,   265,  1887,   385,  1623,  1317,
+     166,  -362,   169,   170,  -362,   203,  1689,  1374,    40,  1887,
+    -362,  -362,  -362,  -362,   200,  1887,   212,  1755,  1953,  1374,
+     186,  -362,  -362,    23,   -56,   -74,     3,  -362,  1887,  1821,
+    -362,  1887,  1887,  1887,  -362,  1887,  -362,  1887,  1887,  1887,
+    1887,  1887,  1887,  1887,  1887,  1887,   238,   554,   169,   219,
+    -362,  1887,  -362,  -362,  1887,    51,  1887,    76,  1374,  1887,
+    1887,  1557,  1887,  1623,  1887,   569,  -362,  1887,   584,   194,
+     679,   694,   709,   181,   280,   724,   399,  -362,   -49,   739,
+    -362,   -41,   754,  -362,   -40,  -362,  -362,    39,    41,    69,
+      79,    93,    95,  -362,    33,    98,   224,  -362,   849,  1887,
+     227,   864,  -362,  -362,   -36,  -362,  -362,  -362,  -362,  -362,
+     -22,  1374,   252,   163,   163,  1403,    30,    30,    23,   414,
+      18,  1389,    30,  -362,  1887,  -362,  -362,  1887,  -362,  1332,
+     509,  1887,   472,  2415,   569,   739,   -19,   754,   -18,   509,
+    -362,   879,  -362,  2415,  -362,  1887,  1887,  1887,  -362,  1887,
+    -362,  1887,  1887,  -362,  -362,  -362,  -362,  -362,  -362,  -362,
+    -362,  -362,  -362,  -362,  -362,  1495,  -362,  -362,  -362,  2481,
+     894,   233,   -35,  -362,  -362,  -362,  1887,   909,   909,  1887,
+    -362,   924,   138,  1374,   213,  -362,  -362,  1887,   214,  1019,
+    1034,  1049,  1064,   524,   539,   216,   218,   221,   222,   223,
+     230,   232,   116,   118,   126,   139,   144,  1079,  -362,  -362,
+    -362,  -362,  1094,  -362,  -362,  1189,   242,  1887,  2415,   -15,
+     -64,  -362,  1887,  -362,  1887,  1887,  -362,  1887,  -362,  -362,
+    -362,  -362,  -362,  -362,  -362,  -362,  -362,  -362,  -362,  -362,
+    -362,  -362,  -362,  1887,  1887,   -31,   256,  -362,  -362,   225,
+     204,  -362,   246,  1204,  1219,  1234,  1249,  1264,  1359,  -362,
+     -64,   258,   254,  1887,  -362,  -362,  -362,  -362,  -362,  -362,
+    -362,  -362,   225,  -362,   -14,  -362,  -362
 };
 
@@ -967 +968 @@
 static const yytype_int16 yypgoto[] =
 {
-    -361,  -361,  -361,  -361,  -361,  -361,  -361,    -4,    -1,    48,
-    -361,  -361,  -361,    79,  -361,  -361,   398,   360,   315,  -209,
-    -361,  -360,    18,    33,   238,     0,  -361,  -361,  -361,  -361,
-    -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,  -361,
-    -361,  -361,  -361,  -361
+    -362,  -362,  -362,  -362,  -362,  -362,  -362,    -4,    -1,    48,
+    -362,  -362,  -362,  -168,  -362,  -362,   303,   308,   209,  -249,
+    -362,  -361,   -80,   -17,   185,     0,  -362,  -362,  -362,  -362,
+    -362,  -362,  -362,  -362,  -362,  -362,  -362,  -362,  -362,  -362,
+    -362,  -362,  -362,  -362
 };
 
@@ -981 +982 @@
 static const yytype_int16 yytable[] =
 {
-      61,    70,   148,   100,   123,   169,   368,   152,   153,   381,
-      89,   154,   150,   155,   156,   113,   115,   117,   119,   148,
-     151,   148,   125,   122,   151,   225,   154,   151,   330,   156,
-     226,   154,   381,   124,   156,   331,   369,   170,   154,   120,
-     121,   156,   151,   151,   304,   171,   172,    70,   274,   276,
-     144,   103,    97,  -154,   308,   101,   151,   154,   148,   186,
-     156,   379,   278,   151,   104,   168,   175,   101,   101,   101,
-     101,   105,   151,   177,   101,   106,  -110,   127,   293,   107,
-     151,   251,   151,   108,  -110,  -110,   294,   128,   305,   149,
-     157,   158,   159,   160,   161,   139,   162,   147,   143,   163,
-     164,   285,   146,   109,   165,   227,   149,   286,   149,   161,
-     198,   166,   167,   201,   161,   148,   162,   204,   101,   165,
-     160,   161,   214,   162,   165,   101,   215,   151,   178,   366,
-     110,   165,   170,   306,   100,   111,   224,   158,   159,   160,
-     161,  -152,   162,   126,   228,   149,   164,   185,   230,   129,
-     165,   188,   190,   191,   192,   193,   194,   195,   196,   151,
-     199,   243,   151,   130,   202,   367,   131,   249,   396,   152,
-     153,   132,   252,   154,   101,   155,   156,   218,   216,   217,
-     256,   148,   258,   221,   179,   279,   101,   152,   153,  -112,
-     133,   154,   135,   155,   156,   134,   101,  -112,  -112,   231,
-     232,   233,   149,   234,   136,   235,   236,   237,   238,   239,
-     240,   241,   242,   101,   103,   280,   137,   148,    30,   101,
-     148,   176,   250,   169,   101,   180,   281,   254,   255,   179,
-     257,   180,   259,   181,   282,   261,   182,   283,   152,   153,
-     183,   284,   154,   181,   155,   156,   184,   287,   182,   302,
-     183,   244,   157,   158,   159,   160,   161,   184,   162,   148,
-     151,   163,   164,  -132,  -132,   245,   165,   290,   149,   148,
-     157,   158,   159,   160,   161,   148,   162,   267,   220,   163,
-     164,   205,   152,   268,   165,   321,   154,   104,   356,   156,
-     206,   148,   297,   222,  -105,   298,   337,   171,   148,   301,
-    -153,   303,  -105,  -105,   149,   248,   339,   149,   107,   357,
-     263,   303,   288,   309,   310,   311,   291,   312,   329,   313,
-     314,   157,   158,   159,   160,   161,   338,   162,   269,   340,
-     163,   164,   364,  -106,   270,   165,   365,   327,   108,   358,
-     349,  -106,  -106,  -107,   332,   368,   149,   335,   350,  -108,
-     380,  -107,  -107,   110,   359,   351,   149,  -108,  -108,   111,
-     360,   352,   149,   141,   142,   157,   158,   159,   160,   161,
-     353,   162,  -111,  -133,  -133,   164,   333,   334,   149,   165,
-    -111,  -111,   394,     2,     3,   149,   303,   354,   355,   383,
-     373,     4,   374,   375,   384,   376,   392,     5,     6,     7,
-       8,   393,   152,   153,     9,   102,   154,   140,   155,   156,
-     395,   377,   378,   391,    10,   253,     0,   152,   153,     0,
-       0,   154,     0,   155,   156,     0,     0,     0,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,     0,    27,    28,    29,    30,     0,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,     0,    49,
-       0,    50,     0,    51,     0,     0,     0,    52,     0,     0,
-       0,    53,     0,     0,    54,   157,   158,   159,   160,   161,
-       0,   162,   272,     0,   163,   164,     0,     0,   273,   165,
-     157,   158,   159,   160,   161,   295,   162,   296,     0,   163,
-     164,   152,   153,     0,   165,   154,     0,   155,   156,     0,
-       0,     0,     0,     0,     0,     0,   152,   153,     0,     0,
-     154,     0,   155,   156,     0,     0,     0,     0,     0,     0,
-       0,   152,   153,     0,     0,   154,     0,   155,   156,     0,
-       0,     0,     0,     0,     0,     0,   152,   153,     0,     0,
-     154,     0,   155,   156,     0,     0,     0,     0,     0,     0,
-       0,   152,   153,     0,     0,   154,     0,   155,   156,     0,
-       0,     0,     0,     0,     0,     0,   152,   153,     0,     0,
-     154,     0,   155,   156,   157,   158,   159,   160,   161,     0,
-     162,   299,     0,   163,   164,     0,     0,   300,   165,   157,
-     158,   159,   160,   161,     0,   162,   345,     0,   163,   164,
-       0,     0,   346,   165,   157,   158,   159,   160,   161,     0,
-     162,   347,     0,   163,   164,     0,     0,   348,   165,   157,
-     158,   159,   160,   161,     0,   162,   247,     0,   163,   164,
-       0,     0,     0,   165,   157,   158,   159,   160,   161,     0,
-     162,     0,     0,   163,   164,     0,     0,   260,   165,   157,
-     158,   159,   160,   161,     0,   162,     0,     0,   163,   164,
-     152,   153,   262,   165,   154,     0,   155,   156,     0,     0,
-       0,     0,     0,     0,     0,   152,   153,     0,     0,   154,
-       0,   155,   156,     0,     0,     0,     0,     0,     0,     0,
-     152,   153,     0,     0,   154,     0,   155,   156,     0,     0,
-       0,     0,     0,     0,     0,   152,   153,     0,     0,   154,
-       0,   155,   156,     0,     0,     0,     0,     0,     0,     0,
-     152,   153,     0,     0,   154,     0,   155,   156,     0,     0,
-       0,     0,     0,     0,     0,   152,   153,     0,     0,   154,
-       0,   155,   156,   157,   158,   159,   160,   161,     0,   162,
-       0,     0,   163,   164,     0,     0,   264,   165,   157,   158,
-     159,   160,   161,     0,   162,   265,     0,   163,   164,     0,
-       0,     0,   165,   157,   158,   159,   160,   161,     0,   162,
-     266,     0,   163,   164,     0,     0,     0,   165,   157,   158,
-     159,   160,   161,     0,   162,   271,     0,   163,   164,     0,
-       0,     0,   165,   157,   158,   159,   160,   161,     0,   162,
-       0,     0,   163,   164,     0,     0,   275,   165,   157,   158,
-     159,   160,   161,     0,   162,     0,     0,   163,   164,   152,
-     153,   277,   165,   154,     0,   155,   156,     0,     0,     0,
-       0,     0,     0,     0,   152,   153,     0,     0,   154,     0,
-     155,   156,     0,     0,     0,     0,     0,     0,     0,   152,
-     153,     0,     0,   154,     0,   155,   156,     0,     0,     0,
-       0,     0,     0,     0,   152,   153,     0,     0,   154,     0,
-     155,   156,     0,     0,     0,     0,     0,     0,     0,   152,
-     153,     0,     0,   154,     0,   155,   156,     0,     0,     0,
-       0,     0,     0,     0,   152,   153,     0,     0,   154,     0,
-     155,   156,   157,   158,   159,   160,   161,     0,   162,   289,
-       0,   163,   164,     0,     0,     0,   165,   157,   158,   159,
-     160,   161,     0,   162,     0,     0,   163,   164,     0,     0,
-     292,   165,   157,   158,   159,   160,   161,     0,   162,   307,
-       0,   163,   164,     0,     0,     0,   165,   157,   158,   159,
-     160,   161,     0,   162,     0,     0,   163,   164,     0,     0,
-     328,   165,   157,   158,   159,   160,   161,     0,   162,     0,
-       0,   163,   164,     0,     0,   245,   165,   157,   158,   159,
-     160,   161,   336,   162,     0,     0,   163,   164,   152,   153,
-       0,   165,   154,     0,   155,   156,     0,     0,     0,     0,
-       0,     0,     0,   152,   153,     0,     0,   154,     0,   155,
-     156,     0,     0,     0,     0,     0,     0,     0,   152,   153,
-       0,     0,   154,     0,   155,   156,     0,     0,     0,     0,
-       0,     0,     0,   152,   153,     0,     0,   154,     0,   155,
-     156,     0,     0,     0,     0,     0,     0,     0,   152,   153,
-       0,     0,   154,     0,   155,   156,     0,     0,     0,     0,
-       0,     0,     0,   152,   153,     0,     0,   154,     0,   155,
-     156,   157,   158,   159,   160,   161,     0,   162,     0,     0,
-     163,   164,     0,     0,   341,   165,   157,   158,   159,   160,
-     161,     0,   162,   342,     0,   163,   164,     0,     0,     0,
+      61,    70,   169,   100,   304,   368,   152,   153,   381,   148,
+     154,    89,   155,   156,   308,   113,   115,   117,   119,   123,
+     151,   150,   125,   122,   103,   154,   226,   104,   156,   151,
+     154,   381,   330,   156,   170,   369,   225,   154,   151,   331,
+     156,   105,   171,   172,   148,   151,   106,    70,   124,   107,
+     144,   274,    97,   151,   151,   101,   108,   186,   151,   276,
+     278,   379,   148,   151,   293,   168,   175,   101,   101,   101,
+     101,   109,   151,   177,   101,   151,   151,   127,   294,   151,
+     151,   305,   306,   120,   121,   367,   396,   148,   110,   366,
+     157,   158,   159,   160,   161,   139,   162,   149,   143,   163,
+     164,   111,   146,   126,   165,   227,   216,   217,   128,   161,
+     198,   166,   167,   201,   161,   129,   162,   204,   101,   165,
+     160,   161,   214,   162,   165,   101,   215,   285,   178,   333,
+     334,   165,   149,   286,   100,   130,   224,  -110,   179,   279,
+     103,   280,   251,   132,   228,  -110,  -110,   185,   230,   148,
+     149,   188,   190,   191,   192,   193,   194,   195,   196,   131,
+     199,   243,   170,   133,   202,   134,   152,   249,   180,   281,
+     154,  -152,   252,   156,   101,   149,   135,   218,   181,   282,
+     256,   136,   258,   221,   152,   153,   101,   137,   154,    30,
+     155,   156,   182,   283,   183,   284,   101,   184,   287,   231,
+     232,   233,   147,   234,   169,   235,   236,   237,   238,   239,
+     240,   241,   242,   101,   148,   104,   356,   107,   357,   101,
+     179,   148,   250,   176,   101,   108,   358,   254,   255,   337,
+     257,   180,   259,  -153,   181,   261,   182,   149,   110,   359,
+     183,   152,   153,   111,   360,   154,   184,   155,   156,   302,
+     157,   158,   159,   160,   161,  -154,   162,   141,   142,   154,
+     164,   205,   156,   151,   165,   206,   220,   290,   157,   158,
+     159,   160,   161,   148,   162,   267,   148,   163,   164,   222,
+     171,   268,   165,   152,   153,   321,   248,   154,   263,   155,
+     156,   288,   297,   291,   368,   298,  -112,  -132,  -132,   301,
+     329,   303,   149,   383,  -112,  -112,   339,   338,   340,   149,
+     102,   303,   395,   309,   310,   311,   349,   312,   350,   313,
+     314,   351,   352,   353,   244,   157,   158,   159,   160,   161,
+     354,   162,   355,   364,   163,   164,   365,   327,   245,   165,
+     158,   159,   160,   161,   332,   162,   384,   335,  -105,   164,
+     380,  -106,   392,   165,   393,   140,  -105,  -105,     0,  -106,
+    -106,   149,   253,   391,   149,     0,     0,   157,   158,   159,
+     160,   161,     0,   162,   269,     0,   163,   164,     0,     0,
+     270,   165,   394,     2,     3,     0,   303,     0,     0,     0,
+     373,     4,   374,   375,     0,   376,   148,     5,     6,     7,
+       8,     0,   152,   153,     0,     9,   154,     0,   155,   156,
+       0,   377,   378,     0,     0,    10,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,     0,    27,    28,    29,    30,
+       0,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,     0,
+      49,  -107,    50,     0,    51,     0,     0,     0,    52,  -107,
+    -107,     0,    53,   148,   149,    54,   157,   158,   159,   160,
+     161,     0,   162,   272,     0,   163,   164,     0,     0,   273,
+     165,   157,   158,   159,   160,   161,   295,   162,   296,     0,
+     163,   164,   152,   153,     0,   165,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,  -133,  -133,     0,     0,
+       0,   149,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,   157,   158,   159,   160,
+     161,     0,   162,   299,     0,   163,   164,     0,     0,   300,
+     165,   157,   158,   159,   160,   161,     0,   162,   345,     0,
+     163,   164,     0,     0,   346,   165,   157,   158,   159,   160,
+     161,     0,   162,   347,     0,   163,   164,     0,     0,   348,
+     165,   157,   158,   159,   160,   161,     0,   162,   247,     0,
+     163,   164,     0,     0,     0,   165,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,   260,
      165,   157,   158,   159,   160,   161,     0,   162,     0,     0,
-     163,   164,     0,     0,   343,   165,   157,   158,   159,   160,
-     161,     0,   162,   344,     0,   163,   164,     0,     0,     0,
-     165,   157,   158,   159,   160,   161,     0,   162,     0,     0,
-     163,   164,     0,     0,   361,   165,   157,   158,   159,   160,
-     161,   362,   162,     0,     0,   163,   164,   152,   153,     0,
-     165,   154,     0,   155,   156,     0,     0,     0,     0,     0,
-       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+     163,   164,   152,   153,   262,   165,   154,     0,   155,   156,
        0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
        0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
@@ -1108 +1057 @@
        0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
        0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
-     157,   158,   159,   160,   161,     0,   162,   363,     0,   163,
-     164,     0,     0,     0,   165,   157,   158,   159,   160,   161,
-       0,   162,     0,     0,   163,   164,     0,     0,   385,   165,
-     157,   158,   159,   160,   161,     0,   162,     0,     0,   163,
-     164,     0,     0,   386,   165,   157,   158,   159,   160,   161,
-       0,   162,     0,     0,   163,   164,     0,     0,   387,   165,
-     157,   158,   159,   160,   161,     0,   162,     0,     0,   163,
-     164,     0,     0,   388,   165,   157,   158,   159,   160,   161,
-       0,   162,     0,     0,   163,   164,   152,   153,   389,   165,
-     154,     0,   155,   156,     0,     0,     0,     0,     0,     0,
-       0,   152,   153,     0,     0,   154,     0,   155,   156,     0,
-       0,     5,     6,   315,   316,     0,   152,   153,     9,     0,
-     154,     0,   155,   156,     0,     0,     0,     0,     0,     0,
-     152,     0,     0,     0,   154,     0,     0,   156,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,   264,
+     165,   157,   158,   159,   160,   161,     0,   162,   265,     0,
+     163,   164,     0,     0,     0,   165,   157,   158,   159,   160,
+     161,     0,   162,   266,     0,   163,   164,     0,     0,     0,
+     165,   157,   158,   159,   160,   161,     0,   162,   271,     0,
+     163,   164,     0,     0,     0,   165,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,   275,
+     165,   157,   158,   159,   160,   161,     0,   162,     0,     0,
+     163,   164,   152,   153,   277,   165,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,   157,   158,   159,   160,
+     161,     0,   162,   289,     0,   163,   164,     0,     0,     0,
+     165,   157,   158,   159,   160,   161,     0,   162,     0,     0,
+     163,   164,     0,     0,   292,   165,   157,   158,   159,   160,
+     161,     0,   162,   307,     0,   163,   164,     0,     0,     0,
+     165,   157,   158,   159,   160,   161,     0,   162,     0,     0,
+     163,   164,     0,     0,   328,   165,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,   245,
+     165,   157,   158,   159,   160,   161,   336,   162,     0,     0,
+     163,   164,   152,   153,     0,   165,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,   341,
+     165,   157,   158,   159,   160,   161,     0,   162,   342,     0,
+     163,   164,     0,     0,     0,   165,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,   343,
+     165,   157,   158,   159,   160,   161,     0,   162,   344,     0,
+     163,   164,     0,     0,     0,   165,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,   361,
+     165,   157,   158,   159,   160,   161,   362,   162,     0,     0,
+     163,   164,   152,   153,     0,   165,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,   157,   158,   159,   160,
+     161,     0,   162,   363,     0,   163,   164,     0,     0,     0,
+     165,   157,   158,   159,   160,   161,     0,   162,     0,     0,
+     163,   164,     0,     0,   385,   165,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,   163,   164,     0,     0,   386,
+     165,   157,   158,   159,   160,   161,     0,   162,   148,     0,
+     163,   164,     0,     0,   387,   165,   157,   158,   159,   160,
+     161,     0,   162,   148,     0,   163,   164,     0,     0,   388,
+     165,   157,   158,   159,   160,   161,     0,   162,     0,     0,
+     163,   164,   152,   153,   389,   165,   154,     0,   155,   156,
+       0,     0,     0,     0,     0,     0,     0,   152,   153,     0,
+       0,   154,     0,   155,   156,     0,     0,     0,     0,     0,
+       0,     0,   152,   153,     0,     0,   154,     0,   155,   156,
+       0,     0,     0,  -108,     0,     0,   152,     0,     0,     0,
+     154,  -108,  -108,   156,     0,     0,   149,     0,  -111,     0,
+       0,     0,     0,     0,     0,     0,  -111,  -111,     0,     0,
+       0,   149,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   157,   158,   159,   160,
+     161,   390,   162,     0,     0,   163,   164,     0,     0,     0,
+     165,   157,   158,   159,   160,   161,     0,   162,     0,     0,
+     163,   164,     0,     0,     0,   165,   157,   158,   159,   160,
+     161,     0,   162,     0,     0,     0,   164,     0,     0,     0,
+     165,   158,   159,   160,   161,     0,   162,     0,     0,     4,
+     164,     0,     0,     0,   165,     5,     6,    90,    91,     5,
+       6,   315,   316,     9,     0,     0,     0,     9,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     317,   318,   319,   320,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   157,
-     158,   159,   160,   161,   390,   162,     0,     0,   163,   164,
-       0,     0,     0,   165,   157,   158,   159,   160,   161,     0,
-     162,     0,     0,   163,   164,     0,     0,     0,   165,   157,
-     158,   159,   160,   161,     0,   162,     0,     0,     0,   164,
-       0,     0,     0,   165,   158,   159,   160,   161,     0,   162,
-       0,     0,     4,   164,     0,     0,     0,   165,     5,     6,
-      90,    91,     0,     0,     0,     9,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    11,    12,    13,
+      14,    15,    16,    17,    18,    92,    93,    94,    95,   317,
+     318,   319,   320,     0,     0,     0,     0,    30,     0,    31,
+      32,    33,     0,    35,    36,     4,     0,     0,    40,    41,
+       0,     5,     6,    90,    91,     0,    96,     0,     0,     9,
+      50,     0,    51,     0,     0,     0,     0,     0,     0,     0,
+      53,   197,     0,    54,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
+       0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     4,     0,     0,    40,    41,     0,     5,     6,    90,
+      91,     0,    96,     0,     0,     9,    50,     0,    51,     0,
+       0,     0,     0,     0,     0,     0,    53,   200,     0,    54,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    11,
+      12,    13,    14,    15,    16,    17,    18,    92,    93,    94,
+      95,     0,     0,     0,     0,     0,     0,     0,     0,    30,
+       0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
+      40,    41,     0,     5,     6,   207,   208,     0,    96,     0,
+       0,     9,    50,     0,    51,     0,     0,     0,     0,     0,
+       0,     0,    53,   203,     0,    54,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    11,    12,    13,    14,    15,
+      16,    17,    18,   209,   210,   211,   212,     0,     0,     0,
+       0,     0,     0,     0,     0,    30,     0,    31,    32,    33,
+       0,    35,    36,     4,     0,     0,    40,    41,     0,     5,
+       6,    90,    91,     0,    96,     0,     0,     9,    50,     0,
+      51,     0,     0,     0,     0,     0,     0,     0,    53,   213,
+       0,    54,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    11,    12,    13,    14,    15,    16,    17,    18,    92,
+      93,    94,    95,     0,     0,     0,     0,     0,     0,     0,
+       0,    30,     0,    31,    32,    33,     0,    35,    36,     4,
+       0,     0,    40,    41,     0,     5,     6,    90,    91,     0,
+      96,     0,     0,     9,    50,     0,    51,     0,     0,     0,
+       0,     0,     0,     0,    53,   223,     0,    54,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    11,    12,    13,
+      14,    15,    16,    17,    18,    92,    93,    94,    95,     0,
+       0,     0,     0,     0,     0,     0,     0,    30,     0,    31,
+      32,    33,     0,    35,    36,     4,     0,     0,    40,    41,
+       0,     5,     6,    90,    91,     0,    96,     0,     0,     9,
+      50,     0,    51,     0,     0,     0,     0,     0,     0,     0,
+      53,   229,     0,    54,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
+       0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     4,     0,     0,    40,    41,     0,     5,     6,    90,
+      91,     0,    96,     0,     0,     9,    50,     0,    51,     0,
+       0,     0,     0,     0,     0,     0,    53,     0,     0,    54,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    11,
       12,    13,    14,    15,    16,    17,    18,    92,    93,    94,
@@ -1138 +1186 @@
        0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
       40,    41,     0,     5,     6,    90,    91,     0,    96,     0,
-       9,     0,    50,     0,    51,     0,     0,     0,     0,     0,
-       0,     0,    53,   197,     0,    54,     0,     0,     0,     0,
-       0,     0,     0,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,    92,    93,    94,    95,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,    36,     4,     0,     0,    40,    41,     0,     5,     6,
-      90,    91,     0,    96,     0,     9,     0,    50,     0,    51,
-       0,     0,     0,     0,     0,     0,     0,    53,   200,     0,
-      54,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-      12,    13,    14,    15,    16,    17,    18,    92,    93,    94,
-      95,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
-      40,    41,     0,     5,     6,   207,   208,     0,    96,     0,
-       9,     0,    50,     0,    51,     0,     0,     0,     0,     0,
-       0,     0,    53,   203,     0,    54,     0,     0,     0,     0,
-       0,     0,     0,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,   209,   210,   211,   212,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,    36,     4,     0,     0,    40,    41,     0,     5,     6,
-      90,    91,     0,    96,     0,     9,     0,    50,     0,    51,
-       0,     0,     0,     0,     0,     0,     0,    53,   213,     0,
-      54,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-      12,    13,    14,    15,    16,    17,    18,    92,    93,    94,
-      95,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
-      40,    41,     0,     5,     6,    90,    91,     0,    96,     0,
-       9,     0,    50,     0,    51,     0,     0,     0,     0,     0,
-       0,     0,    53,   223,     0,    54,     0,     0,     0,     0,
-       0,     0,     0,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,    92,    93,    94,    95,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,    36,     4,     0,     0,    40,    41,     0,     5,     6,
-      90,    91,     0,    96,     0,     9,     0,    50,     0,    51,
-       0,     0,     0,     0,     0,     0,     0,    53,   229,     0,
-      54,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-      12,    13,    14,    15,    16,    17,    18,    92,    93,    94,
-      95,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
-      40,    41,     0,     5,     6,    90,    91,     0,    96,     0,
-       9,     0,    50,     0,    51,     0,     0,     0,     0,     0,
-       0,     0,    53,     0,     0,    54,     0,     0,     0,     0,
-       0,     0,     0,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,    92,    93,    94,    95,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,    36,     4,     0,     0,    40,    41,     0,     5,     6,
-      90,    91,     0,    96,     0,     9,     0,    50,     0,    51,
-       0,     0,     0,     0,     0,     0,     0,    99,     0,     0,
-      54,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-      12,    13,    14,    15,    16,    17,    18,    92,    93,    94,
-      95,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
-      40,    41,     0,     5,     6,    90,    91,     0,    96,     0,
-       9,     0,    50,     0,    51,     0,     0,     0,     0,     0,
-       0,     0,   112,     0,     0,    54,     0,     0,     0,     0,
-       0,     0,     0,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,    92,    93,    94,    95,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,    36,     4,     0,     0,    40,    41,     0,     5,     6,
-      90,    91,     0,    96,     0,     9,     0,    50,     0,    51,
-       0,     0,     0,     0,     0,     0,     0,   114,     0,     0,
-      54,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-      12,    13,    14,    15,    16,    17,    18,    92,    93,    94,
-      95,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
-      40,    41,     0,     5,     6,    90,    91,     0,    96,     0,
-       9,     0,    50,     0,    51,     0,     0,     0,     0,     0,
-       0,     0,   116,     0,     0,    54,     0,     0,     0,     0,
-       0,     0,     0,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,    92,    93,    94,    95,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,    36,     4,     0,     0,    40,    41,     0,     5,     6,
-     138,    91,     0,    96,     0,     9,     0,    50,     0,    51,
-       0,     0,     0,     0,     0,     0,     0,   118,     0,     0,
-      54,     0,     0,     0,     0,     0,     0,     0,     0,    11,
+       0,     9,    50,     0,    51,     0,     0,     0,     0,     0,
+       0,     0,    99,     0,     0,    54,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    11,    12,    13,    14,    15,
+      16,    17,    18,    92,    93,    94,    95,     0,     0,     0,
+       0,     0,     0,     0,     0,    30,     0,    31,    32,    33,
+       0,    35,    36,     4,     0,     0,    40,    41,     0,     5,
+       6,    90,    91,     0,    96,     0,     0,     9,    50,     0,
+      51,     0,     0,     0,     0,     0,     0,     0,   112,     0,
+       0,    54,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    11,    12,    13,    14,    15,    16,    17,    18,    92,
+      93,    94,    95,     0,     0,     0,     0,     0,     0,     0,
+       0,    30,     0,    31,    32,    33,     0,    35,    36,     4,
+       0,     0,    40,    41,     0,     5,     6,    90,    91,     0,
+      96,     0,     0,     9,    50,     0,    51,     0,     0,     0,
+       0,     0,     0,     0,   114,     0,     0,    54,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    11,    12,    13,
+      14,    15,    16,    17,    18,    92,    93,    94,    95,     0,
+       0,     0,     0,     0,     0,     0,     0,    30,     0,    31,
+      32,    33,     0,    35,    36,     4,     0,     0,    40,    41,
+       0,     5,     6,    90,    91,     0,    96,     0,     0,     9,
+      50,     0,    51,     0,     0,     0,     0,     0,     0,     0,
+     116,     0,     0,    54,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    11,    12,    13,    14,    15,    16,    17,
+      18,    92,    93,    94,    95,     0,     0,     0,     0,     0,
+       0,     0,     0,    30,     0,    31,    32,    33,     0,    35,
+      36,     4,     0,     0,    40,    41,     0,     5,     6,   138,
+      91,     0,    96,     0,     0,     9,    50,     0,    51,     0,
+       0,     0,     0,     0,     0,     0,   118,     0,     0,    54,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       22,     0,     0,     0,     0,     0,     0,     0,     0,    30,
        0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
       40,    41,     0,     5,     6,    90,    91,     0,    96,     0,
-       9,     0,    50,     0,    51,     0,     0,     0,     0,     0,
+       0,     9,    50,     0,    51,     0,     0,     0,     0,     0,
        0,     0,    53,     0,     0,    54,     0,     0,     0,     0,
-       0,     0,     0,     0,    11,    12,    13,    14,    15,    16,
-      17,    18,    92,    93,    94,    95,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,    36,     4,     0,     0,    40,    41,     0,     5,     6,
-      90,    91,     0,    96,     0,     9,     0,    50,     0,    51,
-       0,     0,     0,     0,     0,     0,     0,   174,     0,     0,
-      54,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-      12,    13,    14,    15,    16,    17,    18,    92,    93,    94,
-      95,     0,     0,     0,     0,     0,     0,     0,     0,    30,
-       0,    31,    32,    33,     0,    35,    36,     4,     0,     0,
-      40,    41,     0,     5,     6,    90,    91,     0,    96,     0,
-       9,     0,    50,     0,    51,     0,     0,     0,     0,     0,
-       0,     0,   187,     0,     0,    54,     0,     0,     0,     0,
-       0,     0,     0,     0,   322,    12,    13,   323,   324,    16,
-     325,   326,    92,    93,    94,    95,     0,     0,     0,     0,
-       0,     0,     0,     0,    30,     0,    31,    32,    33,     0,
-      35,    36,     0,     0,     0,    40,    41,     0,     0,     0,
-       0,     0,     0,    96,     0,     0,     0,    50,     0,    51,
-       0,     0,     0,     0,     0,     0,     0,    53,     0,     0,
-      54
+       0,     0,     0,     0,     0,    11,    12,    13,    14,    15,
+      16,    17,    18,    92,    93,    94,    95,     0,     0,     0,
+       0,     0,     0,     0,     0,    30,     0,    31,    32,    33,
+       0,    35,    36,     4,     0,     0,    40,    41,     0,     5,
+       6,    90,    91,     0,    96,     0,     0,     9,    50,     0,
+      51,     0,     0,     0,     0,     0,     0,     0,   174,     0,
+       0,    54,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    11,    12,    13,    14,    15,    16,    17,    18,    92,
+      93,    94,    95,     0,     0,     0,     0,     0,     0,     0,
+       0,    30,     0,    31,    32,    33,     0,    35,    36,     4,
+       0,     0,    40,    41,     0,     5,     6,    90,    91,     0,
+      96,     0,     0,     9,    50,     0,    51,     0,     0,     0,
+       0,     0,     0,     0,   187,     0,     0,    54,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   322,    12,    13,
+     323,   324,    16,   325,   326,    92,    93,    94,    95,     0,
+       0,     0,     0,     0,     0,     0,     0,    30,     0,    31,
+      32,    33,     0,    35,    36,     0,     0,     0,    40,    41,
+       0,     0,     0,     0,     0,     0,    96,     0,     0,     0,
+      50,     0,    51,     0,     0,     0,     0,     0,     0,     0,
+      53,     0,     0,    54
 };
 
 static const yytype_int16 yycheck[] =
 {
-       1,     1,    11,     7,    65,    12,    68,     3,     4,   369,
-      94,     7,    85,     9,    10,    19,    20,    21,    22,    11,
-      93,    11,    26,    24,    93,    91,     7,    93,    66,    10,
-      99,     7,   392,    94,    10,    73,    98,    85,     7,    65,
-      66,    10,    93,    93,   253,    93,    94,    47,    99,    99,
-      51,    98,     4,     3,   263,     7,    93,     7,    11,    66,
-      10,    91,    99,    93,    98,    66,    70,    19,    20,    21,
-      22,    98,    93,    77,    26,    98,    85,    29,    99,    98,
-      93,    90,    93,    98,    93,    94,    99,    65,    99,    98,
-      86,    87,    88,    89,    90,    47,    92,    94,    50,    95,
-      96,    93,    54,    98,   100,   101,    98,    99,    98,    90,
-     111,    63,    64,   114,    90,    11,    92,   118,    70,   100,
-      89,    90,   126,    92,   100,    77,   126,    93,    80,   338,
-      98,   100,    85,    99,   138,    98,   137,    87,    88,    89,
-      90,    94,    92,    98,   148,    98,    96,    99,   149,    98,
-     100,   103,   104,   105,   106,   107,   108,   109,   110,    93,
-     112,   165,    93,    98,   116,    99,    66,   171,    99,     3,
-       4,    98,   176,     7,   126,     9,    10,   129,    65,    66,
-     181,    11,   183,   135,    98,    99,   138,     3,     4,    85,
-      98,     7,    98,     9,    10,    65,   148,    93,    94,   151,
-     152,   153,    98,   155,    65,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,    98,    99,    98,    11,    65,   171,
-      11,    93,   174,    12,   176,    98,    99,   179,   180,    98,
-     182,    98,   184,    98,    99,   187,    98,    99,     3,     4,
-      98,    99,     7,    98,     9,    10,    98,    99,    98,   253,
-      98,    85,    86,    87,    88,    89,    90,    98,    92,    11,
-      93,    95,    96,    93,    94,    99,   100,   219,    98,    11,
-      86,    87,    88,    89,    90,    11,    92,    93,    65,    95,
-      96,    94,     3,    99,   100,   285,     7,    98,    99,    10,
-      94,    11,   244,    66,    85,   247,    90,    93,    11,   251,
-      94,   253,    93,    94,    98,    66,   307,    98,    98,    99,
-      93,   263,    66,   265,   266,   267,    65,   269,    66,   271,
-     272,    86,    87,    88,    89,    90,    93,    92,    93,    93,
-      95,    96,    90,    85,    99,   100,   337,   289,    98,    99,
-      99,    93,    94,    85,   296,    68,    98,   299,    99,    85,
-      93,    93,    94,    98,    99,    99,    98,    93,    94,    98,
-      99,    99,    98,    48,    49,    86,    87,    88,    89,    90,
-      99,    92,    85,    93,    94,    96,   297,   298,    98,   100,
-      93,    94,   383,     0,     1,    98,   338,    99,    99,    98,
-     342,     8,   344,   345,    99,   347,    93,    14,    15,    16,
-      17,    99,     3,     4,    21,     7,     7,    47,     9,    10,
-     392,   363,   364,   380,    31,   177,    -1,     3,     4,    -1,
-      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    45,    46,
+       1,     1,    12,     7,   253,    69,     3,     4,   369,    11,
+       7,    95,     9,    10,   263,    19,    20,    21,    22,    66,
+      94,    86,    26,    24,    99,     7,   100,    99,    10,    94,
+       7,   392,    67,    10,    86,    99,    92,     7,    94,    74,
+      10,    99,    94,    95,    11,    94,    99,    47,    95,    99,
+      51,   100,     4,    94,    94,     7,    99,    67,    94,   100,
+     100,    92,    11,    94,   100,    66,    70,    19,    20,    21,
+      22,    99,    94,    77,    26,    94,    94,    29,   100,    94,
+      94,   100,   100,    66,    67,   100,   100,    11,    99,   338,
+      87,    88,    89,    90,    91,    47,    93,    99,    50,    96,
+      97,    99,    54,    99,   101,   102,    66,    67,    66,    91,
+     111,    63,    64,   114,    91,    99,    93,   118,    70,   101,
+      90,    91,   126,    93,   101,    77,   126,    94,    80,   297,
+     298,   101,    99,   100,   138,    99,   137,    86,    99,   100,
+      99,   100,    91,    99,   148,    94,    95,    99,   149,    11,
+      99,   103,   104,   105,   106,   107,   108,   109,   110,    67,
+     112,   165,    86,    99,   116,    66,     3,   171,    99,   100,
+       7,    95,   176,    10,   126,    99,    99,   129,    99,   100,
+     181,    66,   183,   135,     3,     4,   138,    99,     7,    66,
+       9,    10,    99,   100,    99,   100,   148,    99,   100,   151,
+     152,   153,    95,   155,    12,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,    11,    99,   100,    99,   100,   171,
+      99,    11,   174,    94,   176,    99,   100,   179,   180,    91,
+     182,    99,   184,    95,    99,   187,    99,    99,    99,   100,
+      99,     3,     4,    99,   100,     7,    99,     9,    10,   253,
+      87,    88,    89,    90,    91,     3,    93,    48,    49,     7,
+      97,    95,    10,    94,   101,    95,    66,   219,    87,    88,
+      89,    90,    91,    11,    93,    94,    11,    96,    97,    67,
+      94,   100,   101,     3,     4,   285,    67,     7,    94,     9,
+      10,    67,   244,    66,    69,   247,    86,    94,    95,   251,
+      67,   253,    99,    99,    94,    95,   307,    94,    94,    99,
+       7,   263,   392,   265,   266,   267,   100,   269,   100,   271,
+     272,   100,   100,   100,    86,    87,    88,    89,    90,    91,
+     100,    93,   100,    91,    96,    97,   337,   289,   100,   101,
+      88,    89,    90,    91,   296,    93,   100,   299,    86,    97,
+      94,    86,    94,   101,   100,    47,    94,    95,    -1,    94,
+      95,    99,   177,   380,    99,    -1,    -1,    87,    88,    89,
+      90,    91,    -1,    93,    94,    -1,    96,    97,    -1,    -1,
+     100,   101,   383,     0,     1,    -1,   338,    -1,    -1,    -1,
+     342,     8,   344,   345,    -1,   347,    11,    14,    15,    16,
+      17,    -1,     3,     4,    -1,    22,     7,    -1,     9,    10,
+      -1,   363,   364,    -1,    -1,    32,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    46,
       47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    -1,    62,    63,    64,    65,    -1,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    -1,    86,
-      -1,    88,    -1,    90,    -1,    -1,    -1,    94,    -1,    -1,
-      -1,    98,    -1,    -1,   101,    86,    87,    88,    89,    90,
-      -1,    92,    93,    -1,    95,    96,    -1,    -1,    99,   100,
-      86,    87,    88,    89,    90,    91,    92,    93,    -1,    95,
-      96,     3,     4,    -1,   100,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
-       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
-       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
-       7,    -1,     9,    10,    86,    87,    88,    89,    90,    -1,
-      92,    93,    -1,    95,    96,    -1,    -1,    99,   100,    86,
-      87,    88,    89,    90,    -1,    92,    93,    -1,    95,    96,
-      -1,    -1,    99,   100,    86,    87,    88,    89,    90,    -1,
-      92,    93,    -1,    95,    96,    -1,    -1,    99,   100,    86,
-      87,    88,    89,    90,    -1,    92,    93,    -1,    95,    96,
-      -1,    -1,    -1,   100,    86,    87,    88,    89,    90,    -1,
-      92,    -1,    -1,    95,    96,    -1,    -1,    99,   100,    86,
-      87,    88,    89,    90,    -1,    92,    -1,    -1,    95,    96,
-       3,     4,    99,   100,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,
-      -1,     9,    10,    86,    87,    88,    89,    90,    -1,    92,
-      -1,    -1,    95,    96,    -1,    -1,    99,   100,    86,    87,
-      88,    89,    90,    -1,    92,    93,    -1,    95,    96,    -1,
-      -1,    -1,   100,    86,    87,    88,    89,    90,    -1,    92,
-      93,    -1,    95,    96,    -1,    -1,    -1,   100,    86,    87,
-      88,    89,    90,    -1,    92,    93,    -1,    95,    96,    -1,
-      -1,    -1,   100,    86,    87,    88,    89,    90,    -1,    92,
-      -1,    -1,    95,    96,    -1,    -1,    99,   100,    86,    87,
-      88,    89,    90,    -1,    92,    -1,    -1,    95,    96,     3,
-       4,    99,   100,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
-       4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
-       4,    -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,
-       9,    10,    86,    87,    88,    89,    90,    -1,    92,    93,
-      -1,    95,    96,    -1,    -1,    -1,   100,    86,    87,    88,
-      89,    90,    -1,    92,    -1,    -1,    95,    96,    -1,    -1,
-      99,   100,    86,    87,    88,    89,    90,    -1,    92,    93,
-      -1,    95,    96,    -1,    -1,    -1,   100,    86,    87,    88,
-      89,    90,    -1,    92,    -1,    -1,    95,    96,    -1,    -1,
-      99,   100,    86,    87,    88,    89,    90,    -1,    92,    -1,
-      -1,    95,    96,    -1,    -1,    99,   100,    86,    87,    88,
-      89,    90,    91,    92,    -1,    -1,    95,    96,     3,     4,
-      -1,   100,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,
-      -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,
-      -1,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,
-      10,    86,    87,    88,    89,    90,    -1,    92,    -1,    -1,
-      95,    96,    -1,    -1,    99,   100,    86,    87,    88,    89,
-      90,    -1,    92,    93,    -1,    95,    96,    -1,    -1,    -1,
-     100,    86,    87,    88,    89,    90,    -1,    92,    -1,    -1,
-      95,    96,    -1,    -1,    99,   100,    86,    87,    88,    89,
-      90,    -1,    92,    93,    -1,    95,    96,    -1,    -1,    -1,
-     100,    86,    87,    88,    89,    90,    -1,    92,    -1,    -1,
-      95,    96,    -1,    -1,    99,   100,    86,    87,    88,    89,
-      90,    91,    92,    -1,    -1,    95,    96,     3,     4,    -1,
-     100,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      57,    58,    59,    60,    61,    -1,    63,    64,    65,    66,
+      -1,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
+      87,    86,    89,    -1,    91,    -1,    -1,    -1,    95,    94,
+      95,    -1,    99,    11,    99,   102,    87,    88,    89,    90,
+      91,    -1,    93,    94,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    92,    93,    94,    -1,
+      96,    97,     3,     4,    -1,   101,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    94,    95,    -1,    -1,
+      -1,    99,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    87,    88,    89,    90,
+      91,    -1,    93,    94,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    94,    -1,
+      96,    97,    -1,    -1,   100,   101,    87,    88,    89,    90,
+      91,    -1,    93,    94,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    94,    -1,
+      96,    97,    -1,    -1,    -1,   101,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    -1,    -1,
+      96,    97,     3,     4,   100,   101,     7,    -1,     9,    10,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
       -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
@@ -1369 +1320 @@
       -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
-      86,    87,    88,    89,    90,    -1,    92,    93,    -1,    95,
-      96,    -1,    -1,    -1,   100,    86,    87,    88,    89,    90,
-      -1,    92,    -1,    -1,    95,    96,    -1,    -1,    99,   100,
-      86,    87,    88,    89,    90,    -1,    92,    -1,    -1,    95,
-      96,    -1,    -1,    99,   100,    86,    87,    88,    89,    90,
-      -1,    92,    -1,    -1,    95,    96,    -1,    -1,    99,   100,
-      86,    87,    88,    89,    90,    -1,    92,    -1,    -1,    95,
-      96,    -1,    -1,    99,   100,    86,    87,    88,    89,    90,
-      -1,    92,    -1,    -1,    95,    96,     3,     4,    99,   100,
-       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,    -1,
-      -1,    14,    15,    16,    17,    -1,     3,     4,    21,    -1,
-       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,    -1,    -1,    -1,     7,    -1,    -1,    10,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    94,    -1,
+      96,    97,    -1,    -1,    -1,   101,    87,    88,    89,    90,
+      91,    -1,    93,    94,    -1,    96,    97,    -1,    -1,    -1,
+     101,    87,    88,    89,    90,    91,    -1,    93,    94,    -1,
+      96,    97,    -1,    -1,    -1,   101,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    -1,    -1,
+      96,    97,     3,     4,   100,   101,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    87,    88,    89,    90,
+      91,    -1,    93,    94,    -1,    96,    97,    -1,    -1,    -1,
+     101,    87,    88,    89,    90,    91,    -1,    93,    -1,    -1,
+      96,    97,    -1,    -1,   100,   101,    87,    88,    89,    90,
+      91,    -1,    93,    94,    -1,    96,    97,    -1,    -1,    -1,
+     101,    87,    88,    89,    90,    91,    -1,    93,    -1,    -1,
+      96,    97,    -1,    -1,   100,   101,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    92,    93,    -1,    -1,
+      96,    97,     3,     4,    -1,   101,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    94,    -1,
+      96,    97,    -1,    -1,    -1,   101,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    94,    -1,
+      96,    97,    -1,    -1,    -1,   101,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    92,    93,    -1,    -1,
+      96,    97,     3,     4,    -1,   101,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    87,    88,    89,    90,
+      91,    -1,    93,    94,    -1,    96,    97,    -1,    -1,    -1,
+     101,    87,    88,    89,    90,    91,    -1,    93,    -1,    -1,
+      96,    97,    -1,    -1,   100,   101,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    11,    -1,
+      96,    97,    -1,    -1,   100,   101,    87,    88,    89,    90,
+      91,    -1,    93,    11,    -1,    96,    97,    -1,    -1,   100,
+     101,    87,    88,    89,    90,    91,    -1,    93,    -1,    -1,
+      96,    97,     3,     4,   100,   101,     7,    -1,     9,    10,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,
+      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,     4,    -1,    -1,     7,    -1,     9,    10,
+      -1,    -1,    -1,    86,    -1,    -1,     3,    -1,    -1,    -1,
+       7,    94,    95,    10,    -1,    -1,    99,    -1,    86,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    -1,    -1,
+      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    87,    88,    89,    90,
+      91,    92,    93,    -1,    -1,    96,    97,    -1,    -1,    -1,
+     101,    87,    88,    89,    90,    91,    -1,    93,    -1,    -1,
+      96,    97,    -1,    -1,    -1,   101,    87,    88,    89,    90,
+      91,    -1,    93,    -1,    -1,    -1,    97,    -1,    -1,    -1,
+     101,    88,    89,    90,    91,    -1,    93,    -1,    -1,     8,
+      97,    -1,    -1,    -1,   101,    14,    15,    16,    17,    14,
+      15,    16,    17,    22,    -1,    -1,    -1,    22,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      53,    54,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    86,
-      87,    88,    89,    90,    91,    92,    -1,    -1,    95,    96,
-      -1,    -1,    -1,   100,    86,    87,    88,    89,    90,    -1,
-      92,    -1,    -1,    95,    96,    -1,    -1,    -1,   100,    86,
-      87,    88,    89,    90,    -1,    92,    -1,    -1,    -1,    96,
-      -1,    -1,    -1,   100,    87,    88,    89,    90,    -1,    92,
-      -1,    -1,     8,    96,    -1,    -1,    -1,   100,    14,    15,
-      16,    17,    -1,    -1,    -1,    21,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    67,    68,    69,    -1,    71,    72,     8,    -1,    -1,
-      76,    77,    -1,    14,    15,    16,    17,    -1,    84,    -1,
-      21,    -1,    88,    -1,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    98,    99,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    69,    -1,
-      71,    72,     8,    -1,    -1,    76,    77,    -1,    14,    15,
-      16,    17,    -1,    84,    -1,    21,    -1,    88,    -1,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    99,    -1,
-     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    67,    68,    69,    -1,    71,    72,     8,    -1,    -1,
-      76,    77,    -1,    14,    15,    16,    17,    -1,    84,    -1,
-      21,    -1,    88,    -1,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    98,    99,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    69,    -1,
-      71,    72,     8,    -1,    -1,    76,    77,    -1,    14,    15,
-      16,    17,    -1,    84,    -1,    21,    -1,    88,    -1,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    99,    -1,
-     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    67,    68,    69,    -1,    71,    72,     8,    -1,    -1,
-      76,    77,    -1,    14,    15,    16,    17,    -1,    84,    -1,
-      21,    -1,    88,    -1,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    98,    99,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    69,    -1,
-      71,    72,     8,    -1,    -1,    76,    77,    -1,    14,    15,
-      16,    17,    -1,    84,    -1,    21,    -1,    88,    -1,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    99,    -1,
-     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    67,    68,    69,    -1,    71,    72,     8,    -1,    -1,
-      76,    77,    -1,    14,    15,    16,    17,    -1,    84,    -1,
-      21,    -1,    88,    -1,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    98,    -1,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    69,    -1,
-      71,    72,     8,    -1,    -1,    76,    77,    -1,    14,    15,
-      16,    17,    -1,    84,    -1,    21,    -1,    88,    -1,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    -1,    -1,
-     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    67,    68,    69,    -1,    71,    72,     8,    -1,    -1,
-      76,    77,    -1,    14,    15,    16,    17,    -1,    84,    -1,
-      21,    -1,    88,    -1,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    98,    -1,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    69,    -1,
-      71,    72,     8,    -1,    -1,    76,    77,    -1,    14,    15,
-      16,    17,    -1,    84,    -1,    21,    -1,    88,    -1,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    -1,    -1,
-     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    67,    68,    69,    -1,    71,    72,     8,    -1,    -1,
-      76,    77,    -1,    14,    15,    16,    17,    -1,    84,    -1,
-      21,    -1,    88,    -1,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    98,    -1,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    69,    -1,
-      71,    72,     8,    -1,    -1,    76,    77,    -1,    14,    15,
-      16,    17,    -1,    84,    -1,    21,    -1,    88,    -1,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    -1,    -1,
-     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    67,    68,    69,    -1,    71,    72,     8,    -1,    -1,
-      76,    77,    -1,    14,    15,    16,    17,    -1,    84,    -1,
-      21,    -1,    88,    -1,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    98,    -1,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    69,    -1,
-      71,    72,     8,    -1,    -1,    76,    77,    -1,    14,    15,
-      16,    17,    -1,    84,    -1,    21,    -1,    88,    -1,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    -1,    -1,
-     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    67,    68,    69,    -1,    71,    72,     8,    -1,    -1,
-      76,    77,    -1,    14,    15,    16,    17,    -1,    84,    -1,
-      21,    -1,    88,    -1,    90,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    98,    -1,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    67,    68,    69,    -1,
-      71,    72,    -1,    -1,    -1,    76,    77,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    -1,    -1,    -1,    88,    -1,    90,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    -1,    -1,
-     101
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    54,
+      55,    56,    57,    -1,    -1,    -1,    -1,    66,    -1,    68,
+      69,    70,    -1,    72,    73,     8,    -1,    -1,    77,    78,
+      -1,    14,    15,    16,    17,    -1,    85,    -1,    -1,    22,
+      89,    -1,    91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      99,   100,    -1,   102,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    66,    -1,    68,    69,    70,    -1,    72,
+      73,     8,    -1,    -1,    77,    78,    -1,    14,    15,    16,
+      17,    -1,    85,    -1,    -1,    22,    89,    -1,    91,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    99,   100,    -1,   102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,
+      -1,    68,    69,    70,    -1,    72,    73,     8,    -1,    -1,
+      77,    78,    -1,    14,    15,    16,    17,    -1,    85,    -1,
+      -1,    22,    89,    -1,    91,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    99,   100,    -1,   102,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    66,    -1,    68,    69,    70,
+      -1,    72,    73,     8,    -1,    -1,    77,    78,    -1,    14,
+      15,    16,    17,    -1,    85,    -1,    -1,    22,    89,    -1,
+      91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,   100,
+      -1,   102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    66,    -1,    68,    69,    70,    -1,    72,    73,     8,
+      -1,    -1,    77,    78,    -1,    14,    15,    16,    17,    -1,
+      85,    -1,    -1,    22,    89,    -1,    91,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    99,   100,    -1,   102,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    -1,    68,
+      69,    70,    -1,    72,    73,     8,    -1,    -1,    77,    78,
+      -1,    14,    15,    16,    17,    -1,    85,    -1,    -1,    22,
+      89,    -1,    91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      99,   100,    -1,   102,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    66,    -1,    68,    69,    70,    -1,    72,
+      73,     8,    -1,    -1,    77,    78,    -1,    14,    15,    16,
+      17,    -1,    85,    -1,    -1,    22,    89,    -1,    91,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,   102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,
+      -1,    68,    69,    70,    -1,    72,    73,     8,    -1,    -1,
+      77,    78,    -1,    14,    15,    16,    17,    -1,    85,    -1,
+      -1,    22,    89,    -1,    91,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    99,    -1,    -1,   102,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    66,    -1,    68,    69,    70,
+      -1,    72,    73,     8,    -1,    -1,    77,    78,    -1,    14,
+      15,    16,    17,    -1,    85,    -1,    -1,    22,    89,    -1,
+      91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,
+      -1,   102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    66,    -1,    68,    69,    70,    -1,    72,    73,     8,
+      -1,    -1,    77,    78,    -1,    14,    15,    16,    17,    -1,
+      85,    -1,    -1,    22,    89,    -1,    91,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    99,    -1,    -1,   102,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    -1,    68,
+      69,    70,    -1,    72,    73,     8,    -1,    -1,    77,    78,
+      -1,    14,    15,    16,    17,    -1,    85,    -1,    -1,    22,
+      89,    -1,    91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      99,    -1,    -1,   102,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    66,    -1,    68,    69,    70,    -1,    72,
+      73,     8,    -1,    -1,    77,    78,    -1,    14,    15,    16,
+      17,    -1,    85,    -1,    -1,    22,    89,    -1,    91,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,   102,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,
+      -1,    68,    69,    70,    -1,    72,    73,     8,    -1,    -1,
+      77,    78,    -1,    14,    15,    16,    17,    -1,    85,    -1,
+      -1,    22,    89,    -1,    91,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    99,    -1,    -1,   102,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    66,    -1,    68,    69,    70,
+      -1,    72,    73,     8,    -1,    -1,    77,    78,    -1,    14,
+      15,    16,    17,    -1,    85,    -1,    -1,    22,    89,    -1,
+      91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,
+      -1,   102,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    66,    -1,    68,    69,    70,    -1,    72,    73,     8,
+      -1,    -1,    77,    78,    -1,    14,    15,    16,    17,    -1,
+      85,    -1,    -1,    22,    89,    -1,    91,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    99,    -1,    -1,   102,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    -1,    68,
+      69,    70,    -1,    72,    73,    -1,    -1,    -1,    77,    78,
+      -1,    -1,    -1,    -1,    -1,    -1,    85,    -1,    -1,    -1,
+      89,    -1,    91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      99,    -1,    -1,   102
 };
 
@@ -1505 +1510 @@
 static const yytype_uint8 yystos[] =
 {
-       0,   103,     0,     1,     8,    14,    15,    16,    17,    21,
-      31,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    62,    63,    64,
-      65,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    86,
-      88,    90,    94,    98,   101,   104,   105,   106,   107,   108,
-     109,   110,   111,   113,   114,   116,   117,   118,   119,   120,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,    94,
-      16,    17,    53,    54,    55,    56,    84,   111,   127,    98,
-     109,   111,   118,    98,    98,    98,    98,    98,    98,    98,
-      98,    98,    98,   109,    98,   109,    98,   109,    98,   109,
-      65,    66,   110,    65,    94,   109,    98,   111,    65,    98,
-      98,    66,    98,    98,    65,    98,    65,    98,    16,   111,
-     119,   120,   120,   111,   110,   110,   111,    94,    11,    98,
-      85,    93,     3,     4,     7,     9,    10,    86,    87,    88,
-      89,    90,    92,    95,    96,   100,   111,   111,   110,    12,
-      85,    93,    94,   126,    98,   109,    93,   109,   111,    98,
-      98,    98,    98,    98,    98,   111,    66,    98,   111,   121,
-     111,   111,   111,   111,   111,   111,   111,    99,   110,   111,
-      99,   110,   111,    99,   110,    94,    94,    16,    17,    53,
-      54,    55,    56,    99,   109,   127,    65,    66,   111,   112,
-      65,   111,    66,    99,   110,    91,    99,   101,   109,    99,
-     110,   111,   111,   111,   111,   111,   111,   111,   111,   111,
-     111,   111,   111,   109,    85,    99,   115,    93,    66,   109,
-     111,    90,   109,   126,   111,   111,   110,   111,   110,   111,
-      99,   111,    99,    93,    99,    93,    93,    93,    99,    93,
-      99,    93,    93,    99,    99,    99,    99,    99,    99,    99,
-      99,    99,    99,    99,    99,    93,    99,    99,    66,    93,
-     111,    65,    99,    99,    99,    91,    93,   111,   111,    93,
-      99,   111,   109,   111,   121,    99,    99,    93,   121,   111,
-     111,   111,   111,   111,   111,    16,    17,    53,    54,    55,
-      56,   127,    45,    48,    49,    51,    52,   111,    99,    66,
-      66,    73,   111,   115,   115,   111,    91,    90,    93,   110,
-      93,    99,    93,    99,    93,    93,    99,    93,    99,    99,
-      99,    99,    99,    99,    99,    99,    99,    99,    99,    99,
-      99,    99,    91,    93,    90,   110,   121,    99,    68,    98,
-     122,   123,   125,   111,   111,   111,   111,   111,   111,    91,
-      93,   123,   124,    98,    99,    99,    99,    99,    99,    99,
-      91,   125,    93,    99,   110,   124,    99
+       0,   104,     0,     1,     8,    14,    15,    16,    17,    22,
+      32,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    63,    64,    65,
+      66,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    87,
+      89,    91,    95,    99,   102,   105,   106,   107,   108,   109,
+     110,   111,   112,   114,   115,   117,   118,   119,   120,   121,
+     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,    95,
+      16,    17,    54,    55,    56,    57,    85,   112,   128,    99,
+     110,   112,   119,    99,    99,    99,    99,    99,    99,    99,
+      99,    99,    99,   110,    99,   110,    99,   110,    99,   110,
+      66,    67,   111,    66,    95,   110,    99,   112,    66,    99,
+      99,    67,    99,    99,    66,    99,    66,    99,    16,   112,
+     120,   121,   121,   112,   111,   111,   112,    95,    11,    99,
+      86,    94,     3,     4,     7,     9,    10,    87,    88,    89,
+      90,    91,    93,    96,    97,   101,   112,   112,   111,    12,
+      86,    94,    95,   127,    99,   110,    94,   110,   112,    99,
+      99,    99,    99,    99,    99,   112,    67,    99,   112,   122,
+     112,   112,   112,   112,   112,   112,   112,   100,   111,   112,
+     100,   111,   112,   100,   111,    95,    95,    16,    17,    54,
+      55,    56,    57,   100,   110,   128,    66,    67,   112,   113,
+      66,   112,    67,   100,   111,    92,   100,   102,   110,   100,
+     111,   112,   112,   112,   112,   112,   112,   112,   112,   112,
+     112,   112,   112,   110,    86,   100,   116,    94,    67,   110,
+     112,    91,   110,   127,   112,   112,   111,   112,   111,   112,
+     100,   112,   100,    94,   100,    94,    94,    94,   100,    94,
+     100,    94,    94,   100,   100,   100,   100,   100,   100,   100,
+     100,   100,   100,   100,   100,    94,   100,   100,    67,    94,
+     112,    66,   100,   100,   100,    92,    94,   112,   112,    94,
+     100,   112,   110,   112,   122,   100,   100,    94,   122,   112,
+     112,   112,   112,   112,   112,    16,    17,    54,    55,    56,
+      57,   128,    46,    49,    50,    52,    53,   112,   100,    67,
+      67,    74,   112,   116,   116,   112,    92,    91,    94,   111,
+      94,   100,    94,   100,    94,    94,   100,    94,   100,   100,
+     100,   100,   100,   100,   100,   100,   100,   100,   100,   100,
+     100,   100,    92,    94,    91,   111,   122,   100,    69,    99,
+     123,   124,   126,   112,   112,   112,   112,   112,   112,    92,
+      94,   124,   125,    99,   100,   100,   100,   100,   100,   100,
+      92,   126,    94,   100,   111,   125,   100
 };
 
@@ -2368 +2373 @@
 
 /* Line 1464 of yacc.c  */
-#line 319 "grammar.y"
+#line 320 "grammar.y"
     {
             if (timerv)
@@ -2404 +2409 @@
 
 /* Line 1464 of yacc.c  */
-#line 354 "grammar.y"
+#line 355 "grammar.y"
     {currentVoice->ifsw=0;;}
     break;
@@ -2411 +2416 @@
 
 /* Line 1464 of yacc.c  */
-#line 356 "grammar.y"
+#line 357 "grammar.y"
     { (yyvsp[(1) - (2)].lv).CleanUp(); currentVoice->ifsw=0;;}
     break;
@@ -2418 +2423 @@
 
 /* Line 1464 of yacc.c  */
-#line 358 "grammar.y"
+#line 359 "grammar.y"
     {
             YYACCEPT;
@@ -2427 +2432 @@
 
 /* Line 1464 of yacc.c  */
-#line 362 "grammar.y"
+#line 363 "grammar.y"
     {
             currentVoice->ifsw=0;
@@ -2437 +2442 @@
 
 /* Line 1464 of yacc.c  */
-#line 367 "grammar.y"
+#line 368 "grammar.y"
     {currentVoice->ifsw=0;;}
     break;
@@ -2444 +2449 @@
 
 /* Line 1464 of yacc.c  */
-#line 369 "grammar.y"
+#line 370 "grammar.y"
     {
             #ifdef SIQ
@@ -2498 +2503 @@
 
 /* Line 1464 of yacc.c  */
-#line 427 "grammar.y"
+#line 428 "grammar.y"
     {if (currentVoice!=NULL) currentVoice->ifsw=0;;}
     break;
@@ -2505 +2510 @@
 
 /* Line 1464 of yacc.c  */
-#line 430 "grammar.y"
+#line 431 "grammar.y"
     { omFree((ADDRESS)(yyvsp[(2) - (2)].name)); ;}
     break;
@@ -2512 +2517 @@
 
 /* Line 1464 of yacc.c  */
-#line 445 "grammar.y"
+#line 446 "grammar.y"
     {
             if(iiAssign(&(yyvsp[(1) - (2)].lv),&(yyvsp[(2) - (2)].lv))) YYERROR;
@@ -2521 +2526 @@
 
 /* Line 1464 of yacc.c  */
-#line 452 "grammar.y"
+#line 453 "grammar.y"
     {
             if (currRing==NULL) MYYERROR("no ring active");
@@ -2531 +2536 @@
 
 /* Line 1464 of yacc.c  */
-#line 457 "grammar.y"
+#line 458 "grammar.y"
     {
             syMake(&(yyval.lv),(yyvsp[(1) - (1)].name));
@@ -2540 +2545 @@
 
 /* Line 1464 of yacc.c  */
-#line 461 "grammar.y"
+#line 462 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv), &(yyvsp[(1) - (3)].lv), COLONCOLON, &(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -2549 +2554 @@
 
 /* Line 1464 of yacc.c  */
-#line 465 "grammar.y"
+#line 466 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv), &(yyvsp[(1) - (3)].lv), '.', &(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -2558 +2563 @@
 
 /* Line 1464 of yacc.c  */
-#line 469 "grammar.y"
+#line 470 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'(')) YYERROR;
@@ -2567 +2572 @@
 
 /* Line 1464 of yacc.c  */
-#line 473 "grammar.y"
+#line 474 "grammar.y"
     {
             if ((yyvsp[(1) - (4)].lv).next==NULL)
@@ -2586 +2591 @@
 
 /* Line 1464 of yacc.c  */
-#line 487 "grammar.y"
+#line 488 "grammar.y"
     {
             if (currRingHdl==NULL) MYYERROR("no ring active");
@@ -2619 +2624 @@
 
 /* Line 1464 of yacc.c  */
-#line 515 "grammar.y"
+#line 516 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2648 +2653 @@
 
 /* Line 1464 of yacc.c  */
-#line 539 "grammar.y"
+#line 540 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2659 +2664 @@
 
 /* Line 1464 of yacc.c  */
-#line 545 "grammar.y"
+#line 546 "grammar.y"
     {
             memset(&(yyval.lv),0,sizeof((yyval.lv)));
@@ -2670 +2675 @@
 
 /* Line 1464 of yacc.c  */
-#line 551 "grammar.y"
+#line 552 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2679 +2684 @@
 
 /* Line 1464 of yacc.c  */
-#line 555 "grammar.y"
+#line 556 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2688 +2693 @@
 
 /* Line 1464 of yacc.c  */
-#line 559 "grammar.y"
+#line 560 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2697 +2702 @@
 
 /* Line 1464 of yacc.c  */
-#line 563 "grammar.y"
+#line 564 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2706 +2711 @@
 
 /* Line 1464 of yacc.c  */
-#line 567 "grammar.y"
+#line 568 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2715 +2720 @@
 
 /* Line 1464 of yacc.c  */
-#line 571 "grammar.y"
+#line 572 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2724 +2729 @@
 
 /* Line 1464 of yacc.c  */
-#line 575 "grammar.y"
+#line 576 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2733 +2738 @@
 
 /* Line 1464 of yacc.c  */
-#line 579 "grammar.y"
+#line 580 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2742 +2747 @@
 
 /* Line 1464 of yacc.c  */
-#line 583 "grammar.y"
+#line 584 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2751 +2756 @@
 
 /* Line 1464 of yacc.c  */
-#line 587 "grammar.y"
+#line 588 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2760 +2765 @@
 
 /* Line 1464 of yacc.c  */
-#line 591 "grammar.y"
+#line 592 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2769 +2774 @@
 
 /* Line 1464 of yacc.c  */
-#line 595 "grammar.y"
+#line 596 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2778 +2783 @@
 
 /* Line 1464 of yacc.c  */
-#line 599 "grammar.y"
+#line 600 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2787 +2792 @@
 
 /* Line 1464 of yacc.c  */
-#line 603 "grammar.y"
+#line 604 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2796 +2801 @@
 
 /* Line 1464 of yacc.c  */
-#line 607 "grammar.y"
+#line 608 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(3) - (6)].lv),(yyvsp[(1) - (6)].i),&(yyvsp[(5) - (6)].lv),TRUE)) YYERROR;
@@ -2805 +2810 @@
 
 /* Line 1464 of yacc.c  */
-#line 611 "grammar.y"
+#line 612 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2814 +2819 @@
 
 /* Line 1464 of yacc.c  */
-#line 615 "grammar.y"
+#line 616 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2823 +2828 @@
 
 /* Line 1464 of yacc.c  */
-#line 619 "grammar.y"
+#line 620 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2832 +2837 @@
 
 /* Line 1464 of yacc.c  */
-#line 623 "grammar.y"
+#line 624 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2841 +2846 @@
 
 /* Line 1464 of yacc.c  */
-#line 627 "grammar.y"
+#line 628 "grammar.y"
     {
             if(iiExprArithM(&(yyval.lv),NULL,(yyvsp[(1) - (3)].i))) YYERROR;
@@ -2850 +2855 @@
 
 /* Line 1464 of yacc.c  */
-#line 631 "grammar.y"
+#line 632 "grammar.y"
     {
             int b=iiExprArithM(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i)); // handle branchTo
@@ -2861 +2866 @@
 
 /* Line 1464 of yacc.c  */
-#line 637 "grammar.y"
+#line 638 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),(yyvsp[(1) - (8)].i),&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2870 +2875 @@
 
 /* Line 1464 of yacc.c  */
-#line 641 "grammar.y"
+#line 642 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),(yyvsp[(1) - (4)].i))) YYERROR;
@@ -2879 +2884 @@
 
 /* Line 1464 of yacc.c  */
-#line 645 "grammar.y"
+#line 646 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),RING_CMD,&(yyvsp[(3) - (8)].lv),&(yyvsp[(5) - (8)].lv),&(yyvsp[(7) - (8)].lv))) YYERROR;
@@ -2888 +2893 @@
 
 /* Line 1464 of yacc.c  */
-#line 649 "grammar.y"
+#line 650 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(3) - (4)].lv),RING_CMD)) YYERROR;
@@ -2897 +2902 @@
 
 /* Line 1464 of yacc.c  */
-#line 653 "grammar.y"
+#line 654 "grammar.y"
     {
             if (iiARROW(&(yyval.lv),(yyvsp[(1) - (3)].name),(yyvsp[(3) - (3)].name))) YYERROR;
@@ -2907 +2912 @@
 
 /* Line 1464 of yacc.c  */
-#line 657 "grammar.y"
+#line 658 "grammar.y"
     { (yyval.lv) = (yyvsp[(2) - (3)].lv); ;}
     break;
@@ -2914 +2919 @@
 
 /* Line 1464 of yacc.c  */
-#line 662 "grammar.y"
+#line 663 "grammar.y"
     {
             leftv v = &(yyvsp[(1) - (3)].lv);
@@ -2930 +2935 @@
 
 /* Line 1464 of yacc.c  */
-#line 673 "grammar.y"
+#line 674 "grammar.y"
     {
             (yyval.lv) = (yyvsp[(1) - (1)].lv);
@@ -2939 +2944 @@
 
 /* Line 1464 of yacc.c  */
-#line 679 "grammar.y"
+#line 680 "grammar.y"
     {
             /*if ($1.typ == eunknown) YYERROR;*/
@@ -2949 +2954 @@
 
 /* Line 1464 of yacc.c  */
-#line 683 "grammar.y"
+#line 684 "grammar.y"
     { (yyval.lv) = (yyvsp[(1) - (1)].lv); ;}
     break;
@@ -2956 +2961 @@
 
 /* Line 1464 of yacc.c  */
-#line 685 "grammar.y"
+#line 686 "grammar.y"
     {
             if(iiExprArith3(&(yyval.lv),'[',&(yyvsp[(1) - (6)].lv),&(yyvsp[(3) - (6)].lv),&(yyvsp[(5) - (6)].lv))) YYERROR;
@@ -2965 +2970 @@
 
 /* Line 1464 of yacc.c  */
-#line 689 "grammar.y"
+#line 690 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (4)].lv),'[',&(yyvsp[(3) - (4)].lv))) YYERROR;
@@ -2974 +2979 @@
 
 /* Line 1464 of yacc.c  */
-#line 693 "grammar.y"
+#line 694 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -2983 +2988 @@
 
 /* Line 1464 of yacc.c  */
-#line 697 "grammar.y"
+#line 698 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -2992 +2997 @@
 
 /* Line 1464 of yacc.c  */
-#line 701 "grammar.y"
+#line 702 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -3001 +3006 @@
 
 /* Line 1464 of yacc.c  */
-#line 705 "grammar.y"
+#line 706 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -3010 +3015 @@
 
 /* Line 1464 of yacc.c  */
-#line 709 "grammar.y"
+#line 710 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), (yyvsp[(5) - (6)].i), NULL)) YYERROR;
@@ -3019 +3024 @@
 
 /* Line 1464 of yacc.c  */
-#line 713 "grammar.y"
+#line 714 "grammar.y"
     {
             if (iiApply(&(yyval.lv), &(yyvsp[(3) - (6)].lv), 0, &(yyvsp[(5) - (6)].lv))) YYERROR;
@@ -3028 +3033 @@
 
 /* Line 1464 of yacc.c  */
-#line 717 "grammar.y"
+#line 718 "grammar.y"
     {
             (yyval.lv)=(yyvsp[(2) - (3)].lv);
@@ -3037 +3042 @@
 
 /* Line 1464 of yacc.c  */
-#line 721 "grammar.y"
+#line 722 "grammar.y"
     {
             #ifdef SIQ
@@ -3059 +3064 @@
 
 /* Line 1464 of yacc.c  */
-#line 738 "grammar.y"
+#line 739 "grammar.y"
     {
             iiTestAssume(&(yyvsp[(2) - (5)].lv),&(yyvsp[(4) - (5)].lv));
@@ -3070 +3075 @@
 
 /* Line 1464 of yacc.c  */
-#line 744 "grammar.y"
+#line 745 "grammar.y"
     {
             #ifdef SIQ
@@ -3081 +3086 @@
 
 /* Line 1464 of yacc.c  */
-#line 750 "grammar.y"
+#line 751 "grammar.y"
     {
             #ifdef SIQ
@@ -3096 +3101 @@
 
 /* Line 1464 of yacc.c  */
-#line 762 "grammar.y"
+#line 763 "grammar.y"
     {
             #ifdef SIQ
@@ -3107 +3112 @@
 
 /* Line 1464 of yacc.c  */
-#line 770 "grammar.y"
+#line 771 "grammar.y"
     {
             #ifdef SIQ
@@ -3118 +3123 @@
 
 /* Line 1464 of yacc.c  */
-#line 778 "grammar.y"
+#line 779 "grammar.y"
     {
             #ifdef SIQ
@@ -3129 +3134 @@
 
 /* Line 1464 of yacc.c  */
-#line 787 "grammar.y"
+#line 788 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),PLUSPLUS)) YYERROR;
@@ -3138 +3143 @@
 
 /* Line 1464 of yacc.c  */
-#line 791 "grammar.y"
+#line 792 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(1) - (2)].lv),MINUSMINUS)) YYERROR;
@@ -3147 +3152 @@
 
 /* Line 1464 of yacc.c  */
-#line 795 "grammar.y"
+#line 796 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'+',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3156 +3161 @@
 
 /* Line 1464 of yacc.c  */
-#line 799 "grammar.y"
+#line 800 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'-',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3165 +3170 @@
 
 /* Line 1464 of yacc.c  */
-#line 803 "grammar.y"
+#line 804 "grammar.y"
     { /* also for *,% */
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3174 +3179 @@
 
 /* Line 1464 of yacc.c  */
-#line 807 "grammar.y"
+#line 808 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),'^',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3183 +3188 @@
 
 /* Line 1464 of yacc.c  */
-#line 811 "grammar.y"
+#line 812 "grammar.y"
     { /* also for > */
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3192 +3197 @@
 
 /* Line 1464 of yacc.c  */
-#line 815 "grammar.y"
+#line 816 "grammar.y"
     { /* also for |*/
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),(yyvsp[(2) - (3)].i),&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3201 +3206 @@
 
 /* Line 1464 of yacc.c  */
-#line 819 "grammar.y"
+#line 820 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),NOTEQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3210 +3215 @@
 
 /* Line 1464 of yacc.c  */
-#line 823 "grammar.y"
+#line 824 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),EQUAL_EQUAL,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3219 +3224 @@
 
 /* Line 1464 of yacc.c  */
-#line 827 "grammar.y"
+#line 828 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),DOTDOT,&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3228 +3233 @@
 
 /* Line 1464 of yacc.c  */
-#line 831 "grammar.y"
+#line 832 "grammar.y"
     {
             if(iiExprArith2(&(yyval.lv),&(yyvsp[(1) - (3)].lv),':',&(yyvsp[(3) - (3)].lv))) YYERROR;
@@ -3237 +3242 @@
 
 /* Line 1464 of yacc.c  */
-#line 835 "grammar.y"
+#line 836 "grammar.y"
     {
             if (siq>0)
@@ -3254 +3259 @@
 
 /* Line 1464 of yacc.c  */
-#line 847 "grammar.y"
+#line 848 "grammar.y"
     {
             if(iiExprArith1(&(yyval.lv),&(yyvsp[(2) - (2)].lv),'-')) YYERROR;
@@ -3263 +3268 @@
 
 /* Line 1464 of yacc.c  */
-#line 853 "grammar.y"
+#line 854 "grammar.y"
     { (yyval.lv) = (yyvsp[(1) - (2)].lv); ;}
     break;
@@ -3270 +3275 @@
 
 /* Line 1464 of yacc.c  */
-#line 855 "grammar.y"
+#line 856 "grammar.y"
     {
             if ((yyvsp[(1) - (2)].lv).rtyp==0)
@@ -3290 +3295 @@
 
 /* Line 1464 of yacc.c  */
-#line 875 "grammar.y"
+#line 876 "grammar.y"
     {
             if ((yyvsp[(2) - (3)].lv).Typ()!=STRING_CMD)
@@ -3304 +3309 @@
 
 /* Line 1464 of yacc.c  */
-#line 887 "grammar.y"
+#line 888 "grammar.y"
     {
             if (iiDeclCommand(&(yyval.lv),&(yyvsp[(2) - (2)].lv),myynest,(yyvsp[(1) - (2)].i),&((yyvsp[(2) - (2)].lv).req_packhdl->idroot)))
@@ -3314 +3319 @@
 
 /