[armedbear-cvs] r12224 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Oct 25 18:29:07 2009
New Revision: 12224

Log:
Make it possible to require a double-colon package separator
 by setting *DOUBLE-COLON-PACKAGE-SEPARATORS* to non-NIL.

Modified:
   trunk/abcl/src/org/armedbear/lisp/Lisp.java
   trunk/abcl/src/org/armedbear/lisp/Symbol.java

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Sun Oct 25 18:29:07 2009
@@ -2450,6 +2450,11 @@
     Symbol.COMPILE_FILE_TRUENAME.initializeSpecial(NIL);
   }
 
+  // ### *double-colon-package-separators*
+  // internal symbol
+  public static final Symbol DOUBLE_COLON_PACKAGE_SEPARATORS =
+    internSpecial("*DOUBLE-COLON-PACKAGE-SEPARATORS*", PACKAGE_SYS, NIL);
+
   // ### *load-depth*
   // internal symbol
   public static final Symbol _LOAD_DEPTH_ =

Modified: trunk/abcl/src/org/armedbear/lisp/Symbol.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Symbol.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Symbol.java	Sun Oct 25 18:29:07 2009
@@ -580,7 +580,8 @@
           }
       }
     FastStringBuffer sb = new FastStringBuffer(packageName);
-    if (((Package)pkg).findExternalSymbol(name) != null)
+    if (((Package)pkg).findExternalSymbol(name) != null
+        && DOUBLE_COLON_PACKAGE_SEPARATORS.symbolValue(thread) == NIL)
       sb.append(':');
     else
       sb.append("::");