Changeset 200e729 in git for Singular/iparith.cc

Timestamp:

Oct 13, 2006, 2:16:37 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

e8492c0397c2e2e0772582e6787ee288d3c77a44

Parents:

39132394cccb0abb04cb64b0a4c7c37ca8c84ed8

Message:

*hannes: not used: nuMPResMat


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

File:

• Singular/iparith.cc (modified) (6 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.414 2006-10-06 14:47:45 Singular Exp $ */
+/* $Id: iparith.cc,v 1.415 2006-10-13 12:16:37 Singular Exp $ */
 
 /*
@@ -2123 +2123 @@
   return FALSE;
 }
-static BOOLEAN jjLOAD2(leftv res, leftv v, leftv w)
-{
-  return jjLOAD(res, v,(int)(long)w->Data());
+static BOOLEAN jjLOAD_E(leftv res, leftv v, leftv u)
+{
+  char * s=(char *)u->Data();
+  if(strcmp(s, "with")==0)
+    return jjLOAD(res, v, TRUE);
+  WerrorS("invalid second argument");
+  WerrorS("load(\"libname\" [,\"with\"]);");
+  return TRUE;
 }
 static BOOLEAN jjMINOR(leftv res, leftv u, leftv v)
@@ -2821 +2826 @@
 static BOOLEAN jjWRONG(leftv res, leftv u)
 {
-  return TRUE;
-}
-
-static BOOLEAN jjLOAD_E(leftv res, leftv v, leftv u)
-{
-  char * s=(char *)u->Data();
-  if(strcmp(s, "with")==0)
-    return jjLOAD(res, v, TRUE);
-  WerrorS("invalid second argument");
-  WerrorS("load(\"libname\" [,\"with\"]);");
   return TRUE;
 }
@@ -3103 +3098 @@
 ,{jjLIFTSTD,   LIFTSTD_CMD,    MODUL_CMD,      MODUL_CMD,  MATRIX_CMD ALLOW_PLURAL}
 ,{jjCALL2MANY, LIST_CMD,       LIST_CMD,       DEF_CMD,    DEF_CMD ALLOW_PLURAL}
-,{jjLOAD2,     LOAD_CMD,       NONE,           STRING_CMD, INT_CMD ALLOW_PLURAL}
+,{jjLOAD_E,    LOAD_CMD,       NONE,           STRING_CMD, STRING_CMD ALLOW_PLURAL}
 ,{jjRES,       LRES_CMD,       RESOLUTION_CMD, IDEAL_CMD,  INT_CMD NO_PLURAL}
 ,{jjMINOR,     MINOR_CMD,      IDEAL_CMD,      MATRIX_CMD, INT_CMD NO_PLURAL}
@@ -3114 +3109 @@
 ,{jjRES,       MRES_CMD,       RESOLUTION_CMD, IDEAL_CMD,  INT_CMD ALLOW_PLURAL}
 ,{jjRES,       MRES_CMD,       RESOLUTION_CMD, MODUL_CMD,  INT_CMD ALLOW_PLURAL}
+//,{nuMPResMat,  MPRES_CMD,      MODUL_CMD,      IDEAL_CMD,  INT_CMD NO_PLURAL}
 #ifdef HAVE_PLURAL
 ,{jjPlural_num_poly, NCALGEBRA_CMD,  NONE,  POLY_CMD,   POLY_CMD   NO_PLURAL}
@@ -3161 +3157 @@
 ,{jjVARSTR2,   VARSTR_CMD,     STRING_CMD,     QRING_CMD,  INT_CMD ALLOW_PLURAL}
 ,{jjWEDGE,     WEDGE_CMD,      MATRIX_CMD,     MATRIX_CMD, INT_CMD NO_PLURAL}
-,{jjLOAD_E,    LOAD_CMD,       NONE,           STRING_CMD, STRING_CMD ALLOW_PLURAL}
-,{nuMPResMat,  MPRES_CMD,      MODUL_CMD,      IDEAL_CMD,  INT_CMD NO_PLURAL}
 ,{NULL,        0,              0,              0,          0 NO_PLURAL}
 };