Changeset 2a2c07 in git

Timestamp:

Apr 18, 1997, 1:25:03 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d6a968ad46e91f0ffffede4a68649eea37ed52c6

Parents:

ef304d9dba21b588603cac1440c1ae1fe53a012e

Message:

Fri Apr 18 09:47:22 1997  Olaf Bachmann
<obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>

	* silink.cc (DumpAsciiIdhdl): LIB string is dumped without type
	  declaration

	* mpsr_Get.cc (InitIdentifierLeftv): used mpsr_SetCurrRing(r,
	  TRUE) so that pOne works if no ring did previously exist.

	* iparith.cc: Added jjPROC3.

Tue Apr 15 12:07:17 1997  Olaf Bachmann
<obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>

	* silink.cc (slStandardInit): changed Ascii type specifyer from
	  "ascii" to "Ascii" for consistency

	* iparith.cc : added #else branch to #ifdef HAVE_FGLM in proc table

	*  (extra.cc): system("sh",command) returns exit status of command


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• iparith.cc (modified) (4 diffs)
• mpsr_Get.cc (modified) (2 diffs)
• mpsr_GetMisc.cc (modified) (3 diffs)
• silink.cc (modified) (2 diffs)
• subexpr.cc (modified) (2 diffs)

Singular/ChangeLog

@@ +1 @@
+Fri Apr 18 09:47:22 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * silink.cc (DumpAsciiIdhdl): LIB string is dumped without type
+          declaration 
+
+        * mpsr_Get.cc (InitIdentifierLeftv): used mpsr_SetCurrRing(r,
+          TRUE) so that pOne works if no ring did previously exist.
+
+        * iparith.cc: Added jjPROC3.
+
 Tue Apr 15 12:07:17 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
 

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.21 1997-04-17 17:52:18 Singular Exp $ */
+/* $Id: iparith.cc,v 1.22 1997-04-18 11:24:55 obachman Exp $ */
 /*
 * ABSTRACT: table driven kernel interface, used by interpreter
@@ -2142 +2142 @@
 static BOOLEAN jjPROC1(leftv res, leftv u)
 {
-  leftv sl = iiMake_proc((idhdl)u->data,NULL);
+  if ((u->rtyp!=IDHDL) || (u->e!=NULL))
+    return TRUE;
+  leftv sl = iiMake_proc((idhdl) u->data,NULL);
   if (sl==NULL)
   {
@@ -3323 +3325 @@
   return FALSE;
 }
+static BOOLEAN jjPROC3(leftv res, leftv u, leftv v, leftv w)
+{
+  v->next=(leftv)Alloc(sizeof(sleftv));
+  memcpy(v->next,w,sizeof(sleftv));
+  BOOLEAN r=iiExprArith2(res,u,'(',v);
+  v->rtyp=0; v->data=NULL; 
+  w->rtyp=0; w->data=NULL;
+  return r;
+}
 static BOOLEAN jjCALL3MANY(leftv res, leftv u, leftv v, leftv w)
 {
@@ -3656 +3667 @@
 ,{jjBRACK_Ma_IV_I,  '[',        POLY_CMD,   MATRIX_CMD, INTVEC_CMD, INT_CMD }
 ,{jjBRACK_Ma_IV_IV, '[',        POLY_CMD,   MATRIX_CMD, INTVEC_CMD, INTVEC_CMD }
+,{jjPROC3,          '(',        ANY_TYPE,   PROC_CMD,   DEF_CMD,    DEF_CMD }
 ,{atATTRIB3,        ATTRIB_CMD, NONE,       IDHDL,      STRING_CMD, DEF_CMD }
 ,{jjCOEFFS3_P,      COEFFS_CMD, MATRIX_CMD, POLY_CMD,   POLY_CMD,   MATRIX_CMD }

Singular/mpsr_Get.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_Get.cc,v 1.8 1997-04-10 13:08:36 obachman Exp $ */
+/* $Id: mpsr_Get.cc,v 1.9 1997-04-18 11:24:58 obachman Exp $ */
 /***************************************************************
  *
@@ -211 +211 @@
       
       pos = mpsr_rDefault(0, name, mlv->r);
-      mpsr_SetCurrRing(mlv->r, FALSE);
+      mpsr_SetCurrRing(mlv->r, TRUE);
       p = pOne();
       p->exp[pos+1] = 1;

Singular/mpsr_GetMisc.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_GetMisc.cc,v 1.4 1997-04-02 15:07:38 Singular Exp $ */
+/* $Id: mpsr_GetMisc.cc,v 1.5 1997-04-18 11:25:00 obachman Exp $ */
 
 /***************************************************************
@@ -416 +416 @@
 idhdl mpsr_FindIdhdl(char *name, ring &r)
 {
-  idhdl h = idroot->get(name, 0), h2;
+  idhdl h = (idroot != NULL ? idroot->get(name, 0): NULL), h2;
   r = NULL;
   
@@ -430 +430 @@
     if (IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD)
     {
-      h2 = IDRING(h)->idroot->get(name, 0);
+      h2 = (IDRING(h)->idroot!=NULL ?IDRING(h)->idroot->get(name, 0) : NULL);
+      
       if (h2 != NULL)
       {

Singular/silink.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.cc,v 1.9 1997-04-15 12:48:37 obachman Exp $ */
+/* $Id: silink.cc,v 1.10 1997-04-18 11:25:01 obachman Exp $ */
 
 /*
@@ -510 +510 @@
   if (type_id == QRING_CMD) return DumpQring(fd, h, type_str);
   
+  if (type_id == STRING_CMD && strcmp("LIB", IDID(h)) == 0)
+  {
+    if (fprintf(fd, "LIB \"%s\";\n", IDSTRING(h)) == EOF) return TRUE;
+    else return FALSE;
+  }
+                                      
   // put type and name 
   if (fprintf(fd, "%s %s", type_str, IDID(h)) == EOF) return TRUE;

Singular/subexpr.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: subexpr.cc,v 1.12 1997-04-09 12:20:14 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.13 1997-04-18 11:25:03 obachman Exp $ */
 
 /*
@@ -1199 +1199 @@
   {
     int t=Typ();
-    void *d=CopyD(t);
-    data=d;
-    rtyp=t;
-    name=NULL;
-    e=NULL;
+    if (t!=PROC_CMD)
+    {
+      void *d=CopyD(t);
+      data=d;
+      rtyp=t;
+      name=NULL;
+      e=NULL;
+    }
   }
   else if (rtyp==COMMAND)