Changeset a3bc95e in git

Timestamp:

Oct 9, 2001, 6:36:27 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

7497ef3773fc1afff892546445b1d82b1cf0fb05

Parents:

e58c4abd91b68d128331a23f3f9dd76dff924048

Message:

*hannes: namespaces ->ns


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

Location:

Singular

Files:

• clapconv.cc (modified) (4 diffs)
• cntrlc.cc (modified) (3 diffs)
• dError.h (modified) (2 diffs)
• distrib.h (modified) (1 diff)
• emacs.cc (modified) (15 diffs)
• extra.cc (modified) (3 diffs)
• feOpt.cc (modified) (4 diffs)
• feOpt.h (modified) (6 diffs)
• fegetopt.h (modified) (2 diffs)
• fehelp.cc (modified) (1 diff)
• fglm.cc (modified) (4 diffs)
• fglmhom.cc (modified) (6 diffs)
• fglmzero.cc (modified) (3 diffs)
• gnumpc.cc (modified) (3 diffs)
• gnumpc.h (modified) (2 diffs)
• gr_kstd2.cc (modified) (2 diffs)
• grammar.y (modified) (5 diffs)
• gring.cc (modified) (28 diffs)
• gring.h (modified) (2 diffs)
• ideals.h (modified) (2 diffs)
• intvec.cc (modified) (5 diffs)
• iparith.cc (modified) (4 diffs)
• ipid.cc (modified) (26 diffs)
• ipid.h (modified) (5 diffs)
• iplib.cc (modified) (24 diffs)
• ipshell.cc (modified) (16 diffs)
• ipshell.h (modified) (3 diffs)
• kbuckets.cc (modified) (9 diffs)
• kbuckets.h (modified) (5 diffs)
• kspoly.cc (modified) (18 diffs)
• libparse.h (modified) (2 diffs)
• libparse.l (modified) (6 diffs)
• lists.h (modified) (2 diffs)
• misc.cc (modified) (2 diffs)
• mmalloc.cc (modified) (2 diffs)
• mmalloc.h (modified) (2 diffs)
• modulop.h (modified) (2 diffs)
• mpr_complex.cc (modified) (7 diffs)
• mpr_complex.h (modified) (3 diffs)
• mpr_inout.h (modified) (2 diffs)
• mpr_numeric.h (modified) (3 diffs)
• mpsr_Get.cc (modified) (3 diffs)
• mpsr_sl.cc (modified) (3 diffs)
• omSingularConfig.h (modified) (3 diffs)
• pInline1.cc (modified) (2 diffs)
• pShallowCopyDelete.cc (modified) (5 diffs)
• pShallowCopyDelete.h (modified) (1 diff)
• p_Add_q__T.cc (modified) (7 diffs)
• p_Copy__T.cc (modified) (2 diffs)
• p_Delete__T.cc (modified) (2 diffs)
• p_MemCmp.h (modified) (26 diffs)
• p_Merge_q__T.cc (modified) (7 diffs)
• p_Minus_mm_Mult_qq__T.cc (modified) (10 diffs)
• p_Mult_mm__T.cc (modified) (2 diffs)
• p_Mult_nn__T.cc (modified) (2 diffs)
• p_Mult_q.cc (modified) (14 diffs)
• p_Mult_q.h (modified) (1 diff)
• p_Procs.h (modified) (3 diffs)
• p_Procs_Dynamic.cc (modified) (10 diffs)
• p_Procs_Impl.h (modified) (32 diffs)
• p_Procs_Static.h (modified) (2 diffs)
• p_ShallowCopyDelete__T.cc (modified) (3 diffs)
• p_polys.h (modified) (11 diffs)
• pcv.cc (modified) (2 diffs)
• polys.cc (modified) (3 diffs)
• pp_Mult_Coeff_mm_DivSelectMult__T.cc (modified) (4 diffs)
• pp_Mult_Coeff_mm_DivSelect__T.cc (modified) (2 diffs)
• pp_Mult_mm_Noether__T.cc (modified) (5 diffs)
• pp_Mult_mm__T.cc (modified) (2 diffs)
• prCopy.cc (modified) (13 diffs)
• prCopyMacros.h (modified) (1 diff)
• prCopyTemplate.cc (modified) (4 diffs)
• ring.h (modified) (2 diffs)
• run.h (modified) (3 diffs)
• sbuckets.cc (modified) (17 diffs)
• sbuckets.h (modified) (2 diffs)
• scanner.l (modified) (2 diffs)
• silink.cc (modified) (4 diffs)
• sing_dbm.cc (modified) (8 diffs)
• sing_dld.cc (modified) (2 diffs)
• sing_win.cc (modified) (3 diffs)
• slInit_Dynamic.cc (modified) (7 diffs)
• sparsmat.cc (modified) (9 diffs)
• structs.h (modified) (8 diffs)
• subexpr.cc (modified) (7 diffs)
• subexpr.h (modified) (2 diffs)
• syz.cc (modified) (5 diffs)
• syz0.cc (modified) (3 diffs)
• tesths.cc (modified) (3 diffs)
• utils.cc (modified) (6 diffs)
• walk.cc (modified) (76 diffs)
• walk.h (modified) (6 diffs)

