Changeset d1fbbf in git

Timestamp:

Sep 10, 2012, 11:15:38 PM (10 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

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

Children:

36ebfaa4578b6a83a5511dbbc252bdd925f2845ff768d91b15a3cda106e7c041c7889cda1828dbfe

Parents:

60da76178ec79ee6647fded520f4de44f6a84da4

Message:

Making autoloading of 'reference' and 'shared' customizable
new Added configure option
chg Explained more generic CountedRef::is_ref(leftv)

Files:

• Singular/countedref.cc (modified) (3 diffs)
• Singular/countedref.h (modified) (1 diff)
• Singular/extra.cc (modified) (2 diffs)
• Singular/tesths.cc (modified) (1 diff)
• configure.ac (modified) (1 diff)

Singular/countedref.cc

@@ -183 +183 @@
 }
 
-/// We use the as a marker of refernce types.
+/// We use the function pointer as a marker of reference types
+/// for CountedRef::is_ref(leftv), see the latter for details
 BOOLEAN countedref_CheckAssign(blackbox *b, leftv L, leftv R)
 {
@@ -204 +205 @@
 
   /// Check whether argument is already a reference type
+  /// @note We check for the function pointer @c countedref_CheckAssign here,
+  /// that we (ab-)use as a unique marker. This avoids to check a bunch of
+  /// of runtime-varying @c typ IDs for identifying reference-like types.
   static BOOLEAN is_ref(leftv arg) {
     int typ = arg->Typ();
@@ -713 +717 @@
 
 
-#ifdef HAVE_DYNAMIC_COUNTEDREF
-extern "C" { void mod_init() { countedref_init(); } }
-#endif
-

Singular/countedref.h

@@ -448 +448 @@
 void countedref_shared_load();
 
-//#define  SINGULAR_COUNTEDREF_AUTOLOAD
-
 inline void
 countedref_init()
 {
-#ifdef SINGULAR_COUNTEDREF_AUTOLOAD
   countedref_reference_load();
   countedref_shared_load();
-#endif
 }
 

Singular/extra.cc

@@ -2931 +2931 @@
        if (strcmp(sys_cmd, "shared") == 0)
        {
-       #ifndef SINGULAR_COUNTEDREF_AUTOLOAD
+       #ifndef SI_COUNTEDREF_AUTOLOAD
          void countedref_shared_load();
          countedref_shared_load();
@@ -2940 +2940 @@
        else if (strcmp(sys_cmd, "reference") == 0)
        {
-       #ifndef SINGULAR_COUNTEDREF_AUTOLOAD
+       #ifndef SI_COUNTEDREF_AUTOLOAD
          void countedref_reference_load();
          countedref_reference_load();

Singular/tesths.cc

@@ -170 +170 @@
    pyobject_setup();
 #endif
+#ifdef SI_COUNTEDREF_AUTOLOAD
   countedref_init();
+#endif
 #ifdef HAVE_FANS
   bbcone_setup();

configure.ac

@@ -132 +132 @@
 AM_CONDITIONAL(WANT_DEBUG, test x"${ENABLE_DEBUG}" == xyes)
 
+AC_ARG_ENABLE(countedref, AS_HELP_STRING([--enable-countedref], [Enable autoloading of reference counted types]),
+[if test "x$enableval" = "xyes"; then
+ENABLE_COUNTEDREF_AUTOLOAD=yes
+fi], ENABLE_COUNTEDREF_AUTOLOAD=no)
+
+if test x"${ENABLE_COUNTEDREF_AUTOLOAD}" == xyes; then
+  AC_DEFINE([SI_COUNTEDREF_AUTOLOAD],1,[Enable autoloading of reference counted types])
+  AC_SUBST(SI_COUNTEDREF_AUTOLOAD)
+fi
+
 AC_CONFIG_SUBDIRS([findexec]) 
 AC_CONFIG_SUBDIRS([omalloc])