Scoped ids for fns

Author: galdolber

src/jvm/clojure/lang/Compiler.java

@@ -256,6 +256,8 @@ public class Compiler implements Opcodes {
 
   // DynamicClassLoader
   static final public Var LOADER = Var.create().setDynamic();
+  
+  static final public Var NEXT_ID = Var.create(new Atom(1)).setDynamic();
 
   // String
   static final public Var SOURCE = Var.intern(
@@ -323,6 +325,13 @@ public static void emitSource(String source) {
       sc.println(source);
     }
   }
+  
+  public static int nextScopedID() {
+    Atom n = (Atom) NEXT_ID.deref();
+    Integer i = (Integer) n.deref();
+    n.reset(i+1);
+    return i;
+  }
 
   public static void emitSource() {
     SourceWriter sc = (SourceWriter) SOURCE_WRITER.deref();
@@ -4336,9 +4345,9 @@ static Expr parse(C context, ISeq form, String name, Object defContext) {
       if (RT.second(form) instanceof Symbol)
         name = ((Symbol) RT.second(form)).name;
       String simpleName = name != null ? (munge(name).replace(".", "_DOT_") + (enclosingMethod != null ? "__"
-          + RT.nextID()
+          + nextScopedID()
           : ""))
-          : ("fn" + "__" + RT.nextID());
+          : ("fn" + "__" + nextScopedID());
 
       /*Fix CLJ-1330
          String basename = (enclosingMethod != null ?
@@ -4374,7 +4383,7 @@ PersistentVector.EMPTY, CONSTANT_IDS, new IdentityHashMap(),
             KEYWORDS, PersistentHashMap.EMPTY, VARS, PersistentHashMap.EMPTY,
             KEYWORD_CALLSITES, PersistentVector.EMPTY, PROTOCOL_CALLSITES,
             PersistentVector.EMPTY, VAR_CALLSITES, emptyVarCallSites(),
-            NO_RECUR, null));
+            NO_RECUR, null, Compiler.NEXT_ID, new Atom(1)));
 
         // arglist might be preceded by symbol naming this fn
         if (RT.second(form) instanceof Symbol) {
@@ -8530,7 +8539,7 @@ PersistentVector.EMPTY, CONSTANT_IDS, new IdentityHashMap(),
             KEYWORDS, PersistentHashMap.EMPTY, VARS, PersistentHashMap.EMPTY,
             KEYWORD_CALLSITES, PersistentVector.EMPTY, PROTOCOL_CALLSITES,
             PersistentVector.EMPTY, VAR_CALLSITES, emptyVarCallSites(),
-            NO_RECUR, null));
+            NO_RECUR, null, Compiler.NEXT_ID, new Atom(1)));
         if (ret.isDeftype()) {
           Var.pushThreadBindings(RT.mapUniqueKeys(METHOD, null, LOCAL_ENV,
               ret.fields, COMPILE_STUB_SYM, Symbol.intern(null, tagName),

src/jvm/clojure/lang/RT.java

@@ -1003,7 +1003,7 @@ static public void load(String scriptbase, boolean failIfNotFound) throws IOExce
          || classURL == null) {
         try {
           Var.pushThreadBindings(
-              RT.mapUniqueKeys(CURRENT_NS, CURRENT_NS.deref(),
+              RT.mapUniqueKeys(CURRENT_NS, CURRENT_NS.deref(), Compiler.NEXT_ID, new Atom(1),
                      WARN_ON_REFLECTION, WARN_ON_REFLECTION.deref()
                   ,RT.UNCHECKED_MATH, RT.UNCHECKED_MATH.deref()));
           loaded = (loadClassForName(scriptbase.replace('/', '.') + LOADER_SUFFIX) != null);