Permalink
Browse files

Update starting point to latest Clojure master of March 13, 2012

Also remove patch for CLJ-860, which was applied to master recently.
  • Loading branch information...
jafingerhut committed Mar 13, 2012
1 parent 0065d27 commit 56acb615cde061be2eb7ed2d251b421e85a1311e
View
@@ -2,7 +2,7 @@
set -e
-CLOJURE_SHA="58b9d7816c5dd2bafb48aefcccd238b3f17241dc"
+CLOJURE_SHA="14428c296de483ea666bd874701046e7088e545c"
[ ! -e clojure ] && git clone http://github.com/clojure/clojure
@@ -1,38 +0,0 @@
-From e69bdcedcc820100b4ad7133a140fd85e41c522d Mon Sep 17 00:00:00 2001
-From: Hugo Duncan <hugo@hugoduncan.org>
-Date: Fri, 21 Oct 2011 14:17:37 -0400
-Subject: [PATCH] Add *enable-locals-clearing* to control locals clearing
-
-When set to false, the canBeCleared flag in LocalBinding is set to false.
----
- src/jvm/clojure/lang/Compiler.java | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
-index 3d487f1..9c5b809 100644
---- a/src/jvm/clojure/lang/Compiler.java
-+++ b/src/jvm/clojure/lang/Compiler.java
-@@ -238,6 +238,9 @@ static final public Var INSTANCE = Var.intern(Namespace.findOrCreate(Symbol.inte
-
- static final public Var ADD_ANNOTATIONS = Var.intern(Namespace.findOrCreate(Symbol.intern("clojure.core")),
- Symbol.intern("add-annotations"));
-+static final public Var ENABLE_LOCALS_CLEARING = Var.intern(Namespace.findOrCreate(Symbol.intern("clojure.core")),
-+ Symbol.intern("*enable-locals-clearing*"), Boolean.TRUE).setDynamic();
-+//boolean
-
- //collection of keys
- static final public Var ELIDE_META = Var.intern(Namespace.findOrCreate(Symbol.intern("clojure.core")),
-@@ -5449,8 +5452,8 @@ public static class LocalBinding{
- public final int idx;
- public final String name;
- public final boolean isArg;
-- public final PathNode clearPathRoot;
-- public boolean canBeCleared = true;
-+ public final PathNode clearPathRoot;
-+ public boolean canBeCleared = (Boolean)(ENABLE_LOCALS_CLEARING.deref());
- public boolean recurMistmatch = false;
-
- public LocalBinding(int num, Symbol sym, Symbol tag, Expr init, boolean isArg,PathNode clearPathRoot)
---
-1.7.9.2
-
@@ -1,37 +0,0 @@
-From f381ec95320743ed36beadee18cca3aa28dc1a3f Mon Sep 17 00:00:00 2001
-From: Hugo Duncan <hugo@hugoduncan.org>
-Date: Fri, 21 Oct 2011 14:17:37 -0400
-Subject: [PATCH] Add *enable-locals-clearing* to control locals clearing
-
-When set to false, the canBeCleared flag in LocalBinding is set to false.
----
- src/jvm/clojure/lang/Compiler.java | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
-index 55e1268..01955db 100644
---- a/src/jvm/clojure/lang/Compiler.java
-+++ b/src/jvm/clojure/lang/Compiler.java
-@@ -238,6 +238,9 @@ static final public Var INSTANCE = Var.intern(Namespace.findOrCreate(Symbol.inte
-
- static final public Var ADD_ANNOTATIONS = Var.intern(Namespace.findOrCreate(Symbol.intern("clojure.core")),
- Symbol.intern("add-annotations"));
-+static final public Var ENABLE_LOCALS_CLEARING = Var.intern(Namespace.findOrCreate(Symbol.intern("clojure.core")),
-+ Symbol.intern("*enable-locals-clearing*"), Boolean.TRUE).setDynamic();
-+//boolean
-
-
- //Integer
-@@ -5454,8 +5457,8 @@ public static class LocalBinding{
- public final int idx;
- public final String name;
- public final boolean isArg;
-- public final PathNode clearPathRoot;
-- public boolean canBeCleared = true;
-+ public final PathNode clearPathRoot;
-+ public boolean canBeCleared = (Boolean)(ENABLE_LOCALS_CLEARING.deref());
- public boolean recurMistmatch = false;
-
- public LocalBinding(int num, Symbol sym, Symbol tag, Expr init, boolean isArg,PathNode clearPathRoot)
---
-1.7.5.4
View
@@ -13,7 +13,6 @@ CLJ-881-patch-from-dimitrov.txt
CLJ-768-patch-for-after-CLJ-881-fixed.patch
CLJ-886-fix2.patch
CLJ-932-0001.patch
-add-enable-locals-clearing-updated.diff
capitalize-for-supplementary-chars-patch.txt
cl-format-efg-coerce-ratios-to-doubes-patch1.txt
clj-103-incorrect-if-let-error-patch2.txt

0 comments on commit 56acb61

Please sign in to comment.