Changeset 19b018 in git for Singular/countedref.cc

Timestamp:

Sep 7, 2012, 10:17:48 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

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

Children:

c4d8c3a681ea70bc8bd0864ac803ece0f451e619

Parents:

8357e215b04863da2f7f9897d29475d589e7c2f8

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-09-07 22:17:48+02:00

git-committer:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-09-08 00:20:23+02:00

Message:

reference and shared do not rely on their type id anymore

File:

• Singular/countedref.cc (modified) (7 diffs)

Singular/countedref.cc

@@ -26 +26 @@
 #include "ipshell.h"
 
-class CountedRefEnv {
-  typedef CountedRefEnv self;
-
-public:
-
-  static int& ref_id() {
-    static int g_ref_id = 0;
-    return g_ref_id;
-  }
-
-  static int& sh_id() {
-    static int g_sh_id = 0;
-    return g_sh_id;
-  }
-};
 
 /// Overloading ring destruction
@@ -198 +183 @@
 }
 
+/// We use the as a marker of refernce types.
+BOOLEAN countedref_CheckAssign(blackbox *b, leftv L, leftv R)
+{
+  return FALSE;
+}
+
 
 class CountedRef {
@@ -215 +206 @@
   static BOOLEAN is_ref(leftv arg) {
     int typ = arg->Typ();
-    return ((typ==CountedRefEnv::ref_id())  ||(typ==CountedRefEnv::sh_id()) );
-    //    return ((typ > MAX_TOK) &&
-    //            (getBlackboxStuff(typ)->blackbox_Init == countedref_Init));
+    return ((typ > MAX_TOK) &&
+            (getBlackboxStuff(typ)->blackbox_CheckAssign == countedref_CheckAssign));
   }
 
@@ -684 +674 @@
 {
   blackbox *bbx = (blackbox*)omAlloc0(sizeof(blackbox));
+  bbx->blackbox_CheckAssign = countedref_CheckAssign;
   bbx->blackbox_destroy = countedref_destroy;
   bbx->blackbox_String  = countedref_String;
@@ -697 +688 @@
   bbx->blackbox_deserialize = countedref_deserialize;
   bbx->data             = omAlloc0(newstruct_desc_size());
-  CountedRefEnv::ref_id()=setBlackboxStuff(bbx, "reference");
+  setBlackboxStuff(bbx, "reference");
 
   /// The @c shared type is "inherited" from @c reference.
@@ -703 +694 @@
   blackbox *bbxshared = 
     (blackbox*)memcpy(omAlloc(sizeof(blackbox)), bbx, sizeof(blackbox));
+  bbxshared->blackbox_CheckAssign = countedref_CheckAssign;
   bbxshared->blackbox_Assign  = countedref_AssignShared;
   bbxshared->blackbox_destroy = countedref_destroyShared;
@@ -709 +701 @@
   bbxshared->blackbox_Init    = countedref_InitShared;
   bbxshared->data             = omAlloc0(newstruct_desc_size());
-  CountedRefEnv::sh_id()=setBlackboxStuff(bbxshared, "shared");
+  setBlackboxStuff(bbxshared, "shared");
 }