coerce all Boolean false returns to Boolean.FALSE

richhickey · richhickey · commit 345aff14826f · 2008-01-16T18:46:02.000Z
diff --git a/clojure.iml b/clojure.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
+<module version="4" relativePaths="true" type="JAVA_MODULE">
   <component name="BuildJarSettings">
     <containerInfo>
       <containerElement type="module" name="clojure">
@@ -11,6 +11,7 @@
     <setting name="buildJar" value="true" />
     <setting name="mainClass" value="clojure.lang.Compiler" />
   </component>
+  <component name="ModuleRootManager" />
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/classes" />
     <exclude-output />
diff --git a/src/jvm/clojure/lang/Reflector.java b/src/jvm/clojure/lang/Reflector.java
@@ -325,6 +325,8 @@ static boolean isCongruent(Class[] params, Object[] args){
 static Object prepRet(Class c, Object x){
 //	if(c == boolean.class)
 //		return ((Boolean) x).booleanValue() ? RT.T : null;
+	if(x instanceof Boolean && !((Boolean) x).booleanValue())
+		return Boolean.FALSE;
 	return x;
 }
 }

Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,8 @@ static boolean isCongruent(Class[] params, Object[] args){`
`325`	`325`	`static Object prepRet(Class c, Object x){`
`326`	`326`	`// if(c == boolean.class)`
`327`	`327`	`// return ((Boolean) x).booleanValue() ? RT.T : null;`
	`328`	`+ if(x instanceof Boolean && !((Boolean) x).booleanValue())`
	`329`	`+ return Boolean.FALSE;`
`328`	`330`	`return x;`
`329`	`331`	`}`
`330`	`332`	`}`