|
13 | 13 | \( :list \[ :vector \{ :map
|
14 | 14 | \} :unmatched \] :unmatched \) :unmatched
|
15 | 15 | \~ :unquote \' :quote \` :syntax-quote
|
16 |
| - \; :comment \@ :deref}) |
| 16 | + \; :comment \@ :deref \" :string}) |
17 | 17 |
|
18 | 18 | (defmulti parse-next
|
19 | 19 | "Parse the next element from the given reader. Dispatch is done using the first
|
|
74 | 74 | opening quotation mark."
|
75 | 75 | [reader]
|
76 | 76 | (ignore reader)
|
77 |
| - (loop [rx [] |
78 |
| - escape? false] |
79 |
| - (if-let [c (r/read-char reader)] |
80 |
| - (cond (and (not escape?) (= c \")) (token :token (re-pattern (apply str rx))) |
81 |
| - (= c \\) (recur (conj rx c) true) |
82 |
| - :else (recur (conj rx c) false)) |
83 |
| - (throw-reader reader "Unexpected EOF while reading regular expression.")))) |
| 77 | + (let [buf (StringBuffer.)] |
| 78 | + (loop [escape? false] |
| 79 | + (if-let [c (r/read-char reader)] |
| 80 | + (if (and (not escape?) (= c \")) |
| 81 | + (token :token (re-pattern (.toString buf))) |
| 82 | + (do |
| 83 | + (.append buf c) |
| 84 | + (recur (and (not escape?) (= c \\))))) |
| 85 | + (throw-reader reader "Unexpected EOF while reading regular expression."))))) |
84 | 86 |
|
85 | 87 | (defn- parse-reader-macro
|
86 | 88 | "Parse token starting with '#'."
|
|
107 | 109 | (r/unread reader \~)
|
108 | 110 | (parse-prefixed :unquote reader delim)))))
|
109 | 111 |
|
| 112 | +(defn- parse-string-contents |
| 113 | + "Use EDN reader to transform the literal representation of a Clojure string |
| 114 | + to its Clojure representation, e.g. \"a\\\\nb\" -> \"a\\nb\"." |
| 115 | + [s] |
| 116 | + (edn/read-string (str "\"" s "\""))) |
| 117 | + |
| 118 | +(defn- parse-string |
| 119 | + "Parse string. Produces `:token` for single-line strings and `:multi-line` for |
| 120 | + those spanning multiple lines." |
| 121 | + [reader delim] |
| 122 | + (ignore reader) |
| 123 | + (let [buf (StringBuffer.)] |
| 124 | + (loop [escape? false |
| 125 | + result-type :token |
| 126 | + results []] |
| 127 | + (if-let [c (r/read-char reader)] |
| 128 | + (cond (and (not escape?) (= c \")) (->> (conj results (.toString buf)) |
| 129 | + (map parse-string-contents) |
| 130 | + (apply token result-type)) |
| 131 | + (= c \newline) (let [s (.toString buf)] |
| 132 | + (.setLength buf 0) |
| 133 | + (recur escape? :multi-line (conj results s))) |
| 134 | + :else (do |
| 135 | + (.append buf c) |
| 136 | + (recur (and (not escape?) (= c \\)) result-type results))) |
| 137 | + (throw-reader reader "Unexpected EOF while reading regular expression."))))) |
| 138 | + |
110 | 139 | ;; ## Register Parsers
|
111 | 140 |
|
112 | 141 | (defmethod parse-next nil [reader delim]
|
|
130 | 159 | (defmethod parse-next :unquote [reader delim] (parse-unquote reader delim))
|
131 | 160 | (defmethod parse-next :quote [reader delim] (parse-prefixed :quote reader delim))
|
132 | 161 | (defmethod parse-next :syntax-quote [reader d] (parse-prefixed :syntax-quote reader d))
|
| 162 | +(defmethod parse-next :string [reader delim] (parse-string reader delim)) |
0 commit comments