On Fri, Feb 13, 2009 at 1:30 PM, Chouser <chou...@gmail.com> wrote:
>
> To turn on the flag you need to rebuild clojure with an
> extra option, like this:
>
> ant -Dclojure.assert-if-lazy-seq=please
>
> Any non-empty string will do for the value.
>
> You will need to set the value at runtime as well. There
> may be a way to avoid this, but I haven't thought of how.
Ok, I figured out a way. With the attached patch, all you need is the
ant command-line option shown above when compiling Clojure.
The property is checked once at compile time and stored as a constant
in the 'if' macro itself. If you've built Clojure with that property
set, all uses of 'if' will do the extra check.
--Chouser
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Clojure" group.
To post to this group, send email to clojure@googlegroups.com
To unsubscribe from this group, send email to
clojure+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/clojure?hl=en
-~----------~----~----~----~------~----~------~--~---
commit 6b44579229db019636cb3f122f87c439ae884ccf
Author: Chouser <chou...@n01se.net>
Date: Sat Feb 14 01:25:51 2009 -0500
[lazy] Add support for assert-if-lazy-seq property.
diff --git a/branches/lazy/build.xml b/branches/lazy/build.xml
index 04583ba..bc5fcc7 100644
--- a/branches/lazy/build.xml
+++ b/branches/lazy/build.xml
@@ -11,6 +11,7 @@
<property name="build" location="classes"/>
<property name="clojure_jar" location="clojure.jar"/>
<property name="slim_jar" location="clojure-slim.jar"/>
+ <property name="clojure.assert-if-lazy-seq" value=""/>
<target name="init" depends="clean">
<tstamp/>
@@ -28,6 +29,7 @@
<java classname="clojure.lang.Compile"
classpath="${build}:${cljsrc}">
<sysproperty key="clojure.compile.path" value="${build}"/>
+ <sysproperty key="clojure.assert-if-lazy-seq" value="${clojure.assert-if-lazy-seq}"/>
<arg value="clojure.core"/>
<arg value="clojure.main"/>
<arg value="clojure.set"/>
diff --git a/branches/lazy/src/clj/clojure/core.clj b/branches/lazy/src/clj/clojure/core.clj
index eb31005..c15ba4d 100644
--- a/branches/lazy/src/clj/clojure/core.clj
+++ b/branches/lazy/src/clj/clojure/core.clj
@@ -36,6 +36,10 @@
fn (fn* fn [& decl] (cons 'fn* decl)))
(def
+ #^{:macro true}
+ if (fn* if [& decl] (cons 'if* decl)))
+
+(def
#^{:arglists '([coll])
:doc "Returns the first item in the collection. Calls seq on its
argument. If coll is nil, returns nil."}
@@ -291,6 +295,20 @@
(. (var defmacro) (setMacro))
+(defmacro assert-if-lazy-seq? {:private true} []
+ (let [prop (System/getProperty "clojure.assert-if-lazy-seq")]
+ (if prop
+ (if (.isEmpty prop) nil true))))
+
+(defmacro if [tst & etc]
+ (if* (assert-if-lazy-seq?)
+ (let [tstsym 'G__0_0]
+ (list 'let [tstsym tst]
+ (list 'if* (list 'instance? clojure.lang.LazySeq tstsym)
+ (list 'throw (list 'new Exception "LazySeq used in 'if'"))
+ (cons 'if* (cons tstsym etc)))))
+ (cons 'if* (cons tst etc))))
+
(defmacro when
"Evaluates test. If logical true, evaluates body in an implicit do."
[test & body]
@@ -1642,7 +1660,7 @@
([coll]
(sort compare coll))
([#^java.util.Comparator comp coll]
- (when (and coll (not (zero? (count coll))))
+ (when (seq coll)
(let [a (to-array coll)]
(. java.util.Arrays (sort a comp))
(seq a)))))
diff --git a/branches/lazy/src/clj/clojure/core_proxy.clj b/branches/lazy/src/clj/clojure/core_proxy.clj
index 8517e23..edbc78f 100644
--- a/branches/lazy/src/clj/clojure/core_proxy.clj
+++ b/branches/lazy/src/clj/clojure/core_proxy.clj
@@ -155,7 +155,7 @@
meths (concat
(seq (. c (getDeclaredMethods)))
(seq (. c (getMethods))))]
- (if meths
+ (if (seq meths)
(let [#^java.lang.reflect.Method meth (first meths)
mods (. meth (getModifiers))
mk (method-sig meth)]
diff --git a/branches/lazy/src/jvm/clojure/lang/Compiler.java b/branches/lazy/src/jvm/clojure/lang/Compiler.java
index 664045f..b29876f 100644
--- a/branches/lazy/src/jvm/clojure/lang/Compiler.java
+++ b/branches/lazy/src/jvm/clojure/lang/Compiler.java
@@ -40,7 +40,7 @@ public class Compiler implements Opcodes{
static final Symbol DEF = Symbol.create("def");
static final Symbol LOOP = Symbol.create("loop*");
static final Symbol RECUR = Symbol.create("recur");
-static final Symbol IF = Symbol.create("if");
+static final Symbol IF = Symbol.create("if*");
static final Symbol LET = Symbol.create("let*");
static final Symbol DO = Symbol.create("do");
static final Symbol FN = Symbol.create("fn*");
