Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Made compatible with the 1.2 snapshot and fixed a bug in the build.

  • Loading branch information...
commit a59ff9e4bc7a4a9084559b6e2f755ca344a3adc6 1 parent 1ed0139
TomAndFrank authored
View
2  org-enclojure-commons/src/main/clojure/org/enclojure/commons/trace.clj
@@ -26,7 +26,7 @@
`(let [f# (fn ~@body)]
(defn ~name [& args#]
(if org.enclojure.commons.trace/*context*
- (let [m# ^(var ~name)]
+ (let [m# (meta (var ~name))]
(binding [org.enclojure.commons.trace/*context*
(conj org.enclojure.commons.trace/*context*
(assoc m# :ns (.getName (:ns m#))) {:args args# :body '~body})]
View
4 org-enclojure-ide/src/main/clojure/org/enclojure/ide/lexer.clj
@@ -50,8 +50,8 @@
(def publics (ns-publics 'clojure.core))
(def interns (ns-interns 'clojure.core))
(def imports (ns-imports 'clojure.core))
-(def has-args (into {} (filter #(:arglists ^(val %)) publics)))
-(def macros (into {} (filter #(:macro ^(val %)) publics)))
+(def has-args (into {} (filter #(:arglists (meta (val %))) publics)))
+(def macros (into {} (filter #(:macro (meta (val %))) publics)))
(def functions (filter #(not (contains? macros (key %))) has-args))
(defn function? [s] (contains? functions (symbol s)))
View
8 pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http//www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<properties>
- <clojure.version>1.1.0</clojure.version>
+ <clojure.version>1.2.0</clojure.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.version>RELEASE68</netbeans.version>
<brandingToken>enclojure</brandingToken>
@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.enclojure</groupId>
<artifactId>nb-enclojure-app</artifactId>
- <version>1.1.1</version>
+ <version>1.1</version>
<url>http://enclojure.org/</url>
<description>Enclojure library.</description>
<name>Enclojure Tools</name>
@@ -26,12 +26,12 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
- <version>${clojure.version}</version>
+ <version>${clojure.version}-master-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId>
- <version>${clojure.version}</version>
+ <version>${clojure.version}-SNAPSHOT</version>
</dependency>
</dependencies>
<repositories>
Please sign in to comment.
Something went wrong with that request. Please try again.