Browse files

* .gitignore: move files around so core.logic works with Clojure and …

…ClojureScript. update changes file.
  • Loading branch information...
1 parent 6e8c034 commit b432b9ff50fd9f7db7de7961538c754312ff7b4a David Nolen committed Mar 30, 2012
View
1 .gitignore
@@ -1,4 +1,3 @@
-*~
.lein*
*.jar
*.org
View
9 CHANGES.md
@@ -1,3 +1,12 @@
+From 0.6.9 to 0.7.0
+====
+
+Fixes
+---
+* Fix project layout so core.logic can work in both Clojure and ClojureScript applications
+* fixed LConsSeq -pr-seq implementation
+
+
From 0.6.8 to 0.6.9
====
View
2 project.clj
@@ -1,4 +1,4 @@
-(defproject core.logic "0.6.9-SNAPSHOT"
+(defproject core.logic "0.7.0"
:description "A logic/relational programming library for Clojure"
:parent [org.clojure/pom.contrib "0.0.25"]
:source-path "src/main/clojure"
View
4 src/main/cljs/cljs/core/logic.cljs → src/main/clojure/cljs/core/logic.cljs
@@ -1,8 +1,8 @@
(ns cljs.core.logic
(:refer-clojure :exclude [==])
- (:use-macros [clj.core.logic.macros :only
+ (:use-macros [cljs.core.logic.macros :only
[defne defna defnu fresh == -inc]])
- (:require-macros [clj.core.logic.macros :as m])
+ (:require-macros [cljs.core.logic.macros :as m])
(:require [clojure.set :as set]))
(def ^{:dynamic true} *occurs-check* true)
View
2 src/main/cljs/clj/core/logic/macros.clj → src/main/clojure/cljs/core/logic/macros.clj
@@ -1,4 +1,4 @@
-(ns clj.core.logic.macros
+(ns cljs.core.logic.macros
(:refer-clojure :exclude [==])
(:require [clojure.set :as set]))
View
4 src/test/cljs/cljs/core/logic/tests.cljs
@@ -1,9 +1,9 @@
(ns cljs.core.logic.tests
(:refer-clojure :exclude [==])
(:use-macros
- [clj.core.logic.macros
+ [cljs.core.logic.macros
:only [run run* == conde conda condu fresh defne matche all]])
- (:require-macros [clj.core.logic.macros :as m]
+ (:require-macros [cljs.core.logic.macros :as m]
[clojure.tools.macro :as mu])
(:use
[cljs.core.logic

0 comments on commit b432b9f

Please sign in to comment.