Singular/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.32 2000-12-08 17:26:22 Singular Exp $
+// $Id: clapconv.cc,v 1.33 2001-10-09 16:35:56 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -210 +210 @@
       {
         number z=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
         z->debug=123456;
 #endif
@@ -283 +283 @@
       {
         number z=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
         z->debug=123456;
 #endif
@@ -581 +581 @@
   {
     number z=(number)omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
     z->debug=123456;
 #endif

Singular/cntrlc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: cntrlc.cc,v 1.38 2001-08-27 14:46:50 Singular Exp $ */
+/* $Id: cntrlc.cc,v 1.39 2001-10-09 16:35:56 Singular Exp $ */
 /*
 * ABSTRACT - interupt handling
@@ -366 +366 @@
       c = 'a';
     }
-    
+
     switch(c)
     {
@@ -640 +640 @@
 /* Under HPUX 9, system(...) returns -1 if SIGCHLD does not equal
    SIG_DFL. However, if it stays at SIG_DFL we get zombie processes
-   for terminated childs generated by fork. Therefors some special treatment 
+   for terminated childs generated by fork. Therefors some special treatment
    is necessary */
 #ifdef HPUX_9

Singular/dError.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 9/00
- *  Version: $Id: dError.h,v 1.5 2000-12-31 15:14:29 obachman Exp $
+ *  Version: $Id: dError.h,v 1.6 2001-10-09 16:35:56 Singular Exp $
  *******************************************************************/
 #ifndef DERROR_H
@@ -13 +13 @@
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif

Singular/distrib.h

@@ -1 @@
-#undef MAKE_DISTRIBUTION 
+#undef MAKE_DISTRIBUTION

Singular/emacs.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: emacs.cc,v 1.20 2001-08-27 14:46:56 Singular Exp $ */
+/* $Id: emacs.cc,v 1.21 2001-10-09 16:35:57 Singular Exp $ */
 /*
 * ABSTRACT: Esingular main file
@@ -75 +75 @@
 void fePrintReportBug(char* msg, char* file, int line)
 {
-  error("YOU HAVE FOUND A BUG IN SINGULAR. 
+  error("YOU HAVE FOUND A BUG IN SINGULAR.
 Please, email the following output to singular@mathematik.uni-kl.de
-Bug occured at %s:%d 
-Message: %s 
+Bug occured at %s:%d
+Message: %s
 Version: " S_UNAME S_VERSION1 " (%lu) " __DATE__ __TIME__,
         file, line, msg, feVersionId);
@@ -100 +100 @@
   int no_emacs_call = 0;
   char cwd[MAXPATHLEN];
-  
+
   // parse-cmdline options
-  
+
   feInitResources(argv[0]);
   feResource('S');
   feResource('b');
   feResource('r');
-  
+
   int optc, option_index;
-  
-  while ((optc = fe_getopt_long(argc, argv, SHORT_OPTS_STRING, 
+
+  while ((optc = fe_getopt_long(argc, argv, SHORT_OPTS_STRING,
                                 feOptSpec, &option_index))
         != EOF)
@@ -119 +119 @@
           feOptHelp(feArgv0);
           exit(0);
-          
+
         case '?':
         case ':':
@@ -134 +134 @@
                 emacs = fe_optarg;
               break;
-#else              
+#else
               case FE_OPT_EMACS:
                 emacs = fe_optarg;
                 break;
-                
+
               case FE_OPT_EMACS_DIR:
                 emacs_dir = fe_optarg;
                 break;
-                
+
               case FE_OPT_EMACS_LOAD:
                 emacs_load = fe_optarg;
                 break;
-#endif                
+#endif
               case FE_OPT_SINGULAR:
                 singular = fe_optarg;
@@ -154 +154 @@
                 no_emacs_call = 1;
                 break;
-                
+
               default:
                 goto NEXT;
           }
           // delete options from option-list
-          if (fe_optind > 2 && *argv[fe_optind-1] != '-' && 
+          if (fe_optind > 2 && *argv[fe_optind-1] != '-' &&
               fe_optarg != NULL && feOptSpec[option_index].has_arg)
           {
@@ -181 +181 @@
   if (emacs == NULL)
   {
-    error( "Error: Can't find emacs xterm program. \n Expected it at %s or %s\n Specify alternative with --xterm=PROGRAM option,\n or set ESINGULAR_EMACS environment variable to the name of the program to use as xterm.\n", 
+    error( "Error: Can't find emacs xterm program. \n Expected it at %s or %s\n Specify alternative with --xterm=PROGRAM option,\n or set ESINGULAR_EMACS environment variable to the name of the program to use as xterm.\n",
            feResourceDefault('X'));
     mainUsage();
     exit(1);
   }
-  
+
   if (singular == NULL) singular = feResource("SingularXterm", 0);
   if (singular == NULL)
   {
-    error( "Error: Can't find singular executable.\n Expected it at %s\n Specify with --singular option,\n or set TSINGULAR_SINGULAR environment variable.\n", 
+    error( "Error: Can't find singular executable.\n Expected it at %s\n Specify with --singular option,\n or set TSINGULAR_SINGULAR environment variable.\n",
             feResourceDefault("SingularXterm"));
     mainUsage();
@@ -196 +196 @@
   }
 
-#ifdef WINNT 
+#ifdef WINNT
 #define EXTRA_XTERM_ARGS "+vb -sl 2000 -fb Courier-bold-13 -tn linux -cr Red3"
 #else
@@ -202 +202 @@
 #endif
 
-  syscall = (char*) omAlloc(strlen(emacs) + 
-                                 strlen(singular) + 
+  syscall = (char*) omAlloc(strlen(emacs) +
+                                 strlen(singular) +
                                  length + 300);
   sprintf(syscall, "%s %s -e %s ", emacs, EXTRA_XTERM_ARGS, singular);
@@ -215 +215 @@
     }
   }
-#else  
+#else
   // make sure  emacs, singular, emacs_dir, emacs_load are set
   if (emacs == NULL) emacs = feResource("xemacs", 0);
@@ -221 +221 @@
   if (emacs == NULL)
   {
-    error( "Error: Can't find emacs or xemacs executable. \n Expected it at %s or %s\n Specify alternative with --emacs option,\n or set ESINGULAR_EMACS environment variable.\n", 
+    error( "Error: Can't find emacs or xemacs executable. \n Expected it at %s or %s\n Specify alternative with --emacs option,\n or set ESINGULAR_EMACS environment variable.\n",
             feResourceDefault("emacs"), feResourceDefault("xemacs"));
     mainUsage();
     exit(1);
   }
-            
+
   if (singular == NULL) singular = feResource("SingularEmacs", 0);
   if (singular == NULL)
   {
-    error( "Error: Can't find singular executable.\n Expected it at %s\n Specify with --singular option,\n or set ESINGULAR_SINGULAR environment variable.\n", 
+    error( "Error: Can't find singular executable.\n Expected it at %s\n Specify with --singular option,\n or set ESINGULAR_SINGULAR environment variable.\n",
             feResourceDefault("SingularEmacs"));
     mainUsage();
     exit(1);
   }
-    
+
   if (emacs_dir == NULL) emacs_dir = feResource("EmacsDir", 0);
   if (emacs_dir == NULL)
   {
-    error( "Error: Can't find emacs directory for Singular lisp files. \n Expected it at %s\n Specify with --emacs_dir option,\n or set ESINGULAR_EMACS_DIR environment variable.\n", 
+    error( "Error: Can't find emacs directory for Singular lisp files. \n Expected it at %s\n Specify with --emacs_dir option,\n or set ESINGULAR_EMACS_DIR environment variable.\n",
             feResourceDefault("EmacsDir"));
     mainUsage();
@@ -245 +245 @@
   }
 
-  if (emacs_load == NULL) 
+  if (emacs_load == NULL)
   {
     // look into env variable
@@ -268 +268 @@
         if (emacs_load == NULL)
         {
-          error( "Error: Can't find emacs load file for Singular mode. \n Expected it at %s\n Specify with --emacs_load option,\n or set ESINGULAR_EMACS_LOAD environment variable,\n or put file '.emacs-singular' in your home directory.\n", 
-                  feResourceDefault("EmacsLoad"));  
+          error( "Error: Can't find emacs load file for Singular mode. \n Expected it at %s\n Specify with --emacs_load option,\n or set ESINGULAR_EMACS_LOAD environment variable,\n or put file '.emacs-singular' in your home directory.\n",
+                  feResourceDefault("EmacsLoad"));
           mainUsage();
           exit(1);
@@ -276 +276 @@
     }
   }
-  
-  syscall = (char*) omAlloc(strlen(emacs) + 
-                           strlen(singular) + 
-                           strlen(emacs_dir) + 
+
+  syscall = (char*) omAlloc(strlen(emacs) +
+                           strlen(singular) +
+                           strlen(emacs_dir) +
                            strlen(emacs_load) +
                            length + 300);
@@ -288 +288 @@
   // append / at the end of cwd
   if (cwd[strlen(cwd)-1] != '/') strcat(cwd, "/");
-    
-  // Note: option -no-init-file should be equivalent to -q. Anyhow, 
+
+  // Note: option -no-init-file should be equivalent to -q. Anyhow,
   // xemacs-20.4 sometimes crashed on startup when using -q. DonŽt know why.
   sprintf(syscall, "%s %seval '(setq singular-emacs-home-directory \"%s\")' %sno-init-file %sl %s %seval '(singular-other \"%s\" \"%s\" (list ",
-          emacs, prefix, emacs_dir, prefix, prefix, emacs_load, prefix, 
+          emacs, prefix, emacs_dir, prefix, prefix, emacs_load, prefix,
           singular, cwd);
 

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.168 2001-09-27 15:56:25 Singular Exp $ */
+/* $Id: extra.cc,v 1.169 2001-10-09 16:35:57 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -246 +246 @@
         #ifdef HAVE_NAMESPACES
           TEST_FOR("Namespaces");
+        #endif
+        #ifdef HAVE_NS
+          TEST_FOR("namespaces");
         #endif
         #ifdef HAVE_DYNAMIC_LOADING
@@ -1023 +1026 @@
     {
 #ifdef HAVE_NS
-      idhdl hh=basePack->idroot;
-      while (hh!=NULL)
-      {
-        if (IDDATA(hh)==(void *)currRing) PrintS("(R)");
-        else if (IDDATA(hh)==(void *)currPack) PrintS("(P)");
-        else PrintS("   ");
-        Print("::%s, typ %s level %d\n",
-               IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh));
-        hh=IDNEXT(hh);
-      }
-      hh=basePack->idroot;
-      while (hh!=NULL)
-      {
-        if (IDDATA(hh)==(void *)basePack)
-          Print("(T)::%s, typ %s level %d\n",
-          IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh));
-        else
-        if ((IDTYP(hh)==RING_CMD)
-        || (IDTYP(hh)==QRING_CMD)
-        || (IDTYP(hh)==PACKAGE_CMD))
-        {
-          idhdl h2=IDRING(hh)->idroot;
-          while (h2!=NULL)
-          {
-            if (IDDATA(h2)==(void *)currRing) PrintS("(R)");
-            else if (IDDATA(h2)==(void *)currPack) PrintS("(P)");
-            else PrintS("   ");
-            Print("%s::%s, typ %s level %d\n",
-            IDID(hh),IDID(h2),Tok2Cmdname(IDTYP(h2)),IDLEV(h2));
-            h2=IDNEXT(h2);
-          }
-        }
-        hh=IDNEXT(hh);
-      }
-#else      
+      listall();
+#else
       idhdl hh=IDROOT;
       while (hh!=NULL)

Singular/feOpt.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feOpt.cc,v 1.18 2001-09-19 09:49:37 Singular Exp $ */
+/* $Id: feOpt.cc,v 1.19 2001-10-09 16:35:58 Singular Exp $ */
 /*
 * ABSTRACT: Implementation of option buisness
@@ -67 +67 @@
   {"xterm",         required_argument,      LONG_OPTION_RETURN,
    "XTERM",     "Use XTERM as terminal program to run Singular",          feOptString, 0,   0},
-#endif  
+#endif
 
   {"singular",          required_argument,  LONG_OPTION_RETURN,
@@ -184 +184 @@
 #elif defined(TSINGULAR)
   fd = fopen("feOptTS.inc", "w");
-#else  
+#else
   fd = fopen("feOpt.inc", "w");
 #endif
@@ -375 +375 @@
         else
           sdb_flags = 0;
-      #endif      
+      #endif    
         return NULL;
 

Singular/feOpt.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feOpt.h,v 1.6 2000-05-05 18:40:28 obachman Exp $ */
+/* $Id: feOpt.h,v 1.7 2001-10-09 16:35:58 Singular Exp $ */
 /*
 * ABSTRACT: Declarations for working with Options
@@ -12 +12 @@
 
 extern const char SHORT_OPTS_STRING[];
-#define LONG_OPTION_RETURN 13 
+#define LONG_OPTION_RETURN 13
 
 /* specifies format of options */
@@ -37 +37 @@
 
 void* feGetOptValue(feOptIndex opt);
-  
+
 
 #ifdef __cplusplus
@@ -48 +48 @@
 inline int feOptValue(feOptIndex opt, char** val)
 {
-  if (opt != FE_OPT_UNDEF && feOptSpec[(int)opt].type == feOptString) 
+  if (opt != FE_OPT_UNDEF && feOptSpec[(int)opt].type == feOptString)
   {
     *val = (char*) feOptSpec[(int)opt].value;
@@ -58 +58 @@
 inline int feOptValue(feOptIndex opt, int* val)
 {
-  if (opt != FE_OPT_UNDEF && feOptSpec[(int)opt].type != feOptString) 
+  if (opt != FE_OPT_UNDEF && feOptSpec[(int)opt].type != feOptString)
   {
     *val = (int) feOptSpec[(int)opt].value;
@@ -66 +66 @@
   return FALSE;
 }
- 
+
 // maps name to otions
 feOptIndex feGetOptIndex(const char* name);

Singular/fegetopt.h

@@ -15 +15 @@
    along with this program; if not, write to the Free Software
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-/* 
-   obachman 9/99: adapted to Singular by 
+/*
+   obachman 9/99: adapted to Singular by
     * adding prefix fe_ to global variables
-    * extended fe_option structure    
+    * extended fe_option structure
 */
 
@@ -91 +91 @@
   const char*   help;    // (short) help string
   feOptType     type;    // type of argument, if has_arg > 0
-  void*         value;   // (default) value of option 
+  void*         value;   // (default) value of option
   int           set;     // only relevant for strings: 0 if not set, 1 if set
 };

Singular/fehelp.cc

@@ -601 +601 @@
     yylplex(str, libnamebuf, &lib_style, IDROOT, FALSE, GET_INFO);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+    yylplex(str, libnamebuf, &lib_style, IDROOT, FALSE, GET_INFO);
+#else /* HAVE_NS */
     yylplex(str, libnamebuf, &lib_style, GET_INFO);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
     reinit_yylp();

Singular/fglm.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglm.cc,v 1.25 2001-01-12 13:47:09 Singular Exp $
+// $Id: fglm.cc,v 1.26 2001-10-09 16:35:59 Singular Exp $
 
 /****************************************
@@ -147 +147 @@
     else
         pperm= NULL;
-    maFindPerm( sring->names, nvar, sring->parameter, npar, 
-                dring->names, nvar, dring->parameter, npar, vperm, pperm, 
+    maFindPerm( sring->names, nvar, sring->parameter, npar,
+                dring->names, nvar, dring->parameter, npar, vperm, pperm,
                 dring->ch);
     for ( k= nvar; (k > 0) && (state == FglmOk); k-- )
@@ -187 +187 @@
         // check if dring->qideal is contained in sring->qideal:
         int * dsvperm = (int *)omAlloc0( (nvar+1)*sizeof( int ) );
-        maFindPerm( dring->names, nvar, NULL, 0, sring->names, nvar, NULL, 0, 
+        maFindPerm( dring->names, nvar, NULL, 0, sring->names, nvar, NULL, 0,
                     dsvperm, NULL, sring->ch);
         nMap=nSetMap(dring);
@@ -341 +341 @@
       else if ( pIsConstant( quot ) ) state= FglmPolyIsOne;
     }
-    
+
     if ( state == FglmOk ) {
       assumeStdFlag( first );

Singular/fglmhom.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmhom.cc,v 1.17 2000-09-18 09:18:58 obachman Exp $
+// $Id: fglmhom.cc,v 1.18 2001-10-09 16:35:59 Singular Exp $
 
 /****************************************
@@ -68 +68 @@
     }
 #ifndef HAVE_EXPLICIT_CONSTR
-    void initialize( poly m, int b, BOOLEAN ind ) 
+    void initialize( poly m, int b, BOOLEAN ind )
     {
         basis = b;
@@ -75 +75 @@
         mon.sm = NULL;
     }
-    void initialize( const homogElem h ) 
+    void initialize( const homogElem h )
     {
         basis = h.basis;
@@ -166 +166 @@
 #ifdef HAVE_EXPLICIT_CONSTR
                 // Expand array using Singulars ReAlloc function
-                dat->monlist= 
-                    (homogElem * )omReallocSize( dat->monlist, 
-                                           (dat->monlistmax)*sizeof( homogElem ), 
+                dat->monlist=
+                    (homogElem * )omReallocSize( dat->monlist,
+                                           (dat->monlistmax)*sizeof( homogElem ),
                                            (dat->monlistmax+dat->monlistblock) * sizeof( homogElem ) );
                 for ( k= dat->monlistmax; k < (dat->monlistmax+dat->monlistblock); k++ )
@@ -177 +177 @@
                 homogElem * tempelem = new homogElem[ newsize ];
                 // Copy old elements
-                for ( k= dat->monlistmax - 1; k >= 0; k-- ) 
+                for ( k= dat->monlistmax - 1; k >= 0; k-- )
                     tempelem[k].initialize( dat->monlist[k] );
                 delete [] homogElem;
@@ -363 +363 @@
     // Map the sourceHeads to the destRing
     int * vperm = (int *)omAlloc( (sourceRing->N + 1)*sizeof(int) );
-    maFindPerm( sourceRing->names, sourceRing->N, NULL, 0, currRing->names, 
+    maFindPerm( sourceRing->names, sourceRing->N, NULL, 0, currRing->names,
                 currRing->N, NULL, 0, vperm, NULL, currRing->ch);
     //nSetMap( sourceRing->ch, sourceRing->parameter, sourceRing->P, sourceRing->minpoly );

Singular/fglmzero.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmzero.cc,v 1.33 2001-01-09 15:40:06 Singular Exp $
+// $Id: fglmzero.cc,v 1.34 2001-10-09 16:36:00 Singular Exp $
 
 /****************************************
@@ -661 +661 @@
     //    STICKYPROT("Calculating vector rep\n");
     v = data.getVectorRep( p );
-    // if ( v.isZero() ) 
+    // if ( v.isZero() )
     //   STICKYPROT("vectorrep is 0\n");
     return ( data.state() );
@@ -1020 +1020 @@
       initv = iv;
     }
-      
+
     poly one = pOne();
     data.updateCandidates( one, initv );

Singular/gnumpc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.cc,v 1.20 2001-03-22 19:10:59 Singular Exp $ */
+/* $Id: gnumpc.cc,v 1.21 2001-10-09 16:36:00 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP complex floating-point numbers
@@ -322 +322 @@
   gmp_complex* n = new gmp_complex(((gmp_complex*)a)->real());
   return (number)n;
-}  
-  
+}
+
 number ngcImPart(number a)
 {
@@ -329 +329 @@
   gmp_complex* n = new gmp_complex(((gmp_complex*)a)->imag());
   return (number)n;
-}  
-  
+}
+
 /*2
 * za >= 0 ?

Singular/gnumpc.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpc.h,v 1.10 2001-03-22 19:11:00 Singular Exp $ */
+/* $Id: gnumpc.h,v 1.11 2001-10-09 16:36:00 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -48 +48 @@
 // folded-file: t ***
 // compile-command: "make installg" ***
-// End: *** 
+// End: ***

Singular/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.2 2001-08-27 14:47:00 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.3 2001-10-09 16:36:01 Singular Exp $ */
 /* $Log: not supported by cvs2svn $
+/* Revision 1.2  2001/08/27 14:47:00  Singular
+/* *hannes: merge-2-0-2
+/*
 /* Revision 1.1.2.2  2001/08/16 13:17:29  Singular
 /* * hannes: removed rcsid
@@ -580 +583 @@
           pLmFree((*h).lcm);
           (*h).lcm=NULL;
-        }  
+        }
         (*h).p = NULL;
         return 0;

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.93 2001-09-25 16:07:26 Singular Exp $ */
+/* $Id: grammar.y,v 1.94 2001-10-09 16:36:01 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -1133 +1133 @@
 #ifdef HAVE_NS
 #else
-            Print("%s::%s;\n", (char *)$4.Name(),$2.Name()); 
+            Print("%s::%s;\n", (char *)$4.Name(),$2.Name());
 #endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
@@ -1430 +1430 @@
               idhdl h=(idhdl)$2.data;
               if ($2.e!=NULL) h=rFindHdl((ring)$2.Data(),NULL, NULL);
+              //Print("setring %s lev %d (ptr:%x)\n",IDID(h),IDLEV(h),IDRING(h));
               if ($1==KEEPRING_CMD)
               {
@@ -1461 +1462 @@
                             if (BVERBOSE(V_REDEFINE))
                               Warn("redefining %s",IDID(p));
-                            killhdl(old,&root);
+                            killhdl2(old,&root);
                           }
                           IDLEV(p)=prevlev;
@@ -1467 +1468 @@
                         p=IDNEXT(p);
                       }
+                      IDRING(h)->idroot=root;
                     //}
                   }
 #ifdef USE_IILOCALRING
                   iiLocalRing[myynest-1]=IDRING(h);
-#else
+#endif
                   procstack->currRing=IDRING(h);
                   procstack->currRingHdl=h;
-#endif
                 }
                 else

Singular/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.9 2001-02-28 11:54:49 levandov Exp $
+ *  Version: $Id: gring.cc,v 1.10 2001-10-09 16:36:02 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -81 +81 @@
   Exponent_t expP=0;
   Exponent_t expOut=0;
-  
+
   while (p!=NULL)
   {
@@ -87 +87 @@
     p_Test(v,r);
     p_Test(p,r);
-    
+
     expP=p_GetComp(v,r);
     if (expP==0)
@@ -98 +98 @@
       {
         expOut=expM;
-      }      
+      }
     }
     else
@@ -113 +113 @@
       }
     }
-    
+
     p_GetExpV(v,P,r);
     cP=p_GetCoeff(v,r);
@@ -155 +155 @@
   Exponent_t expP=0;
   Exponent_t expOut=0;
-  
+
   while (p!=NULL)
   {
@@ -161 +161 @@
     p_Test(v,r);
     p_Test(p,r);
-    
+
     expP=p_GetComp(v,r);
     if (expP==0)
@@ -172 +172 @@
       {
         expOut=expM;
-      }      
+      }
     }
     else
@@ -186 +186 @@
       }
     }
-    
+
     p_GetExpV(v,P,r);
     cP=p_GetCoeff(v,r);
@@ -222 +222 @@
   F[0]=0;
   G[0]=0;
-  
+
   iF=r->N;
   while ((F[iF]==0)&&(iF>=1)) iF--; /* last exp_num of F */
@@ -237 +237 @@
     {
       F[i]=F[i]+G[i];
-    }  
+    }
     p_SetExpV(out,F,r);
     p_Setm(out,r);
@@ -248 +248 @@
 // g is univariate monomial
   {
-//    if (ri->nc->type==nc_skew) -- postpone to TU   
+//    if (ri->nc->type==nc_skew) -- postpone to TU
     out=nc_mm_Mult_uu(F,jG,G[jG],r);
     freeT(F,r->N);
@@ -254 +254 @@
     return(out);
   }
-  
+
   number n1=n_Init(1,r);
   Exponent_t *Prv=(Exponent_t *)omAlloc0(ExpSize);
@@ -331 +331 @@
        p_Setm(Pn,r);
        p_Test(Pn,r);
-       
+
 //       if (pNext(D)==0)
 // is D a monomial? could be postponed higher
@@ -339 +339 @@
 //       else
 //       {
-       Rout=nc_p_Mult_mm(D,Pn,r); 
+       Rout=nc_p_Mult_mm(D,Pn,r);
 //       }
      }
@@ -347 +347 @@
        D=NULL;
      }
-     
+
      if (Rout!=NULL)
      {
@@ -395 +395 @@
   int i;
   number num=NULL;
-  
+
   int iF=r->N;
   while ((F[iF]==0)&&(iF>0)) iF-- ;   /* last exponent_num of F */
@@ -426 +426 @@
    return(out);
   }
-  
+
   Exponent_t *Prv=(Exponent_t*)omAlloc0((r->N+1)*sizeof(Exponent_t));
   Exponent_t *Nxt=(Exponent_t*)omAlloc0((r->N+1)*sizeof(Exponent_t));
@@ -518 +518 @@
        kk=lF[cnt+1];
        On[kk]=F[kk];
-       
+
        Pn=pOne();
        p_SetExpV(Pn,On,r);
@@ -562 +562 @@
 /* leadterm and Prv-part with coef 1 */
 //  U[0]=exp;
-  
+
 //  U[jG]=U[jG]+bG;  /* make leadterm */
 // ??????????? we have done it already :-0
@@ -587 +587 @@
 }
 
-//----------pMultUU--------- 
+//----------pMultUU---------
 poly nc_uu_Mult_ww (int i, int a, int j, int b, const ring r)
 {
   poly out=NULL;
   number tmp_number=NULL;
-  
-//Now check zero exeptions, commutativity and should we do something at all?  
+
+//Now check zero exeptions, commutativity and should we do something at all?
   out=pOne();
   p_SetExp(out,j,b,r);
@@ -600 +600 @@
   p_Setm(out,r);
   if ((a==0)||(b==0)||(i<=j)) return(out);//zero exeptions and usual case
-  
+
   if (MATELEM(r->nc->COM,j,i)!=NULL)
 //commutative or quasicommutative case
@@ -607 +607 @@
     {
       return(out);
-    }     
+    }
     else
     {
@@ -629 +629 @@
     return (out);
   }
-  
-//  poly C=MATELEM(r->nc->C,j,i);               
-//  number c=p_GetCoeff(C,r); //coeff           
+
+//  poly C=MATELEM(r->nc->C,j,i);
+//  number c=p_GetCoeff(C,r); //coeff
 //  p_Delete(&C,r);
-      
+
   int newcMTsize=0;
   int k,m;
   p_Delete(&out,r);//Shura thinks it is nesessary
 
-  
+
   if (a>=b) {newcMTsize=a;} else {newcMTsize=b;}
   if (newcMTsize>cMTsize)
@@ -644 +644 @@
      newcMTsize = newcMTsize+cMTsize;
      matrix tmp = mpNew(newcMTsize,newcMTsize);
-     
+
      for (k=1;k<r->N;k++)
      {
@@ -662 +662 @@
   poly x=pOne();p_SetExp(x,j,1,r);p_Setm(x,r);//var(j);
   poly y=pOne();p_SetExp(y,i,1,r);p_Setm(y,r);//var(i);  for convenience
-  
+
   poly t=NULL;
 /* ------------ Main Cycles ----------------------------*/
@@ -679 +679 @@
      t=NULL;
   }
-  
+
   for (m=2;m<=b;m++)
   {
@@ -762 +762 @@
   int i=0;
   int nv=r->N;
-  
+
   Exponent_t *A1=(Exponent_t *)omAlloc0((r->N+1)*sizeof(Exponent_t));
   Exponent_t *A2=(Exponent_t *)omAlloc0((r->N+1)*sizeof(Exponent_t));

Singular/gring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gring.h,v 1.7 2001-02-28 11:54:49 levandov Exp $ */
+/* $Id: gring.h,v 1.8 2001-10-09 16:36:02 Singular Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
@@ -20 +20 @@
 // other routines we need in addition :
 poly nc_mm_Mult_p(const poly m, poly p, const ring r);
-poly nc_mm_Mult_nn (Exponent_t *F, Exponent_t *G, const ring r); 
+poly nc_mm_Mult_nn (Exponent_t *F, Exponent_t *G, const ring r);
 poly nc_mm_Mult_uu (Exponent_t *F,int jG,int bG, const ring r);
 poly nc_uu_Mult_ww (int i, int a, int j, int b, const ring r);

Singular/ideals.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.h,v 1.34 2001-03-05 16:41:48 mschulze Exp $ */
+/* $Id: ideals.h,v 1.35 2001-10-09 16:36:02 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -60 +60 @@
 
 long idRankFreeModule(ideal m, ring lmRing, ring tailRing);
-inline long idRankFreeModule(ideal m, ring r = currRing) 
+inline long idRankFreeModule(ideal m, ring r = currRing)
 {return idRankFreeModule(m, r, r);}
 

Singular/intvec.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: intvec.cc,v 1.23 2001-01-31 18:04:51 Singular Exp $ */
+/* $Id: intvec.cc,v 1.24 2001-10-09 16:36:03 Singular Exp $ */
 /*
 * ABSTRACT: class intvec: lists/vectors of integers
@@ -323 +323 @@
 
 /*2
-*computes a triangular matrix 
+*computes a triangular matrix
 */
 //void ivTriangMat(intvec * imat)
@@ -332 +332 @@
 //  i *= imat->cols();
 //  for(j=k;j>=i;j--)
-//    (*imat)[j] = 0; 
+//    (*imat)[j] = 0;
 //}
 
@@ -353 +353 @@
 static void ivContent(intvec *);
 static int ivL1Norm(intvec *);
-static int ivCondNumber(intvec *, int); 
+static int ivCondNumber(intvec *, int);
 
 /* Triangulierung in intmat.cc */
@@ -697 +697 @@
     for(k=w->rows()-1;k>=0;k--)
       (*res)[k] = (*w)[k];
-  } 
+  }
 }
 

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.267 2001-09-25 16:07:26 Singular Exp $ */
+/* $Id: iparith.cc,v 1.268 2001-10-09 16:36:03 Singular Exp $ */
 
 /*
@@ -763 +763 @@
       case PACKAGE_CMD:
         packhdl = (idhdl)u->data;
-        if((!IDPACKAGE(packhdl)->loaded) 
+        if((!IDPACKAGE(packhdl)->loaded)
         && (IDPACKAGE(packhdl)->language > LANG_TOP))
         {
@@ -1458 +1458 @@
   leftv sl = iiMake_proc((idhdl)u->data,u,v);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+  leftv sl;
+  if (u->req_packhdl==currPack)
+    sl = iiMake_proc((idhdl)u->data,NULL,v);
+  else
+    sl = iiMake_proc((idhdl)u->data,u->req_packhdl,v);
+#else /* HAVE_NS */
   leftv sl = iiMake_proc((idhdl)u->data,v);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
   if (sl==NULL)
@@ -2559 +2567 @@
   leftv sl = iiMake_proc((idhdl) u->data,u,NULL);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+  leftv sl = iiMake_proc((idhdl) u->data,u->req_packhdl,NULL);
+#else /* HAVE_NS */
   leftv sl = iiMake_proc((idhdl) u->data,NULL);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
   if (sl==NULL)

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.53 2001-09-25 16:07:27 Singular Exp $ */
+/* $Id: ipid.cc,v 1.54 2001-10-09 16:36:04 Singular Exp $ */
 
 /*
@@ -46 +46 @@
 #ifdef HAVE_NS
 idhdl currPackHdl = NULL;
+idhdl basePackHdl = NULL;
 package currPack =NULL;
 package basePack =NULL;
@@ -350 +351 @@
     else if ((IDTYP(h) == t)||(t==DEF_CMD))
     {
+      if ((IDTYP(h)==PACKAGE_CMD)
+      && (strcmp(s,"Top")==0))
+      {
+        goto errlabel;
+      } 
       if (BVERBOSE(V_REDEFINE))
 #ifdef KAI
@@ -357 +363 @@
 #endif
 #ifdef HAVE_NAMESPACES
-        if(t==PACKAGE_CMD && strcmp(s,"Top")==0) {
-          Warn("identifier `%s` in use",s);
-          return(h);
-        }
-#endif /* HAVE_NAMESPACES */
-        if (s==IDID(h))
-        IDID(h)=NULL;
-      killhdl(h,root);
+      if(t==PACKAGE_CMD && strcmp(s,"Top")==0)
+      {
+        Warn("identifier `%s` in use",s);
+        return(h);
+      }
+#endif /* HAVE_NAMESPACES */
+      if (s==IDID(h)) IDID(h)=NULL;
+      killhdl2(h,root);
     }
     else
@@ -375 +381 @@
     {
       if (IDLEV(h)!=lev)
-      {
         s=omStrDup(s);
-      }
       else if ((IDTYP(h) == t)||(t==DEF_CMD))
       {
@@ -386 +390 @@
           Warn("redefining %s **",s);
 #endif
-        IDID(h)=NULL;
-        killhdl(h,&IDROOT);
+        if (s==IDID(h)) IDID(h)=NULL;
+        killhdl2(h,&IDROOT);
       }
       else
-      {
         goto errlabel;
-      }
     }
   }
