Changeset 4f80bb in git for Singular/subexpr.cc

Timestamp:

Sep 17, 2010, 2:57:28 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dce1e3bbf2389a71a367d500df527054c5d4459f

Parents:

8e7db4cc8c23b1a45ca71f3217a02819e04d9c84

Message:

new types fan and cone, new commands for them;
normally turned off (turn on in Singular/mod2.h and kernel/mod2.h by def HAVE_FANS)

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

File:

• Singular/subexpr.cc (modified) (4 diffs)

Singular/subexpr.cc

@@ -38 +38 @@
 #include <Singular/attrib.h>
 #include <Singular/subexpr.h>
+#include <Singular/Fan.h>
+#include <Singular/Cone.h>
 
 omBin sSubexpr_bin = omGetSpecBin(sizeof(_ssubexpr));
@@ -153 +155 @@
           ::Print("%d",(int)(long)d);
           break;
+#ifdef HAVE_FANS
+       case CONE_CMD:
+       case FAN_CMD:
+          PrintNSpaces(spaces);
+          {
+            char *s = String();
+            ::PrintS(s);
+            omFree(s);
+          }
+          break;
+#endif /* HAVE_FANS */
        case PROC_CMD:
          {
@@ -490 +503 @@
         return d;
       }
+#ifdef HAVE_FANS
+    case FAN_CMD:
+      {
+        Fan* fff = (Fan*)d;
+        Fan* ggg = new Fan(*fff);
+        return ggg;
+      }
+    case CONE_CMD:
+      {
+        Cone* ccc = (Cone*)d;
+        Cone* ggg = new Cone(*ccc);
+        return ggg;
+      }
+#endif /* HAVE_FANS */
     case RESOLUTION_CMD:
       return (void*)syCopy((syStrategy)d);
@@ -776 +803 @@
           }
           return s;
-
+#ifdef HAVE_FANS
+        case FAN_CMD:
+        {
+          Fan* fff = (Fan*)d;
+          s = fff->toString();
+          char* ns = (char*) omAlloc(strlen(s) + 10);
+          sprintf(ns, "%s", s);
+          omCheckAddr(ns);
+          omFree(s);
+          return ns;
+        }
+        case CONE_CMD:
+        {
+          Cone* ccc = (Cone*)d;
+          s = ccc->toString();
+          char* ns = (char*) omAlloc(strlen(s) + 10);
+          sprintf(ns, "%s", s);
+          omCheckAddr(ns);
+          omFree(s);
+          return ns;
+        }
+#endif /* HAVE_FANS */
         case RESOLUTION_CMD:
         {