Updated to Java commit 4036c77 (2012.03.13): added compiler-options map, moved elide-meta to use that, added disable-locals-clearing

dmiller · dmiller · commit 37e39bfa781a · 2012-06-21T21:23:39.000-05:00
diff --git a/Clojure/Clojure.Compile/Compile.cs b/Clojure/Clojure.Compile/Compile.cs
@@ -29,7 +29,6 @@ static class Compile
         const string PATH_PROP = "CLOJURE_COMPILE_PATH";
         const string REFLECTION_WARNING_PROP = "CLOJURE_COMPILE_WARN_ON_REFLECTION";
         const string UNCHECKED_MATH_PROP = "CLOJURE_COMPILE_UNCHECKED_MATH";
-        const string ELIDE_META_PROP = "CLOJURE_ELIDE_META";
 
         static void Main(string[] args)
         {
@@ -54,15 +53,27 @@ static void Main(string[] args)
             bool warnOnReflection = warnVal == null ? false : warnVal.Equals("true");
             string mathVal = Environment.GetEnvironmentVariable(UNCHECKED_MATH_PROP);
             bool uncheckedMath = mathVal == null ? false : mathVal.Equals("true");
-            object elide = RT.readString(Environment.GetEnvironmentVariable(ELIDE_META_PROP) ?? "nil");
+
+            object compilerOptions = null;
+            foreach (DictionaryEntry kv in Environment.GetEnvironmentVariables())
+            {
+                String name = (String)kv.Key;
+                String v = (String)kv.Value;
+                if ( name.StartsWith("CLOJURE_COMPILER_") )
+                {
+                    compilerOptions = RT.assoc(compilerOptions
+                        ,RT.keyword(null,name.Substring(1+name.LastIndexOf('_')))
+                        ,RT.readString(v));
+                }
+            }
 
             try
             {
                 Var.pushThreadBindings(RT.map(
                     Compiler.CompilePathVar, path,
                     RT.WarnOnReflectionVar, warnOnReflection,
                     RT.UncheckedMathVar, uncheckedMath,
-                    Compiler.ElideMetaVar,elide
+                    Compiler.CompilerOptionsVar, compilerOptions
                     ));
 
                 Stopwatch sw = new Stopwatch();
diff --git a/Clojure/Clojure.Source/clojure/core.clj b/Clojure/Clojure.Source/clojure/core.clj
@@ -5707,8 +5707,12 @@
   coercions will be done without overflow checks. Default: false."
   {:added "1.3"})
 
-(add-doc-and-meta *elide-meta*
-  "Bind to a collection of metadata keys to elide during compilation.
+(add-doc-and-meta *compiler-options*
+  "A map of keys to options.
+  Note, when binding dynamically make sure to merge with previous value.
+  Supported options:
+  :elide-meta - a collection of metadata keys to elide during compilation.
+  :disable-locals-clearing - set to true to disable clearing, useful for using a debugger
   Alpha, subject to change."
   {:added "1.4"})
 
diff --git a/Clojure/Clojure/CljCompiler/Compiler.cs b/Clojure/Clojure/CljCompiler/Compiler.cs
@@ -88,6 +88,9 @@ public static class Compiler
         //static readonly Keyword OnKeyword = Keyword.intern(null, "on");
         internal static readonly Keyword DynamicKeyword = Keyword.intern("dynamic");
 
+        internal static readonly Keyword DisableLocalsClearingKeyword = Keyword.intern("disable-locals-clearing");
+        internal static readonly Keyword ElideMetaKeyword = Keyword.intern("elide-meta");
+ 
 
         #endregion
 
@@ -151,14 +154,17 @@ public static class Compiler
         internal static readonly Var CompilerContextVar = Var.create(null).setDynamic();
         internal static readonly Var CompilerActiveVar = Var.create(false).setDynamic();
 
+        public static readonly Var CompilerOptionsVar = Var.intern(Namespace.findOrCreate(Symbol.intern("clojure.core")),
+            Symbol.intern("*compiler-options*"), null).setDynamic();
 
-        // collection of keys
-        public static readonly Var ElideMetaVar = Var.intern(Namespace.findOrCreate(Symbol.intern("clojure.core")),
-            Symbol.intern("*elide-meta*"), null).setDynamic();
+        public static object GetCompilerOption(Keyword k)
+        {
+            return RT.get(CompilerOptionsVar.deref(), k);
+        }
 
         public static object ElideMeta(object m)
         {
-            ICollection<Object> elides = (ICollection<Object>)ElideMetaVar.get();
+            ICollection<Object> elides = (ICollection<Object>)GetCompilerOption(ElideMetaKeyword);
             if (elides != null)
             {
                 foreach (object k in elides)
