ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/JSON-XS/XS.xs
(Generate patch)

Comparing JSON-XS/XS.xs (file contents):
Revision 1.5 by root, Thu Mar 22 23:24:18 2007 UTC vs.
Revision 1.27 by root, Mon Apr 9 05:09:57 2007 UTC

3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "assert.h" 5#include "assert.h"
6#include "string.h" 6#include "string.h"
7#include "stdlib.h" 7#include "stdlib.h"
8#include "stdio.h"
8 9
10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif
13
9#define F_ASCII 0x00000001 14#define F_ASCII 0x00000001UL
10#define F_UTF8 0x00000002 15#define F_UTF8 0x00000002UL
11#define F_INDENT 0x00000004 16#define F_INDENT 0x00000004UL
12#define F_CANONICAL 0x00000008 17#define F_CANONICAL 0x00000008UL
13#define F_SPACE_BEFORE 0x00000010 18#define F_SPACE_BEFORE 0x00000010UL
14#define F_SPACE_AFTER 0x00000020 19#define F_SPACE_AFTER 0x00000020UL
15#define F_JSON_RPC 0x00000040
16#define F_ALLOW_NONREF 0x00000080 20#define F_ALLOW_NONREF 0x00000080UL
21#define F_SHRINK 0x00000100UL
22#define F_MAXDEPTH 0xf8000000UL
23#define S_MAXDEPTH 27
24
25#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
26
27// F_SELFCONVERT? <=> to_json/toJson
28// F_BLESSED? <=> { $__class__$ => }
17 29
18#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 30#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
19#define F_DEFAULT 0 31#define F_DEFAULT (9UL << S_MAXDEPTH)
20 32
21#define INIT_SIZE 32 // initial scalar size to be allocated 33#define INIT_SIZE 32 // initial scalar size to be allocated
34#define INDENT_STEP 3 // spaces per indentation level
35
36#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
37#define SHORT_STRING_LEN 512 // special-case strings of up to this size
22 38
23#define SB do { 39#define SB do {
24#define SE } while (0) 40#define SE } while (0)
25 41
26static HV *json_stash; 42static HV *json_stash; // JSON::XS::
43
44/////////////////////////////////////////////////////////////////////////////
45// utility functions
46
47static UV *
48SvJSON (SV *sv)
49{
50 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
51 croak ("object is not of type JSON::XS");
52
53 return &SvUVX (SvRV (sv));
54}
55
56static void
57shrink (SV *sv)
58{
59 sv_utf8_downgrade (sv, 1);
60 if (SvLEN (sv) > SvCUR (sv) + 1)
61 {
62#ifdef SvPV_shrink_to_cur
63 SvPV_shrink_to_cur (sv);
64#elif defined (SvPV_renew)
65 SvPV_renew (sv, SvCUR (sv) + 1);
66#endif
67 }
68}
69
70// decode an utf-8 character and return it, or (UV)-1 in
71// case of an error.
72// we special-case "safe" characters from U+80 .. U+7FF,
73// but use the very good perl function to parse anything else.
74// note that we never call this function for a ascii codepoints
75static UV
76decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
77{
78 if (s[0] > 0xdf || s[0] < 0xc2)
79 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
80 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
81 {
82 *clen = 2;
83 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
84 }
85 else
86 {
87 *clen = (STRLEN)-1;
88 return (UV)-1;
89 }
90}
91
92/////////////////////////////////////////////////////////////////////////////
93// encoder
27 94
28// structure used for encoding JSON 95// structure used for encoding JSON
29typedef struct 96typedef struct
30{ 97{
31 char *cur; 98 char *cur; // SvPVX (sv) + current output position
32 STRLEN len; // SvLEN (sv)
33 char *end; // SvEND (sv) 99 char *end; // SvEND (sv)
34 SV *sv; 100 SV *sv; // result scalar
35 UV flags; 101 U32 flags; // F_*
36 int max_recurse; 102 U32 indent; // indentation level
37 int indent; 103 U32 maxdepth; // max. indentation/recursion level
38} enc_t; 104} enc_t;
39
40// structure used for decoding JSON
41typedef struct
42{
43 char *cur;
44 char *end;
45 const char *err;
46 UV flags;
47} dec_t;
48
49static UV *
50SvJSON (SV *sv)
51{
52 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
53 croak ("object is not of type JSON::XS");
54
55 return &SvUVX (SvRV (sv));
56}
57
58/////////////////////////////////////////////////////////////////////////////
59 105
60static void 106static void
61need (enc_t *enc, STRLEN len) 107need (enc_t *enc, STRLEN len)
62{ 108{
63 if (enc->cur + len >= enc->end) 109 if (enc->cur + len >= enc->end)
64 { 110 {
65 STRLEN cur = enc->cur - SvPVX (enc->sv); 111 STRLEN cur = enc->cur - SvPVX (enc->sv);
66 SvGROW (enc->sv, cur + len + 1); 112 SvGROW (enc->sv, cur + len + 1);
67 enc->cur = SvPVX (enc->sv) + cur; 113 enc->cur = SvPVX (enc->sv) + cur;
68 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 114 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
69 } 115 }
70} 116}
71 117
72static void 118static void
73encode_ch (enc_t *enc, char ch) 119encode_ch (enc_t *enc, char ch)
85 131
86 while (str < end) 132 while (str < end)
87 { 133 {
88 unsigned char ch = *(unsigned char *)str; 134 unsigned char ch = *(unsigned char *)str;
89 135
90 if (ch == '"') 136 if (ch >= 0x20 && ch < 0x80) // most common case
91 { 137 {
138 if (ch == '"') // but with slow exceptions
139 {
92 need (enc, len += 1); 140 need (enc, len += 1);
93 *enc->cur++ = '\\'; 141 *enc->cur++ = '\\';
94 *enc->cur++ = '"'; 142 *enc->cur++ = '"';
95 ++str;
96 } 143 }
97 else if (ch == '\\') 144 else if (ch == '\\')
98 { 145 {
99 need (enc, len += 1); 146 need (enc, len += 1);
100 *enc->cur++ = '\\'; 147 *enc->cur++ = '\\';
101 *enc->cur++ = '\\'; 148 *enc->cur++ = '\\';
102 ++str;
103 } 149 }
104 else if (ch >= 0x20 && ch < 0x80) // most common case 150 else
105 {
106 *enc->cur++ = ch; 151 *enc->cur++ = ch;
107 ++str; 152
108 }
109 else if (ch == '\015')
110 {
111 need (enc, len += 1);
112 *enc->cur++ = '\\';
113 *enc->cur++ = 'r';
114 ++str;
115 }
116 else if (ch == '\012')
117 {
118 need (enc, len += 1);
119 *enc->cur++ = '\\';
120 *enc->cur++ = 'n';
121 ++str; 153 ++str;
122 } 154 }
123 else 155 else
124 { 156 {
125 STRLEN clen; 157 switch (ch)
126 UV uch;
127
128 if (is_utf8)
129 { 158 {
130 uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY); 159 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
131 if (clen == (STRLEN)-1) 160 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
132 croak ("malformed UTF-8 character in string, cannot convert to JSON"); 161 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
133 } 162 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
134 else 163 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
135 {
136 uch = ch;
137 clen = 1;
138 }
139 164
140 if (uch < 0x80 || enc->flags & F_ASCII) 165 default:
141 {
142 if (uch > 0xFFFFUL)
143 { 166 {
167 STRLEN clen;
168 UV uch;
169
170 if (is_utf8)
171 {
172 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
173 uch = decode_utf8 (str, end - str, &clen);
174 if (clen == (STRLEN)-1)
175 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
176 }
177 else
178 {
179 uch = ch;
180 clen = 1;
181 }
182
183 if (uch > 0x10FFFFUL)
184 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
185
186 if (uch < 0x80 || enc->flags & F_ASCII)
187 {
188 if (uch > 0xFFFFUL)
189 {
144 need (enc, len += 11); 190 need (enc, len += 11);
145 sprintf (enc->cur, "\\u%04x\\u%04x", 191 sprintf (enc->cur, "\\u%04x\\u%04x",
146 (uch - 0x10000) / 0x400 + 0xD800, 192 (int)((uch - 0x10000) / 0x400 + 0xD800),
147 (uch - 0x10000) % 0x400 + 0xDC00); 193 (int)((uch - 0x10000) % 0x400 + 0xDC00));
148 enc->cur += 12; 194 enc->cur += 12;
195 }
196 else
197 {
198 static char hexdigit [16] = "0123456789abcdef";
199 need (enc, len += 5);
200 *enc->cur++ = '\\';
201 *enc->cur++ = 'u';
202 *enc->cur++ = hexdigit [ uch >> 12 ];
203 *enc->cur++ = hexdigit [(uch >> 8) & 15];
204 *enc->cur++ = hexdigit [(uch >> 4) & 15];
205 *enc->cur++ = hexdigit [(uch >> 0) & 15];
206 }
207
208 str += clen;
209 }
210 else if (is_utf8)
211 {
212 need (enc, len += clen);
213 do
214 {
215 *enc->cur++ = *str++;
216 }
217 while (--clen);
218 }
219 else
220 {
221 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed
222 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
223 ++str;
224 }
149 } 225 }
150 else
151 {
152 static char hexdigit [16] = "0123456789abcdef";
153 need (enc, len += 5);
154 *enc->cur++ = '\\';
155 *enc->cur++ = 'u';
156 *enc->cur++ = hexdigit [ uch >> 12 ];
157 *enc->cur++ = hexdigit [(uch >> 8) & 15];
158 *enc->cur++ = hexdigit [(uch >> 4) & 15];
159 *enc->cur++ = hexdigit [(uch >> 0) & 15];
160 }
161
162 str += clen;
163 }
164 else if (is_utf8)
165 {
166 need (enc, len += clen);
167 do
168 {
169 *enc->cur++ = *str++;
170 }
171 while (--clen);
172 }
173 else
174 {
175 need (enc, 10); // never more than 11 bytes needed
176 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
177 ++str;
178 } 226 }
179 } 227 }
180 228
181 --len; 229 --len;
182 } 230 }
183} 231}
184 232
185#define INDENT SB \ 233static void
234encode_indent (enc_t *enc)
235{
186 if (enc->flags & F_INDENT) \ 236 if (enc->flags & F_INDENT)
187 { \ 237 {
188 int i_; \ 238 int spaces = enc->indent * INDENT_STEP;
189 need (enc, enc->indent); \
190 for (i_ = enc->indent * 3; i_--; )\
191 encode_ch (enc, ' '); \
192 } \
193 SE
194 239
195#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE 240 need (enc, spaces);
196#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE 241 memset (enc->cur, ' ', spaces);
197#define COMMA SB \ 242 enc->cur += spaces;
243 }
244}
245
246static void
247encode_space (enc_t *enc)
248{
249 need (enc, 1);
198 encode_ch (enc, ','); \ 250 encode_ch (enc, ' ');
251}
252
253static void
254encode_nl (enc_t *enc)
255{
199 if (enc->flags & F_INDENT) \ 256 if (enc->flags & F_INDENT)
200 NL; \ 257 {
258 need (enc, 1);
259 encode_ch (enc, '\n');
260 }
261}
262
263static void
264encode_comma (enc_t *enc)
265{
266 encode_ch (enc, ',');
267
268 if (enc->flags & F_INDENT)
269 encode_nl (enc);
201 else if (enc->flags & F_SPACE_AFTER) \ 270 else if (enc->flags & F_SPACE_AFTER)
202 SPACE; \ 271 encode_space (enc);
203 SE 272}
204 273
205static void encode_sv (enc_t *enc, SV *sv); 274static void encode_sv (enc_t *enc, SV *sv);
206 275
207static void 276static void
208encode_av (enc_t *enc, AV *av) 277encode_av (enc_t *enc, AV *av)
209{ 278{
210 int i, len = av_len (av); 279 int i, len = av_len (av);
211 280
212 encode_ch (enc, '['); NL; 281 if (enc->indent >= enc->maxdepth)
282 croak ("data structure too deep (hit recursion limit)");
283
284 encode_ch (enc, '['); encode_nl (enc);
213 ++enc->indent; 285 ++enc->indent;
214 286
215 for (i = 0; i <= len; ++i) 287 for (i = 0; i <= len; ++i)
216 { 288 {
217 INDENT; 289 encode_indent (enc);
218 encode_sv (enc, *av_fetch (av, i, 0)); 290 encode_sv (enc, *av_fetch (av, i, 0));
219 291
220 if (i < len) 292 if (i < len)
221 COMMA; 293 encode_comma (enc);
222 } 294 }
223 295
224 NL; 296 encode_nl (enc);
225 297
226 --enc->indent; 298 --enc->indent;
227 INDENT; encode_ch (enc, ']'); 299 encode_indent (enc); encode_ch (enc, ']');
228} 300}
229 301
230static void 302static void
231encode_he (enc_t *enc, HE *he) 303encode_he (enc_t *enc, HE *he)
232{ 304{
246 else 318 else
247 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 319 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
248 320
249 encode_ch (enc, '"'); 321 encode_ch (enc, '"');
250 322
251 if (enc->flags & F_SPACE_BEFORE) SPACE; 323 if (enc->flags & F_SPACE_BEFORE) encode_space (enc);
252 encode_ch (enc, ':'); 324 encode_ch (enc, ':');
253 if (enc->flags & F_SPACE_AFTER ) SPACE; 325 if (enc->flags & F_SPACE_AFTER ) encode_space (enc);
254 encode_sv (enc, HeVAL (he)); 326 encode_sv (enc, HeVAL (he));
255} 327}
256 328
257// compare hash entries, used when all keys are bytestrings 329// compare hash entries, used when all keys are bytestrings
258static int 330static int
264 HE *b = *(HE **)b_; 336 HE *b = *(HE **)b_;
265 337
266 STRLEN la = HeKLEN (a); 338 STRLEN la = HeKLEN (a);
267 STRLEN lb = HeKLEN (b); 339 STRLEN lb = HeKLEN (b);
268 340
269 if (!(cmp == memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 341 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))
270 cmp = la < lb ? -1 : la == lb ? 0 : 1; 342 cmp = la - lb;
271 343
272 return cmp; 344 return cmp;
273} 345}
274 346
275// compare hash entries, used when some keys are sv's or utf-x 347// compare hash entries, used when some keys are sv's or utf-x
282static void 354static void
283encode_hv (enc_t *enc, HV *hv) 355encode_hv (enc_t *enc, HV *hv)
284{ 356{
285 int count, i; 357 int count, i;
286 358
359 if (enc->indent >= enc->maxdepth)
360 croak ("data structure too deep (hit recursion limit)");
361
287 encode_ch (enc, '{'); NL; ++enc->indent; 362 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
288 363
289 if ((count = hv_iterinit (hv))) 364 if ((count = hv_iterinit (hv)))
290 { 365 {
291 // for canonical output we have to sort by keys first 366 // for canonical output we have to sort by keys first
292 // actually, this is mostly due to the stupid so-called 367 // actually, this is mostly due to the stupid so-called
293 // security workaround added somewhere in 5.8.x. 368 // security workaround added somewhere in 5.8.x.
294 // that randomises hash orderings 369 // that randomises hash orderings
295 if (enc->flags & F_CANONICAL) 370 if (enc->flags & F_CANONICAL)
296 { 371 {
297 HE *he, *hes [count]; 372 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
298 int fast = 1; 373 int fast = 1;
299 374
300 i = 0; 375 i = 0;
301 while ((he = hv_iternext (hv))) 376 while ((he = hv_iternext (hv)))
302 { 377 {
309 384
310 if (fast) 385 if (fast)
311 qsort (hes, count, sizeof (HE *), he_cmp_fast); 386 qsort (hes, count, sizeof (HE *), he_cmp_fast);
312 else 387 else
313 { 388 {
314 // hack to disable "use bytes" 389 // hack to forcefully disable "use bytes"
315 COP *oldcop = PL_curcop, cop; 390 COP cop = *PL_curcop;
316 cop.op_private = 0; 391 cop.op_private = 0;
392
393 ENTER;
394 SAVETMPS;
395
396 SAVEVPTR (PL_curcop);
317 PL_curcop = &cop; 397 PL_curcop = &cop;
318 398
319 SAVETMPS;
320 qsort (hes, count, sizeof (HE *), he_cmp_slow); 399 qsort (hes, count, sizeof (HE *), he_cmp_slow);
400
321 FREETMPS; 401 FREETMPS;
322 402 LEAVE;
323 PL_curcop = oldcop;
324 } 403 }
325 404
326 for (i = 0; i < count; ++i) 405 for (i = 0; i < count; ++i)
327 { 406 {
328 INDENT; 407 encode_indent (enc);
329 encode_he (enc, hes [i]); 408 encode_he (enc, hes [i]);
330 409
331 if (i < count - 1) 410 if (i < count - 1)
332 COMMA; 411 encode_comma (enc);
333 } 412 }
334 413
335 NL; 414 encode_nl (enc);
336 } 415 }
337 else 416 else
338 { 417 {
339 SV *sv;
340 HE *he = hv_iternext (hv); 418 HE *he = hv_iternext (hv);
341 419
342 for (;;) 420 for (;;)
343 { 421 {
344 INDENT; 422 encode_indent (enc);
345 encode_he (enc, he); 423 encode_he (enc, he);
346 424
347 if (!(he = hv_iternext (hv))) 425 if (!(he = hv_iternext (hv)))
348 break; 426 break;
349 427
350 COMMA; 428 encode_comma (enc);
351 } 429 }
352 430
353 NL; 431 encode_nl (enc);
354 } 432 }
355 } 433 }
356 434
357 --enc->indent; INDENT; encode_ch (enc, '}'); 435 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
436}
437
438// encode objects, arrays and special \0=false and \1=true values.
439static void
440encode_rv (enc_t *enc, SV *sv)
441{
442 svtype svt;
443
444 SvGETMAGIC (sv);
445 svt = SvTYPE (sv);
446
447 if (svt == SVt_PVHV)
448 encode_hv (enc, (HV *)sv);
449 else if (svt == SVt_PVAV)
450 encode_av (enc, (AV *)sv);
451 else if (svt < SVt_PVAV)
452 {
453 if (SvNIOK (sv) && SvIV (sv) == 0)
454 encode_str (enc, "false", 5, 0);
455 else if (SvNIOK (sv) && SvIV (sv) == 1)
456 encode_str (enc, "true", 4, 0);
457 else
458 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
459 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
460 }
461 else
462 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
463 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
358} 464}
359 465
360static void 466static void
361encode_sv (enc_t *enc, SV *sv) 467encode_sv (enc_t *enc, SV *sv)
362{ 468{
383 SvIsUV(sv) 489 SvIsUV(sv)
384 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 490 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))
385 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 491 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));
386 } 492 }
387 else if (SvROK (sv)) 493 else if (SvROK (sv))
388 { 494 encode_rv (enc, SvRV (sv));
389 if (!--enc->max_recurse)
390 croak ("data structure too deep (hit recursion limit)");
391
392 sv = SvRV (sv);
393
394 switch (SvTYPE (sv))
395 {
396 case SVt_PVAV: encode_av (enc, (AV *)sv); break;
397 case SVt_PVHV: encode_hv (enc, (HV *)sv); break;
398
399 default:
400 croak ("JSON can only represent references to arrays or hashes");
401 }
402 }
403 else if (!SvOK (sv)) 495 else if (!SvOK (sv))
404 encode_str (enc, "null", 4, 0); 496 encode_str (enc, "null", 4, 0);
405 else 497 else
406 croak ("encountered perl type that JSON cannot handle"); 498 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
499 SvPV_nolen (sv), SvFLAGS (sv));
407} 500}
408 501
409static SV * 502static SV *
410encode_json (SV *scalar, UV flags) 503encode_json (SV *scalar, U32 flags)
411{ 504{
505 enc_t enc;
506
412 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 507 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
413 croak ("hash- or arraref required (not a simple scalar, use allow_nonref to allow this)"); 508 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
414 509
415 enc_t enc;
416 enc.flags = flags; 510 enc.flags = flags;
417 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 511 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
418 enc.cur = SvPVX (enc.sv); 512 enc.cur = SvPVX (enc.sv);
419 enc.end = SvEND (enc.sv); 513 enc.end = SvEND (enc.sv);
420 enc.max_recurse = 0;
421 enc.indent = 0; 514 enc.indent = 0;
515 enc.maxdepth = DEC_DEPTH (flags);
422 516
423 SvPOK_only (enc.sv); 517 SvPOK_only (enc.sv);
424 encode_sv (&enc, scalar); 518 encode_sv (&enc, scalar);
425 519
426 if (!(flags & (F_ASCII | F_UTF8))) 520 if (!(flags & (F_ASCII | F_UTF8)))
427 SvUTF8_on (enc.sv); 521 SvUTF8_on (enc.sv);
428 522
429 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 523 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
524 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
525
526 if (enc.flags & F_SHRINK)
527 shrink (enc.sv);
528
430 return enc.sv; 529 return enc.sv;
431} 530}
432 531
433///////////////////////////////////////////////////////////////////////////// 532/////////////////////////////////////////////////////////////////////////////
533// decoder
434 534
435#define WS \ 535// structure used for decoding JSON
536typedef struct
537{
538 char *cur; // current parser pointer
539 char *end; // end of input string
540 const char *err; // parse error, if != 0
541 U32 flags; // F_*
542 U32 depth; // recursion depth
543 U32 maxdepth; // recursion depth limit
544} dec_t;
545
546static void
547decode_ws (dec_t *dec)
548{
436 for (;;) \ 549 for (;;)
437 { \ 550 {
438 char ch = *dec->cur; \ 551 char ch = *dec->cur;
552
439 if (ch > 0x20 \ 553 if (ch > 0x20
440 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \ 554 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
441 break; \ 555 break;
556
442 ++dec->cur; \ 557 ++dec->cur;
443 } 558 }
559}
444 560
445#define ERR(reason) SB dec->err = reason; goto fail; SE 561#define ERR(reason) SB dec->err = reason; goto fail; SE
562
446#define EXPECT_CH(ch) SB \ 563#define EXPECT_CH(ch) SB \
447 if (*dec->cur != ch) \ 564 if (*dec->cur != ch) \
448 ERR (# ch " expected"); \ 565 ERR (# ch " expected"); \
449 ++dec->cur; \ 566 ++dec->cur; \
450 SE 567 SE
451 568
569#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
570#define DEC_DEC_DEPTH --dec->depth
571
452static SV *decode_sv (dec_t *dec); 572static SV *decode_sv (dec_t *dec);
453 573
454static signed char decode_hexdigit[256]; 574static signed char decode_hexdigit[256];
455 575
456static UV 576static UV
457decode_4hex (dec_t *dec) 577decode_4hex (dec_t *dec)
458{ 578{
459 signed char d1, d2, d3, d4; 579 signed char d1, d2, d3, d4;
580 unsigned char *cur = (unsigned char *)dec->cur;
460 581
461 d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]];
462 if (d1 < 0) ERR ("four hexadecimal digits expected"); 582 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");
463 d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]];
464 if (d2 < 0) ERR ("four hexadecimal digits expected"); 583 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");
465 d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]];
466 if (d3 < 0) ERR ("four hexadecimal digits expected"); 584 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");
467 d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]];
468 if (d4 < 0) ERR ("four hexadecimal digits expected"); 585 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");
469 586
470 dec->cur += 4; 587 dec->cur += 4;
471 588
472 return ((UV)d1) << 12 589 return ((UV)d1) << 12
473 | ((UV)d2) << 8 590 | ((UV)d2) << 8
476 593
477fail: 594fail:
478 return (UV)-1; 595 return (UV)-1;
479} 596}
480 597
481#define APPEND_GROW(n) SB \
482 if (cur + (n) >= end) \
483 { \
484 STRLEN ofs = cur - SvPVX (sv); \
485 SvGROW (sv, ofs + (n) + 1); \
486 cur = SvPVX (sv) + ofs; \
487 end = SvEND (sv); \
488 } \
489 SE
490
491#define APPEND_CH(ch) SB \
492 APPEND_GROW (1); \
493 *cur++ = (ch); \
494 SE
495
496static SV * 598static SV *
497decode_str (dec_t *dec) 599decode_str (dec_t *dec)
498{ 600{
499 SV *sv = NEWSV (0,2); 601 SV *sv = 0;
500 int utf8 = 0; 602 int utf8 = 0;
501 char *cur = SvPVX (sv);
502 char *end = SvEND (sv);
503 603
504 for (;;) 604 do
505 { 605 {
506 unsigned char ch = *(unsigned char *)dec->cur; 606 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN];
607 char *cur = buf;
507 608
508 if (ch == '"') 609 do
509 break;
510 else if (ch == '\\')
511 { 610 {
512 switch (*++dec->cur) 611 unsigned char ch = *(unsigned char *)dec->cur++;
612
613 if (ch == '"')
513 { 614 {
514 case '\\': 615 --dec->cur;
515 case '/': 616 break;
516 case '"': APPEND_CH (*dec->cur++); break; 617 }
517 618 else if (ch == '\\')
518 case 'b': APPEND_CH ('\010'); ++dec->cur; break; 619 {
519 case 't': APPEND_CH ('\011'); ++dec->cur; break; 620 switch (*dec->cur)
520 case 'n': APPEND_CH ('\012'); ++dec->cur; break;
521 case 'f': APPEND_CH ('\014'); ++dec->cur; break;
522 case 'r': APPEND_CH ('\015'); ++dec->cur; break;
523
524 case 'u':
525 { 621 {
526 UV lo, hi; 622 case '\\':
527 ++dec->cur; 623 case '/':
624 case '"': *cur++ = *dec->cur++; break;
528 625
529 hi = decode_4hex (dec); 626 case 'b': ++dec->cur; *cur++ = '\010'; break;
530 if (hi == (UV)-1) 627 case 't': ++dec->cur; *cur++ = '\011'; break;
531 goto fail; 628 case 'n': ++dec->cur; *cur++ = '\012'; break;
629 case 'f': ++dec->cur; *cur++ = '\014'; break;
630 case 'r': ++dec->cur; *cur++ = '\015'; break;
532 631
533 // possibly a surrogate pair 632 case 'u':
534 if (hi >= 0xd800 && hi < 0xdc00)
535 { 633 {
536 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 634 UV lo, hi;
537 ERR ("missing low surrogate character in surrogate pair");
538
539 dec->cur += 2; 635 ++dec->cur;
540 636
541 lo = decode_4hex (dec); 637 hi = decode_4hex (dec);
542 if (lo == (UV)-1) 638 if (hi == (UV)-1)
543 goto fail; 639 goto fail;
544 640
641 // possibly a surrogate pair
642 if (hi >= 0xd800)
643 if (hi < 0xdc00)
644 {
645 if (dec->cur [0] != '\\' || dec->cur [1] != 'u')
646 ERR ("missing low surrogate character in surrogate pair");
647
648 dec->cur += 2;
649
650 lo = decode_4hex (dec);
651 if (lo == (UV)-1)
652 goto fail;
653
545 if (lo < 0xdc00 || lo >= 0xe000) 654 if (lo < 0xdc00 || lo >= 0xe000)
546 ERR ("surrogate pair expected"); 655 ERR ("surrogate pair expected");
547 656
548 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; 657 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
658 }
659 else if (hi < 0xe000)
660 ERR ("missing high surrogate character in surrogate pair");
661
662 if (hi >= 0x80)
663 {
664 utf8 = 1;
665
666 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
667 }
668 else
669 *cur++ = hi;
549 } 670 }
550 else if (hi >= 0xdc00 && hi < 0xe000)
551 ERR ("missing high surrogate character in surrogate pair");
552
553 if (hi >= 0x80)
554 { 671 break;
555 utf8 = 1;
556 672
557 APPEND_GROW (4); // at most 4 bytes for 21 bits
558 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
559 }
560 else 673 default:
561 APPEND_CH (hi); 674 --dec->cur;
675 ERR ("illegal backslash escape sequence in string");
562 } 676 }
563 break; 677 }
678 else if (ch >= 0x20 && ch <= 0x7f)
679 *cur++ = ch;
680 else if (ch >= 0x80)
681 {
682 STRLEN clen;
683 UV uch;
564 684
565 default:
566 --dec->cur; 685 --dec->cur;
567 ERR ("illegal backslash escape sequence in string"); 686
687 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
688 if (clen == (STRLEN)-1)
689 ERR ("malformed UTF-8 character in JSON string");
690
691 do
692 *cur++ = *dec->cur++;
693 while (--clen);
694
695 utf8 = 1;
696 }
697 else
698 {
699 --dec->cur;
700
701 if (!ch)
702 ERR ("unexpected end of string while parsing JSON string");
703 else
704 ERR ("invalid character encountered while parsing JSON string");
568 } 705 }
569 } 706 }
570 else if (ch >= 0x20 && ch <= 0x7f) 707 while (cur < buf + SHORT_STRING_LEN);
571 APPEND_CH (*dec->cur++); 708
572 else if (ch >= 0x80)
573 { 709 {
574 STRLEN clen; 710 STRLEN len = cur - buf;
575 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
576 if (clen == (STRLEN)-1)
577 ERR ("malformed UTF-8 character in string, cannot convert to JSON");
578 711
579 APPEND_GROW (clen); 712 if (sv)
580 do
581 { 713 {
582 *cur++ = *dec->cur++; 714 SvGROW (sv, SvCUR (sv) + len + 1);
715 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
716 SvCUR_set (sv, SvCUR (sv) + len);
583 } 717 }
584 while (--clen);
585
586 utf8 = 1;
587 }
588 else if (dec->cur == dec->end)
589 ERR ("unexpected end of string while parsing json string");
590 else 718 else
591 ERR ("invalid character encountered"); 719 sv = newSVpvn (buf, len);
592 } 720 }
721 }
722 while (*dec->cur != '"');
593 723
594 ++dec->cur; 724 ++dec->cur;
595 725
596 SvCUR_set (sv, cur - SvPVX (sv)); 726 if (sv)
597 727 {
598 SvPOK_only (sv); 728 SvPOK_only (sv);
599 *SvEND (sv) = 0; 729 *SvEND (sv) = 0;
600 730
601 if (utf8) 731 if (utf8)
602 SvUTF8_on (sv); 732 SvUTF8_on (sv);
733 }
734 else
735 sv = newSVpvn ("", 0);
603 736
604 return sv; 737 return sv;
605 738
606fail: 739fail:
607 SvREFCNT_dec (sv);
608 return 0; 740 return 0;
609} 741}
610 742
611static SV * 743static SV *
612decode_num (dec_t *dec) 744decode_num (dec_t *dec)
693static SV * 825static SV *
694decode_av (dec_t *dec) 826decode_av (dec_t *dec)
695{ 827{
696 AV *av = newAV (); 828 AV *av = newAV ();
697 829
698 WS; 830 DEC_INC_DEPTH;
831 decode_ws (dec);
832
699 if (*dec->cur == ']') 833 if (*dec->cur == ']')
700 ++dec->cur; 834 ++dec->cur;
701 else 835 else
702 for (;;) 836 for (;;)
703 { 837 {
707 if (!value) 841 if (!value)
708 goto fail; 842 goto fail;
709 843
710 av_push (av, value); 844 av_push (av, value);
711 845
712 WS; 846 decode_ws (dec);
713 847
714 if (*dec->cur == ']') 848 if (*dec->cur == ']')
715 { 849 {
716 ++dec->cur; 850 ++dec->cur;
717 break; 851 break;
721 ERR (", or ] expected while parsing array"); 855 ERR (", or ] expected while parsing array");
722 856
723 ++dec->cur; 857 ++dec->cur;
724 } 858 }
725 859
860 DEC_DEC_DEPTH;
726 return newRV_noinc ((SV *)av); 861 return newRV_noinc ((SV *)av);
727 862
728fail: 863fail:
729 SvREFCNT_dec (av); 864 SvREFCNT_dec (av);
865 DEC_DEC_DEPTH;
730 return 0; 866 return 0;
731} 867}
732 868
733static SV * 869static SV *
734decode_hv (dec_t *dec) 870decode_hv (dec_t *dec)
735{ 871{
736 HV *hv = newHV (); 872 HV *hv = newHV ();
737 873
738 WS; 874 DEC_INC_DEPTH;
875 decode_ws (dec);
876
739 if (*dec->cur == '}') 877 if (*dec->cur == '}')
740 ++dec->cur; 878 ++dec->cur;
741 else 879 else
742 for (;;) 880 for (;;)
743 { 881 {
744 SV *key, *value; 882 SV *key, *value;
745 883
746 WS; EXPECT_CH ('"'); 884 decode_ws (dec); EXPECT_CH ('"');
747 885
748 key = decode_str (dec); 886 key = decode_str (dec);
749 if (!key) 887 if (!key)
750 goto fail; 888 goto fail;
751 889
752 WS; EXPECT_CH (':'); 890 decode_ws (dec); EXPECT_CH (':');
753 891
754 value = decode_sv (dec); 892 value = decode_sv (dec);
755 if (!value) 893 if (!value)
756 { 894 {
757 SvREFCNT_dec (key); 895 SvREFCNT_dec (key);
758 goto fail; 896 goto fail;
759 } 897 }
760 898
761 //TODO: optimise
762 hv_store_ent (hv, key, value, 0); 899 hv_store_ent (hv, key, value, 0);
900 SvREFCNT_dec (key);
763 901
764 WS; 902 decode_ws (dec);
765 903
766 if (*dec->cur == '}') 904 if (*dec->cur == '}')
767 { 905 {
768 ++dec->cur; 906 ++dec->cur;
769 break; 907 break;
773 ERR (", or } expected while parsing object/hash"); 911 ERR (", or } expected while parsing object/hash");
774 912
775 ++dec->cur; 913 ++dec->cur;
776 } 914 }
777 915
916 DEC_DEC_DEPTH;
778 return newRV_noinc ((SV *)hv); 917 return newRV_noinc ((SV *)hv);
779 918
780fail: 919fail:
781 SvREFCNT_dec (hv); 920 SvREFCNT_dec (hv);
921 DEC_DEC_DEPTH;
782 return 0; 922 return 0;
783} 923}
784 924
785static SV * 925static SV *
786decode_sv (dec_t *dec) 926decode_sv (dec_t *dec)
787{ 927{
788 WS; 928 decode_ws (dec);
789 switch (*dec->cur) 929 switch (*dec->cur)
790 { 930 {
791 case '"': ++dec->cur; return decode_str (dec); 931 case '"': ++dec->cur; return decode_str (dec);
792 case '[': ++dec->cur; return decode_av (dec); 932 case '[': ++dec->cur; return decode_av (dec);
793 case '{': ++dec->cur; return decode_hv (dec); 933 case '{': ++dec->cur; return decode_hv (dec);
829 ERR ("'null' expected"); 969 ERR ("'null' expected");
830 970
831 break; 971 break;
832 972
833 default: 973 default:
834 ERR ("malformed json string"); 974 ERR ("malformed JSON string, neither array, object, number, string or atom");
835 break; 975 break;
836 } 976 }
837 977
838fail: 978fail:
839 return 0; 979 return 0;
840} 980}
841 981
842static SV * 982static SV *
843decode_json (SV *string, UV flags) 983decode_json (SV *string, U32 flags)
844{ 984{
985 dec_t dec;
845 SV *sv; 986 SV *sv;
987
988 SvUPGRADE (string, SVt_PV);
846 989
847 if (flags & F_UTF8) 990 if (flags & F_UTF8)
848 sv_utf8_downgrade (string, 0); 991 sv_utf8_downgrade (string, 0);
849 else 992 else
850 sv_utf8_upgrade (string); 993 sv_utf8_upgrade (string);
851 994
852 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 995 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
853 996
854 dec_t dec;
855 dec.flags = flags; 997 dec.flags = flags;
856 dec.cur = SvPVX (string); 998 dec.cur = SvPVX (string);
857 dec.end = SvEND (string); 999 dec.end = SvEND (string);
858 dec.err = 0; 1000 dec.err = 0;
1001 dec.depth = 0;
1002 dec.maxdepth = DEC_DEPTH (dec.flags);
859 1003
1004 *dec.end = 0; // this should basically be a nop, too, but make sure its there
860 sv = decode_sv (&dec); 1005 sv = decode_sv (&dec);
861 1006
862 if (!sv) 1007 if (!sv)
863 { 1008 {
1009 IV offset = dec.flags & F_UTF8
1010 ? dec.cur - SvPVX (string)
864 IV offset = utf8_distance (dec.cur, SvPVX (string)); 1011 : utf8_distance (dec.cur, SvPVX (string));
865 SV *uni = sv_newmortal (); 1012 SV *uni = sv_newmortal ();
1013
866 // horrible hack to silence warning inside pv_uni_display 1014 // horrible hack to silence warning inside pv_uni_display
867 COP cop; 1015 COP cop = *PL_curcop;
868 memset (&cop, 0, sizeof (cop));
869 cop.cop_warnings = pWARN_NONE; 1016 cop.cop_warnings = pWARN_NONE;
1017 ENTER;
870 SAVEVPTR (PL_curcop); 1018 SAVEVPTR (PL_curcop);
871 PL_curcop = &cop; 1019 PL_curcop = &cop;
872
873 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1020 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1021 LEAVE;
1022
874 croak ("%s, at character offset %d (%s)", 1023 croak ("%s, at character offset %d [\"%s\"]",
875 dec.err, 1024 dec.err,
876 (int)offset, 1025 (int)offset,
877 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1026 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
878 } 1027 }
879 1028
880 sv = sv_2mortal (sv); 1029 sv = sv_2mortal (sv);
881 1030
882 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1031 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))
883 croak ("JSON object or array expected (but number, string, true, false or null found, use allow_nonref to allow this)"); 1032 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
884 1033
885 return sv; 1034 return sv;
886} 1035}
887 1036
1037/////////////////////////////////////////////////////////////////////////////
1038// XS interface functions
1039
888MODULE = JSON::XS PACKAGE = JSON::XS 1040MODULE = JSON::XS PACKAGE = JSON::XS
889 1041
890BOOT: 1042BOOT:
891{ 1043{
892 int i; 1044 int i;
893 1045
894 memset (decode_hexdigit, 0xff, 256); 1046 memset (decode_hexdigit, 0xff, 256);
1047
895 for (i = 10; i--; ) 1048 for (i = 0; i < 256; ++i)
896 decode_hexdigit ['0' + i] = i; 1049 decode_hexdigit [i] =
897 1050 i >= '0' && i <= '9' ? i - '0'
898 for (i = 7; i--; ) 1051 : i >= 'a' && i <= 'f' ? i - 'a' + 10
899 { 1052 : i >= 'A' && i <= 'F' ? i - 'A' + 10
900 decode_hexdigit ['a' + i] = 10 + i; 1053 : -1;
901 decode_hexdigit ['A' + i] = 10 + i;
902 }
903 1054
904 json_stash = gv_stashpv ("JSON::XS", 1); 1055 json_stash = gv_stashpv ("JSON::XS", 1);
905} 1056}
906 1057
907PROTOTYPES: DISABLE 1058PROTOTYPES: DISABLE
910 CODE: 1061 CODE:
911 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1062 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);
912 OUTPUT: 1063 OUTPUT:
913 RETVAL 1064 RETVAL
914 1065
915SV *ascii (SV *self, int enable) 1066SV *ascii (SV *self, int enable = 1)
916 ALIAS: 1067 ALIAS:
917 ascii = F_ASCII 1068 ascii = F_ASCII
918 utf8 = F_UTF8 1069 utf8 = F_UTF8
919 indent = F_INDENT 1070 indent = F_INDENT
920 canonical = F_CANONICAL 1071 canonical = F_CANONICAL
921 space_before = F_SPACE_BEFORE 1072 space_before = F_SPACE_BEFORE
922 space_after = F_SPACE_AFTER 1073 space_after = F_SPACE_AFTER
923 json_rpc = F_JSON_RPC
924 pretty = F_PRETTY 1074 pretty = F_PRETTY
925 allow_nonref = F_ALLOW_NONREF 1075 allow_nonref = F_ALLOW_NONREF
1076 shrink = F_SHRINK
926 CODE: 1077 CODE:
927{ 1078{
928 UV *uv = SvJSON (self); 1079 UV *uv = SvJSON (self);
929 if (enable) 1080 if (enable)
930 *uv |= ix; 1081 *uv |= ix;
934 RETVAL = newSVsv (self); 1085 RETVAL = newSVsv (self);
935} 1086}
936 OUTPUT: 1087 OUTPUT:
937 RETVAL 1088 RETVAL
938 1089
1090SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
1091 CODE:
1092{
1093 UV *uv = SvJSON (self);
1094 UV log2 = 0;
1095
1096 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1097
1098 while ((1UL << log2) < max_depth)
1099 ++log2;
1100
1101 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1102
1103 RETVAL = newSVsv (self);
1104}
1105 OUTPUT:
1106 RETVAL
1107
939void encode (SV *self, SV *scalar) 1108void encode (SV *self, SV *scalar)
940 PPCODE: 1109 PPCODE:
941 XPUSHs (encode_json (scalar, *SvJSON (self))); 1110 XPUSHs (encode_json (scalar, *SvJSON (self)));
942 1111
943void decode (SV *self, SV *jsonstr) 1112void decode (SV *self, SV *jsonstr)
945 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1114 XPUSHs (decode_json (jsonstr, *SvJSON (self)));
946 1115
947PROTOTYPES: ENABLE 1116PROTOTYPES: ENABLE
948 1117
949void to_json (SV *scalar) 1118void to_json (SV *scalar)
1119 ALIAS:
1120 objToJson = 0
950 PPCODE: 1121 PPCODE:
951 XPUSHs (encode_json (scalar, F_UTF8)); 1122 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
952 1123
953void from_json (SV *jsonstr) 1124void from_json (SV *jsonstr)
1125 ALIAS:
1126 jsonToObj = 0
954 PPCODE: 1127 PPCODE:
955 XPUSHs (decode_json (jsonstr, F_UTF8)); 1128 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8));
956 1129

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines