Commit26d9f98

authored

Merge pull request#12 from kkinnear/master

Upgrade to tools.reader 1.0.5, fix broken call to read-token (Issue#11)

2 parents5fe6eeb +0168690 commit26d9f98Copy full SHA for 26d9f98

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`:dependencies [[org.clojure/clojure"1.7.0"]`
`9`	`9`	`[org.clojure/clojurescript"1.7.228"`
`10`	`10`	`:exclusions [org.apache.ant/ant]]`
`11`		`- [org.clojure/tools.reader"1.0.0-alpha3"]]`
	`11`	`+ [org.clojure/tools.reader"1.0.5"]]`
`12`	`12`	`:doo {:build"test"}`
`13`	`13`	`:profiles {:dev`
`14`	`14`	`{:plugins [[lein-cljsbuild"1.1.2"]`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`[goog.string:as gstring]`
`7`	`7`	`[rewrite-clj.node.protocols:as nd]))`
`8`	`8`
`9`		`-(defreader-errorreader-types/reader-error)`
`10`	`9`	`(defread-charreader-types/read-char)`
`11`	`10`	`(defget-column-numberreader-types/get-column-number)`
`12`	`11`	`(defget-line-numberreader-types/get-line-number)`
`@@ -179,7 +178,7 @@`
`179`	`178`
`180`	`179`	`(defnread-keyword`
`181`	`180`	`[^not-native reader initch]`
`182`		`- (let [tok (cljs.tools.reader/read-token reader (read-char reader))`
	`181`	`+ (let [tok (cljs.tools.reader/read-token reader:keyword(read-char reader))`
`183`	`182`	`a (re-matches* (re-pattern"^[:]?([^0-9/]./)?([^0-9/][^/])$") tok)`
`184`	`183`	`token (aget a0)`
`185`	`184`	`ns (aget a1)`
`@@ -188,7 +187,9 @@`
`188`	`187`	`(identical? (.ns (substring (- (.-lengthns)2) (.-lengthns)))":/"))`
`189`	`188`	`(identical? (aget name (dec (.-length name)))":")`
`190`	`189`	`(not (== (.indexOf token"::"1)-1)))`
`191`		`- (reader-error reader"Invalid token:" token)`
	`190`	`+ (cljs.tools.reader.impl.errors/reader-error reader`
	`191`	`+"Invalid token:"`
	`192`	`+ token)`
`192`	`193`	`(if (and (not (nil?ns)) (> (.-lengthns)0))`
`193`	`194`	`(keyword (.substringns0 (.indexOfns"/")) name)`
`194`	`195`	`(keyword (.substring token1))))))`

Comments

(0)