@@ -423 +425 @@
 #endif
         IDID(h)=NULL;
-        killhdl(h,&currRing->idroot);
+        killhdl2(h,&currRing->idroot);
       }
       else
@@ -431 +433 @@
     }
   }
-  return *root = (*root)->set(s, lev, t, init);
+  *root = (*root)->set(s, lev, t, init);
+  checkall();
+  return *root;
 
   errlabel:
@@ -452 +456 @@
         if (h!=NULL)
         {
-          killhdl(h,&(currRing->idroot));
+          killhdl2(h,&(currRing->idroot));
           return;
         }
@@ -459 +463 @@
       return;
     }
-    killhdl(h,ih);
+    killhdl2(h,ih);
   }
   else
@@ -469 +473 @@
   int t=IDTYP(h);
   if ((BEGIN_RING<t) && (t<END_RING) && (t!=QRING_CMD))
-    killhdl(h,&currRing->idroot);
+    killhdl2(h,&currRing->idroot);
   else
   {
@@ -475 +479 @@
     if(t==PACKAGE_CMD)
     {
-      killhdl(h,&NSROOT(namespaceroot->root));
+      killhdl2(h,&NSROOT(namespaceroot->root));
     }
     else
 #endif /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+    if(t==PACKAGE_CMD)
+    {
+      killhdl2(h,&(basePack->idroot));
+    }
+    else
+    {
+      idhdl s=currPack->idroot;
+      while ((s!=h) && (s!=NULL)) s=s->next;
+      if (s!=NULL)
+        killhdl2(h,&(currPack->idroot));
+      else if (basePack!=currPack)
+      {
+        idhdl s=basePack->idroot;
+        while ((s!=h) && (s!=NULL)) s=s->next;
+        if (s!=NULL)
+          killhdl2(h,&(basePack->idroot));
+        else
+          killhdl2(h,&(currRing->idroot));
+       }
+    }
+#else /* HAVE_NS */
     {
       idhdl s=IDROOT;
       while ((s!=h) && (s!=NULL)) s=s->next;
-      if (s==NULL) killhdl(h,&currRing->idroot);
-      else killhdl(h,&IDROOT);
-    }
-  }
-}
-
-void killhdl(idhdl h, idhdl * ih)
+      if (s==NULL) killhdl2(h,&(currRing->idroot));
+      else killhdl2(h,&IDROOT);
+    }
+#endif /* HAVE_NAMESPACES */
+  }
+}
+
+void killhdl2(idhdl h, idhdl * ih)
 {
   //printf("kill %s, id %x, typ %d lev: %d\n",IDID(h),(int)IDID(h),IDTYP(h),IDLEV(h));
@@ -501 +528 @@
   }
   // ring / qring  --------------------------------------------------------
+  if ((IDTYP(h) == PACKAGE_CMD) && (strcmp(IDID(h),"Top")==0))
+  {
+    WarnS("can not kill `Top`");
+    return;
+  }
   if ((IDTYP(h) == RING_CMD) || (IDTYP(h) == QRING_CMD))
   {
@@ -533 +565 @@
       {
         temp = IDNEXT(hdh);
-        killhdl(hdh,&(IDRING(h)->idroot));
+        killhdl2(hdh,&(IDRING(h)->idroot));
         hdh = temp;
       }
-      killhdl(*hd,hd);
+      killhdl2(*hd,hd);
     }
     // reset currRing ?
@@ -581 +613 @@
   }
 #endif /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+  // package -------------------------------------------------------------
+  else if (IDTYP(h) == PACKAGE_CMD)
+  {
+    // any objects defined for this package ?
+    if ((IDPACKAGE(h)->ref<=0)  &&  (IDPACKAGE(h)->idroot!=NULL))
+    {
+      if (currPack==IDPACKAGE(h))
+      {
+        currPack=basePack;
+        currPackHdl=NULL;
+      }
+      idhdl * hd = &IDRING(h)->idroot;
+      idhdl  hdh = IDNEXT(*hd);
+      idhdl  temp;
+      while (hdh!=NULL)
+      {
+        temp = IDNEXT(hdh);
+        killhdl2(hdh,&(IDPACKAGE(h)->idroot));
+        hdh = temp;
+      }
+      killhdl2(*hd,hd);
+    }
+    paKill(IDPACKAGE(h));
+    if (currPackHdl==h) currPackHdl=packFindHdl(currPack);
+  }
+#endif /* HAVE_NS */
   // poly / vector -------------------------------------------------------
   else if ((IDTYP(h) == POLY_CMD) || (IDTYP(h) == VECTOR_CMD))
@@ -644 +703 @@
   //  general  -------------------------------------------------------------
   // now dechain it and delete idrec
-#ifdef KAI_
+#ifdef KAI
   if(h->next != NULL)
     Print("=======>%s(%x) -> %s<====\n", IDID(h), IDID(h), IDID(h->next));
@@ -657 +716 @@
   {
     // h is at the beginning of the list
-    *ih = IDNEXT(*ih);
+    *ih = IDNEXT(h) /* ==*ih */;
   }
   else
@@ -778 +837 @@
 * move 'tomove' from root1 list to root2 list
 */
-static void ipSwapId(idhdl tomove, idhdl &root1, idhdl &root2)
+static int ipSwapId(idhdl tomove, idhdl &root1, idhdl &root2)
 {
   idhdl h;
@@ -784 +843 @@
   h=root2;
   while ((h!=NULL) && (h!=tomove)) h=IDNEXT(h);
-  if (h!=NULL) return;
+  if (h!=NULL) return FALSE; /*okay */
   /* search predecessor of h in root1, remove 'tomove' */
   h=root1;
@@ -794 +853 @@
   {
     while ((h!=NULL) && (IDNEXT(h)!=tomove)) h=IDNEXT(h);
-    if (h==NULL) return; /* not in the list root1 -> do nothing */
+    if (h==NULL) return TRUE; /* not in the list root1 -> do nothing */
     IDNEXT(h)=IDNEXT(tomove);
   }
@@ -800 +859 @@
   IDNEXT(tomove)=root2;
   root2=tomove;
+  return FALSE;
 }
 
@@ -806 +866 @@
   if ((currRing!=NULL)&&(tomove!=NULL))
   {
-    if (((QRING_CMD!=IDTYP(tomove)) && (BEGIN_RING<IDTYP(tomove)) && (IDTYP(tomove)<END_RING))
+    if (((QRING_CMD!=IDTYP(tomove)) && RingDependend(IDTYP(tomove)))
     || ((IDTYP(tomove)==LIST_CMD) && (lRingDependend(IDLIST(tomove)))))
     {
       /*move 'tomove' to ring id's*/
+#ifdef HAVE_NS
+      if (ipSwapId(tomove,IDROOT,currRing->idroot))
+      ipSwapId(tomove,basePack->idroot,currRing->idroot);
+#else
       ipSwapId(tomove,IDROOT,currRing->idroot);
+#endif
     }
     else
@@ -917 +982 @@
          (IDTYP(hdh)==PACKAGE_CMD && IDPACKAGE(hdh)->language==LANG_TOP &&
          IDPACKAGE(hdh)->ref>0 ))
-        killhdl(hdh,&(pack->idroot));
+        killhdl2(hdh,&(pack->idroot));
       hdh = temp;
     }
@@ -1001 +1066 @@
 #endif
 
-void proclevel::push(ring r, idhdl R,char *n)
-{
+void proclevel::push(char *n)
+{
+  //Print("push %s\n",n);
   proclevel *p=(proclevel*)omAlloc0(sizeof(proclevel));
-  p->currRing=r;
-  p->currRingHdl=R;
+  p->currRing=::currRing;
+  p->currRingHdl=::currRingHdl;
   p->name=n;
   #ifdef HAVE_NS
@@ -1013 +1079 @@
   p->next=this;
   procstack=p;
-}  
-void proclevel::pop(ring &r, idhdl &R)
-{
-  r=this->currRing;
+}
+void proclevel::pop()
+{
+  //Print("pop %s\n",name);
+  if (currRing!=::currRing) PrintS("currRing wrong\n");;
+  ::currRing=this->currRing;
   //if (r==NULL) Print("set ring to NULL at lev %d(%s)\n",myynest,name);
-  R=this->currRingHdl;
+  ::currRingHdl=this->currRingHdl;
+  if((::currRingHdl==NULL)||(IDRING(::currRingHdl)!=(::currRing)))
+    ::currRingHdl=rFindHdl(::currRing,NULL,NULL);
   #ifdef HAVE_NS
+  //Print("restore pack=%s,1.obj=%s\n",IDID(currPackHdl),IDID(currPack->idroot));
   ::currPackHdl=this->currPackHdl;
   ::currPack=this->currPack;
@@ -1143 +1214 @@
 }
 #endif /* HAVE_NAMESPACES */
+
+#ifdef HAVE_NS
+idhdl packFindHdl(package r)
+{
+  idhdl h=basePack->idroot;
+  while (h!=NULL)
+  {
+    if ((IDTYP(h)==PACKAGE_CMD)
+        && (IDPACKAGE(h)==r))
+      return h;
+    h=IDNEXT(h);
+  }
+  return NULL;
+}
+#endif

Singular/ipid.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.h,v 1.30 2001-09-25 16:07:28 Singular Exp $ */
+/* $Id: ipid.h,v 1.31 2001-10-09 16:36:05 Singular Exp $ */
 /*
 * ABSTRACT: identfier handling
@@ -35 +35 @@
   pack->ref++;
   return pack;
+}
+
+inline void paKill(package pack)
+{
+  pack->ref--;
 }
 
@@ -110 +115 @@
   char      * name;
   proclevel()  { memset(this,0,sizeof(*this)); }
-  void    push(ring,idhdl,char *);
-  void    pop(ring &, idhdl &);
-}; 
+  void    push(char *);
+  void    pop();
+};
 extern proclevel *procstack;
 
@@ -149 +154 @@
 #ifdef HAVE_NS
 extern idhdl currPackHdl;
+extern idhdl basePackHdl;
 extern package currPack;
 extern package basePack;
@@ -165 +171 @@
 void  killid(char * a, idhdl * i);
 void  killhdl(idhdl h);
-void  killhdl(idhdl h, idhdl * ih);
+void  killhdl2(idhdl h, idhdl * ih);
 lists ipNameList(idhdl root);
 void  ipMoveId(idhdl h);
 BOOLEAN checkPackage(package pack);
+#ifdef HAVE_NS
+idhdl packFindHdl(package r);
+#endif
 
 #define FLAG_STD   0

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.91 2001-09-27 13:13:03 Singular Exp $ */
+/* $Id: iplib.cc,v 1.92 2001-10-09 16:36:05 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -62 +62 @@
 
 #ifndef HAVE_NAMESPACES
+#ifndef HAVE_NS
   char *p;
 
@@ -69 +70 @@
 
   return TRUE;
+#else
+  char *plib = iiConvName(lib);
+  hl = basePack->idroot->get(plib,0);
+  if((hl==NULL) ||(IDTYP(hl)!=PACKAGE_CMD))
+  {
+    omFree(plib);
+    return FALSE;
+  }
+  omFree(plib);
+  return (strcmp(lib,IDPACKAGE(hl)->libname)==0);
+#endif
 #else
   char *plib = iiConvName(lib);
@@ -316 +328 @@
   myynest++;
   err=yyparse();
+  checkall();
   if (sLastPrinted.rtyp!=0)
   {
@@ -322 +335 @@
   //Print("kill locals for %s (level %d)\n",IDID(pn),myynest);
   killlocals(myynest);
+  checkall();
   //Print("end kill locals for %s (%d)\n",IDID(pn),myynest);
   myynest--;
@@ -331 +345 @@
 
 #ifdef USE_IILOCALRING
-ring    *iiLocalRing
-#ifdef TEST
-                    =NULL
-#endif
-                   ;
-#endif
-sleftv  *iiRETURNEXPR
-#ifdef TEST
-                    =NULL
-#endif
-                   ;
+ring    *iiLocalRing;
+#endif
+sleftv  *iiRETURNEXPR;
 int     iiRETURNEXPR_len=0;
 
@@ -347 +353 @@
 static void iiShowLevRings()
 {
+  int i;
 #ifdef USE_IILOCALRING
-  int i;
   for (i=1;i<=myynest;i++)
   {
@@ -357 +363 @@
   }
 #endif
-  {
-    proclevel * nshdl;
-    for(nshdl=procstack; nshdl != NULL; nshdl = nshdl->next)
-    {
-      if (nshdl->currRing==NULL) PrintS("NULL");
-      else                       Print("%d",nshdl->currRing);
-      PrintLn();
-    }
-  }
+#ifdef HAVE_NS
+  i=myynest;
+  proclevel *p=procstack;
+  while (p!=NULL)
+  {
+    Print("lev %d:",i);
+    if (p->currRingHdl==NULL) PrintS("NULL");
+    else                      Print("%s",IDID(p->currRingHdl));
+    PrintLn();
+    p=p->next;
+  }
+#endif
   if (currRing==NULL) PrintS("curr:NULL\n");
   else                Print ("curr:%x\n",currRing);
@@ -390 +399 @@
 sleftv * iiMake_proc(idhdl pn, sleftv* slpn, sleftv* sl)
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+sleftv * iiMake_proc(idhdl pn, package pack, sleftv* sl)
+#else /* HAVE_NS */
 sleftv * iiMake_proc(idhdl pn, sleftv* sl)
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
 {
@@ -422 +435 @@
     //printf("iiMake_proc: staying in TOP-LEVEL\n");
   }
-  procstack->push(currRing,currRingHdl,pi->procname);
 #else /* HAVE_NAMESPACES */
   omFree((ADDRESS)plib);
@@ -431 +443 @@
     return NULL;
   }
-  procstack->push(currRing,currRingHdl,pi->procname);
 #endif /* HAVE_NAMESPACES */
   iiCheckNest();
@@ -438 +449 @@
 #endif
   iiRETURNEXPR[myynest+1].Init();
+  procstack->push(pi->procname);
   if ((traceit&TRACE_SHOW_PROC)
   || (pi->trace_flag&TRACE_SHOW_PROC))
@@ -455 +467 @@
 
     case LANG_SINGULAR:
+                 #ifdef HAVE_NS
+                 if ((pi->pack!=NULL)&&(currPack!=pi->pack))
+                 {
+                   currPack=pi->pack;
+                   currPackHdl=packFindHdl(currPack);
+                   //Print("set pack=%s\n",IDID(currPackHdl));
+                 }
+                 else if ((pack!=NULL)&&(currPack!=pack))
+                 {
+                   currPack=pack;
+                   currPackHdl=packFindHdl(currPack);
+                 }
+                 #endif
                  err=iiPStart(pn,sl);
                  break;
@@ -507 +532 @@
   }
 #else /* USE_IILOCALRING */
+  if (procstack->currRing != currRing)
+  {
+    //if (procstack->currRingHdl!=NULL)
+    //Print("procstack:%s,",IDID(procstack->currRingHdl));
+    //if (currRingHdl!=NULL)
+    //Print(" curr:%s\n",IDID(currRingHdl));
+    //Print("pr:%x, curr: %x\n",procstack->currRing,currRing);
+    if (((iiRETURNEXPR[myynest+1].Typ()>BEGIN_RING)
+      && (iiRETURNEXPR[myynest+1].Typ()<END_RING))
+    || ((iiRETURNEXPR[myynest+1].Typ()==LIST_CMD)
+      && (lRingDependend((lists)iiRETURNEXPR[myynest+1].Data()))))
+    {
+      //idhdl hn;
+      char *n;
+      char *o;
+      if (procstack->currRing!=NULL)
+      {
+        //PrintS("reset ring\n");
+        procstack->currRingHdl=rFindHdl(procstack->currRing,NULL, NULL);
+        if (procstack->currRingHdl==NULL)
+          procstack->currRingHdl=
+           rFindHdl(procstack->currRing,NULL,procstack->currPack->idroot);
+        if (procstack->currRingHdl==NULL)
+          procstack->currRingHdl=
+           rFindHdl(procstack->currRing,NULL,basePack->idroot);
+        o=IDID(procstack->currRingHdl);
+        currRing=procstack->currRing;
+        currRingHdl=procstack->currRingHdl;
+      }
+      else                            o="none";
+      if (currRing!=NULL)             n=IDID(currRingHdl);
+      else                            n="none";
+      if (currRing==NULL)
+      {
+        Werror("ring change during procedure call: %s -> %s",o,n);
+        iiRETURNEXPR[myynest+1].CleanUp();
+        err=TRUE;
+      }
+    }
+    if (procstack->currRingHdl!=NULL)
+    {
+      rSetHdl(procstack->currRingHdl);
+    }
+    else
+    { currRingHdl=NULL; currRing=NULL; }
+  }
+#endif /* USE_IILOCALRING */
+#ifdef HAVE_NAMESPACES
   if (NS_LRING != currRing)
   {
@@ -546 +619 @@
     { currRingHdl=NULL; currRing=NULL; }
   }
-#endif /* USE_IILOCALRING */
+#endif /* HAVE_NAMESPACES */
   if (iiCurrArgs!=NULL)
   {
@@ -554 +627 @@
     iiCurrArgs=NULL;
   }
-  procstack->pop(currRing,currRingHdl);
+  procstack->pop();
   if (err)
     return NULL;
@@ -581 +654 @@
   if(ns != NULL)  namespaceroot->push(IDPACKAGE(ns), IDID(ns), myynest+1);
   else            namespaceroot->push(namespaceroot->root->pack, "Top", myynest+1);
-  procstack->push(currRing,currRingHdl,example);
+  procstack->push(example);
 #else /* HAVE_NAMESPACES */
-  procstack->push(currRing,currRingHdl,example);
+  procstack->push(example);
 #endif /* HAVE_NAMESPACES */
 #ifdef USE_IILOCALRING
@@ -623 +696 @@
   }
 #else /* USE_IILOCALRING */
+#endif /* USE_IILOCALRING */
   if (NS_LRING != currRing)
   {
@@ -638 +712 @@
     }
   }
-#endif /* USE_IILOCALRING */
-  procstack->pop(currRing,currRingHdl);
+//#endif /* USE_IILOCALRING */
+  procstack->pop();
   return err;
 }
@@ -770 +844 @@
   idhdl pl;
 #else
+#ifdef HAVE_NS
+  idhdl pl;
+#endif
   idhdl hl;
 #endif /* HAVE_NAMESPACES */
@@ -778 +855 @@
   char *plib = iiConvName(newlib);
 #endif /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+  char *plib = iiConvName(newlib);
+#endif
   FILE * fp = feFopen( newlib, "r", libnamebuf, tellerror );
   if (fp==NULL)
@@ -873 +953 @@
   LoadResult = iiLoadLIB(fp, libnamebuf, newlib, pl, autoexport, tellerror);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+  pl = basePack->idroot->get(plib,0);
+  if (pl==NULL)
+  {
+    pl = enterid( omStrDup(plib),0, PACKAGE_CMD,
+                  &(basePack->idroot), TRUE );
+    IDPACKAGE(pl)->language = LANG_SINGULAR;
+    IDPACKAGE(pl)->libname=omStrDup(newlib);
+  }
+  else
+  {
+    if(IDTYP(pl)!=PACKAGE_CMD)
+    {
+      Warn("not of typ package.");
+      fclose(fp);
+      return TRUE;
+    }
+  }
+  LoadResult = iiLoadLIB(fp, libnamebuf, newlib, pl, TRUE, tellerror);
+#else /* HAVE_NS */
   LoadResult = iiLoadLIB(fp, libnamebuf, newlib, NULL, FALSE, tellerror);
