Permalink
Browse files

Cleanup in prep for cljs.

  • Loading branch information...
1 parent 5c61c5f commit 05f06986fb507ccc915235b111ad779fb2b58307 @richard-lyman committed Aug 12, 2012
View
@@ -1,10 +1,10 @@
-(defproject com.lithinos/amotoen "0.2.0-SNAPSHOT"
+(defproject com.lithinos/amotoen "0.3.0-SNAPSHOT"
:description "Amotoen is a Clojure library that supports PEG style definitions of grammars that can produce parsers."
:url "http://www.lithinos.com/amotoen"
:license {:name "EPL-v1.0" :distribution :repo :comments "same as Clojure" :url "http://www.eclipse.org/legal/epl-v10.html"}
:source-path "src"
:resource-paths ["res"]
:dependencies [[org.clojure/clojure "1.4.0"]]
:jar-name "amotoen.jar"
- :jar-exclusions [#"(markdown|minimark|project).clj" #"maven"]
+ :jar-exclusions [#"(markdown|project).clj" #"maven"]
:manifest {"Built-By" "\"Richard Lyman\" <richard.lyman@gmail.com>"})
@@ -6,8 +6,7 @@
; the terms of this license.
; You must not remove this notice, or any other, from this software.
-(ns com.lithinos.amotoen.core
- (:use [clojure.set]))
+(ns com.lithinos.amotoen.core)
; s - input string
; w - input wrapper
@@ -7,8 +7,7 @@
; You must not remove this notice, or any other, from this software.
(ns com.lithinos.amotoen.grammars.csv
- (:use [clojure.pprint])
- (:use [com.lithinos.amotoen.core]))
+ (:use [com.lithinos.amotoen.core :only [post-process wrap-string]]))
(def grammar {
:Document [:Line '(* :Line) :$]
@@ -7,14 +7,15 @@
; You must not remove this notice, or any other, from this software.
(ns com.lithinos.amotoen.grammars.json
- (:use [com.lithinos.amotoen.core]))
+ (:use [com.lithinos.amotoen.core :only [pegs lpegs]]))
(defn json-control-character [g w]
- (let [s #{ \u0000 \u0001 \u0002 \u0003 \u0004 \u0005 \u0006 \u0007 \u0008 \u0009 \u000A \u000B \u000C \u000D \u000E \u000F
- \u0010 \u0011 \u0012 \u0013 \u0014 \u0015 \u0016 \u0017 \u0018 \u0019 \u001A \u001B \u001C \u001D \u001E \u001F}]
- (if (contains? s (c w))
- (m w)
- nil)))
+ false) ; Until the error messages about 'c' are fixed...
+; (let [s #{ \u0000 \u0001 \u0002 \u0003 \u0004 \u0005 \u0006 \u0007 \u0008 \u0009 \u000A \u000B \u000C \u000D \u000E \u000F
+; \u0010 \u0011 \u0012 \u0013 \u0014 \u0015 \u0016 \u0017 \u0018 \u0019 \u001A \u001B \u001C \u001D \u001E \u001F}]
+; (if (contains? s (c w))
+; (m w)
+; nil)))
(def grammar {
:_* '(* (| \newline \return \tab \space))
@@ -7,8 +7,7 @@
; You must not remove this notice, or any other, from this software.
(ns com.lithinos.amotoen.grammars.minimark
- (:use [clojure.pprint])
- (:use [com.lithinos.amotoen.core]))
+ (:use [com.lithinos.amotoen.core :only [pegs lpegs post-process wrap-string]]))
(defn containing [s b e] [s b (list '* b) e])

0 comments on commit 05f0698

Please sign in to comment.