Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Grimoire 0.4 update #19

Merged
merged 5 commits into from Dec 20, 2014
Merged

Grimoire 0.4 update #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d3c0ac
Fix the set! link
arrdem Sep 7, 2014
e459f4f
Use the new store path
arrdem Oct 10, 2014
d648f5d
Share @alexrobbins's fix for grimoire/#119
arrdem Oct 19, 2014
eb6748b
Use latest URL, conj.io
arrdem Dec 19, 2014
465f816
Use lib-grimoire for Grimoire's munge
arrdem Dec 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/clj-jvm/project.clj
View file
Open in desktop
Expand Up @@ -6,5 +6,6 @@
:dependencies [;;[org.clojure/clojure "1.5.1"]
[org.clojure/clojure "1.6.0"]
[org.codehaus.jsr166-mirror/jsr166y "1.7.0"]
[org.clojure/tools.reader "0.7.10"]]
[org.clojure/tools.reader "0.7.10"]
[org.clojure-grimoire/lib-grimoire "0.6.0"]]
:main generator.core)
19 changes: 7 additions & 12 deletions src/clj-jvm/src/generator/core.clj
View file
Open in desktop
Expand Up @@ -5,7 +5,8 @@
(:require [clojure.java.io :as io])
(:require [clojure.tools.reader.edn])
(:require [clojure data pprint repl set string xml zip])
(:require [clojure.core.reducers]))
(:require [clojure.core.reducers])
(:require [grimoire.util :as g.u]))

;; Andy Fingerhut
;; andy_fingerhut@alum.wustl.edu
Expand Down Expand Up @@ -996,13 +997,7 @@
s))

(defn grimoire-url-fixup [s]
(-> s
(str/replace "?" "_QMARK_")
(str/replace "." "_DOT_")
(str/replace "/" "_SLASH_")
(str/replace #"^_*" "")
(str/replace #"_*$" "")
(str "/")))
(-> s g.u/munge (str "/")))

(defn sym-to-pair [prefix sym link-dest base-url]
[(str prefix sym)
Expand All @@ -1027,8 +1022,7 @@


(def grimoire-base-url
(str "http://grimoire.arrdem.com/"
(:major *clojure-version*) "." (:minor *clojure-version*) ".0/"))
(str "http://conj.io/store/org.clojure/clojure/latest/"))

(defn symbol-url-pairs-for-whole-namespaces [link-target-site]
(apply concat
Expand Down Expand Up @@ -1136,8 +1130,8 @@
:links-to-clojuredocs
"http://clojuredocs.org/clojure_core/clojure.core/set!"
:links-to-grimoire
;(str grimoire-base-url "clojure.core/setBANG")
"http://clojure.org/java_interop#Java%20Interop-The%20Dot%20special%20form-%28set!%20%28.%20Classname-symbol%20staticFieldName-symbol%29%20expr%29"
(str grimoire-base-url "clojure.core/set!")
;"http://clojure.org/java_interop#Java%20Interop-The%20Dot%20special%20form-%28set!%20%28.%20Classname-symbol%20staticFieldName-symbol%29%20expr%29"
)]
["catch" (case link-target-site
:links-to-clojure
Expand Down Expand Up @@ -1379,6 +1373,7 @@
};
};
});
$('#search').keyup();
})
</script>
</head>
Expand Down