-#endif /* HAVE_NAMESPACES */
+#endif /* HAVE_NS */
+#endif /* HAVE_NAMESPACES */
+
+  omFree((ADDRESS)newlib);
 
 #ifdef HAVE_NAMESPACES
   if(!LoadResult) IDPACKAGE(pl)->loaded = TRUE;
   namespaceroot->pop();
-#endif /* HAVE_NAMESPACES */
-
-  omFree((ADDRESS)newlib);
-#ifdef HAVE_NAMESPACES
   omFree((ADDRESS)plib);
-#endif /* HAVE_LIBPARSER */
+#endif /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+  if(!LoadResult) IDPACKAGE(pl)->loaded = TRUE;
+  omFree((ADDRESS)plib);
+#endif /* HAVE_NS */
+
  return LoadResult;
 }
@@ -939 +1043 @@
     yylplex(newlib, libnamebuf, &lib_style, pl, autoexport);
   #else /* HAVE_NAMESPACES */
+  #ifdef HAVE_NS
+    yylplex(newlib, libnamebuf, &lib_style, pl, autoexport);
+  #else
     yylplex(newlib, libnamebuf, &lib_style);
+  #endif /* HAVE_NS */
   #endif /* HAVE_NAMESPACES */
   if(yylp_errno)
@@ -1032 +1140 @@
   pi->language = LANG_SINGULAR;
   pi->ref = 1;
+  pi->pack = NULL;
   pi->is_static = pstatic;
   pi->data.s.proc_start = pos;

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.67 2001-09-27 13:13:03 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.68 2001-10-09 16:36:06 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -244 +244 @@
       {
         idhdl nexth = IDNEXT(h);
-        killhdl(h,localhdl);
+        killhdl2(h,localhdl);
         h = nexth;
         //PrintS("kill\n");
@@ -259 +259 @@
 void killlocals(int v)
 {
+#ifndef HAVE_NS
   killlocals0(v,&IDROOT);
+#else
+  killlocals0(v,&(currPack->idroot));
+  if (currPack!=basePack)
+  {
+    //PrintS("killlocals in Top\n");
+    killlocals0(v,&(basePack->idroot));
+  }
+#endif
 
   if ((iiRETURNEXPR_len > myynest)
@@ -270 +279 @@
 
   idhdl sh=currRingHdl;
+  ring sr=currRing;
   BOOLEAN changed=FALSE;
 #ifndef HAVE_NAMESPACES
+#ifdef HAVE_NS
+  idhdl h = currPack->idroot;
+#else
   idhdl h = IDROOT;
-
+#endif
+
+//  Print("killlocals in %s\n",IDID(currPackHdl));
   while (h!=NULL)
   {
@@ -279 +294 @@
     && (IDRING(h)->idroot!=NULL))
     {
-      if (h!=currRingHdl) {changed=TRUE;rSetHdl(h);}
+      if (IDRING(h)!=currRing) {changed=TRUE;rSetHdl(h);}
       killlocals0(v,&(IDRING(h)->idroot));
     }
     h = IDNEXT(h);
   }
+#ifdef HAVE_NS
+  if (currPack!=basePack)
+  {
+    //PrintS("killlocals in Top\n");
+    h=basePack->idroot;
+    while (h!=NULL)
+    {
+      if (((IDTYP(h)==QRING_CMD) || (IDTYP(h) == RING_CMD))
+      && (IDRING(h)->idroot!=NULL))
+      {
+        //Print("go to %s\n",IDID(h));
+        if (IDRING(h)!=currRing) {changed=TRUE;rSetHdl(h);}
+        killlocals0(v,&(IDRING(h)->idroot));
+      }
+      h = IDNEXT(h);
+    }
+  }
+#endif
 #else
   idhdl h = NSROOT(namespaceroot->root);
@@ -322 +355 @@
     currRingHdl=NULL;
     if (sh!=NULL) rSetHdl(sh);
+    else if (sr!=NULL)
+    {
+      sh=rFindHdl(sr,NULL,NULL);
+      rSetHdl(sh);
+    }
   }
 
   if (myynest<=1) iiNoKeepRing=TRUE;
+  //Print("end killlocals  >= %d\n",v);
+  //listall();
 }
 
@@ -613 +653 @@
 #else
   r=IDROOT->get(theMap->preimage,myynest);
+#ifdef HAVE_NS
+  if ((currPack!=basePack)
+  &&((r==NULL) || ((r->typ != RING_CMD) && (r->typ != QRING_CMD))))
+    r=basePack->idroot->get(theMap->preimage,myynest);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
   if ((r!=NULL) && ((r->typ == RING_CMD) || (r->typ== QRING_CMD)))
@@ -887 +932 @@
 #endif /* HAVE_NAMESPACES */
     {
+      if (name->rtyp==IDHDL) { id=omStrDup(id); }
       sy->data = (char *)enterid(id,lev,t,root,init_b);
     }
@@ -959 +1005 @@
             if (iiLocalRing[0]==IDRING(h)) iiLocalRing[0]=NULL;
 #else
+#endif
             proclevel *p=procstack;
             while (p->next!=NULL) p=p->next;
@@ -966 +1013 @@
               p->currRingHdl=NULL;
             }
-#endif
-        killhdl(h,root);
+//#endif
+        killhdl2(h,root);
       }
       else
@@ -1094 +1141 @@
 BOOLEAN iiExport (leftv v, int toLev)
 {
+  checkall();
   BOOLEAN nok=FALSE;
   leftv r=v;
@@ -1114 +1162 @@
   }
   r->CleanUp();
+  checkall();
   return nok;
 }
@@ -1142 +1191 @@
             Warn("redefining %s",IDID(old));
           }
-          killhdl(old,&root);
+          killhdl2(old,&root);
         }
         else
@@ -1165 +1214 @@
 BOOLEAN iiExport (leftv v, int toLev, idhdl root)
 {
+  checkall();
   BOOLEAN nok=FALSE;
   leftv rv=v;
@@ -1186 +1236 @@
             Warn("redefining %s",IDID(old));
           }
-          killhdl(old,&root);
+          killhdl2(old,&root);
         }
         else
@@ -1203 +1253 @@
   }
   rv->CleanUp();
+  checkall();
   return nok;
 }

Singular/ipshell.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.h,v 1.25 2001-09-25 16:07:29 Singular Exp $ */
+/* $Id: ipshell.h,v 1.26 2001-10-09 16:36:06 Singular Exp $ */
 /*
 * ABSTRACT
@@ -171 +171 @@
 sleftv * iiMake_proc(idhdl pn, sleftv* slpn, sleftv* sl);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+sleftv * iiMake_proc(idhdl pn, package pack, sleftv* sl);
+#else /* HAVE_NS */
 sleftv * iiMake_proc(idhdl pn, sleftv* sl);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
 // from misc.cc:
@@ -180 +184 @@
 /* ================================================================== */
 void  singular_example(char *str);
+
+#ifdef HAVE_NS
+void listall();
+void checkall();
+#endif
 #endif
 

Singular/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.23 2000-12-31 15:14:32 obachman Exp $ */
+/* $Id: kbuckets.cc,v 1.24 2001-10-09 16:36:06 Singular Exp $ */
 
 #include "mod2.h"
@@ -121 +121 @@
   *bucket_pt = NULL;
 }
-  
+
 
 void kBucketDeleteAndDestroy(kBucket_pt *bucket_pt)
@@ -190 +190 @@
   assume(length <= 0 || length == pLength(lm));
   assume(kBucketIsCleared(bucket));
-  
+
   if (lm == NULL) return;
 
@@ -322 +322 @@
 ///
 /// For changing the ring of the Bpoly to new_tailBin
