Changeset fb85f97 in git

Timestamp:

Sep 30, 2011, 11:55:04 AM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

9043345b54bd11e757c9df83bdf84b9be0bffab2

Parents:

df34cff872aba396626a72fb448bfd2e215eb54b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-30 11:55:04+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:51+01:00

Message:

FIX: rings are printed with details only via "print(r); " not via "r; "
CHG: minor cleanup

Location:

Singular

Files:

• ipprint.cc (modified) (3 diffs)
• ipprint.h (modified) (1 diff)
• subexpr.cc (modified) (1 diff)
• subexpr.h (modified) (3 diffs)

Singular/ipprint.cc

@@ -8 +8 @@
 
 #include <kernel/mod2.h>
-#include <Singular/tok.h>
-#include <Singular/ipid.h>
 #include <omalloc/omalloc.h>
+
+#include <misc/intvec.h>
+
+#include <polys/matpol.h>
+
 #include <kernel/febase.h>
 #include <kernel/polys.h>
-#include <polys/matpol.h>
-#include <Singular/subexpr.h>
-#include <misc/intvec.h>
-#include <Singular/ipshell.h>
-#include <Singular/ipprint.h>
 #include <kernel/ideals.h>
-#include <Singular/attrib.h>
+
+#include "tok.h"
+#include "ipid.h"
+#include "subexpr.h"
+#include "ipshell.h"
+#include "ipprint.h"
+#include "attrib.h"
 
 /*2
@@ -187 +191 @@
 
 /*2
+* print for: ring
+*/
+static BOOLEAN ipPrint_RING(leftv u)
+{
+  ring r=(ring)u->Data();
+  rWrite(r, TRUE);
+  return FALSE;
+}
+
+/*2
 * print for: vector
 */
@@ -252 +266 @@
       case VECTOR_CMD:
         bo=ipPrint_V(u);
+        break;
+
+      case RING_CMD:
+      case QRING_CMD:
+        bo=ipPrint_RING(u);
         break;
 

Singular/ipprint.h

@@ -10 +10 @@
 #include <kernel/structs.h>
 
+class sleftv; typedef sleftv * leftv;
+
 BOOLEAN jjPRINT(leftv res, leftv u);
 BOOLEAN jjPRINT_FORMAT(leftv res, leftv u, leftv v);
 BOOLEAN jjDBPRINT(leftv res, leftv u);
+
 #endif
 

Singular/subexpr.cc

@@ -126 +126 @@
         case RING_CMD:
         case QRING_CMD:
+        {             
           PrintNSpaces(spaces);
-          rWrite((ring)d);
+          const ring r = (const ring)d;
+          rWrite(r, currRing == r);
           break;
+        }        
         case MATRIX_CMD:
           iiWriteMatrix((matrix)d,n,2, currRing, spaces);

Singular/subexpr.h

@@ -10 +10 @@
 
 #include <string.h>
+
+#include <polys/monomials/ring.h>
+
+#include <kernel/febase.h>
+//#include <kernel/structs.h>
+
 #include <Singular/grammar.h>
 #include <Singular/tok.h>
-//#include <kernel/structs.h>
 #include <Singular/attrib.h>
-#include <kernel/febase.h>
-#include <polys/monomials/ring.h>
 
 struct _ssubexpr
@@ -31 +34 @@
 class sleftv;
 typedef sleftv * leftv;
+
+/// Class used for (list of) interpreter objects
 class sleftv
 {
@@ -57 +62 @@
     package     req_packhdl;
     inline void Init() { memset(this,0,sizeof(*this)); }
+    void CleanUp(ring r=currRing);
+   
+    /// Called by type_cmd (e.g. "r;") or as default in jPRINT
     void Print(leftv store=NULL,int spaces=0);
-    void CleanUp(ring r=currRing);
+   
+    /// Called for conversion to string (used by string(..), write(..),..)
     char * String(void *d=NULL, BOOLEAN typed = FALSE, int dim = 1);
+   
     void Copy(leftv e);
     attr CopyA();