ninjudd

/**
 *   Copyright (c) Justin Balthrop and Lance Bradley. All rights reserved.
 *   The use and distribution terms for this software are covered by the
 *   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
 *   which can be found in the file epl-v10.html at the root of this distribution.
 *   By using this software in any fashion, you are agreeing to be bound by
 * 	 the terms of this license.
 *   You must not remove this notice, or any other, from this software.
 **/

ninjudd

diff --git a/src/clj/clojure/main.clj b/src/clj/clojure/main.clj
index 1af45bf..0b08840 100644
--- a/src/clj/clojure/main.clj
+++ b/src/clj/clojure/main.clj
@@ -159,7 +159,8 @@
        read, eval, or print throws an exception or error
        default: repl-caught"
   [& options]
-  (let [cl (.getContextClassLoader (Thread/currentThread))]
+  (let [cl (.getContextClassLoader (Thread/currentThread))

ninjudd

diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index be92476..6708f9d 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -568,38 +568,38 @@ public static class KeywordExpr implements Expr{
        }
 
        public Class getJavaClass() throws ClassNotFoundException{
                return Keyword.class;
        }

ninjudd

diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 44ad147..e27bd85 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -181,13 +181,13 @@ final static public Var AGENT = Var.intern(CLOJURE_NS, Symbol.create("*agent*"),
 final static public Var READEVAL = Var.intern(CLOJURE_NS, Symbol.create("*read-eval*"), T);
 final static public Var ASSERT = Var.intern(CLOJURE_NS, Symbol.create("*assert*"), T);
 final static public Var MATH_CONTEXT = Var.intern(CLOJURE_NS, Symbol.create("*math-context*"), null);
 static Keyword LINE_KEY = Keyword.intern(null, "line");
 static Keyword FILE_KEY = Keyword.intern(null, "file");

ninjudd

diff --git a/bin/cake b/bin/cake
index 09d9e9d..3f12f88 100755
--- a/bin/cake
+++ b/bin/cake
@@ -407,9 +407,14 @@ private
   end
 
   def read_until_prompt(socket)
-    while line = socket.gets
+    while ready = select([socket, $stdin])[0][0]

ninjudd

     [deps] Fetching dependencies...
Downloading: org/clojure/clojure/1.2.0/clojure-1.2.0.pom from repository central at http://repo1.maven.org/maven2
Unable to locate resource in repository
Downloading: org/clojure/clojure/1.2.0/clojure-1.2.0.pom from repository clojure at http://build.clojure.org/releases
Transferring 1K from clojure
Downloading: org/clojure/clojure/1.2.0/clojure-1.2.0.jar from repository central at http://repo1.maven.org/maven2
Unable to locate resource in repository
Downloading: org/clojure/clojure/1.2.0/clojure-1.2.0.jar from repository clojure at http://build.clojure.org/releases
Transferring 3161K from clojure
     [deps] Copying 1 file to /Users/justin/projects/test/build/lib

ninjudd

fallout:cake master$ cake deps force
     [deps] Fetching dependencies...
property not found for :foo
                            ant.clj:32 cake.ant/set-attributes!
                            ant.clj:40 cake.ant/make*
                  dependencies.clj:101 cake.tasks.dependencies/fetch
                  dependencies.clj:121 cake.tasks.dependencies/fetch-deps
                  dependencies.clj:141 cake.tasks.dependencies/eval1143$fn[fn]
                          core.clj:102 cake.core/run-task$fn[fn]
                          core.clj:101 cake.core/run-task

ninjudd

diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 9aea629..d76e82b 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -383,21 +383,21 @@ static public void load(String scriptbase) throws Exception{
 
 static public void load(String scriptbase, boolean failIfNotFound) throws Exception{
        String classfile = scriptbase + LOADER_SUFFIX + ".class";
        String cljfile = scriptbase + ".clj";
        URL classURL = baseLoader().getResource(classfile);

ninjudd

;; Don't use ScheduledThreadPoolExecutor, just loop and execute tests directly

(deftask lazytest
  "Just fire up lazy test on src and test for now"
  (bake (:use lazytest.watch) 
        (:require lazytest.runner.console
	          lazytest.report.nested) []
        (let [runner (reloading-runner ["src" "test"] lazytest.runner.console/run-tests lazytest.report.nested/report)]
          (while true          
            (runner)

ninjudd

  def test_get_some_with_validation
    100.times do |i|
      i = -i if i.odd?
      m.set(i.to_s, i)
      assert_equal i, m.get(i.to_s)
    end

    keys = (0...100).collect {|key| key.to_s}

    results = m.get_some(keys, :validation => lambda {|k,v| k.to_i == v}) do |missing_keys|