-/// 
+///
 void kBucketShallowCopyDelete(kBucket_pt bucket,
                               ring new_tailRing, omBin new_tailBin,
@@ -329 +329 @@
 #ifndef HAVE_PSEUDO_BUCKETS
   int i;
-  
+
   kBucketCanonicalize(bucket);
   for (i=0; i<= bucket->buckets_used; i++)
     if (bucket->buckets[i] != NULL)
-      bucket->buckets[i] = p_shallow_copy_delete(bucket->buckets[i], 
+      bucket->buckets[i] = p_shallow_copy_delete(bucket->buckets[i],
                                                  bucket->bucket_ring,
                                                  new_tailRing,
@@ -385 +385 @@
   else
     l1 = *l;
-  
+
   kBucketMergeLm(bucket);
   kbTest(bucket);
@@ -442 +442 @@
   {
     p1 = p_Minus_mm_Mult_qq(bucket->buckets[i], m, p1,
-                            bucket->buckets_length[i], l1, 
+                            bucket->buckets_length[i], l1,
                             spNoether, r);
     l1 = bucket->buckets_length[i];
@@ -462 +462 @@
     pSetCoeff0(m, nNeg(pGetCoeff(m)));
   }
-    
+
   while (bucket->buckets[i] != NULL)
   {
@@ -526 +526 @@
     p1 = r->p_Procs->pp_Mult_mm(p1, m, r, last);
   }
-    
+
   while (bucket->buckets[i] != NULL)
   {

Singular/kbuckets.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.h,v 1.14 2000-12-31 15:14:32 obachman Exp $ */
+/* $Id: kbuckets.h,v 1.15 2001-10-09 16:36:07 Singular Exp $ */
 #include "structs.h"
 #include "p_Procs.h"
@@ -121 +121 @@
 // first, do ExtractLarger
 // then add q
-inline poly 
+inline poly
 kBucket_ExtractLarger_Add_q(kBucket_pt bucket, poly append, poly q, int *lq)
 {
@@ -147 +147 @@
 ///
 /// For changing the ring of the Bpoly to new_tailBin
-/// 
-void kBucketShallowCopyDelete(kBucket_pt bucket, 
+///
+void kBucketShallowCopyDelete(kBucket_pt bucket,
                               ring new_tailRing, omBin new_tailBin,
                               pShallowCopyDeleteProc p_shallow_copy_delete);
@@ -155 +155 @@
 ///
 /// Tests
-/// 
-/// 
-#ifdef KDEBUG 
+///
+///
+#ifdef KDEBUG
 BOOLEAN kbTest(kBucket_pt bucket);
 #else
@@ -169 +169 @@
 
 // define this if length of bucket polys are 2, 4, 8, etc
-// instead of 4, 16, 64 ... -- 
+// instead of 4, 16, 64 ... --
 // this seems to be less efficient, both, in theory and in practice
-// #define BUCKET_TWO_BASE 
+// #define BUCKET_TWO_BASE
 #ifdef BUCKET_TWO_BASE
 #define MAX_BUCKET 28

Singular/kspoly.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kspoly.cc,v 1.24 2001-01-09 15:40:09 Singular Exp $ */
+/* $Id: kspoly.cc,v 1.25 2001-10-09 16:36:07 Singular Exp $ */
 /*
 *  ABSTRACT -  Routines for Spoly creation and reductions
@@ -26 +26 @@
  * Reduces PR with PW
  * Assumes PR != NULL, PW != NULL, Lm(PR) divides Lm(PW)
- * 
+ *
  ***************************************************************/
 int ksReducePoly(LObject* PR,
@@ -48 +48 @@
   kTest_L(PR);
   kTest_T(PW);
-  
+
   poly p1 = PR->GetLmTailRing();
   poly p2 = PW->GetLmTailRing();
@@ -56 +56 @@
   p_CheckPolyRing(p2, tailRing);
 
-  pAssume1(p2 != NULL && p1 != NULL && 
+  pAssume1(p2 != NULL && p1 != NULL &&
            p_DivisibleBy(p2,  p1, tailRing));
 
   pAssume1(p_GetComp(p1, tailRing) == p_GetComp(p2, tailRing) ||
-           (p_GetComp(p2, tailRing) == 0 && 
+           (p_GetComp(p2, tailRing) == 0 &&
             p_MaxComp(pNext(p2),tailRing) == 0));
 
@@ -71 +71 @@
 
   p_ExpVectorSub(lm, p2, tailRing);
-  
+
   if (tailRing != currRing)
   {
@@ -98 +98 @@
     int ct = ksCheckCoeff(&an, &bn);
     p_SetCoeff(lm, bn,tailRing);
-    if ((ct == 0) || (ct == 2)) 
+    if ((ct == 0) || (ct == 2))
       PR->Tail_Mult_nn(an);
     if (coef != NULL) *coef = an;
@@ -107 +107 @@
     if (coef != NULL) *coef = n_Init(1, tailRing);
   }
-  
-  
-  // and finally, 
+
+
+  // and finally,
   PR->Tail_Minus_mm_Mult_qq(lm, t2, PW->GetpLength() - 1, spNoether);
   PR->LmDeleteAndIter();
@@ -124 +124 @@
  *
  * Creates S-Poly of p1 and p2
- * 
+ *
  *
  ***************************************************************/
-void ksCreateSpoly(LObject* Pair,   poly spNoether, 
-                   int use_buckets, ring tailRing, 
+void ksCreateSpoly(LObject* Pair,   poly spNoether,
+                   int use_buckets, ring tailRing,
                    poly m1, poly m2, TObject** R)
 {
@@ -139 +139 @@
   poly last;
   Pair->tailRing = tailRing;
-  
+
   assume(p1 != NULL);
   assume(p2 != NULL);
@@ -149 +149 @@
 
   int l1=0, l2=0;
-  
+
   if (p_GetComp(p1, currRing)!=p_GetComp(p2, currRing))
   {
@@ -168 +168 @@
   if (m1 == NULL)
     k_GetLeadTerms(p1, p2, currRing, m1, m2, tailRing);
-    
+
   pSetCoeff0(m1, lc2);
   pSetCoeff0(m2, lc1);  // and now, m1 * LT(p1) == m2 * LT(p2)
@@ -177 +177 @@
     l2 = (R[Pair->i_r2])->GetpLength() - 1;
   }
-  
+
   // get m2 * a2
   if (spNoether != NULL)
@@ -191 +191 @@
   // get m2*a2 - m1*a1
   Pair->Tail_Minus_mm_Mult_qq(m1, a1, l1, spNoether);
-  
+
   // Clean-up time
   Pair->LmDeleteAndIter();
   p_LmDelete(m1, tailRing);
-  
+
   if (co != 0)
   {
@@ -215 +215 @@
   poly Lp =     PR->GetLmCurrRing();
   poly Save =   PW->GetLmCurrRing();
-  
+
   kTest_L(PR);
   kTest_T(PW);
   pAssume(pIsMonomOf(Lp, Current));
-  
+
   assume(Lp != NULL && Current != NULL && pNext(Current) != NULL);
   assume(PR->bucket == NULL);
@@ -228 +228 @@
   pAssume(!pHaveCommonMonoms(Red.p, With.p));
   ret = ksReducePoly(&Red, &With, spNoether, &coef);
-  
+
   if (!ret)
   {
@@ -245 +245 @@
   }
 
-  if (Lp == Save) 
+  if (Lp == Save)
     With.Delete();
   return ret;
@@ -253 +253 @@
  *
  * Auxillary Routines
- * 
- * 
+ *
+ *
  ***************************************************************/
 
@@ -464 +464 @@
   }
 }
-
-
-
-
-
-  
-  

Singular/libparse.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: libparse.h,v 1.12 2000-04-27 10:07:08 obachman Exp $ */
+/* $Id: libparse.h,v 1.13 2001-10-09 16:36:07 Singular Exp $ */
 /*
 * ABSTRACT: lib parsing
@@ -16 +16 @@
 procinfo *iiInitSingularProcinfo(procinfov pi, char *libname,
                                  char *procname, int line, long pos,
-                                 BOOLEAN pstatic = FALSE);
+                                 BOOLEAN pstatic = FALSE);
 #ifdef HAVE_NAMESPACES
 int yylplex(char *libname, char *libfile, lib_style_types *lib_style,
            idhdl pl, BOOLEAN autoexport=FALSE, lp_modes=LOAD_LIB);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
 int yylplex(char *libname, char *libfile, lib_style_types *lib_style,
-            lp_modes=LOAD_LIB);
+           idhdl pl, BOOLEAN autoexport=FALSE, lp_modes=LOAD_LIB);
+#else
+int yylplex(char *libname, char *libfile, lib_style_types *lib_style,
+            lp_modes=LOAD_LIB);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
 

Singular/libparse.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: libparse.l,v 1.47 2001-09-25 16:07:29 Singular Exp $ */
+/* $Id: libparse.l,v 1.48 2001-10-09 16:36:08 Singular Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -34 +34 @@
 #ifdef HAVE_NAMESPACES
 void copy_string(lp_modes mode, idhdl pl);
-extern void piCleanUp(procinfov pi);
 #else /* HAVE_NAMESPACES */
 void copy_string(lp_modes mode);
 #endif /* HAVE_NAMESPACES */
+extern void piCleanUp(procinfov pi);
 void make_version(char *p, int what);
 
@@ -119 +119 @@
 extern namehdl namespaceroot;
 #endif /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+idhdl h_top;
+#endif
 #define pi IDPROC(h0)
 extern "C"
@@ -180 +183 @@
                            idhdl pl, BOOLEAN autoexport, lp_modes mode)
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+#define YY_DECL int yylex(char *newlib, char *libfile, \
+                           lib_style_types *lib_style, \
+                           idhdl pl, BOOLEAN autoexport, lp_modes mode)
+#else
 #define YY_DECL int yylex(char *newlib, char *libfile, \
                            lib_style_types *lib_style, \
                            lp_modes mode)
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
 
@@ -341 +350 @@
              if( mode == LOAD_LIB)
              {
-                #ifdef HAVE_NAMESPACES
-                h0 = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,
-                                  &IDPACKAGE(pl)->idroot, TRUE);
-                if(!p_static && autoexport)
-                {
-                   namespaceroot->push( NSPACK(namespaceroot->root) ,"");
-                   h_top = enterid( omStrDup(proc), myynest, PROC_CMD,
-                                  &NSROOT(namespaceroot->root), FALSE );
-                   namespaceroot->pop();
-                }
+               #ifdef HAVE_NAMESPACES
+               h0 = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,
+                                 &IDPACKAGE(pl)->idroot, TRUE);
+               if(!p_static && autoexport)
+               {
+                  namespaceroot->push( NSPACK(namespaceroot->root) ,"");
+                  h_top = enterid( omStrDup(proc), myynest, PROC_CMD,
+                                 &NSROOT(namespaceroot->root), FALSE );
+                  namespaceroot->pop();
+               }
                #else /* HAVE_NAMESPACES */
+               #ifdef HAVE_NS
+               h0 = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,
+                                 &(IDPACKAGE(pl)->idroot), TRUE);
+               if(!p_static && autoexport)
+               {
+                  h_top = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,
+                                 &(basePack->idroot), FALSE );
+               }
+               #else
                h0 = enterid( omStrDup(proc), 0 /*myynest*/, PROC_CMD,
                                    &IDROOT, TRUE );
+               #endif /* HAVE_NS */
                #endif /* HAVE_NAMESPACES */
                /* omCheckAddr(IDID(h0)); */
@@ -368 +387 @@
                  }
                  #endif /* HAVE_NAMESPACES */
+                 #ifdef HAVE_NS
+                 if (!p_static && h_top != NULL && autoexport)
+                 {
+                   if(IDPROC(h_top)!=NULL) piCleanUp((procinfo *)IDPROC(h_top));
+                   IDPROC(h_top)=IDPROC(h0);
+                   IDPROC(h_top)->ref++;
+                 }
+                 IDPROC(h0)->pack=IDPACKAGE(pl);
+                 #endif /* HAVE_NS */
                  if (BVERBOSE(V_LOAD_PROC))
                    Warn( "     proc '%s' registered", proc );

Singular/lists.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: lists.h,v 1.15 2001-08-27 14:47:08 Singular Exp $ */
+/* $Id: lists.h,v 1.16 2001-10-09 16:36:08 Singular Exp $ */
 /*
 * ABSTRACT: handling of the list type
@@ -13 +13 @@
 #include "tok.h"
 
-#ifdef MDEBUG 
-#define INLINE_THIS 
+#ifdef MDEBUG
+#define INLINE_THIS
 #else
 #define INLINE_THIS inline

Singular/misc.cc

@@ -631 +631 @@
 #endif
 #ifdef HAVE_NAMESPACES
+              StringAppendS("Namespaces,");
+#endif
+#ifdef HAVE_NS
               StringAppendS("namespaces,");
 #endif
@@ -679 +682 @@
 }
 
-
+#ifdef HAVE_NS
+void listall()
+{
+      idhdl hh=basePack->idroot;
+      PrintS("====== Top ==============\n");
+      while (hh!=NULL)
+      {
+        if (IDDATA(hh)==NULL) PrintS("(N)");
+        else if (IDDATA(hh)==(void *)currRing) PrintS("(R)");
+        else if (IDDATA(hh)==(void *)currPack) PrintS("(P)");
+        else PrintS("   ");
+        Print("::%s, typ %s level %d",
+               IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh));
+        if ((IDTYP(hh)==RING_CMD)
+        || (IDTYP(hh)==QRING_CMD))
+          Print(" ref: %d\n",IDRING(hh)->ref);
+        else
+          PrintLn();
+        hh=IDNEXT(hh);
+      }
+      hh=basePack->idroot;
+      while (hh!=NULL)
+      {
+        if (IDDATA(hh)==(void *)basePack)
+          Print("(T)::%s, typ %s level %d\n",
+          IDID(hh),Tok2Cmdname(IDTYP(hh)),IDLEV(hh));
+        else
+        if ((IDTYP(hh)==RING_CMD)
+        || (IDTYP(hh)==QRING_CMD)
+        || (IDTYP(hh)==PACKAGE_CMD))
+        {
+          Print("====== %s ==============\n",IDID(hh));
+          idhdl h2=IDRING(hh)->idroot;
+          while (h2!=NULL)
+          {
+            if (IDDATA(h2)==NULL) PrintS("(N)");
+            else if (IDDATA(h2)==(void *)currRing) PrintS("(R)");
+            else if (IDDATA(h2)==(void *)currPack) PrintS("(P)");
+            else PrintS("   ");
+            Print("%s::%s, typ %s level %d\n",
+            IDID(hh),IDID(h2),Tok2Cmdname(IDTYP(h2)),IDLEV(h2));
+            h2=IDNEXT(h2);
+          }
+        }
+        hh=IDNEXT(hh);
+      }
+      Print("currRing:%x, currPack:%x,basePack:%x\n",currRing,currPack,basePack);
+}
+void checkall()
+{
+      idhdl hh=basePack->idroot;
+      while (hh!=NULL)
+      {
+        omCheckAddr(hh);
+        omCheckAddr(IDID(hh));
+        if (RingDependend(IDTYP(hh))) Print("%s typ %d in Top\n",IDID(hh),IDTYP(hh));
+        hh=IDNEXT(hh);
+      }
+      hh=basePack->idroot;
+      while (hh!=NULL)
+      {
+        if (IDTYP(hh)==PACKAGE_CMD)
+        {
+          idhdl h2=IDPACKAGE(hh)->idroot;
+          while (h2!=NULL)
+          {
+            omCheckAddr(h2);
+            omCheckAddr(IDID(h2));
+            if (RingDependend(IDTYP(h2))) Print("%s typ %d in %s\n",IDID(h2),IDTYP(h2),IDID(hh));
+            h2=IDNEXT(h2);
+          }
+        }
+        hh=IDNEXT(hh);
+      }
+}
+#endif

Singular/mmalloc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmalloc.cc,v 1.4 2001-02-01 21:19:54 obachman Exp $ */
+/* $Id: mmalloc.cc,v 1.5 2001-10-09 16:36:09 Singular Exp $ */
 /*
 * ABSTRACT: standard version of C++-memory management alloc func
@@ -12 +12 @@
 #include <omalloc.h>
 
-/* We define those, so that our values of 
+/* We define those, so that our values of
    OM_TRACK and OM_CHECK are used  */
 void* operator new ( size_t size )

Singular/mmalloc.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmalloc.h,v 1.2 2000-08-14 16:05:43 obachman Exp $ */
+/* $Id: mmalloc.h,v 1.3 2001-10-09 16:36:09 Singular Exp $ */
 /*
 * ABSTRACT: declaration of routines for memory stuff
@@ -16 +16 @@
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif

Singular/modulop.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: modulop.h,v 1.15 2001-01-09 15:40:11 Singular Exp $ */
+/* $Id: modulop.h,v 1.16 2001-10-09 16:36:09 Singular Exp $ */
 /*
 * ABSTRACT: numbers modulo p (<=32003)
@@ -53 +53 @@
 inline number npMultM(number a, number b)
 {
-  return (number) 
+  return (number)
     ((((unsigned long) a)*((unsigned long) b)) % ((unsigned long) npPrimeM));
 }

Singular/mpr_complex.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.cc,v 1.31 2001-08-27 14:47:13 Singular Exp $ */
+/* $Id: mpr_complex.cc,v 1.32 2001-10-09 16:36:10 Singular Exp $ */
 
 /*
@@ -50 +50 @@
  *  the size of mantissa consists of two parts:
  *    the "output" part a and the "rest" part b.
- *  According to the GMP-precision digits is 
+ *  According to the GMP-precision digits is
  *  recomputed to bits (basis 2).
  *  Two numbers a, b are equal if
@@ -86 +86 @@
     *c_in = '0';
     strcpy(&(c_in[1]), in);
-    
+
     mpf_set_str( t, c_in, 10 );
     omFreeSize((void*)c_in, len);
@@ -233 +233 @@
 bool operator >= ( const gmp_float & a, const gmp_float & b )
 {
-  if (a.t == b.t)  
-    return true;  
+  if (a.t == b.t)
+    return true;
   return mpf_cmp( a.t, b.t ) >= 0;
 }
 bool operator <= ( const gmp_float & a, const gmp_float & b )
 {
-  if (a.t == b.t)  
-    return true;   
+  if (a.t == b.t)
+    return true;
   return mpf_cmp( a.t, b.t ) <= 0;
 }
@@ -365 +365 @@
   gmp_float r;
 
-  switch (k) 
+  switch (k)
   {
   case QTOF:
@@ -665 +665 @@
       out=(char*)omAlloc( len );
       memset(out,0,len);
-      if ( !c.real().isZero() ) 
+      if ( !c.real().isZero() )
         sprintf(out,"(%s%s%s)",in_real,c.imag().sign()>=0?"+I*":"-I*",in_imag);
       else
@@ -673 +673 @@
     omFree( (ADDRESS) in_imag );
   }
-  else 
+  else
   {
     out= floatToStr( c.real(), oprec );

Singular/mpr_complex.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_complex.h,v 1.17 2001-08-27 14:47:14 Singular Exp $ */
+/* $Id: mpr_complex.h,v 1.18 2001-10-09 16:36:10 Singular Exp $ */
 
 /*
@@ -100 +100 @@
   inline const mpf_t *mpfp() const;
   inline mpf_t *_mpfp();
-  
+
   inline operator double();
   inline operator double() const;
@@ -177 +177 @@
 }
 
-inline mpf_t *gmp_float::_mpfp() 
+inline mpf_t *gmp_float::_mpfp()
 {
   return &t;

Singular/mpr_inout.h

@@ -5 +5 @@
 ****************************************/
 
-/* $Id: mpr_inout.h,v 1.6 1999-12-02 23:03:51 wenk Exp $ */
+/* $Id: mpr_inout.h,v 1.7 2001-10-09 16:36:10 Singular Exp $ */
 
 /*
@@ -49 +49 @@
 
 /**
- * COMPUTE: polynomial p with values given by v at points p1,..,pN derived 
+ * COMPUTE: polynomial p with values given by v at points p1,..,pN derived
  * from p; more precisely: consider p as point in K^n and v as N elements in K,
  * let p1,..,pN be the points in K^n obtained by evaluating all monomials
- * of degree 0,1,...,N at p in lexicographical order, then the procedure 
+ * of degree 0,1,...,N at p in lexicographical order, then the procedure
  * computes the polynomial f satisfying f(pi) = v[i]
  * RETURN:  polynomial f of degree d

Singular/mpr_numeric.h

@@ -5 +5 @@
 ****************************************/
 
-/* $Id: mpr_numeric.h,v 1.5 1999-12-02 23:03:52 wenk Exp $ */
+/* $Id: mpr_numeric.h,v 1.6 2001-10-09 16:36:11 Singular Exp $ */
 
 /*
@@ -18 +18 @@
 
 // define polish mode when finding roots
-#define PM_NONE    0 
+#define PM_NONE    0
 #define PM_POLISH  1
 #define PM_CORRUPT 2
@@ -176 +176 @@
 {
 public:
-  
+
   int m;         // number of constraints, make sure m == m1 + m2 + m3 !!
   int n;         // # of independent variables
   int m1,m2,m3;  // constraints <=, >= and ==
-  int icase;     // == 0: finite solution found; 
+  int icase;     // == 0: finite solution found;
                  // == +1 objective funtion unbound; == -1: no solution
-  int *izrov,*iposv;    
+  int *izrov,*iposv;
 
   mprfloat **LiPM; // the matrix (of size [m+2, n+1])
 
-  /** #rows should be >= m+2, #cols >= n+1 
+  /** #rows should be >= m+2, #cols >= n+1
    */
   simplex( int rows, int cols );

Singular/mpsr_Get.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_Get.cc,v 1.37 2001-09-25 15:45:43 Singular Exp $ */
+/* $Id: mpsr_Get.cc,v 1.38 2001-10-09 16:36:11 Singular Exp $ */
 /***************************************************************
  *
@@ -173 +173 @@
 {
   number n = (number) omAllocBin(rnumber_bin);
-#if defined(LDEBUG) 
+#if defined(LDEBUG)
     n->debug=123456;
 #endif
@@ -214 +214 @@
     {
       poly p;
-      
+
       pos = mpsr_rDefault(0, name, mlv->r);
       mpsr_SetCurrRing(mlv->r, TRUE);

Singular/mpsr_sl.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: mpsr_sl.cc,v 1.3 2001-09-19 09:49:37 Singular Exp $
+ *  Version: $Id: mpsr_sl.cc,v 1.4 2001-10-09 16:36:11 Singular Exp $
  *******************************************************************/
 
@@ -404 +404 @@
 #ifdef HPUX_9
   signal(SIGCHLD, (void (*)(int))SIG_DFL);
-#endif  
+#endif
   if ((strcmp(l->mode, "launch") == 0 || strcmp(l->mode, "fork") == 0) &&
       (MP_GetLinkStatus((MP_Link_pt)l->data,MP_LinkReadyWriting) == MP_TRUE))
@@ -411 +411 @@
 #ifdef HPUX_9
   signal(SIGCHLD, (void (*)(int))SIG_IGN);
-#endif  
+#endif
   SI_LINK_SET_CLOSE_P(l);
   return FALSE;

Singular/omSingularConfig.h

@@ -1 +1 @@
 /*******************************************************************
  *  File:    omSingularConfig.h
- *  Purpose: declaration of External Config stuff for omalloc 
- *           This file is inlcuded by omDefaultConfig.h, i.e., at the the time 
- *           the omalloc library is built. Any changes to the default config 
- *           of omalloc should be done here (and, of course, you need to 
+ *  Purpose: declaration of External Config stuff for omalloc
+ *           This file is inlcuded by omDefaultConfig.h, i.e., at the the time
+ *           the omalloc library is built. Any changes to the default config
+ *           of omalloc should be done here (and, of course, you need to
  *           rebuilt the library).
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: omSingularConfig.h,v 1.3 2000-12-18 15:44:42 obachman Exp $
+ *  Version: $Id: omSingularConfig.h,v 1.4 2001-10-09 16:36:12 Singular Exp $
  *******************************************************************/
 #ifndef OM_SINGULAR_CONFIG_H
@@ -14 +14 @@
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
-  
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -35 +35 @@
 
 /* number of bytes for difference to report: every 1 MByte */
-#define SING_REPORT_THRESHOLD 1000*1024 
+#define SING_REPORT_THRESHOLD 1000*1024
 #define OM_SINGULAR_HOOK                                                        \
 do                                                                              \

Singular/pInline1.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pInline1.cc,v 1.3 2000-10-30 13:40:21 obachman Exp $
+ *  Version: $Id: pInline1.cc,v 1.4 2001-10-09 16:36:12 Singular Exp $
  *******************************************************************/
 #ifndef PINLINE1_CC
@@ -22 +22 @@
 
 #undef NO_INLINE1
-#define NO_INLINE1 
+#define NO_INLINE1
 
 #endif // PDEBUG

Singular/pShallowCopyDelete.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pShallowCopyDelete.cc,v 1.3 2000-10-26 16:31:37 obachman Exp $
+ *  Version: $Id: pShallowCopyDelete.cc,v 1.4 2001-10-09 16:36:12 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -27 +27 @@
   int N = d_r->N;
   int i;
-  
+
 
   while (s_p != NULL)
@@ -33 +33 @@
     d_p->next = p_Init(d_r, d_bin);
     pIter(d_p);
-    
+
     pSetCoeff0(d_p, pGetCoeff(s_p));
     for (i=1; i<= N; i++)
@@ -41 +41 @@
       p_SetComp(d_p, p_GetComp(s_p, s_r), d_r);
     p_Setm(d_p, d_r);
-    
+
     s_p = p_LmFreeAndNext(s_p, s_r);
   }
@@ -53 +53 @@
   return pShallowCopyDelete_General;
 }
-
-
-  
-  
-  

Singular/pShallowCopyDelete.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pShallowCopyDelete.h,v 1.1 2000-10-23 16:32:27 obachman Exp $
+ *  Version: $Id: pShallowCopyDelete.h,v 1.2 2001-10-09 16:36:12 Singular Exp $
  *******************************************************************/
 
 // returns a poly from dest_r which is a ShallowCopy of s_p from source_r
-typedef poly (*pShallowCopyDeleteProc)(poly s_p, ring source_r, ring dest_r, 
+typedef poly (*pShallowCopyDeleteProc)(poly s_p, ring source_r, ring dest_r,
                                        omBin dest_bin);
 pShallowCopyDeleteProc pGetShallowCopyDeleteProc(ring source_r, ring dest_r);

Singular/p_Add_q__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Add_q__T.cc,v 1.2 2001-08-27 14:47:21 Singular Exp $
+ *  Version: $Id: p_Add_q__T.cc,v 1.3 2001-10-09 16:36:13 Singular Exp $
  *******************************************************************/
 
 /***************************************************************
  *
- * Returns:  p + q, 
+ * Returns:  p + q,
  *           Shorter, where Shorter == Length(p) + Length(q) - Length(p+q);
  * Destroys: p, q
- * 
+ *
  ***************************************************************/
 LINKAGE poly p_Add_q(poly p, poly q, int &Shorter, const ring r)
@@ -24 +24 @@
   int l = pLength(p) + pLength(q);
 #endif
-  
+
   // test for trivial cases
   Shorter = 0;
   if (q == NULL) return p;
   if (p == NULL) return q;
-  
+
   number t, n1, n2;
   int shorter = 0;
@@ -47 +47 @@
   n_Delete(&n2, r);
   q = p_LmFreeAndNext(q, r);
-  
+
   if (n_IsZero(t, r))
   {
@@ -64 +64 @@
   if (q==NULL) { pNext(a) = p; goto Finish;}
   goto Top;
-     
+
   Greater:
   a = pNext(a) = p;
@@ -70 +70 @@
   if (p==NULL) { pNext(a) = q; goto Finish;}
   goto Top;
-    
+
   Smaller:
   a = pNext(a) = q;
@@ -76 +76 @@
   if (q==NULL) { pNext(a) = p; goto Finish;}
   goto Top;
-  
+
 
   Finish:
@@ -84 +84 @@
 #if PDEBUG > 0
   pAssume1(l - pLength(pNext(&rp)) == Shorter);
-#endif  
+#endif
   return pNext(&rp);
 }

Singular/p_Copy__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Copy__T.cc,v 1.2 2001-08-27 14:47:22 Singular Exp $
+ *  Version: $Id: p_Copy__T.cc,v 1.3 2001-10-09 16:36:13 Singular Exp $
  *******************************************************************/
 
@@ -18 +18 @@
   omBin bin = r->PolyBin;
   poly h;
-  
+
   DECLARE_LENGTH(const unsigned long length = r->ExpL_Size);
 

Singular/p_Delete__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Delete__T.cc,v 1.2 2001-08-27 14:47:23 Singular Exp $
+ *  Version: $Id: p_Delete__T.cc,v 1.3 2001-10-09 16:36:13 Singular Exp $
  *******************************************************************/
 
@@ -13 +13 @@
 {
   poly p = *pp;
-  
+
   while (p != NULL)
   {

Singular/p_MemCmp.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_MemCmp.h,v 1.2 2000-12-31 15:14:37 obachman Exp $
+ *  Version: $Id: p_MemCmp.h,v 1.3 2001-10-09 16:36:13 Singular Exp $
  *******************************************************************/
 #ifndef P_MEM_CMP_H
@@ -13 +13 @@
 
 /***************************************************************
- *  
+ *
  *  auxiallary macros
- *  
+ *
  *******************************************************************/
 #define _p_MemCmp_Declare(s1, s2)                   \
@@ -63 +63 @@
 }                                                                   \
 while (0)
-  
-/***************************************************************
- *  
+
+/***************************************************************
+ *
  *  Pomog
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthOne_OrdPomog(s1, s2, length, ordsgn, actionE, actionG, actionS) \
@@ -144 +144 @@
 
 /***************************************************************
- *  
+ *
  *  Nomog
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthOne_OrdNomog(s1, s2, length, ordsgn, actionE, actionG, actionS)     \
@@ -168 +168 @@
 
 /***************************************************************
- *  
+ *
  *  PomogZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthTwo_OrdPomogZero(s1, s2, length, ordsgn, actionE, actionG, actionS)     \
@@ -190 +190 @@
 
 /***************************************************************
- *  
+ *
  *  NomogZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthTwo_OrdNomogZero(s1, s2, length, ordsgn, actionE, actionG, actionS)     \
@@ -212 +212 @@
 
 /***************************************************************
- *  
+ *
  *  NegPomog
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthTwo_OrdNegPomog(s1, s2, length, ordsgn, actionE, actionG, actionS)  \
@@ -250 +250 @@
 
 /***************************************************************
- *  
+ *
  *  PomogNeg
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthTwo_OrdPomogNeg(s1, s2, length, ordsgn, actionE, actionG, actionS)  \
@@ -288 +288 @@
 
 /***************************************************************
- *  
+ *
  *  PosNomog
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthThree_OrdPosNomog(s1, s2, length, ordsgn, actionE, actionG, actionS)    \
@@ -306 +306 @@
 #define p_MemCmp_LengthGeneral_OrdPosNomog(s1, s2, length, ordsgn, actionE, actionG, actionS)  \
   p_MemCmp_LengthGeneral_OrdNegPomog(s1, s2, length, ordsgn, actionE, actionS, actionG)
-  
-/***************************************************************
- *  
+
+/***************************************************************
+ *
  *  NomogPos
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthThree_OrdNomogPos(s1, s2, length, ordsgn, actionE, actionG, actionS)    \
@@ -329 +329 @@
 
 /***************************************************************
- *  
+ *
  *  PomogNegZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthThree_OrdPomogNegZero(s1, s2, length, ordsgn, actionE, actionG, actionS)   \
@@ -349 +349 @@
 
 /***************************************************************
- *  
+ *
  *  NegPomogZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthThree_OrdNegPomogZero(s1, s2, length, ordsgn, actionE, actionG, actionS)   \
@@ -369 +369 @@
 
 /***************************************************************
- *  
+ *
  *  NomogPosZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthFour_OrdNomogPosZero(s1, s2, length, ordsgn, actionE, actionG, actionS)    \
@@ -387 +387 @@
 
 /***************************************************************
- *  
+ *
  *  PosNomogZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthFour_OrdPosNomogZero(s1, s2, length, ordsgn, actionE, actionG, actionS)    \
@@ -405 +405 @@
 
 /***************************************************************
- *  
- * PosPosNomog 
- *  
+ *
+ * PosPosNomog
+ *
  *******************************************************************/
 #define p_MemCmp_LengthThree_OrdPosPosNomog(s1, s2, length, ordsgn, actionE, actionG, actionS)             \
@@ -446 +446 @@
 
 /***************************************************************
- *  
- * NegPosNomog 
- *  
+ *
+ * NegPosNomog
+ *
  *******************************************************************/
 #define p_MemCmp_LengthThree_OrdNegPosNomog(s1, s2, length, ordsgn, actionE, actionG, actionS)             \
@@ -488 +488 @@
 
 /***************************************************************
- *  
- * PosNomogPos 
- *  
+ *
+ * PosNomogPos
+ *
  *******************************************************************/
 #define p_MemCmp_LengthThree_OrdPosNomogPos(s1, s2, length, ordsgn, actionE, actionG, actionS)             \
@@ -530 +530 @@
 
 /***************************************************************
- *  
+ *
  *  PosPosNomogZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthFour_OrdPosPosNomogZero(s1, s2, length, ordsgn, actionE, actionG, actionS)    \
@@ -548 +548 @@
 
 /***************************************************************
- *  
+ *
  *  PosNomogPosZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthFour_OrdPosNomogPosZero(s1, s2, length, ordsgn, actionE, actionG, actionS)    \
@@ -566 +566 @@
 
 /***************************************************************
- *  
+ *
  *  NegPosNomogZero
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthFour_OrdNegPosNomogZero(s1, s2, length, ordsgn, actionE, actionG, actionS)    \
@@ -585 +585 @@
 
 /***************************************************************
- *  
+ *
  *  OrdGeneral
- *  
+ *
  *******************************************************************/
 #define _p_MemCmp_OrdGeneral_Declare(s1, s2)    \
@@ -608 +608 @@
   actionG;                                                      \
 }                                                               \
-while (0)                         
+while (0)
 
 #define _p_MemCmp_OrdGeneral(i, actionE)         \
@@ -618 +618 @@
   if (_v1 == _v2) actionE;                      \
 }                                               \
-while(0)                         
+while(0)
 
 #define _p_MemCmp_LengthTwo_OrdGeneral(actionE)          \
@@ -714 +714 @@
 
 /***************************************************************
- *  
+ *
  *  Last but not least LengthGeneral_OrdGeneral
- *  
+ *
  *******************************************************************/
 #define p_MemCmp_LengthGeneral_OrdGeneral(s1, s2, length, ordsgn, actionE, actionG, actionS)    \
@@ -766 +766 @@
 
 /***************************************************************
- *  
+ *
  *  Bitmask
- *  
+ *
  *******************************************************************/
 #define _p_MemCmp_Bitmask_Declare(s1, s2, bitmask)  \
@@ -813 +813 @@
 }                                                                           \
 while (0)
