Browse code
Whitespace cleanup, tabs to spaces.
Jason Melbye authored on 24/12/2016 20:32:28
Showing 1 changed files
Showing 1 changed files
... | ... |
@@ -2,51 +2,51 @@ |
2 | 2 |
(defpackage yaml.emitter |
3 | 3 |
(:use :cl) |
4 | 4 |
(:import-from :cffi |
5 |
- :foreign-free |
|
6 |
- :null-pointer) |
|
5 |
+ :foreign-free |
|
6 |
+ :null-pointer) |
|
7 | 7 |
(:import-from :libyaml.emitter |
8 |
- :allocate-emitter |
|
9 |
- :emitter-initialize |
|
10 |
- :emitter-delete |
|
11 |
- :set-output |
|
12 |
- :stream-start-event-initialize |
|
13 |
- :stream-end-event-initialize |
|
14 |
- :document-start-event-initialize |
|
15 |
- :document-end-event-initialize |
|
16 |
- :scalar-event-initialize |
|
17 |
- :sequence-start-event-initialize |
|
18 |
- :sequence-end-event-initialize |
|
19 |
- :mapping-start-event-initialize |
|
20 |
- :mapping-end-event-initialize) |
|
8 |
+ :allocate-emitter |
|
9 |
+ :emitter-initialize |
|
10 |
+ :emitter-delete |
|
11 |
+ :set-output |
|
12 |
+ :stream-start-event-initialize |
|
13 |
+ :stream-end-event-initialize |
|
14 |
+ :document-start-event-initialize |
|
15 |
+ :document-end-event-initialize |
|
16 |
+ :scalar-event-initialize |
|
17 |
+ :sequence-start-event-initialize |
|
18 |
+ :sequence-end-event-initialize |
|
19 |
+ :mapping-start-event-initialize |
|
20 |
+ :mapping-end-event-initialize) |
|
21 | 21 |
(:import-from :libyaml.event |
22 |
- :allocate-event |
|
23 |
- :event-delete) |
|
22 |
+ :allocate-event |
|
23 |
+ :event-delete) |
|
24 | 24 |
(:import-from :libyaml.write-handler |
25 |
- :*write-handler-callback* |
|
26 |
- :*write-handler-stream*) |
|
25 |
+ :*write-handler-callback* |
|
26 |
+ :*write-handler-stream*) |
|
27 | 27 |
(:export ;; Original interface |
28 |
- :emit |
|
29 |
- :emit-to-string |
|
30 |
- :encode |
|
31 |
- ;; libyaml based interface |
|
32 |
- :stream-start-event |
|
33 |
- :stream-end-event |
|
34 |
- :document-start-event |
|
35 |
- :document-end-event |
|
36 |
- :scalar-event |
|
37 |
- :sequence-start-event |
|
38 |
- :sequence-end-event |
|
39 |
- :mapping-start-event |
|
40 |
- :mapping-end-event |
|
41 |
- :emit-stream |
|
42 |
- :emit-document |
|
43 |
- :emit-sequence |
|
44 |
- :emit-mapping |
|
45 |
- :emit-scalar |
|
28 |
+ :emit |
|
29 |
+ :emit-to-string |
|
30 |
+ :encode |
|
31 |
+ ;; libyaml based interface |
|
32 |
+ :stream-start-event |
|
33 |
+ :stream-end-event |
|
34 |
+ :document-start-event |
|
35 |
+ :document-end-event |
|
36 |
+ :scalar-event |
|
37 |
+ :sequence-start-event |
|
38 |
+ :sequence-end-event |
|
39 |
+ :mapping-start-event |
|
40 |
+ :mapping-end-event |
|
41 |
+ :emit-stream |
|
42 |
+ :emit-document |
|
43 |
+ :emit-sequence |
|
44 |
+ :emit-mapping |
|
45 |
+ :emit-scalar |
|
46 | 46 |
:emit-object |
47 | 47 |
:print-scalar |
48 |
- :with-emitter-to-stream |
|
49 |
- :with-emitter-to-string) |
|
48 |
+ :with-emitter-to-stream |
|
49 |
+ :with-emitter-to-string) |
|
50 | 50 |
(:documentation "The YAML emitter.")) |
51 | 51 |
(in-package :yaml.emitter) |
52 | 52 |
|
... | ... |
@@ -121,42 +121,42 @@ |
121 | 121 |
(stream-end-event-initialize event)) |
122 | 122 |
|
123 | 123 |
(defun document-start-event (event &key (version-directive (null-pointer)) |
124 |
- (tag-directive-start (null-pointer)) |
|
125 |
- (tag-directive-end (null-pointer)) |
|
126 |
- (implicit nil)) |
|
124 |
+ (tag-directive-start (null-pointer)) |
|
125 |
+ (tag-directive-end (null-pointer)) |
|
126 |
+ (implicit nil)) |
|
127 | 127 |
(document-start-event-initialize event version-directive |
128 |
- tag-directive-start |
|
129 |
- tag-directive-end |
|
130 |
- implicit)) |
|
128 |
+ tag-directive-start |
|
129 |
+ tag-directive-end |
|
130 |
+ implicit)) |
|
131 | 131 |
|
132 | 132 |
(defun document-end-event (event &key (implicit nil)) |
133 | 133 |
(document-end-event-initialize event implicit)) |
134 | 134 |
|
135 | 135 |
(defun sequence-start-event (event &key (anchor (null-pointer)) |
136 |
- (tag (null-pointer)) |
|
137 |
- (implicit nil) |
|
138 |
- (style :any-sequence-style)) |
|
136 |
+ (tag (null-pointer)) |
|
137 |
+ (implicit nil) |
|
138 |
+ (style :any-sequence-style)) |
|
139 | 139 |
(sequence-start-event-initialize event anchor tag implicit style)) |
140 | 140 |
|
141 | 141 |
(defun sequence-end-event (event) |
142 | 142 |
(sequence-end-event-initialize event)) |
143 | 143 |
|
144 | 144 |
(defun mapping-start-event (event &key (anchor (null-pointer)) |
145 |
- (tag (null-pointer)) |
|
146 |
- (implicit nil) |
|
147 |
- (style :any-mapping-style)) |
|
145 |
+ (tag (null-pointer)) |
|
146 |
+ (implicit nil) |
|
147 |
+ (style :any-mapping-style)) |
|
148 | 148 |
(mapping-start-event-initialize event anchor tag implicit style)) |
149 | 149 |
|
150 | 150 |
(defun mapping-end-event (event) |
151 | 151 |
(mapping-end-event-initialize event)) |
152 | 152 |
|
153 | 153 |
(defun scalar-event (event value length &key (anchor (null-pointer)) |
154 |
- (tag (null-pointer)) |
|
155 |
- (plain-implicit t) |
|
156 |
- (quoted-implicit t) |
|
157 |
- (style :plain-scalar-style)) |
|
154 |
+ (tag (null-pointer)) |
|
155 |
+ (plain-implicit t) |
|
156 |
+ (quoted-implicit t) |
|
157 |
+ (style :plain-scalar-style)) |
|
158 | 158 |
(scalar-event-initialize event anchor tag value length |
159 |
- plain-implicit quoted-implicit style)) |
|
159 |
+ plain-implicit quoted-implicit style)) |
|
160 | 160 |
|
161 | 161 |
;;; Emitter macros and output functions |
162 | 162 |
|
... | ... |
@@ -169,34 +169,34 @@ |
169 | 169 |
|
170 | 170 |
(defmacro with-emitter-to-stream ((emitter-var output-stream) &rest body) |
171 | 171 |
(let ((foreign-emitter (gensym "EMITTER")) |
172 |
- (foreign-event (gensym "EVENT"))) |
|
172 |
+ (foreign-event (gensym "EVENT"))) |
|
173 | 173 |
`(let* ((,foreign-emitter (allocate-emitter)) |
174 |
- (,foreign-event (allocate-event)) |
|
175 |
- (,emitter-var (cons ,foreign-emitter ,foreign-event)) |
|
176 |
- (*write-handler-stream* ,output-stream)) |
|
174 |
+ (,foreign-event (allocate-event)) |
|
175 |
+ (,emitter-var (cons ,foreign-emitter ,foreign-event)) |
|
176 |
+ (*write-handler-stream* ,output-stream)) |
|
177 | 177 |
(unwind-protect |
178 |
- (progn |
|
179 |
- (emitter-initialize ,foreign-emitter) |
|
180 |
- (set-output ,foreign-emitter *write-handler-callback* (null-pointer)) |
|
181 |
- ,@body) |
|
182 |
- (libyaml.event:event-delete ,foreign-event) |
|
183 |
- (libyaml.emitter:emitter-delete ,foreign-emitter) |
|
184 |
- (foreign-free ,foreign-event) |
|
185 |
- (foreign-free ,foreign-emitter))))) |
|
178 |
+ (progn |
|
179 |
+ (emitter-initialize ,foreign-emitter) |
|
180 |
+ (set-output ,foreign-emitter *write-handler-callback* (null-pointer)) |
|
181 |
+ ,@body) |
|
182 |
+ (libyaml.event:event-delete ,foreign-event) |
|
183 |
+ (libyaml.emitter:emitter-delete ,foreign-emitter) |
|
184 |
+ (foreign-free ,foreign-event) |
|
185 |
+ (foreign-free ,foreign-emitter))))) |
|
186 | 186 |
|
187 | 187 |
(defmacro with-emitter-to-string ((emitter-var) &rest body) |
188 | 188 |
(let ((str (gensym "STR"))) |
189 | 189 |
`(with-output-to-string (,str) |
190 | 190 |
(with-emitter-to-stream (,emitter-var ,str) |
191 |
- ,@body)))) |
|
191 |
+ ,@body)))) |
|
192 | 192 |
|
193 | 193 |
(defmacro emit-stream ((emitter &key (encoding :utf8-encoding)) &body body) |
194 | 194 |
(let ((emitter-value (gensym "EMITTER")) |
195 |
- (foreign-emitter (gensym "FOREIGN-EMITTER")) |
|
196 |
- (foreign-event (gensym "FOREIGN-EVENT"))) |
|
195 |
+ (foreign-emitter (gensym "FOREIGN-EMITTER")) |
|
196 |
+ (foreign-event (gensym "FOREIGN-EVENT"))) |
|
197 | 197 |
`(let* ((,emitter-value ,emitter) |
198 |
- (,foreign-emitter (foreign-emitter ,emitter-value)) |
|
199 |
- (,foreign-event (foreign-event ,emitter-value))) |
|
198 |
+ (,foreign-emitter (foreign-emitter ,emitter-value)) |
|
199 |
+ (,foreign-event (foreign-event ,emitter-value))) |
|
200 | 200 |
(stream-start-event ,foreign-event :encoding ,encoding) |
201 | 201 |
(libyaml.emitter:emit ,foreign-emitter ,foreign-event) |
202 | 202 |
,@body |
... | ... |
@@ -204,18 +204,18 @@ |
204 | 204 |
(libyaml.emitter:emit ,foreign-emitter ,foreign-event)))) |
205 | 205 |
|
206 | 206 |
(defmacro emit-document ((emitter &rest rest |
207 |
- &key version-directive |
|
208 |
- tag-directive-start |
|
209 |
- tag-directive-end |
|
210 |
- (implicit nil)) &body body) |
|
207 |
+ &key version-directive |
|
208 |
+ tag-directive-start |
|
209 |
+ tag-directive-end |
|
210 |
+ (implicit nil)) &body body) |
|
211 | 211 |
(declare (ignorable version-directive tag-directive-start |
212 |
- tag-directive-end implicit)) |
|
212 |
+ tag-directive-end implicit)) |
|
213 | 213 |
(let ((emitter-value (gensym "EMITTER")) |
214 |
- (foreign-emitter (gensym "FOREIGN-EMITTER")) |
|
215 |
- (foreign-event (gensym "FOREIGN-EVENT"))) |
|
214 |
+ (foreign-emitter (gensym "FOREIGN-EMITTER")) |
|
215 |
+ (foreign-event (gensym "FOREIGN-EVENT"))) |
|
216 | 216 |
`(let* ((,emitter-value ,emitter) |
217 |
- (,foreign-emitter (foreign-emitter ,emitter-value)) |
|
218 |
- (,foreign-event (foreign-event ,emitter-value))) |
|
217 |
+ (,foreign-emitter (foreign-emitter ,emitter-value)) |
|
218 |
+ (,foreign-event (foreign-event ,emitter-value))) |
|
219 | 219 |
(apply #'document-start-event ,foreign-event (list ,@rest)) |
220 | 220 |
(libyaml.emitter:emit ,foreign-emitter ,foreign-event) |
221 | 221 |
,@body |
... | ... |
@@ -223,14 +223,14 @@ |
223 | 223 |
(libyaml.emitter:emit ,foreign-emitter ,foreign-event)))) |
224 | 224 |
|
225 | 225 |
(defmacro emit-mapping ((emitter &rest rest &key anchor tag implicit style) |
226 |
- &body body) |
|
226 |
+ &body body) |
|
227 | 227 |
(declare (ignorable anchor tag implicit style)) |
228 | 228 |
(let ((emitter-value (gensym "EMITTER")) |
229 |
- (foreign-emitter (gensym "FOREIGN-EMITTER")) |
|
230 |
- (foreign-event (gensym "FOREIGN-EVENT"))) |
|
229 |
+ (foreign-emitter (gensym "FOREIGN-EMITTER")) |
|
230 |
+ (foreign-event (gensym "FOREIGN-EVENT"))) |
|
231 | 231 |
`(let* ((,emitter-value ,emitter) |
232 |
- (,foreign-emitter (foreign-emitter ,emitter-value)) |
|
233 |
- (,foreign-event (foreign-event ,emitter-value))) |
|
232 |
+ (,foreign-emitter (foreign-emitter ,emitter-value)) |
|
233 |
+ (,foreign-event (foreign-event ,emitter-value))) |
|
234 | 234 |
(apply #'mapping-start-event ,foreign-event (list ,@rest)) |
235 | 235 |
(libyaml.emitter:emit ,foreign-emitter ,foreign-event) |
236 | 236 |
,@body |
... | ... |
@@ -238,14 +238,14 @@ |
238 | 238 |
(libyaml.emitter:emit ,foreign-emitter ,foreign-event)))) |
239 | 239 |
|
240 | 240 |
(defmacro emit-sequence ((emitter &rest rest &key anchor tag implicit style) |
241 |
- &body body) |
|
241 |
+ &body body) |
|
242 | 242 |
(declare (ignorable anchor tag implicit style)) |
243 | 243 |
(let ((emitter-value (gensym "EMITTER")) |
244 |
- (foreign-emitter (gensym "FOREIGN-EMITTER")) |
|
245 |
- (foreign-event (gensym "FOREIGN-EVENT"))) |
|
244 |
+ (foreign-emitter (gensym "FOREIGN-EMITTER")) |
|
245 |
+ (foreign-event (gensym "FOREIGN-EVENT"))) |
|
246 | 246 |
`(let* ((,emitter-value ,emitter) |
247 |
- (,foreign-emitter (foreign-emitter ,emitter-value)) |
|
248 |
- (,foreign-event (foreign-event ,emitter-value))) |
|
247 |
+ (,foreign-emitter (foreign-emitter ,emitter-value)) |
|
248 |
+ (,foreign-event (foreign-event ,emitter-value))) |
|
249 | 249 |
(apply #'sequence-start-event ,foreign-event (list ,@rest)) |
250 | 250 |
(libyaml.emitter:emit ,foreign-emitter ,foreign-event) |
251 | 251 |
,@body |
... | ... |
@@ -253,13 +253,13 @@ |
253 | 253 |
(libyaml.emitter:emit ,foreign-emitter ,foreign-event)))) |
254 | 254 |
|
255 | 255 |
(defun emit-scalar (emitter value &rest rest &key anchor tag |
256 |
- plain-implicit |
|
257 |
- quoted-implicit |
|
258 |
- style) |
|
256 |
+ plain-implicit |
|
257 |
+ quoted-implicit |
|
258 |
+ style) |
|
259 | 259 |
(declare (ignorable anchor tag plain-implicit quoted-implicit style)) |
260 | 260 |
(let ((printed-value (print-scalar value))) |
261 | 261 |
(apply #'scalar-event (foreign-event emitter) |
262 |
- printed-value (length printed-value) rest) |
|
262 |
+ printed-value (length printed-value) rest) |
|
263 | 263 |
(libyaml.emitter:emit (foreign-emitter emitter) (foreign-event emitter)))) |
264 | 264 |
|
265 | 265 |
(defgeneric print-scalar (scalar) |