-  
+
 #define _p_MemCmp_Bitmask_LengthTwo(actionS)    \
   do                                            \

Singular/p_Merge_q__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Merge_q__T.cc,v 1.2 2001-08-27 14:47:24 Singular Exp $
+ *  Version: $Id: p_Merge_q__T.cc,v 1.3 2001-10-09 16:36:14 Singular Exp $
  *******************************************************************/
 
@@ -14 +14 @@
  * Returns:  p merged with q
  * Destroys: p, q
- * 
+ *
  ***************************************************************/
 LINKAGE poly p_Merge_q(poly p, poly q, const ring r)
@@ -24 +24 @@
   int l = pLength(p) + pLength(q);
 #endif
-  
+
   spolyrec rp;
   poly a = &rp;
@@ -37 +37 @@
   dReportError("Equal monomials in p_Merge_q");
   return NULL;
-  
+
   Greater:
   a = pNext(a) = p;
@@ -43 +43 @@
   if (p==NULL) { pNext(a) = q; goto Finish;}
   goto Top;
-    
+
   Smaller:
   a = pNext(a) = q;
@@ -49 +49 @@
   if (q==NULL) { pNext(a) = p; goto Finish;}
   goto Top;
-  
+
   Finish:
 
@@ -55 +55 @@
 #if PDEBUG > 0
   pAssume1(l - pLength(pNext(&rp)) == 0);
-#endif  
+#endif
   return pNext(&rp);
 }

Singular/p_Minus_mm_Mult_qq__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Minus_mm_Mult_qq__T.cc,v 1.2 2001-08-27 14:47:25 Singular Exp $
+ *  Version: $Id: p_Minus_mm_Mult_qq__T.cc,v 1.3 2001-10-09 16:36:14 Singular Exp $
  *******************************************************************/
 
@@ -16 +16 @@
  * Destroys: p
  * Const:    m, q
- * 
+ *
  ***************************************************************/
 LINKAGE poly p_Minus_mm_Mult_qq(poly p, poly m, poly q, int& Shorter, const poly spNoether, const ring r, poly &last)
@@ -31 +31 @@
   // we are done if q == NULL || m == NULL
   if (q == NULL || m == NULL) return p;
-  
+
   spolyrec rp;
   poly a = &rp,                    // collects the result
@@ -50 +50 @@
   const unsigned long* m_e = m->exp;
   omBin bin = r->PolyBin;
-  
+
   if (p == NULL) goto Finish;           // return tneg*q if (p == NULL)
-  
+
   pAssume(p_GetComp(q, r) == 0 || p_GetComp(m, r) == 0);
 
@@ -60 +60 @@
   p_MemSum(qm->exp, q->exp, m_e, length);
   p_MemAddAdjust(qm, r);
-  
-  CmpTop:     
+
+  CmpTop:
   // compare qm = m*q and p w.r.t. monomial ordering
   p_MemCmp(qm->exp, p->exp, length, ordsgn, goto Equal, goto Greater, goto Smaller );
-  
+
   Equal:   // qm equals p
   tb = n_Mult(pGetCoeff(q), tm, r);
@@ -78 +78 @@
   }
   else
-  { // coeffs are equal, so their difference is 0: 
+  { // coeffs are equal, so their difference is 0:
     shorter += 2;
     n_Delete(&tc, r);
@@ -88 +88 @@
   // no, so update qm
   goto SumTop;
-  
+
 
   Greater:
@@ -97 +97 @@
   {
     qm = NULL;
-    goto Finish; 
+    goto Finish;
   }
-  // construct new qm 
+  // construct new qm
   goto AllocTop;
-    
-  Smaller:     
+
+  Smaller:
   a = pNext(a) = p;// append p to result and advance p
   pIter(p);
   if (p == NULL) goto Finish;
   goto CmpTop;
- 
+
 
   Finish: // q or p is NULL: Clean-up time
@@ -129 +129 @@
     pSetCoeff0(m, tm);
   }
-   
+
   n_Delete(&tneg, r);
   if (qm != NULL) p_FreeBinAddr(qm, r);
@@ -135 +135 @@
   p_Test(pNext(&rp), r);
   return pNext(&rp);
-} 
+}

Singular/p_Mult_mm__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_mm__T.cc,v 1.2 2001-08-27 14:47:25 Singular Exp $
+ *  Version: $Id: p_Mult_mm__T.cc,v 1.3 2001-10-09 16:36:15 Singular Exp $
  *******************************************************************/
 
@@ -14 +14 @@
  *   Returns:  p*m
  *   Const:    m
- *   Destroys: p  
+ *   Destroys: p
  *
  ***************************************************************/

Singular/p_Mult_nn__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_nn__T.cc,v 1.2 2001-08-27 14:47:26 Singular Exp $
+ *  Version: $Id: p_Mult_nn__T.cc,v 1.3 2001-10-09 16:36:15 Singular Exp $
  *******************************************************************/
 
@@ -21 +21 @@
   pAssume(!n_IsZero(n,r));
   p_Test(p, r);
-  
+
   poly q = p;
   while (p != NULL)

Singular/p_Mult_q.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_q.cc,v 1.7 2000-12-31 15:14:38 obachman Exp $
+ *  Version: $Id: p_Mult_q.cc,v 1.8 2001-10-09 16:36:15 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -13 +13 @@
 /***************************************************************
  *
- * Returns:  p * q, 
+ * Returns:  p * q,
  * Destroys: if !copy then p, q
  * Assumes: pLength(p) >= 2 pLength(q) >=2
@@ -27 +27 @@
 {
   int l = 0;
-  
+
   do
   {
@@ -62 +62 @@
 }
 
-      
-static poly _p_Mult_q_Bucket(poly p, const int lp, 
-                             poly q, const int lq, 
+
+static poly _p_Mult_q_Bucket(poly p, const int lp,
+                             poly q, const int lq,
                              const int copy, const ring r)
 {
@@ -80 +80 @@
   poly rn = pNext(res);             // pNext(rr)
   number n, n1;
-  
+
   kBucket_pt bucket = kBucketCreate(r);
-  
+
   // initialize bucket
   kBucketInit(bucket, pNext(rn), lp - 2);
@@ -91 +91 @@
   if (rn == NULL) goto Smaller;
   p_LmCmpAction(rn, qn, r, goto Equal, goto Greater, goto Smaller);
-  
+
   Greater:
   // rn > qn, so iter
@@ -98 +98 @@
   pIter(rn);
   goto Top;
-  
+
   // rn < qn, append qn to rr, and compute next Lm(qq)*pp
   Smaller:
@@ -117 +117 @@
     pNext(rr) = kBucketExtractLm(bucket);
   }
-  
+
   pIter(qq);
   if (qq == NULL) goto Finish;
   rn = pNext(rr);
   goto Top;
-  
+
   Equal:
   n1 = pGetCoeff(rn);
@@ -141 +141 @@
   qn = p_LmFreeAndNext(qn, r);
   goto Work;
-  
+
   Finish:
   assume(rr != NULL && pNext(rr) != NULL);
   pNext(pNext(rr)) = kBucketClear(bucket);
   kBucketDestroy(&bucket);
-  
+
   if (!copy)
   {
@@ -171 +171 @@
   poly rn = pNext(res);             // pNext(rr)
   number n, n1;
-  
+
   // now the main loop
   Top:
   if (rn == NULL) goto Smaller;
   p_LmCmpAction(rn, qn, r, goto Equal, goto Greater, goto Smaller);
-  
+
   Greater:
   // rn > qn, so iter
@@ -182 +182 @@
   pIter(rn);
   goto Top;
-  
+
   // rn < qn, append qn to rr, and compute next Lm(qq)*pp
   Smaller:
@@ -195 +195 @@
     pNext(rr) = p_Plus_mm_Mult_qq(rn, qq, pp, r);
   }
-  
+
   pIter(qq);
   if (qq == NULL) goto Finish;
   rn = pNext(rr);
   goto Top;
-  
+
   Equal:
   n1 = pGetCoeff(rn);
@@ -219 +219 @@
   qn = p_LmFreeAndNext(qn, r);
   goto Work;
-  
+
   Finish:
   if (!copy)
@@ -235 +235 @@
   int lp, lq, l;
   poly pt;
-  
+
   pqLength(p, q, lp, lq, MIN_LENGTH_BUCKET);
-  
+
   if (lp < lq)
   {

Singular/p_Mult_q.h

@@ -4 +4 @@
 /***************************************************************
  *  File:    p_Mult_q.h
- *  Purpose: declaration of some auxillary routines for 
+ *  Purpose: declaration of some auxillary routines for
  *           p_Mult_q
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_q.h,v 1.1 2000-12-31 15:14:39 obachman Exp $
+ *  Version: $Id: p_Mult_q.h,v 1.2 2001-10-09 16:36:15 Singular Exp $
  *******************************************************************/
 #include "mod2.h"

Singular/p_Procs.h

@@ -8 +8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Procs.h,v 1.13 2001-08-27 14:47:28 Singular Exp $
+ *  Version: $Id: p_Procs.h,v 1.14 2001-10-09 16:36:16 Singular Exp $
  *******************************************************************/
 #ifndef P_PROCS_H
@@ -21 +21 @@
 typedef poly (*pp_Mult_nn_Proc_Ptr)(poly p, const number n, const ring r);
 typedef poly (*p_Mult_mm_Proc_Ptr)(poly p, const poly m, const ring r);
-typedef poly (*pp_Mult_mm_Proc_Ptr)(poly p, const poly m, 
-                                    const ring r, 
+typedef poly (*pp_Mult_mm_Proc_Ptr)(poly p, const poly m,
+                                    const ring r,
                                     poly &last);
-typedef poly (*pp_Mult_mm_Noether_Proc_Ptr)(poly p, const poly m, 
+typedef poly (*pp_Mult_mm_Noether_Proc_Ptr)(poly p, const poly m,
                                             const poly spNoether, int &ll,
                                             const ring r, poly &last);
 typedef poly (*p_Add_q_Proc_Ptr)(poly p, poly q, int & shorter, const ring r);
-typedef poly (*p_Minus_mm_Mult_qq_Proc_Ptr)(poly p, poly m, poly q, 
+typedef poly (*p_Minus_mm_Mult_qq_Proc_Ptr)(poly p, poly m, poly q,
                                             int &shorter, const poly spNoether,
                                             const ring r, poly &last);
@@ -59 +59 @@
 } pProcs_s;
 
-  
+
 void p_ProcsSet(ring r, p_Procs_s* p_Procs);
 #ifdef RDEBUG
-void p_Debug_GetSpecNames(const ring r, char* &field, char* &length, 
+void p_Debug_GetSpecNames(const ring r, char* &field, char* &length,
                           char* &ord);
 void p_Debug_GetProcNames(const ring r, p_Procs_s* p_Procs);

Singular/p_Procs_Dynamic.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Dynamic.cc,v 1.4 2001-01-30 12:19:24 Singular Exp $
+ *  Version: $Id: p_Procs_Dynamic.cc,v 1.5 2001-10-09 16:36:16 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -58 +58 @@
 {
   const char* module =  p_ProcField_2_Module(proc, field);
-  
-  if (strcmp(module, "FieldIndep") == 0) 
+
+  if (strcmp(module, "FieldIndep") == 0)
     return p_ProcInitHandle(&p_procs_handle_FieldIndep, module);
-  else if (strcmp(module, "FieldZp") == 0) 
+  else if (strcmp(module, "FieldZp") == 0)
     return p_ProcInitHandle(&p_procs_handle_FieldZp, module);
-  else if (strcmp(module, "FieldQ") == 0) 
+  else if (strcmp(module, "FieldQ") == 0)
     return p_ProcInitHandle(&p_procs_handle_FieldQ, module);
-  else if (strcmp(module, "FieldGeneral") == 0) 
+  else if (strcmp(module, "FieldGeneral") == 0)
     return p_ProcInitHandle(&p_procs_handle_FieldGeneral, module);
   else
@@ -74 +74 @@
 }
 
-  
+
 #define InitSetProcs(f, l, o) ((void)0)
 
@@ -81 +81 @@
   switch(proc)
   {
-      case p_Copy_Proc: 
+      case p_Copy_Proc:
         return (void *)p_Copy__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_Delete_Proc: 
+      case p_Delete_Proc:
         return (void *)p_Delete__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_ShallowCopyDelete_Proc: 
+      case p_ShallowCopyDelete_Proc:
         return (void *)p_ShallowCopyDelete__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_Mult_nn_Proc: 
+      case p_Mult_nn_Proc:
         return (void *)p_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral;
-      case pp_Mult_nn_Proc: 
+      case pp_Mult_nn_Proc:
         return (void *)pp_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral;
-      case pp_Mult_mm_Proc: 
+      case pp_Mult_mm_Proc:
         return (void *)pp_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral;
-      case pp_Mult_mm_Noether_Proc: 
+      case pp_Mult_mm_Noether_Proc:
         return (void *)pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_Mult_mm_Proc: 
+      case p_Mult_mm_Proc:
         return (void *)p_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_Add_q_Proc: 
+      case p_Add_q_Proc:
         return (void *)p_Add_q__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_Minus_mm_Mult_qq_Proc: 
+      case p_Minus_mm_Mult_qq_Proc:
         return (void *)p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_Neg_Proc: 
+      case p_Neg_Proc:
         return (void *)p_Neg__FieldGeneral_LengthGeneral_OrdGeneral;
-      case pp_Mult_Coeff_mm_DivSelect_Proc: 
+      case pp_Mult_Coeff_mm_DivSelect_Proc:
         return (void *)pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral;
-      case pp_Mult_Coeff_mm_DivSelectMult_Proc: 
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
         return (void *)pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_Merge_q_Proc: 
+      case p_Merge_q_Proc:
         return (void *)p_Merge_q__FieldGeneral_LengthGeneral_OrdGeneral;
-      case p_kBucketSetLm_Proc: 
+      case p_kBucketSetLm_Proc:
         return (void *)p_kBucketSetLm__FieldGeneral_LengthGeneral_OrdGeneral;
       case p_Unknown_Proc:
@@ -125 +125 @@
   switch(proc)
   {
-      case p_Copy_Proc: 
+      case p_Copy_Proc:
         return "p_Copy__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Delete_Proc: 
+      case p_Delete_Proc:
         return "p_Delete__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_ShallowCopyDelete_Proc: 
+      case p_ShallowCopyDelete_Proc:
         return "p_ShallowCopyDelete__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Mult_nn_Proc: 
+      case p_Mult_nn_Proc:
         return "p_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_nn_Proc: 
+      case pp_Mult_nn_Proc:
         return "pp_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_mm_Proc: 
+      case pp_Mult_mm_Proc:
         return "pp_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_mm_Noether_Proc: 
+      case pp_Mult_mm_Noether_Proc:
         return "pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Mult_mm_Proc: 
+      case p_Mult_mm_Proc:
         return "p_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Add_q_Proc: 
+      case p_Add_q_Proc:
         return "p_Add_q__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Minus_mm_Mult_qq_Proc: 
+      case p_Minus_mm_Mult_qq_Proc:
         return "p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Neg_Proc: 
+      case p_Neg_Proc:
         return "p_Neg__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_Coeff_mm_DivSelect_Proc: 
+      case pp_Mult_Coeff_mm_DivSelect_Proc:
         return "pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral";
-      case pp_Mult_Coeff_mm_DivSelectMult_Proc: 
+      case pp_Mult_Coeff_mm_DivSelectMult_Proc:
         return "pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_Merge_q_Proc: 
+      case p_Merge_q_Proc:
         return "p_Merge_q__FieldGeneral_LengthGeneral_OrdGeneral";
-      case p_kBucketSetLm_Proc: 
+      case p_kBucketSetLm_Proc:
         return "p_kBucketSetLm__FieldGeneral_LengthGeneral_OrdGeneral";
       case p_Unknown_Proc:
@@ -163 +163 @@
 
 
-static void* GetDynamicProc(const char* proc_s, p_Proc proc, 
+static void* GetDynamicProc(const char* proc_s, p_Proc proc,
                             p_Field field, p_Length length, p_Ord ord
 #ifdef RDEBUG
@@ -172 +172 @@
   void* proc_ptr = NULL;
   char proc_name[MAX_PROCNAME_LEN];
-  sprintf(proc_name, "%s__%s_%s_%s", proc_s, 
-          p_FieldEnum_2_String(field), 
-          p_LengthEnum_2_String(length), 
+  sprintf(proc_name, "%s__%s_%s_%s", proc_s,
+          p_FieldEnum_2_String(field),
+          p_LengthEnum_2_String(length),
           p_OrdEnum_2_String(ord));
   // first, try to get the proc from the kernel
@@ -187 +187 @@
 #ifdef RDEBUG
       sprintf(proc_name, GetGeneralProcName(proc));
-#endif      
+#endif
     }
   }
@@ -200 +200 @@
   return  proc_ptr;
 }
-  
+
 
 #define DoReallySetProc(what, field, length, ord)           \
@@ -221 +221 @@
 #endif
 
-      
+
 #include "p_Procs_Set.h"
 

Singular/p_Procs_Impl.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Impl.h,v 1.5 2000-12-31 15:54:46 obachman Exp $
+ *  Version: $Id: p_Procs_Impl.h,v 1.6 2001-10-09 16:36:16 Singular Exp $
  *******************************************************************/
 #ifndef P_PROCS_IMPL_H
@@ -13 +13 @@
 
 /***************************************************************
- *  
+ *
  * Configurations
- * 
+ *
  *******************************************************************/
 
 /***************************************************************
  Here is how it works:
- At run-time, SetProcs is used to choose the appropriate PolyProcs 
+ At run-time, SetProcs is used to choose the appropriate PolyProcs
               based on the ring properies.
- At generate-time, SetProcs is used to generate all 
+ At generate-time, SetProcs is used to generate all
               possible PolyProcs.
- Which PolyProcs are generated/used can be controled by values of 
+ Which PolyProcs are generated/used can be controled by values of
  HAVE_FAST_P_PROCS, HAVE_FAST_LENGTH, HAVE_FAST_ORD, and FAST_FIELD
- 
+
  At generate-time, the file p_Procs.inc is generated,
  which provides implementations of the p_Procs, based on
@@ -32 +32 @@
  macros.
 
- At run-time, a fast proc is set/choosen if found/generated, else 
+ At run-time, a fast proc is set/choosen if found/generated, else
  a general proc is set/choosen.
  *******************************************************************/
@@ -52 +52 @@
 //   2 -- plus special cases for FieldQ
 //   nothing else is implemented, yet
-#ifndef HAVE_FAST_FIELD 
+#ifndef HAVE_FAST_FIELD
 #define HAVE_FAST_FIELD 0
 #endif
@@ -62 +62 @@
 //   3 -- special cases for length <= 4
 //   4 -- special cases for length <= 8
-#ifndef HAVE_FAST_LENGTH 
+#ifndef HAVE_FAST_LENGTH
 #define HAVE_FAST_LENGTH 0
 #endif
@@ -72 +72 @@
 //  3  -- special ords for with n_min <= 3
 //  4  -- special for all ords
-#ifndef HAVE_FAST_ORD 
+#ifndef HAVE_FAST_ORD
 #define HAVE_FAST_ORD 0
 #endif
 
 // Define HAVE_FAST_ZERO_ORD to:
-//  0 -- no zero ords are considered 
+//  0 -- no zero ords are considered
 //  1 -- only ZeroOrds for OrdPosNomogPosZero, OrdNomogPosZero, OrdPomogNegZero
 //  2 -- ZeroOrds for all
-#ifndef HAVE_FAST_ZERO_ORD 
+#ifndef HAVE_FAST_ZERO_ORD
 #define HAVE_FAST_ZERO_ORD 0
 #endif
@@ -94 +94 @@
 
 /***************************************************************
- *  
+ *
  * Definitions of our fields, lengths, ords, procs we work with
- * 
+ *
  *******************************************************************/
 
@@ -106 +106 @@
 {
   FieldGeneral = 0,
-  FieldZp,          
+  FieldZp,
   FieldQ,
   FieldR,
@@ -121 +121 @@
 {
   LengthGeneral = 0, // n >= 1
-  LengthEight,       // n == 8   
+  LengthEight,       // n == 8
   LengthSeven,
   LengthSix,
@@ -131 +131 @@
   LengthUnknown
 };
-typedef enum p_Ord  
-{                   
-  OrdGeneral = 0,   
-                    //     ordsgn   
+typedef enum p_Ord
+{
+  OrdGeneral = 0,
+                    //     ordsgn
                     //  0   1   i   n-1 n   n_min   Example
   OrdPomog,         //  +   +   +   +   +   1       (lp,C)
@@ -199 +199 @@
   {
       case FieldGeneral: return "FieldGeneral";
-      case FieldZp: return "FieldZp";          
+      case FieldZp: return "FieldZp";
       case FieldQ: return "FieldQ";
       case FieldR: return "FieldR";
@@ -218 +218 @@
   switch(length)
   {
-      case LengthGeneral: return "LengthGeneral"; 
-      case LengthEight: return "LengthEight";       
+      case LengthGeneral: return "LengthGeneral";
+      case LengthEight: return "LengthEight";
       case LengthSeven: return "LengthSeven";
       case LengthSix: return "LengthSix";
@@ -236 +236 @@
   switch(ord)
   {
-      case OrdGeneral: return "OrdGeneral";   
-      case OrdPomog: return "OrdPomog";         
-      case OrdNomog: return "OrdNomog";         
-      case OrdNegPomog: return "OrdNegPomog";      
-      case OrdPomogNeg: return "OrdPomogNeg";      
-      case OrdPosNomog: return "OrdPosNomog";      
-      case OrdNomogPos: return "OrdNomogPos";      
-      case OrdPosPosNomog: return "OrdPosPosNomog";   
-      case OrdPosNomogPos: return "OrdPosNomogPos";   
-      case OrdNegPosNomog: return "OrdNegPosNomog";   
+      case OrdGeneral: return "OrdGeneral";
+      case OrdPomog: return "OrdPomog";
+      case OrdNomog: return "OrdNomog";
+      case OrdNegPomog: return "OrdNegPomog";
+      case OrdPomogNeg: return "OrdPomogNeg";
+      case OrdPosNomog: return "OrdPosNomog";
+      case OrdNomogPos: return "OrdNomogPos";
+      case OrdPosPosNomog: return "OrdPosPosNomog";
+      case OrdPosNomogPos: return "OrdPosNomogPos";
+      case OrdNegPosNomog: return "OrdNegPosNomog";
 #ifdef HAVE_LENGTH_DIFF
-      case OrdNegPomogZero: return "OrdNegPomogZero";  
-      case OrdPomogNegZero: return "OrdPomogNegZero";  
-      case OrdPomogZero: return "OrdPomogZero";     
-      case OrdNomogZero: return "OrdNomogZero";     
-      case OrdNomogPosZero: return "OrdNomogPosZero";  
-      case OrdPosNomogZero: return "OrdPosNomogZero";  
+      case OrdNegPomogZero: return "OrdNegPomogZero";
+      case OrdPomogNegZero: return "OrdPomogNegZero";
+      case OrdPomogZero: return "OrdPomogZero";
+      case OrdNomogZero: return "OrdNomogZero";
+      case OrdNomogPosZero: return "OrdNomogPosZero";
+      case OrdPosNomogZero: return "OrdPosNomogZero";
       case OrdPosPosNomogZero: return "OrdPosPosNomogZero";
       case OrdPosNomogPosZero: return "OrdPosNomogPosZero";
@@ -304 +304 @@
       case p_Merge_q_Proc:
         return 1;
-        
+
       default:
         return 0;
@@ -318 +318 @@
       case p_Neg_Proc:
         return 0;
-        
+
       default:
         return 1;
   }
 }
-  
+
 // returns string specifying the module into which the p_Proc
 // should go
@@ -338 +338 @@
 
 /***************************************************************
- *  
- * 
+ *
+ *
  * Deal with OrdZero
- * 
+ *
  *******************************************************************/
 #ifdef HAVE_LENGTH_DIFF
@@ -365 +365 @@
         case OrdPosPosNomogZero:    return OrdPosPosNomog;
         case OrdNegPosNomogZero:    return OrdNegPosNomog;
-        default:    
+        default:
           if (strict) return OrdGeneral;
           else if (ord == OrdPomogNegZero) return OrdPomogNeg;
@@ -384 +384 @@
 
 /***************************************************************
- *  
- * Filters which are applied to field/length/ord, before a proc is 
+ *
+ * Filters which are applied to field/length/ord, before a proc is
  * choosen
- * 
+ *
  *******************************************************************/
 #ifdef p_Procs_Static
-static inline void StaticKernelFilter(p_Field &field, p_Length &length, 
+static inline void StaticKernelFilter(p_Field &field, p_Length &length,
                                       p_Ord &ord, const p_Proc proc)
 {
@@ -407 +407 @@
 {
   if (HAVE_FAST_P_PROCS >= 5) return;
-  
+
   if (HAVE_FAST_P_PROCS < 3 && field == FieldQ)
     field = FieldGeneral;
-  
+
   if ((HAVE_FAST_P_PROCS == 0) ||
       (HAVE_FAST_P_PROCS <= 4 && field != FieldZp && field != FieldQ &&
@@ -420 +420 @@
     return;
   }
-  if (HAVE_FAST_P_PROCS == 1 || 
+  if (HAVE_FAST_P_PROCS == 1 ||
       (HAVE_FAST_P_PROCS == 4 && field != FieldZp && proc != p_Merge_q_Proc))
     ord = OrdGeneral;
@@ -427 +427 @@
 static inline void FastFieldFilter(p_Field &field)
 {
-  if (HAVE_FAST_FIELD <= 0 || 
+  if (HAVE_FAST_FIELD <= 0 ||
       (HAVE_FAST_FIELD == 1 && field != FieldZp) ||
       (field != FieldZp && field != FieldQ))
     field = FieldGeneral;
 }
-      
+
 static inline void FastLengthFilter(p_Length &length)
 {
@@ -457 +457 @@
   if (IsZeroOrd(ord))
   {
-    if ((HAVE_FAST_ZERO_ORD == 1 && (ord != OrdPosNomogPosZero && 
-                                     ord != OrdNomogPosZero && 
+    if ((HAVE_FAST_ZERO_ORD == 1 && (ord != OrdPosNomogPosZero &&
+                                     ord != OrdNomogPosZero &&
                                      ord != OrdPomogNegZero)) ||
         (HAVE_FAST_ZERO_ORD <= 0))
@@ -484 +484 @@
 }
 
-static inline void pp_Mult_mm_Noether_Filter(p_Field &field, 
+static inline void pp_Mult_mm_Noether_Filter(p_Field &field,
                                              p_Length &length, p_Ord &ord)
 {
-  if (ord == OrdPomog 
+  if (ord == OrdPomog
       || ord == OrdPomogZero
-      || (ord == OrdPomogNeg && length > LengthTwo) 
+      || (ord == OrdPomogNeg && length > LengthTwo)
 #ifdef HAVE_LENGTH_DIFF
       || (ord == OrdPomogZero)
@@ -502 +502 @@
   }
 }
-      
-static inline void FastProcFilter(p_Proc proc, p_Field &field, 
+
+static inline void FastProcFilter(p_Proc proc, p_Field &field,
                                   p_Length &length, p_Ord &ord)
 {
@@ -512 +512 @@
         p_Add_q__Filter(length, ord);
         break;
-        
+
       case p_Copy_Proc:
       case p_Delete_Proc:
         NCopy__Filter(field);
         break;
-        
+
       case pp_Mult_mm_Noether_Proc:
         pp_Mult_mm_Noether_Filter(field, length, ord);
@@ -531 +531 @@
           }
           break;
-          
+
       default: break;
   }
@@ -554 +554 @@
       ord > ORD_MAX_N_3)       //  i.e. OrdNomogPosZero and below
     return 0;
-  
+
   if (length >= LengthTwo &&    // i.e. 1 or 2
       ord > ORD_MAX_N_2)        // i.e. PosNomog and below
     return 0;
 
-  if (length == LengthOne && 
+  if (length == LengthOne &&
       ord > ORD_MAX_N_1)           // i.e. PosPomogZero and below
     return 0;
@@ -569 +569 @@
 }
 
- 
+
 static inline int index(p_Length length, p_Ord ord)
 {
@@ -593 +593 @@
       case p_Neg_Proc:
         return field;
-        
+
       case p_ShallowCopyDelete_Proc:
         return length;
-        
+
       case p_Copy_Proc:
       case pp_Mult_mm_Proc:
@@ -610 +610 @@
       case p_kBucketSetLm_Proc:
         return index(field, length, ord);
-        
+
       case p_Merge_q_Proc:
         return index(length, ord);
-        
+
       default:
         assume(0);
@@ -623 +623 @@
 
 /***************************************************************
- * 
- * Macros for setting procs -- these are used for 
+ *
+ * Macros for setting procs -- these are used for
  * generation and setting
  *
@@ -639 +639 @@
 }                                                           \
 while (0)                                                   \
-  
+
 #define SetProcs(field, length, ord)                                    \
 do                                                                      \

Singular/p_Procs_Static.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Static.h,v 1.3 2000-12-20 17:18:53 obachman Exp $
+ *  Version: $Id: p_Procs_Static.h,v 1.4 2001-10-09 16:36:16 Singular Exp $
  *******************************************************************/
 
@@ -46 +46 @@
 
 // Set HAVE_FAST_ZERO_ORD to:
-//  0 -- no zero ords are considered 
+//  0 -- no zero ords are considered
 //  1 -- only ZeroOrds for OrdPosNomogPosZero, OrdNomogPosZero, OrdPomogNegZero
 //  2 -- ZeroOrds for all

Singular/p_ShallowCopyDelete__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_ShallowCopyDelete__T.cc,v 1.2 2001-08-27 14:47:29 Singular Exp $
+ *  Version: $Id: p_ShallowCopyDelete__T.cc,v 1.3 2001-10-09 16:36:17 Singular Exp $
  *******************************************************************/
 
@@ -13 +13 @@
  *
  * Destroys: p
- * Assumes:  Monoms of p are from 
- * Returns: 
+ * Assumes:  Monoms of p are from
+ * Returns:
  ***************************************************************/
 LINKAGE poly p_ShallowCopyDelete(poly s_p, const ring r, omBin d_bin)
@@ -22 +22 @@
   unsigned long* s_e;
   poly h;
-  
+
   DECLARE_LENGTH(const unsigned long length = r->ExpL_Size);
 

Singular/p_polys.h

@@ -4 +4 @@
 /***************************************************************
  *  File:    p_Polys.h
- *  Purpose: declaration of poly stuf which are independent of 
+ *  Purpose: declaration of poly stuf which are independent of
  *           currRing
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 9/00
- *  Version: $Id: p_polys.h,v 1.19 2000-12-31 15:14:40 obachman Exp $
+ *  Version: $Id: p_polys.h,v 1.20 2001-10-09 16:36:17 Singular Exp $
  *******************************************************************/
 #ifndef P_POLYS_H
@@ -24 +24 @@
           - debugging only if PDEBUG >= 2
           - normally inlined, unless PDEBUG >= 2 || NO_INLINE2
- Level 1: operations on monomials with time proportional to length 
+ Level 1: operations on monomials with time proportional to length
           - implemented in: pInline1.h
           - debugging only if PDEBUG >= 1
-          - normally inlined, unless PDEBUG >= 1 || NO_INLINE1 
+          - normally inlined, unless PDEBUG >= 1 || NO_INLINE1
  Level 0: short operations on polynomials with time proportional to
           length of poly
@@ -35 +35 @@
             #define DO_PINLINE0
             #include "pInline0.h"
- Misc   : operations on polynomials which do not fit in any of the 
+ Misc   : operations on polynomials which do not fit in any of the
           above categories
           - implemented in: polys*.cc
@@ -66 +66 @@
 PINLINE2 number p_SetCoeff(poly p, number n, ring r);
 
-// get Order 
+// get Order
 PINLINE2 Order_t p_GetOrder(poly p, ring r);
 // don't use this
@@ -92 +92 @@
 /***************************************************************
  *
- * Allocation/Initalization/Deletion 
+ * Allocation/Initalization/Deletion
  * except for pDeleteLm and pHead, all polys must be != NULL
  *
@@ -158 +158 @@
 PINLINE2 int p_Cmp(poly p1, poly p2, ring r);
 
-  
-/***************************************************************
- *
- * Divisiblity tests, args must be != NULL, except for 
+
+/***************************************************************
+ *
+ * Divisiblity tests, args must be != NULL, except for
  * pDivisbleBy
  *
@@ -169 +169 @@
 PINLINE1 BOOLEAN p_LmDivisibleByNoComp(poly a, poly b, ring r);
 unsigned long p_GetShortExpVector(poly a, ring r);
-PINLINE1 BOOLEAN p_LmShortDivisibleBy(poly a, unsigned long sev_a, 
+PINLINE1 BOOLEAN p_LmShortDivisibleBy(poly a, unsigned long sev_a,
                                       poly b, unsigned long not_sev_b, ring r);
 
@@ -183 +183 @@
  ***************************************************************/
 // test if the monomial is a constant as a vector component
-// i.e., test if all exponents are zero 
+// i.e., test if all exponents are zero
 PINLINE1 BOOLEAN p_LmIsConstantComp(const poly p, const ring r);
 PINLINE1 BOOLEAN p_LmIsConstant(const poly p, const ring r);
@@ -282 +282 @@
 // like p_Minus_mm_Mult_qq, except that if lp == pLength(lp) lq == pLength(lq)
 // then lp == pLength(p -m*q)
-PINLINE2 poly p_Minus_mm_Mult_qq(poly p, poly m, poly q, int &lp, int lq, 
+PINLINE2 poly p_Minus_mm_Mult_qq(poly p, poly m, poly q, int &lp, int lq,
                                  poly spNoether, const ring r);
 // returns p + m*q destroys p, const: q, m
@@ -288 +288 @@
 
 // returns p + m*q destroys p, const: q, m
-PINLINE2 poly p_Plus_mm_Mult_qq(poly p, poly m, poly q, int &lp, int lq, 
+PINLINE2 poly p_Plus_mm_Mult_qq(poly p, poly m, poly q, int &lp, int lq,
                                 const ring r);
 
@@ -402 +402 @@
 // check if Lm(p) is from ring r
 BOOLEAN p_LmCheckIsFromRing(poly p, ring r);
-// check if Lm(p) != NULL, r != NULL and initialized && Lm(p) is from r 
+// check if Lm(p) != NULL, r != NULL and initialized && Lm(p) is from r
 BOOLEAN p_LmCheckPolyRing(poly p, ring r);
 // check if all monoms of p are from ring r

Singular/pcv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: pcv.cc,v 1.32 2001-02-13 13:10:38 Singular Exp $ */
+/* $Id: pcv.cc,v 1.33 2001-10-09 16:36:17 Singular Exp $ */
 /*
 * ABSTRACT: conversion between polys and coef vectors
@@ -154 +154 @@
     {
       res->rtyp=INT_CMD;
-      res->data=(void*)pcvMinDeg((matrix)h->Data());      
+      res->data=(void*)pcvMinDeg((matrix)h->Data());
       return FALSE;
     }

Singular/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.77 2001-09-25 16:07:31 Singular Exp $ */
+/* $Id: polys.cc,v 1.78 2001-10-09 16:36:18 Singular Exp $ */
 
 /*
@@ -71 +71 @@
   pFDeg = new_FDeg;
   currRing->pFDeg = new_FDeg;
-  
+
   if (new_lDeg == NULL)
     new_lDeg = currRing->pLDegOrig;
@@ -80 +80 @@
 
 
-// restores pFDeg and pLDeg: 
+// restores pFDeg and pLDeg:
 extern void pRestoreDegProcs(pFDegProc old_FDeg, pLDegProc old_lDeg)
 {

Singular/pp_Mult_Coeff_mm_DivSelectMult__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pp_Mult_Coeff_mm_DivSelectMult__T.cc,v 1.2 2001-08-27 14:47:33 Singular Exp $
+ *  Version: $Id: pp_Mult_Coeff_mm_DivSelectMult__T.cc,v 1.3 2001-10-09 16:36:18 Singular Exp $
  *******************************************************************/
 
@@ -14 +14 @@
  *   Returns:  p*Coeff(m)*a/b for such monomials pm of p, for which
  *             m is divisble by pm, shorter == #of monomials left out
- *   Assumes:  m, a, b are monomials, ordering is (c, dp), 
+ *   Assumes:  m, a, b are monomials, ordering is (c, dp),
  *            (p*a) is divisble by b for all monimials in question
  *   Const:    p, m, a, b
@@ -40 +40 @@
   unsigned long* ab_e = &(ab->exp[0]);
 
-  p_MemDiff(ab_e, ((unsigned long*) &(a->exp[0])), ((unsigned long*) &(b->exp[0])), 
+  p_MemDiff(ab_e, ((unsigned long*) &(a->exp[0])), ((unsigned long*) &(b->exp[0])),
             length);
-  
+
   int Shorter = 0;
   poly q = &rp;
@@ -50 +50 @@
     p_MemCmp_Bitmask_2(m_e, &(p->exp[2]), bitmask, length_2,
                        goto Divisible, goto NotDivisible);
-    
+
     NotDivisible:
     pAssume(!p_LmDivisibleByNoComp(m, p, r));
     Shorter++;
     goto Iter;
-    
+
     Divisible:
     pAssume(p_LmDivisibleByNoComp(m, p, r));

Singular/pp_Mult_Coeff_mm_DivSelect__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pp_Mult_Coeff_mm_DivSelect__T.cc,v 1.2 2001-08-27 14:47:34 Singular Exp $
+ *  Version: $Id: pp_Mult_Coeff_mm_DivSelect__T.cc,v 1.3 2001-10-09 16:36:19 Singular Exp $
  *******************************************************************/
 
@@ -17 +17 @@
  *
  ***************************************************************/
-LINKAGE poly pp_Mult_Coeff_mm_DivSelect(poly p, const poly m, int &shorter, 
+LINKAGE poly pp_Mult_Coeff_mm_DivSelect(poly p, const poly m, int &shorter,
                                         const ring r)
 {

Singular/pp_Mult_mm_Noether__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pp_Mult_mm_Noether__T.cc,v 1.2 2001-08-27 14:47:35 Singular Exp $
+ *  Version: $Id: pp_Mult_mm_Noether__T.cc,v 1.3 2001-10-09 16:36:19 Singular Exp $
  *******************************************************************/
 
@@ -23 +23 @@
   p_LmTest(m, ri);
   assume(spNoether != NULL);
-  if (p == NULL) 
+  if (p == NULL)
   {
     ll = 0;
@@ -40 +40 @@
   pAssume1(p_GetComp(m, ri) == 0 || p_MaxComp(p, ri) == 0);
   int l = 0;
-  
+
   do
   {
@@ -48 +48 @@
 
     p_MemCmp(r->exp, spNoether_exp, length, ordsgn, goto Continue, goto Continue, goto Break);
-    
+
     Break:
     p_FreeBinAddr(r, ri);
@@ -64 +64 @@
   else
     ll = pLength(p);
-  
-  if (q != &rp) 
+
+  if (q != &rp)
     last = q;
   pNext(q) = NULL;

Singular/pp_Mult_mm__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pp_Mult_mm__T.cc,v 1.2 2001-08-27 14:47:35 Singular Exp $
+ *  Version: $Id: pp_Mult_mm__T.cc,v 1.3 2001-10-09 16:36:19 Singular Exp $
  *******************************************************************/
 
@@ -20 +20 @@
   p_Test(p, ri);
   p_LmTest(m, ri);
-  if (p == NULL) 
+  if (p == NULL)
   {
     last = NULL;

Singular/prCopy.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prCopy.cc,v 1.11 2000-12-31 15:14:43 obachman Exp $ */
+/* $Id: prCopy.cc,v 1.12 2001-10-09 16:36:19 Singular Exp $ */
 /*
 * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
@@ -16 +16 @@
 #include "sbuckets.h"
 
-static inline void 
+static inline void
 prCopyEvector(poly dest, ring dest_r, poly src, ring src_r,int max)
 {
@@ -41 +41 @@
 {
   poly res;
-  
+
   if (rField_has_simple_Alloc(currRing))
     res = pr_Copy_REqual_NSimple_NoSort(p, currRing, currRing);
@@ -92 +92 @@
   else
     res =  pr_Move_NoREqual_NoNSimple_NoSort(p, src_r, currRing);
-  pTest(res);  
-  return res;
-}
-  
+  pTest(res);
+  return res;
+}
+
 /////////////////////////////////////////////////////////////////////////
 // prHead
@@ -114 +114 @@
 {
   prCopyProc_t prproc;
-  if (rField_has_simple_Alloc(currRing)) 
+  if (rField_has_simple_Alloc(currRing))
     prproc = pr_Copy_NoREqual_NSimple_NoSort;
   else
-    prproc = pr_Copy_NoREqual_NoNSimple_NoSort;  
-  
+    prproc = pr_Copy_NoREqual_NoNSimple_NoSort;
+
   return prHeadR(p, src_r, prproc);
 }
@@ -124 +124 @@
 /////////////////////////////////////////////////////////////////////////
 // idrCopy
-static inline ideal 
+static inline ideal
 idrCopy(ideal id, ring src_r, ring dest_r, prCopyProc_t prproc)
 {
@@ -131 +131 @@
   ideal res = idInit(IDELEMS(id), id->rank);
   int i;
-  
+
   for (i=IDELEMS(id)-1; i>=0; i--)
   {
@@ -145 +145 @@
   ideal res;
   prCopyProc_t prproc;
-  if (rField_has_simple_Alloc(currRing)) 
+  if (rField_has_simple_Alloc(currRing))
     prproc = pr_Copy_REqual_NSimple_NoSort;
   else
@@ -157 +157 @@
   ideal res;
   prCopyProc_t prproc;
-  if (rField_has_simple_Alloc(currRing)) 
+  if (rField_has_simple_Alloc(currRing))
     prproc = pr_Copy_NoREqual_NSimple_Sort;
   else
@@ -164 +164 @@
   return res;
 }
-  
+
 ideal idrCopyR_NoSort(ideal id, ring src_r)
 {
   ideal res;
   prCopyProc_t prproc;
-  if (rField_has_simple_Alloc(currRing)) 
+  if (rField_has_simple_Alloc(currRing))
     prproc = pr_Copy_NoREqual_NSimple_NoSort;
   else
@@ -176 +176 @@
   return res;
 }
-  
+
 /////////////////////////////////////////////////////////////////////////
 // idrMove
-static inline ideal 
+static inline ideal
 idrMove(ideal &id, ring src_r, ring dest_r, prCopyProc_t prproc)
 {
   if (id == NULL) return NULL;
   ideal res = id;
-  
+
   int i;
   for (i=IDELEMS(id)-1; i>=0; i--)
@@ -196 +196 @@
   prCopyProc_t prproc;
   ideal res;
-  
-  if (rField_has_simple_Alloc(currRing)) 
+
+  if (rField_has_simple_Alloc(currRing))
     prproc = pr_Move_NoREqual_NSimple_Sort;
   else
@@ -204 +204 @@
   return res;
 }
-  
+
 ideal idrMoveR_NoSort(ideal &id, ring src_r)
 {
   prCopyProc_t prproc;
   ideal res;
-  
-  if (rField_has_simple_Alloc(currRing)) 
+
+  if (rField_has_simple_Alloc(currRing))
     prproc = pr_Move_NoREqual_NSimple_NoSort;
   else

Singular/prCopyMacros.h

@@ -32 +32 @@
 #undef PR_NDELETE
 #undef PR_NUMBER_SIMPLE_NAME
-#if PR_NUMBER_SIMPLE > 0 
+#if PR_NUMBER_SIMPLE > 0
 #define PR_NCOPY(n, r) n
 #define PR_NDELETE(n, r) ((void)0)

Singular/prCopyTemplate.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prCopyTemplate.cc,v 1.5 2000-12-07 15:42:30 obachman Exp $ */
+/* $Id: prCopyTemplate.cc,v 1.6 2001-10-09 16:36:20 Singular Exp $ */
 /*
 * ABSTRACT - templates for pr routines
@@ -8 +8 @@
 
 
-static poly PR_NAME 
+static poly PR_NAME
 (poly &src, ring r_src, ring r_dest)
 {
@@ -14 +14 @@
   poly dest = &dest_s;
   poly tmp;
-  PR_INIT_EVECTOR_COPY(r_src, r_dest); 
+  PR_INIT_EVECTOR_COPY(r_src, r_dest);
 
   while (src != NULL)
@@ -32 +32 @@
   return dest;
 }
-
-    

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.66 2001-05-22 13:20:00 Singular Exp $ */
+/* $Id: ring.h,v 1.67 2001-10-09 16:36:20 Singular Exp $ */
 
 /* includes */
@@ -235 +235 @@
 rOrderType_t    rGetOrderType(ring r);
 /* returns TRUE if var(i) belongs to p-block */
-BOOLEAN rIsPolyVar(int i, ring r = currRing); 
+BOOLEAN rIsPolyVar(int i, ring r = currRing);
 
 inline BOOLEAN rOrd_is_Comp_dp(ring r)
 {
   return ((r->order[0] == ringorder_c || r->order[0] == ringorder_C) &&
-          r->order[1] == ringorder_dp && 
+          r->order[1] == ringorder_dp &&
           r->order[2] == 0);
 }

Singular/run.h

@@ -23 +23 @@
 #ifdef B19
 #define CYGWIN_ATTACH_HANDLE_TO_FD(a)      cygwin32_attach_handle_to_fd      a
-#define CYGWIN_CONV_TO_FULL_POSIX_PATH(a)  cygwin32_conv_to_full_posix_path  a 
+#define CYGWIN_CONV_TO_FULL_POSIX_PATH(a)  cygwin32_conv_to_full_posix_path  a
 #define CYGWIN_CONV_TO_FULL_WIN32_PATH(a)  cygwin32_conv_to_full_win32_path  a
 #define CYGWIN_CONV_TO_POSIX_PATH(a)       cygwin32_conv_to_posix_path       a
@@ -39 +39 @@
 #else
 #define CYGWIN_ATTACH_HANDLE_TO_FD(a)      cygwin_attach_handle_to_fd      a
-#define CYGWIN_CONV_TO_FULL_POSIX_PATH(a)  cygwin_conv_to_full_posix_path  a 
+#define CYGWIN_CONV_TO_FULL_POSIX_PATH(a)  cygwin_conv_to_full_posix_path  a
 #define CYGWIN_CONV_TO_FULL_WIN32_PATH(a)  cygwin_conv_to_full_win32_path  a
 #define CYGWIN_CONV_TO_POSIX_PATH(a)       cygwin_conv_to_posix_path       a
@@ -91 +91 @@
 int fileExists(char* fullname, const char* path, const char* name);
 int endsWith(const char* s1, const char* s2);
-int fileExistsMulti(char* fullname, const char* path, 
+int fileExistsMulti(char* fullname, const char* path,
                     const char* name_noext, const char* exts[],
                     const int extcnt);

Singular/sbuckets.cc

@@ -4 +4 @@
 /***************************************************************
  *  File:    sbuckets.cc
- *  Purpose: implementation of routines for sorting polys using 
+ *  Purpose: implementation of routines for sorting polys using
  *           a bucket sort
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 9/00
- *  Version: $Id: sbuckets.cc,v 1.1 2000-12-31 15:17:47 obachman Exp $
+ *  Version: $Id: sbuckets.cc,v 1.2 2001-10-09 16:36:21 Singular Exp $
  *******************************************************************/
 #include "sbuckets.h"
@@ -56 +56 @@
   }
   while (1);
-  
+
   return j;
 }
-  
+
 //////////////////////////////////////////////////////////////////////////
 // Creation/Destruction of buckets
@@ -96 +96 @@
     assume(LOG2(length) == i);
   }
-  
+
   bucket->buckets[i].p = p;
   bucket->buckets[i].length = length;
   if (i > bucket->max_bucket) bucket->max_bucket = i;
 }
-  
+
 void sBucket_Merge_p(sBucket_pt bucket, poly p, int length)
 {
   assume(bucket != NULL);
   assume(length <= 0 || length == pLength(p));
-  
+
   if (p == NULL) return;
   if (length <= 0) length = pLength(p);
-  
+
   int i = LOG2(length);
-  
+
   while (bucket->buckets[i].p != NULL)
   {
@@ -121 +121 @@
     assume(LOG2(length) == i);
   }
-  
+
   bucket->buckets[i].p = p;
   bucket->buckets[i].length = length;
@@ -131 +131 @@
   assume(bucket != NULL);
   assume(length <= 0 || length == pLength(p));
-  
+
   if (p == NULL) return;
   if (length <= 0) length = pLength(p);
-  
+
   int i = LOG2(length);
-  
+
   while (bucket->buckets[i].p != NULL)
   {
-    p = p_Add_q(p, bucket->buckets[i].p, length, bucket->buckets[i].length, 
+    p = p_Add_q(p, bucket->buckets[i].p, length, bucket->buckets[i].length,
                 bucket->bucket_ring);
     bucket->buckets[i].p = NULL;
@@ -145 +145 @@
     i = LOG2(length);
   }
-  
+
   bucket->buckets[i].p = p;
   bucket->buckets[i].length = length;
@@ -158 +158 @@
   int  lr = 0;
   int i = 0;
-  
+
   while (bucket->buckets[i].p == NULL)
   {
@@ -170 +170 @@
   bucket->buckets[i].length = 0;
   i++;
-  
+
   while (i <= bucket->max_bucket)
   {
@@ -182 +182 @@
     i++;
   }
-  
+
   done:
   *p = pr;
@@ -196 +196 @@
   int  lr = 0;
   int i = 0;
-  
+
   while (bucket->buckets[i].p == NULL)
   {
@@ -208 +208 @@
   bucket->buckets[i].length = 0;
   i++;
-  
+
   while (i <= bucket->max_bucket)
   {
     if (bucket->buckets[i].p != NULL)
     {
-      pr = p_Add_q(pr, bucket->buckets[i].p, lr, bucket->buckets[i].length, 
+      pr = p_Add_q(pr, bucket->buckets[i].p, lr, bucket->buckets[i].length,
                    bucket->bucket_ring);
       bucket->buckets[i].p = NULL;
@@ -220 +220 @@
     i++;
   }
-  
+
   done:
   *p = pr;
@@ -236 +236 @@
   int l_in = pLength(p);
 #endif
-  
+
   if (p == NULL || pNext(p) == NULL) return p;
-  
+
   sBucket_pt bucket = sBucketCreate(r);
   poly pn = pNext(p);
-  
+
   do
   {
@@ -251 +251 @@
   }
   while (1);
-  
+
   int l_dummy;
   sBucketClearMerge(bucket, &pn, &l_dummy);
@@ -273 +273 @@
   int l_in = pLength(p);
 #endif
-  
+
   if (p == NULL || pNext(p) == NULL) return p;
-  
+
   sBucket_pt bucket = sBucketCreate(r);
   poly pn = pNext(p);
-  
+
   do
   {
@@ -288 +288 @@
   }
   while (1);
-  
+
   int l_dummy;
   sBucketClearAdd(bucket, &pn, &l_dummy);
@@ -300 +300 @@
   return pn;
 }
-
-
-
-  
-  
-

Singular/sbuckets.h

@@ -4 +4 @@
 /***************************************************************
  *  File:    sbuckets.h
- *  Purpose: declaration of routines for sorting and adding up polys using 
+ *  Purpose: declaration of routines for sorting and adding up polys using
  *           a bucket sort
  *  Note:    If you need to extract the leading momonial of a bucket,
@@ -10 +10 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 9/00
- *  Version: $Id: sbuckets.h,v 1.1 2000-12-31 15:17:47 obachman Exp $
+ *  Version: $Id: sbuckets.h,v 1.2 2001-10-09 16:36:21 Singular Exp $
  *******************************************************************/
 #ifndef S_BUCKETS_H

Singular/scanner.l

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: scanner.l,v 1.29 2000-09-18 09:19:32 obachman Exp $ */
+/* $Id: scanner.l,v 1.30 2001-10-09 16:36:21 Singular Exp $ */
 #include <stdio.h>
 #include <string.h>
@@ -47 +47 @@
 #undef malloc
 #define malloc my_malloc
-#undef realloc 
+#undef realloc
 #define realloc my_realloc
 #undef free

Singular/silink.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ***************************