1 commit 8935b7db1f25818eff3bb16cbe2b8b2981d4e195
2 Author: Emmanuele Bassi <ebassi@linux.intel.com>
3 Date: Fri Mar 19 17:04:54 2010 +0000
9 2 files changed, 8 insertions(+), 1 deletions(-)
11 commit a3ac934acabe0bf5e03dc5c22c51f0bd8fa056c2
12 Author: Emmanuele Bassi <ebassi@linux.intel.com>
13 Date: Fri Mar 19 16:59:57 2010 +0000
15 parser: Refactor the JsonParser logic
17 The array and object parsing logic in JsonParser has clearly exploded
18 beyond control: a simple tightening of the JSON validation almost broke
19 the parser in two. It it is time to...
21 <cue Christopher Lee voice-over>
25 </cue Christopher Lee voice-over>
27 This time, we should be following the JSON state machine and try to do
28 more prediction of the next state based on peeking the next token.
30 The code is fairly cleaner, now; and, most of all, still passes the
31 validation test suite - which is, you know... nice.
33 (cherry picked from commit 08cec3b7c9202007a5abbf548f8d2f1b54d4d0b4)
35 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
37 json-glib/json-parser.c | 467 ++++++++++++++++++-----------------------------
38 1 files changed, 179 insertions(+), 288 deletions(-)
40 commit e2e4c60f9f1b5302f23f08fea9e3882ea5135406
41 Author: Emmanuele Bassi <ebassi@linux.intel.com>
42 Date: Thu Mar 18 22:41:14 2010 +0000
44 JSON-GLib bug tracking system has been moved
46 We are now using bugzilla.gnome.org, since we're already hosted on
48 (cherry picked from commit 9d7c58b4fb5edeb8e9413acc9d509447e13962e5)
50 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
54 2 files changed, 2 insertions(+), 2 deletions(-)
56 commit 6b2d50001f2db526c5108a764693a632573c51a0
57 Author: Emmanuele Bassi <ebassi@linux.intel.com>
58 Date: Thu Mar 18 17:05:57 2010 +0000
60 generator: Use %g format for g_ascii_formatd()
62 I should read the documentation for the functions I use:
64 Converts a gdouble to a string, using the '.' as decimal point. To
65 format the number you pass in a printf()-style format string. Allowed
66 conversion specifiers are 'e', 'E', 'f', 'F', 'g' and 'G'.
67 -- from g_ascii_formatd() in GLib's API reference
70 (cherry picked from commit f622ee8d8ba54ddea6fbb7311a905ffab7842e8d)
72 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
74 json-glib/json-generator.c | 2 +-
75 1 files changed, 1 insertions(+), 1 deletions(-)
77 commit 7ced197c050f56c2555b9190d648f22e337209b8
78 Author: Emmanuele Bassi <ebassi@linux.intel.com>
79 Date: Fri Mar 5 19:23:49 2010 +0000
81 tests: Add another trailing comma invalid test
82 (cherry picked from commit 88ac0d5111eb528e4c396e4c169ceee4fb046e62)
84 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
86 tests/test-parser.c | 3 ++-
87 1 files changed, 2 insertions(+), 1 deletions(-)
89 commit 3c239e0d75a7246a2a3f75358ad662cefdb0960d
90 Author: Emmanuele Bassi <ebassi@linux.intel.com>
91 Date: Mon Mar 1 17:42:41 2010 +0000
93 tests: Add negative tests
95 Verify that invalid JSON will trigger a parser error.
96 (cherry picked from commit c22c1151e418af9506547804d4bc9fddb60bc0f1)
98 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
100 tests/test-parser.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
101 1 files changed, 53 insertions(+), 0 deletions(-)
103 commit 29881f03468db08bfb404cfcd5b61b4cdc419a87
104 Author: Emmanuele Bassi <ebassi@linux.intel.com>
105 Date: Mon Mar 1 17:41:14 2010 +0000
107 parser: Improve strictness
109 Apparently, some breakage crept in JsonParser which allowed invalid JSON
110 to actually pass. For instance: trailing and missing commas, invalid
111 barewords and wrong array and object closing braces.
112 (cherry picked from commit 26668fe238a52a7fd8374f409fc277aaa8efa826)
114 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
116 json-glib/json-parser.c | 117 +++++++++++++++++++++++++++++++----------------
117 1 files changed, 78 insertions(+), 39 deletions(-)
119 commit 84b68de38bab2d4537a6eb77c8df2a1288cef8ca
120 Author: Emmanuele Bassi <ebassi@linux.intel.com>
121 Date: Fri Feb 26 14:07:47 2010 +0000
123 Post-release version bump to 0.10.3
125 configure.ac | 4 ++--
126 1 files changed, 2 insertions(+), 2 deletions(-)
128 commit 755592e2c9e7e9cafbdf2b349a0df41dfeae83aa
129 Author: Emmanuele Bassi <ebassi@linux.intel.com>
130 Date: Fri Feb 26 14:04:12 2010 +0000
132 Release 0.10.2 (stable snapshot)
134 configure.ac | 4 ++--
135 1 files changed, 2 insertions(+), 2 deletions(-)
137 commit 382159118096b899b10411c8b37dbc743702e205
138 Author: Emmanuele Bassi <ebassi@linux.intel.com>
139 Date: Fri Feb 26 14:03:59 2010 +0000
144 1 files changed, 5 insertions(+), 0 deletions(-)
146 commit a5d9c7bd125571c877f1f7b76f92412b37fc4ce4
147 Author: Emmanuele Bassi <ebassi@linux.intel.com>
148 Date: Sun Jan 24 18:58:28 2010 +0000
150 docs: Fix the GBoxed registration example
152 The registration function for serialization and deserialization has been
153 replaced by two separate functions before releasing 0.10, but I forgot to
154 update the example in the documentation.
155 (cherry picked from commit ea666891cb1e6fc9e527ce6c93a306bc97145f16)
157 json-glib/json-gboxed.c | 11 ++++++-----
158 1 files changed, 6 insertions(+), 5 deletions(-)
160 commit 1ce1d549477b79e7d94fb891f323afbdb8a8d4ce
161 Author: Emmanuele Bassi <ebassi@linux.intel.com>
162 Date: Sun Jan 10 09:59:14 2010 +0000
164 Initialize every member of JsonObject on construction
166 We create JsonObject structures using g_slice_new(), so we need to
167 initialize every member of the structure ourselves.
168 (cherry picked from commit c09c2dc1c54c83fea4ef93486081fe3fab35452c)
170 json-glib/json-object.c | 1 +
171 1 files changed, 1 insertions(+), 0 deletions(-)
173 commit dae32677d140a3ba6a15e1198b53ea0b3e1716b0
174 Author: Emmanuele Bassi <ebassi@linux.intel.com>
175 Date: Tue Dec 29 15:35:21 2009 +0000
177 Post-release version bump to 0.10.1
180 1 files changed, 1 insertions(+), 1 deletions(-)
182 commit 5aff66e8fae3e28c9cb6b74696170154eed303a7
183 Author: Emmanuele Bassi <ebassi@linux.intel.com>
184 Date: Tue Dec 29 15:33:28 2009 +0000
188 configure.ac | 4 ++--
189 1 files changed, 2 insertions(+), 2 deletions(-)
191 commit 7258a776ea90ea4b2dcc6f1e4e440bb09c581a12
192 Author: Emmanuele Bassi <ebassi@linux.intel.com>
193 Date: Tue Dec 29 15:31:22 2009 +0000
195 build: Enable introspection when distchecking
198 1 files changed, 1 insertions(+), 1 deletions(-)
200 commit 80c5178127052e600146ca889500e263da4ebf10
201 Author: Vincent Untz <vuntz@gnome.org>
202 Date: Sun Dec 27 02:09:44 2009 +0100
204 Initialize out variables before using them
206 Here's a small patch for json-glib, to fix some gcc warnings breaking
207 the build with -Werror (gcc can't know if the variable will get
208 initialized or not). I didn't find a product for json-glib in bugzilla,
209 but I guess a mail will work ;-)
213 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
215 json-glib/json-gobject.c | 4 ++--
216 1 files changed, 2 insertions(+), 2 deletions(-)
218 commit e3a57eae397926ad23e216996eda164ed6c15c63
219 Author: Emmanuele Bassi <ebassi@linux.intel.com>
220 Date: Sun Nov 29 12:50:58 2009 +0000
222 Post-release bump to 0.9.3
225 1 files changed, 1 insertions(+), 1 deletions(-)
227 commit 4477758b73a0712fdef5e7907f6b6f4e0878428e
228 Author: Emmanuele Bassi <ebassi@linux.intel.com>
229 Date: Sun Nov 29 12:34:41 2009 +0000
231 Release 0.9.2 (0.10.0-rc1)
234 1 files changed, 1 insertions(+), 1 deletions(-)
236 commit 654f99c6b0d771cc6b4c68790ab164b0f691307d
237 Author: Emmanuele Bassi <ebassi@linux.intel.com>
238 Date: Sun Nov 29 12:34:08 2009 +0000
242 NEWS | 15 +++++++++++++++
243 1 files changed, 15 insertions(+), 0 deletions(-)
245 commit 307605046cf89ef922d1d1e7c7b95405f3ecfdfb
246 Author: Emmanuele Bassi <ebassi@linux.intel.com>
247 Date: Sun Nov 29 12:48:25 2009 +0000
249 docs: Fix annotation for json_gobject_to_data()
251 json-glib/json-gobject.c | 2 +-
252 1 files changed, 1 insertions(+), 1 deletions(-)
254 commit e7eb3ca4a9de1c7348dc82f528cf0858f52849dd
255 Author: Emmanuele Bassi <ebassi@linux.intel.com>
256 Date: Sun Nov 29 12:37:04 2009 +0000
258 docs: Add missing to/from_data methods
260 doc/reference/json-glib-sections.txt | 2 ++
261 1 files changed, 2 insertions(+), 0 deletions(-)
263 commit 27bb2c060a7b2ecc4839719d39b2044efe4c3e7a
264 Author: Emmanuele Bassi <ebassi@linux.intel.com>
265 Date: Sun Nov 29 12:46:27 2009 +0000
267 docs: Add release notes to the README
269 README | 12 ++++++++++--
270 1 files changed, 10 insertions(+), 2 deletions(-)
272 commit 780d82310c47c3f07bcbaab2cefbea0d6decb899
273 Author: Emmanuele Bassi <ebassi@linux.intel.com>
274 Date: Sun Nov 29 12:33:45 2009 +0000
276 docs: Update the README
278 README | 27 ++++++++++++++++-----------
279 1 files changed, 16 insertions(+), 11 deletions(-)
281 commit d122f9b8c09ad7e82b1a70da5d65ebba2111e6cc
282 Author: Emmanuele Bassi <ebassi@linux.intel.com>
283 Date: Sun Nov 29 12:33:01 2009 +0000
285 build: Clean up the configure summary
287 Make the output of the summary a little bit nicer.
289 configure.ac | 27 ++++++++++++++++++++-------
290 1 files changed, 20 insertions(+), 7 deletions(-)
292 commit e4c4480036a82cc5177fc1f184c18019af0e805e
293 Author: Emmanuele Bassi <ebassi@linux.intel.com>
294 Date: Sun Nov 29 12:31:54 2009 +0000
296 build: Require G-I 0.6.4
298 We should require at least 0.6.4 for GObject-Introspection, since that
299 version allows us to pass the .la file to g-ir-scanner.
302 1 files changed, 1 insertions(+), 1 deletions(-)
304 commit 4445bdb04d5eebc145a1db82aa5b811e8d4ed048
305 Author: Emmanuele Bassi <ebassi@linux.intel.com>
306 Date: Sat Nov 28 19:13:27 2009 +0000
308 docs: Fix argument name mismatch
310 gtk-doc complains that the argument name in the header does not match
311 the one in the documentation annotation for the GBoxed deserialization
312 function registration.
314 json-glib/json-gobject.h | 2 +-
315 1 files changed, 1 insertions(+), 1 deletions(-)
317 commit 793e827feaa9be3c4ffbe5c0425ac6bcc0c9e6d1
318 Author: Emmanuele Bassi <ebassi@linux.intel.com>
319 Date: Sat Nov 28 19:06:36 2009 +0000
321 build: Clean up json-glib/Makefile.am rules
323 json-glib/Makefile.am | 24 ++++--------------------
324 1 files changed, 4 insertions(+), 20 deletions(-)
326 commit 97584658672fe4709fc7c3b24a44b477112322f7
327 Author: Emmanuele Bassi <ebassi@linux.intel.com>
328 Date: Sat Nov 28 17:39:37 2009 +0000
330 build: Fix out-of-tree enum types file generation
332 build/autotools/Makefile.am.enums | 4 ++--
333 1 files changed, 2 insertions(+), 2 deletions(-)
335 commit 3cf919e9c7f3201305a1a63a3c270e422a37efed
336 Author: Emmanuele Bassi <ebassi@linux.intel.com>
337 Date: Mon Nov 23 22:20:58 2009 +0000
339 boxed: Split (de)serialization registration
341 A GBoxed type defined as:
349 Can be represented either by a JSON object:
361 The current function for registering a serialization and a
362 deserialization pair does not allow registering more than one
363 deserialization function - which means that there can only be
364 one way to deserialize a GBoxed type into a specific JsonNode
367 To allow having more than one JsonNodeType associated to a
368 GBoxed type and a deserialization function we need to split out
369 the registration of the serialization and deserialization functions
370 into two distinct functions.
372 doc/reference/json-glib-sections.txt | 3 +-
373 json-glib/json-gboxed.c | 115 ++++++++++++++++++++++------------
374 json-glib/json-gobject.c | 4 +-
375 json-glib/json-gobject.h | 63 +++++++++---------
376 tests/test-serialize-boxed.c | 7 +-
377 5 files changed, 114 insertions(+), 78 deletions(-)
379 commit 61d54cc9e2a3098e876e700a9248428f400a5368
380 Author: Tristan Van Berkom <tristan.van.berkom@gmail.com>
381 Date: Thu Nov 12 12:59:03 2009 +0000
383 serializable: Make Serializable in charge of parsing
385 If a GObject class implements JsonSerializable and has overridden
386 the serialize_property() vfunc then the Serializable should be fully in
387 charge of serializing a property - that is: JSON-GLib should not try to
388 add a fallback in case the serialize_property() implementation returned
391 This is a change in semantics for JsonSerializable implementations.
393 http://bugzilla.openedhand.com/show_bug.cgi?id=1859
395 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
397 json-glib/json-gobject.c | 7 +++++--
398 1 files changed, 5 insertions(+), 2 deletions(-)
400 commit 63dc03da507a216c0764bc0e50fc62b2b77dc1b2
401 Author: Emmanuele Bassi <ebassi@linux.intel.com>
402 Date: Thu Nov 12 12:38:29 2009 +0000
404 serializable: Add methods proxying default implementations
406 If you want to use the default implementation of serialize_property()
407 and/or deserialize_property() from an object class implementing
408 JsonSerializable you currently have to peek the interface vtable and
409 then call the vfunc pointers.
411 We can expose the default implementation through functions ourselves and
412 simplify the required code.
414 doc/reference/json-glib-sections.txt | 4 ++
415 json-glib/json-gobject.h | 28 +++++++---
416 json-glib/json-serializable.c | 92 ++++++++++++++++++++++++++++++++++
417 3 files changed, 115 insertions(+), 9 deletions(-)
419 commit 5f484d8c274a2b866f9a3d38eebe2baa1939b7ac
420 Author: Emmanuele Bassi <ebassi@linux.intel.com>
421 Date: Thu Nov 12 12:03:13 2009 +0000
423 gobject: Add deprecation annotations
425 This makes it easier to detect when building without
426 JSON_DISABLE_DEPRECATED.
428 json-glib/json-gobject.h | 4 ++--
429 1 files changed, 2 insertions(+), 2 deletions(-)
431 commit 3c7811bf24d4b957da730949af6795b728db5bad
432 Author: Emmanuele Bassi <ebassi@linux.intel.com>
433 Date: Thu Nov 12 12:02:41 2009 +0000
435 build: Build without deprecations
437 Make sure that JSON-GLib is built without using deprecated API.
439 json-glib/Makefile.am | 1 +
440 1 files changed, 1 insertions(+), 0 deletions(-)
442 commit 923311ee52b77f53c5c529e497ea2a24efaf23ea
443 Author: Emmanuele Bassi <ebassi@linux.intel.com>
444 Date: Thu Nov 12 12:01:04 2009 +0000
446 tests: Do not use deprecated API
448 Tests should not be using API marked as deprecated.
450 tests/Makefile.am | 2 +-
451 tests/test-serialize-boxed.c | 4 ++--
452 tests/test-serialize-complex.c | 2 +-
453 tests/test-serialize-full.c | 2 +-
454 tests/test-serialize-simple.c | 2 +-
455 5 files changed, 6 insertions(+), 6 deletions(-)
457 commit e3ae84e743e1d1a1a0202e900f443e143cb77f45
458 Author: Emmanuele Bassi <ebassi@linux.intel.com>
459 Date: Thu Nov 12 11:57:45 2009 +0000
461 tests: Verify Serializable::serialize_property()
463 Verify that an object with a custom serialize_property() is effectively
464 what we expect it to be when it is parsed.
466 tests/test-serialize-complex.c | 32 ++++++++++++++++++++++++++++++++
467 1 files changed, 32 insertions(+), 0 deletions(-)
469 commit 7cebdd008a02e6cef0514f40327f94eba2a2088e
470 Author: Cornelius Hald <hald@icandy.de>
471 Date: Thu Nov 12 11:37:54 2009 +0000
473 Doubles are converted to strings containing commas
475 Under some locales (e.g. de_DE) a double is converted to a string
476 containing a comma instead of a dot. That breaks the JSON syntax.
479 Double: 0.34 is converted to 0,34 when using locale de_DE
481 http://bugzilla.openedhand.com/show_bug.cgi?id=1826
483 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
485 json-glib/json-generator.c | 7 ++++++-
486 1 files changed, 6 insertions(+), 1 deletions(-)
488 commit 30d4efb775cb416212c00e3ececb0f0147739f40
489 Author: Emmanuele Bassi <ebassi@linux.intel.com>
490 Date: Thu Nov 12 11:28:17 2009 +0000
492 Update Introspection annotations
494 • Fix the transfer rules for JsonNode, JsonObject and JsonArray
497 • Annotate the methods returning lists
499 json-glib/json-array.c | 18 +++++++++---------
500 json-glib/json-node.c | 15 ++++++++-------
501 json-glib/json-object.c | 25 +++++++++++++------------
502 json-glib/json-parser.c | 5 +++--
503 4 files changed, 33 insertions(+), 30 deletions(-)
505 commit 47cd2f678a8321faac0e2d00a3538181e7bc1cbf
506 Author: Emmanuele Bassi <ebassi@linux.intel.com>
507 Date: Thu Nov 12 11:27:36 2009 +0000
509 build: Add more flags to the maintainer cflags list
511 configure.ac | 4 +++-
512 1 files changed, 3 insertions(+), 1 deletions(-)
514 commit ecc185d1c542f6ff41f84be026dc380f611a5d6e
515 Author: Emmanuele Bassi <ebassi@linux.intel.com>
516 Date: Thu Nov 12 10:09:17 2009 +0000
518 enum-types: Put back a missing static
520 The GEnumValue array defining the enumeration type values must be
521 static, otherwise everything will crash when trying to retrieve the
522 enumeration data from the GEnumClass.
524 json-glib/json-enum-types.c.in | 2 +-
525 1 files changed, 1 insertions(+), 1 deletions(-)
527 commit 84f5af58c23b174cc9708e81ce8ccbfffa6e68eb
528 Author: Emmanuele Bassi <ebassi@linux.intel.com>
529 Date: Fri Oct 30 10:46:32 2009 +0000
531 object: Return values list in insertion order
533 Since we return the member names in insertion order, we should also
534 return the member values in the same order.
536 This also allows us to get rid of the (yucky) internal copies of
537 g_hash_table_get_keys() and g_hash_table_get_values(), since we use
538 the hash table only for storage and lookup purposes.
540 json-glib/json-object.c | 55 ++++++-----------------------------------------
541 1 files changed, 7 insertions(+), 48 deletions(-)
543 commit a25a1ded25e5d1f605cffd6da7a5e036151aa70c
544 Author: Mathias Hasselmann <mathias.hasselmann@gmx.de>
545 Date: Thu Oct 29 14:01:04 2009 +0000
547 tests: Verify parsing bare values
549 http://bugzilla.openedhand.com/show_bug.cgi?id=1856
551 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
553 tests/test-parser.c | 38 +++++++++++++++++++++++++++++++++-----
554 1 files changed, 33 insertions(+), 5 deletions(-)
556 commit 026ea0357fbe95e2acd43555e3b5d00e329c9740
557 Author: Emmanuele Bassi <ebassi@linux.intel.com>
558 Date: Thu Oct 29 13:59:44 2009 +0000
560 parser: Advance when parsing bare values
562 A missing get_next_token() prevents getting the contents of
563 the tokenizer in order to place them into the JsonNode.
565 json-glib/json-parser.c | 1 +
566 1 files changed, 1 insertions(+), 0 deletions(-)
568 commit 578111be53065a2bbeda73865bfa4e178f185649
569 Author: Emmanuele Bassi <ebassi@linux.intel.com>
570 Date: Wed Oct 28 16:54:34 2009 +0000
572 introspection: Fix the GIR generation
574 The rule for creating the JSON-GLib GIR file should use the
575 json-glib.la shared object, to avoid using the installed
576 copy of JSON-GLib when compiling the typelib.
578 The include file for JSON-GLib is json-glib/json-gobject.h as
579 well: json-glib/json-object.h does not exist.
581 json-glib/Makefile.am | 11 ++++++++---
582 1 files changed, 8 insertions(+), 3 deletions(-)
584 commit 8f8ce87730fc0bf102a707e84c4f6106b215cfab
585 Author: Emmanuele Bassi <ebassi@linux.intel.com>
586 Date: Wed Oct 28 16:23:39 2009 +0000
588 gobject: Use from/to data naming convention
590 Be more GLib-like, and use
592 <namespace>_<type>_from_data()
593 <namespace>_<type>_to_data()
595 Instead of the homebrew "construct" and "serialize", when dealing
600 • adding json_gobject_from_data() to deprecate
601 json_construct_gobject()
602 • adding json_gobject_to_data() to deprecate
603 json_serialize_gobject()
605 The json_construct_gobject() function also contains a mistake: it
606 uses gsize with the special value of -1 meaning "slurp the whole
607 string", but gsize is an unsigned type. The newly added
608 json_gobject_from_data() correctly uses gssize instead.
610 json-glib/json-gobject.c | 63 +++++++++++++++++++++++++++++++++++++++++++---
611 json-glib/json-gobject.h | 10 +++++++
612 2 files changed, 69 insertions(+), 4 deletions(-)
614 commit 00b4d200849e232cd904d23d3593d6f95252b483
615 Author: Emmanuele Bassi <ebassi@linux.intel.com>
616 Date: Wed Oct 28 16:05:19 2009 +0000
618 gobject: Uniform JSON<->GObject mapping code
620 Rename json_gobject_new() to json_gobject_deserialize(), and
621 json_gobject_dump() to json_gobject_serialize(); this maps the
624 Also for consistency, change the serialize() return value and
625 the deserialize() argument to be JsonNodes of type JSON_NODE_OBJECT.
627 doc/reference/json-glib-sections.txt | 4 +-
628 json-glib/json-gobject.c | 82 ++++++++++++++++++++++------------
629 json-glib/json-gobject.h | 10 ++--
630 3 files changed, 61 insertions(+), 35 deletions(-)
632 commit fc0607c740b153acc96e4df12a12b042e08e831b
633 Author: Emmanuele Bassi <ebassi@linux.intel.com>
634 Date: Wed Oct 28 12:01:21 2009 +0000
636 docs: Add long descriptions
638 The json-boxed and json-serializable sections are missing the
639 long description for the API reference.
641 json-glib/json-gboxed.c | 49 +++++++++++++++++++++++++++++++++++++---
642 json-glib/json-serializable.c | 5 +++-
643 2 files changed, 49 insertions(+), 5 deletions(-)
645 commit 498827110f3d635e545c7351732551676a06a1bf
646 Author: Emmanuele Bassi <ebassi@linux.intel.com>
647 Date: Wed Oct 28 10:07:39 2009 +0000
649 docs: Add the 0.10 symbols index
651 doc/reference/json-glib-docs.xml | 5 +++++
652 1 files changed, 5 insertions(+), 0 deletions(-)
654 commit 0979bbceb654c5e4b5dadf1e6f7e85bb9df87ca5
655 Author: Emmanuele Bassi <ebassi@linux.intel.com>
656 Date: Tue Oct 27 20:58:08 2009 +0000
658 docs: Split out GObject-related sections
660 Like commit c176f70e593c9cfb4901cd9f27ce54b8aa7152f2 did for the
661 source code, the documentation should be split three-ways:
663 • GObject-related API
665 • GBoxed-related API
667 doc/reference/Makefile.am | 15 +++++++--------
668 doc/reference/json-glib-docs.xml | 2 ++
669 doc/reference/json-glib-sections.txt | 33 +++++++++++++++++++++++++++------
670 3 files changed, 36 insertions(+), 14 deletions(-)
672 commit 2f56ba9021ec4fe1574630404d6b24e4813cf1eb
673 Author: Emmanuele Bassi <ebassi@linux.intel.com>
674 Date: Tue Oct 27 20:57:52 2009 +0000
676 docs: Documentation fixes for gtk-doc
678 json-glib/json-gboxed.c | 8 +++++---
679 1 files changed, 5 insertions(+), 3 deletions(-)
681 commit c176f70e593c9cfb4901cd9f27ce54b8aa7152f2
682 Author: Emmanuele Bassi <ebassi@linux.intel.com>
683 Date: Tue Oct 27 20:49:09 2009 +0000
685 build: Split out GBoxed and Serializable
687 The json-gobject.c is getting pretty crowded; we should split out
688 the JsonBoxed API and the JsonSerialized implementation into their
689 separate source files.
691 json-glib/Makefile.am | 4 +
692 json-glib/json-gboxed.c | 275 ++++++++++++++++++++++++++++
693 json-glib/json-gobject-private.h | 39 ++++
694 json-glib/json-gobject.c | 371 +-------------------------------------
695 json-glib/json-serializable.c | 154 ++++++++++++++++
696 5 files changed, 476 insertions(+), 367 deletions(-)
698 commit 373fa3d9b73391b38620fbd9ce9b69f358e5f4c8
699 Author: Emmanuele Bassi <ebassi@linux.intel.com>
700 Date: Tue Oct 27 18:10:19 2009 +0000
702 gobject: Make GObject<->JsonObject functions public
704 The functions mapping a GObject to and from a JsonObject should
705 be public, as they can be used by parsers.
707 json-glib/json-gobject.c | 30 ++++++++++++++++++++++++++++--
708 json-glib/json-gobject.h | 16 ++++++++++------
709 2 files changed, 38 insertions(+), 8 deletions(-)
711 commit 85f7a8e8206168d95b3ef9c02aa584f0fae5b37e
712 Author: Emmanuele Bassi <ebassi@linux.intel.com>
713 Date: Tue Oct 27 18:03:11 2009 +0000
715 gobject: Reuse the list data
717 Since we ignore all members that don't have a corresponding
718 GParamSpec for the class we cannot use:
720 members = g_list_prepend (members, pspec->name);
722 Because pspec might also be NULL. We can reuse the GList iterator
723 data field, since that points to data internal to the JsonObject
724 we are iterating over.
726 json-glib/json-gobject.c | 2 +-
727 1 files changed, 1 insertions(+), 1 deletions(-)
729 commit ff986ee5b8df45255f4f5ab01be0bbad893bc55e
730 Author: Emmanuele Bassi <ebassi@linux.intel.com>
731 Date: Tue Oct 27 17:53:34 2009 +0000
733 gobject: Add experimental GBoxed<->JSON transformation
735 Serializing and deserializing GBoxed types is fairly complicated
736 currently. If a GObject implements JsonSerializable it is possible
737 for the class to intercept the JsonNode, parse it manually and
738 then set the value to the property.
740 This leaves a hole opened for:
742 • manual (de)serialization of GBoxed types
743 • (de)serialization of GBoxed properties in classes not
744 implementing JsonSerializable
746 In order to serialize and deserialize a GBoxed JSON-GLib should
747 provide a mechanism similar to the GValue transformation functions:
748 when registering the boxed type the developer should also be able
749 to register a serialization and a deserialization functions pair
752 (GBoxed type, JSON type)
754 The serialization function would be:
756 JsonNode *(* JsonBoxedSerializeFunc) (gconstpointer boxed);
758 And, conversely, the deserialization function would be:
760 gpointer (* JsonBoxedDeserializeFunc) (JsonNode *node);
762 Obviously, the whole machinery works only for GBoxed types that
763 register the serialization and deserialization functions.
765 .gitignore | 68 ++++++-----
766 json-glib/json-gobject.c | 264 +++++++++++++++++++++++++++++++++++++++++-
767 json-glib/json-gobject.h | 37 ++++++
768 tests/Makefile.am | 8 +-
769 tests/test-serialize-boxed.c | 263 +++++++++++++++++++++++++++++++++++++++++
770 5 files changed, 602 insertions(+), 38 deletions(-)
772 commit 7f6a73a0964b66b15e8b5a9858b9bc76b010f67b
773 Author: Emmanuele Bassi <ebassi@linux.intel.com>
774 Date: Tue Oct 27 17:43:38 2009 +0000
776 node: Add a private NodeType-to-string converter
778 Useful for debugging and logging purposes.
780 json-glib/json-node.c | 23 ++++++++++++++++++++++-
781 json-glib/json-types-private.h | 2 ++
782 2 files changed, 24 insertions(+), 1 deletions(-)
784 commit 3f8990f7a4c362590f19e427aae2f68f27303fe6
785 Author: Emmanuele Bassi <ebassi@linux.intel.com>
786 Date: Tue Oct 27 17:42:14 2009 +0000
788 Remove a stray ';' that broke deserializing GStrv
790 The stray semicolon was preventing the GPtrArray from being
793 json-glib/json-gobject.c | 2 +-
794 1 files changed, 1 insertions(+), 1 deletions(-)
796 commit 8e550ac4dbb5500a40c7adad88868ede40397db7
797 Author: Emmanuele Bassi <ebassi@linux.intel.com>
798 Date: Tue Oct 27 17:41:38 2009 +0000
800 Fix compiler warnings (remove unused variables)
802 json-glib/json-gobject.c | 3 +--
803 1 files changed, 1 insertions(+), 2 deletions(-)
805 commit 3b994a52d9c34f67e4ac52aa4bb0c380789fbd60
806 Author: Emmanuele Bassi <ebassi@linux.intel.com>
807 Date: Tue Oct 27 17:40:55 2009 +0000
809 build: Export MAINTAINER_CFLAGS
811 Apparently, the MAINTAINER_CFLAGS were ignored.
814 1 files changed, 1 insertions(+), 0 deletions(-)
816 commit 0810711a7fbb915ba9397a66e77babb30765d090
817 Author: Emmanuele Bassi <ebassi@linux.intel.com>
818 Date: Tue Oct 27 17:40:23 2009 +0000
820 build: Use AM_PROG_CC_C_O
822 Use the Automake macro to enable per-target compiler flags.
825 1 files changed, 1 insertions(+), 1 deletions(-)
827 commit d664f886372afbe1d54e633240e7b7e06ebc45c8
828 Author: Emmanuele Bassi <ebassi@linux.intel.com>
829 Date: Tue Oct 27 17:40:03 2009 +0000
831 Fix compiler warnings (remove unused variables)
833 tests/test-generator.c | 4 ++--
834 tests/test-serialize-full.c | 1 -
835 2 files changed, 2 insertions(+), 3 deletions(-)
837 commit 83dea3b3dd2281dca206e0873b5fed0a2a3d50de
838 Author: Emmanuele Bassi <ebassi@linux.intel.com>
839 Date: Tue Oct 27 14:01:24 2009 +0000
841 gobject: Support constructor properties
843 The GObject deserialization code currently skips all the constructor
844 and constructor-only properties. In order to implement them we can
845 add a preliminary pass on the JSON object members and build a
848 As we don't have a GObject instance we cannot really use the
849 Serializable interface to provide custom parsing for complex data
850 structures, thus we fall back to the default deserialization code
853 json-glib/json-gobject.c | 98 ++++++++++++++++++++++++++++++++++++++-----
854 tests/test-serialize-full.c | 11 +++--
855 2 files changed, 93 insertions(+), 16 deletions(-)
857 commit 2616938c7c042fced9be197205a535a8b420534e
858 Author: Emmanuele Bassi <ebassi@linux.intel.com>
859 Date: Tue Oct 27 11:57:38 2009 +0000
861 build: Clean up the build environment
863 Some of the rules can be moved into their own files to be included
866 • silent rules (QUIET_*)
867 • glib-mkenums rules
868 • glib-genmarshal rules
870 Also, the test suite rules should be moved from the top-level of
871 the project into the build/autotools directory and then included
872 only where it makes sense.
874 This requires changing most of the build system to use the new
879 Makefile.decl | 61 ------------------------
880 build/Makefile.am | 12 ++++-
881 build/autotools/Makefile.am | 21 +++++++--
882 build/autotools/Makefile.am.enums | 43 +++++++++++++++++
883 build/autotools/Makefile.am.gtest | 61 ++++++++++++++++++++++++
884 build/autotools/Makefile.am.marshal | 45 ++++++++++++++++++
885 build/autotools/Makefile.am.silent | 17 +++++++
886 doc/Makefile.am | 12 ++++-
887 doc/reference/Makefile.am | 5 +-
888 json-glib/Makefile.am | 88 +++++++++++------------------------
889 json-glib/tests/Makefile.am | 12 +++--
890 tests/Makefile.am | 15 ++----
891 14 files changed, 252 insertions(+), 149 deletions(-)
893 commit 5406301b0e3bf74c0d7ae47a618c416d5c6dc29d
894 Author: Emmanuele Bassi <ebassi@linux.intel.com>
895 Date: Tue Oct 27 11:30:55 2009 +0000
897 gobject: Serialize properties holding a GObject
899 Like we deserialize them, we can serialize GObject properties
900 defined using GParamSpecObject.
902 json-glib/json-gobject.c | 14 ++++++++++++++
903 1 files changed, 14 insertions(+), 0 deletions(-)
905 commit 3a2176ebf96b33716d1b50068ca44b1d3cd9b0c8
906 Author: Emmanuele Bassi <ebassi@linux.intel.com>
907 Date: Tue Oct 27 11:29:32 2009 +0000
909 tests: Use properties to change values
911 The values inside _init() should match the default values of the
912 properties as specified by the GParamSpec. If we want to verify
913 a non-default value we should specify the value when instantiating
916 tests/test-serialize-simple.c | 4 ++--
917 1 files changed, 2 insertions(+), 2 deletions(-)
919 commit 1ff48cdc5d773925bda1ddf8bc904a9ea6a5e643
920 Author: Emmanuele Bassi <ebassi@linux.intel.com>
921 Date: Tue Oct 27 11:18:51 2009 +0000
923 gobject: Split GObject serialization code
925 Like for the deserialization of a GObject into a JsonObject we
926 should split out the serialization of a GObject into a JsonObject
927 part of json_serialize_gobject() into its own private function.
929 json-glib/json-gobject.c | 113 +++++++++++++++++++++++++---------------------
930 1 files changed, 61 insertions(+), 52 deletions(-)
932 commit 27afed8dc89bf9562c3536f0a053d250e70eea4d
933 Author: Emmanuele Bassi <ebassi@linux.intel.com>
934 Date: Tue Oct 27 10:30:27 2009 +0000
936 gobject: Recurse in GParamSpecObject properties
938 Use the newly added json_gobject_new() internal function to
939 recurse into properties defined using GParamSpecObject.
941 The same rules used by json_construct_gobject() apply to the
942 properties storing a GObject - including JsonSerializable
945 The test case for serialization and deserialization of a
946 GObject has been updated to include a property holding a
949 json-glib/json-gobject.c | 14 +++++++++-
950 tests/test-serialize-full.c | 58 +++++++++++++++++++++++++++++++++++++-----
951 2 files changed, 64 insertions(+), 8 deletions(-)
953 commit 317447b52455c56b0123168ab127ce026d7d0c22
954 Author: Emmanuele Bassi <ebassi@linux.intel.com>
955 Date: Tue Oct 27 10:20:42 2009 +0000
957 gobject: Split JSON to GObject code
959 If we want to be able to parse a GParamSpecObject property
960 we need to use the same code as json_construct_gobject(), minus
963 json-glib/json-gobject.c | 152 +++++++++++++++++++++++++---------------------
964 1 files changed, 83 insertions(+), 69 deletions(-)
966 commit cba7db96581343e3cbd8e5eb067026efb8cac24e
967 Author: Emmanuele Bassi <ebassi@linux.intel.com>
968 Date: Mon Oct 26 22:36:01 2009 +0000
970 object: Guarantee insertion order
972 When iterating over the members of a JsonObject, or when retrieving
973 the list of members, the insertion order should be preserved by the
974 JsonObject. This is simply implemented by keeping a mirror list of
977 Apparently, though JSON does not guarantee any ordering, it is somewhat
978 expected by JSON (and ECMAScript) users.
980 json-glib/json-object.c | 67 +++++++++++++++++++++-------------------
981 json-glib/json-types-private.h | 3 ++
982 tests/test-generator.c | 3 +-
983 3 files changed, 40 insertions(+), 33 deletions(-)
985 commit d5bebce0286aef5c4b4110c16c22a8ef3dc38405
986 Author: Emmanuele Bassi <ebassi@gnome.org>
987 Date: Mon Sep 28 18:15:48 2009 +0100
989 [node] Add HOLDS macros for quick type checking
991 JsonNode should mimick GValue's API and have macros for easy type checking
993 doc/reference/json-glib-sections.txt | 7 ++++-
994 json-glib/json-types.h | 51 ++++++++++++++++++++++++++++++++++
995 json-glib/tests/node-test.c | 2 +-
996 3 files changed, 58 insertions(+), 2 deletions(-)
998 commit 17fc731ed54b754285bac76c7ac23eac6b96bf24
999 Author: Emmanuele Bassi <ebassi@gnome.org>
1000 Date: Mon Sep 28 14:02:14 2009 +0100
1002 [tests] Add a test case for Object members with empty strings
1004 Both the Object API and the Parser should not choke on members with
1005 empty strings as their value. The Object should just have a member
1006 associated with a JSON_NODE_VALUE node type and an empty string as
1009 json-glib/tests/object-test.c | 13 +++++++++++++
1010 tests/test-parser.c | 1 +
1011 2 files changed, 14 insertions(+), 0 deletions(-)
1013 commit 5181bf24bf3cde743de590ab3ffa0471df9e4799
1014 Author: Emmanuele Bassi <ebassi@gnome.org>
1015 Date: Tue Sep 22 15:42:34 2009 +0100
1017 Post-branch bump to 0.9.1
1019 configure.ac | 4 ++--
1020 1 files changed, 2 insertions(+), 2 deletions(-)
1022 commit 3f83767109979c660469b3b5862fbd04469a8011
1023 Author: Emmanuele Bassi <ebassi@gnome.org>
1024 Date: Tue Sep 22 15:39:46 2009 +0100
1029 configure.ac | 8 ++++++--
1030 2 files changed, 8 insertions(+), 2 deletions(-)
1032 commit bd604338b25884edbd86cf531505259948484323
1033 Author: Emmanuele Bassi <ebassi@gnome.org>
1034 Date: Tue Sep 22 15:34:18 2009 +0100
1036 [parser] Return the right expected token
1038 When parsing a value embedded in a Json Object or Array we need to
1039 return the right expected token so that the generated syntax error
1042 json-glib/json-parser.c | 16 ++++++++++++++--
1043 1 files changed, 14 insertions(+), 2 deletions(-)
1045 commit f99cf3d3d038eff786f85409f3d04736e2068e74
1046 Author: Emmanuele Bassi <ebassi@gnome.org>
1047 Date: Tue Sep 22 15:34:07 2009 +0100
1049 [parser] Whitespace clean up
1051 json-glib/json-parser.c | 11 ++++++-----
1052 1 files changed, 6 insertions(+), 5 deletions(-)
1054 commit 6c20aae2b49a6d64db5e7d1ff3a82950ea9dc58a
1055 Author: Emmanuele Bassi <ebassi@gnome.org>
1056 Date: Mon Sep 7 22:30:11 2009 +0100
1058 [build] Prefer automake-1.11 silent rules to shave
1060 If we have automake-1.11 installed then we should enable the
1061 AM_SILENT_RULES machinery instead of Shave - even though Shave's
1062 output is a lot cleaner.
1065 configure.ac | 20 ++++++++++++++++----
1066 json-glib/Makefile.am | 6 +++++-
1067 3 files changed, 22 insertions(+), 6 deletions(-)
1069 commit 7b4bb80930f12a366d5e5a5eea5b398972cd4891
1070 Author: Emmanuele Bassi <ebassi@gnome.org>
1071 Date: Sun Sep 6 17:31:41 2009 +0100
1073 [node] Add JsonNode.set_parent()
1075 Add the setter for JsonNode:parent, to be used in JsonParser instead
1076 of directly accessing the JsonNode structure.
1078 doc/reference/json-glib-sections.txt | 1 +
1079 json-glib/json-node.c | 18 ++++++++++++++++++
1080 json-glib/json-parser.c | 14 +++++++-------
1081 json-glib/json-types.h | 2 ++
1082 tests/test-parser.c | 10 ++++++++++
1083 5 files changed, 38 insertions(+), 7 deletions(-)
1085 commit c1b76a73e0b2c6e0c7afced10bd6079a0f5b0f5d
1086 Author: Emmanuele Bassi <ebassi@gnome.org>
1087 Date: Sun Sep 6 17:15:46 2009 +0100
1089 [parser] Clean up value parsing
1091 The code that parses a value within an object and an array should
1092 be moved to its own function to avoid duplication.
1094 json-glib/json-parser.c | 199 +++++++++++++++++++----------------------------
1095 tests/test-parser.c | 9 +-
1096 2 files changed, 86 insertions(+), 122 deletions(-)
1098 commit d3f005c27d9a8a46259205f2f8077fb01a6a3609
1099 Author: Emmanuele Bassi <ebassi@gnome.org>
1100 Date: Sun Sep 6 14:44:18 2009 +0100
1102 [docs] Use proper xi:include for indexes
1104 Instead of relying on gtk-doc we can do the proper inclusion of the
1105 API indexes using XInclude, complete with fallbacks.
1107 Also, we should include the additional pages that gtk-doc generates
1108 for us, like the annotations glossary and the object tree.
1110 doc/reference/json-glib-docs.xml | 17 +++++++++++++++++
1111 1 files changed, 17 insertions(+), 0 deletions(-)
1113 commit 7442a3011a860f12cbd40b6687b699b0b648d6b7
1114 Author: Emmanuele Bassi <ebassi@gnome.org>
1115 Date: Wed Sep 2 16:41:51 2009 +0100
1117 [docs] Small documentation fixes
1119 Clean up some notes, and add introspection annotations where needed.
1121 json-glib/json-generator.c | 11 ++++++-----
1122 json-glib/json-gobject.c | 24 ++++++++++++------------
1123 json-glib/json-parser.c | 3 ++-
1124 3 files changed, 20 insertions(+), 18 deletions(-)
1126 commit d7d1e702b1d67fa1ec830a46650a02367ce1dd29
1127 Author: Emmanuele Bassi <ebassi@gnome.org>
1128 Date: Sun Aug 16 05:52:46 2009 +0100
1130 [docs] Remove note about normalization of member names
1132 The normalization of member names inside JsonObject was removed by
1133 commit 8a7e0f381dc7e49745680df92ebb428f18bf4832.
1135 json-glib/json-object.c | 6 +-----
1136 1 files changed, 1 insertions(+), 5 deletions(-)
1138 commit 9362ccc891c914dbcf1be6bd067b0b37ae688057
1139 Author: Emmanuele Bassi <ebassi@gnome.org>
1140 Date: Thu Aug 13 15:10:27 2009 +0100
1142 [docs] Generate new symbols index for 0.6 and 0.8
1144 doc/reference/json-glib-docs.xml | 8 ++++++++
1145 1 files changed, 8 insertions(+), 0 deletions(-)
1147 commit 087bfe83412dca8de1b2dd67c74f490e44ecb96a
1148 Author: Emmanuele Bassi <ebassi@gnome.org>
1149 Date: Thu Aug 13 15:10:07 2009 +0100
1151 [docs] Remove the version number from the title
1153 doc/reference/json-glib-docs.xml | 11 ++++++++---
1154 1 files changed, 8 insertions(+), 3 deletions(-)
1156 commit c7d31d55b50b23c6c1067cb3541f73dddc12127a
1157 Author: Emmanuele Bassi <ebassi@gnome.org>
1158 Date: Thu Aug 13 15:08:56 2009 +0100
1160 [docs] Let gtk-doc build the correct index
1162 Use the --name-space command line argument for gtk-doc to detect the
1163 right namespace of JSON-GLib, and create a useful index.
1165 doc/reference/Makefile.am | 2 +-
1166 1 files changed, 1 insertions(+), 1 deletions(-)
1168 commit be07ba7b983b34231ad2f0fd7fe60ae47b14ce7e
1169 Author: Emmanuele Bassi <ebassi@gnome.org>
1170 Date: Thu Aug 13 14:51:42 2009 +0100
1172 [docs] Rename main file to json-glib-docs.xml
1174 doc/reference/Makefile.am | 36 +++++----
1175 doc/reference/json-glib-docs.sgml | 163 -------------------------------------
1176 doc/reference/json-glib-docs.xml | 163 +++++++++++++++++++++++++++++++++++++
1177 3 files changed, 182 insertions(+), 180 deletions(-)
1179 commit 9661ff342b439b5b398f7bf9ba931d6139d5143d
1180 Author: Emmanuele Bassi <ebassi@gnome.org>
1181 Date: Wed Aug 12 16:09:33 2009 +0100
1183 Post-release version bump to 0.7.7
1186 1 files changed, 1 insertions(+), 1 deletions(-)
1188 commit d5922b42604c09ba7ebcb0adc1566d0a33a99808
1189 Author: Emmanuele Bassi <ebassi@gnome.org>
1190 Date: Wed Aug 12 16:06:40 2009 +0100
1192 [release] 0.7.6 (brown paper bag)
1195 1 files changed, 1 insertions(+), 1 deletions(-)
1197 commit 9a647104ca77d4c4272845fed4bfae028098afd3
1198 Author: Emmanuele Bassi <ebassi@gnome.org>
1199 Date: Wed Aug 12 15:56:00 2009 +0100
1201 Actually use the int64 support in the Scanner
1203 We switched everything to 64 bit integers but then I forgot to
1204 enable the support for actually making the tokenizer store the
1205 parsed integers into a 64 bit value.
1207 Bad Emmanuele, no cookie for you.
1209 json-glib/json-parser.c | 12 ++++++------
1210 json-glib/json-scanner.c | 1 +
1211 2 files changed, 7 insertions(+), 6 deletions(-)
1213 commit f3e0618ee1d8aa90d0ba22e9abe5c7d6b849e0ea
1214 Author: Emmanuele Bassi <ebassi@gnome.org>
1215 Date: Wed Aug 12 14:08:35 2009 +0100
1217 Post-release version bump to 0.7.5
1220 1 files changed, 1 insertions(+), 1 deletions(-)
1222 commit c1c691fc6b58a990ee9bb17504189064051d5a12
1223 Author: Emmanuele Bassi <ebassi@gnome.org>
1224 Date: Wed Aug 12 13:56:08 2009 +0100
1229 1 files changed, 1 insertions(+), 1 deletions(-)
1231 commit 12bc49ea08c50da9a7ed53c475fe873421432ebe
1232 Author: Emmanuele Bassi <ebassi@gnome.org>
1233 Date: Wed Aug 12 14:01:49 2009 +0100
1235 Update the NEWS file
1238 1 files changed, 2 insertions(+), 0 deletions(-)
1240 commit 75b888c26eebf7784c5af045a8c6af353e56b2e9
1241 Author: Emmanuele Bassi <ebassi@gnome.org>
1242 Date: Wed Aug 12 13:59:52 2009 +0100
1244 [build] Use our libtool for the typelib
1246 When compiling the GIR into a .typelib file we can use our own
1247 libtool script; shave will proxy it to the right place.
1249 json-glib/Makefile.am | 20 +++++++++++---------
1250 1 files changed, 11 insertions(+), 9 deletions(-)
1252 commit d84c0f367b06e094ff693d60a724b9f141c33ca9
1253 Author: Emmanuele Bassi <ebassi@gnome.org>
1254 Date: Wed Aug 12 13:48:17 2009 +0100
1256 Disallow single header file inclusion
1258 The correct header file for JSON-GLib is, and has always been,
1259 json-glib.h. Anything else was not supported, as we've been
1260 moving around stuff for a while, now.
1262 This commit enforces the single include file, using the same
1263 policy enacted by other libraries, like: GLib, GTK+ and Clutter.
1265 json-glib/json-enum-types.h.in | 4 ++++
1266 json-glib/json-generator.h | 4 ++++
1267 json-glib/json-glib.h | 6 ++++++
1268 json-glib/json-parser.h | 4 ++++
1269 json-glib/json-types.h | 4 ++++
1270 json-glib/json-version.h.in | 4 ++++
1271 6 files changed, 26 insertions(+), 0 deletions(-)
1273 commit 3adba015e1c1f9edc7b7b2c4364d65f813216225
1274 Author: Emmanuele Bassi <ebassi@gnome.org>
1275 Date: Wed Aug 12 13:46:46 2009 +0100
1277 [introspection] Use json-gobject.h
1279 The json-gobject.h header file includes json-glib.h and all the
1280 GObject-related serialization and deserialization API; we assume
1281 that if you want introspection you should be using this header
1282 and not the plain json-glib.h.
1284 json-glib/Makefile.am | 2 +-
1285 1 files changed, 1 insertions(+), 1 deletions(-)
1287 commit a9386e20bf8e16e17a89dda24781c63bf495aa97
1288 Author: Emmanuele Bassi <ebassi@gnome.org>
1289 Date: Wed Aug 12 13:46:05 2009 +0100
1291 [tests] Include json-glib.h
1293 Do not include json-types.h, use the correct global include.
1295 json-glib/tests/array-test.c | 2 +-
1296 json-glib/tests/node-test.c | 2 +-
1297 json-glib/tests/object-test.c | 2 +-
1298 3 files changed, 3 insertions(+), 3 deletions(-)
1300 commit 8a7e0f381dc7e49745680df92ebb428f18bf4832
1301 Author: Emmanuele Bassi <ebassi@gnome.org>
1302 Date: Wed Aug 12 12:29:34 2009 +0100
1304 Do not sanitize the object member's name
1306 JsonObject sanitizes the name of the member to replace all
1307 characters defined by G_STR_DELIMITERS with '_'. This is
1308 absolutely brain damaged, since a member name can be any
1311 Obviously, if a member name maps to a GObject property is
1312 entirely up to the GObject code to decide whether to sanitize
1313 the member name or not.
1315 json-glib/json-object.c | 35 ++++++-----------------------------
1316 1 files changed, 6 insertions(+), 29 deletions(-)
1318 commit ad638149c2cc1a17c0d2ad1482d932c8940c64e0
1319 Author: Emmanuele Bassi <ebassi@gnome.org>
1320 Date: Wed Aug 12 12:22:44 2009 +0100
1325 1 files changed, 2 insertions(+), 0 deletions(-)
1327 commit d87b18675ac02f42be23bf4070134690b8b9934b
1328 Author: Emmanuele Bassi <ebassi@gnome.org>
1329 Date: Wed Aug 12 12:13:11 2009 +0100
1331 Auto-promote integer types to G_TYPE_INT64
1333 The JSON RFC does not specify the size of the integer type, thus
1334 implicitly falling back to machine-size.
1336 This would all be fine and dandy if some demented Web Developer (and
1337 I use the term "developer" *very much* loosely) did not decide to
1338 use integers to store unique identifiers for objects; obviously, you
1339 can't have more than 2^32-1 status messages in a database with
1340 millions of users who update their status multiple times per day.
1343 Anyway, some languages do a type auto-promotion from Integer to
1344 Long, thus pushing the limit of allowed positive values -- until the
1345 next integer overflow, that is. C, and GLib, do not do that
1346 transparently for us so we need to:
1348 - always use gint64 when parsing a JSON data stream using
1350 - move all the Node, Object and Array APIs to gint64
1351 - auto-promote G_TYPE_INT to G_TYPE_INT64 when setting
1353 - auto-promote and auto-demote G_TYPE_INT properties when
1354 (de)serializing GObjects.
1356 The GLib types used internally by JSON-GLib are, thus:
1358 integer -> G_TYPE_INT64
1359 boolean -> G_TYPE_BOOLEAN
1360 float -> G_TYPE_DOUBLE
1361 string -> G_TYPE_STRING
1363 json-glib/json-array.c | 4 +-
1364 json-glib/json-generator.c | 4 +-
1365 json-glib/json-gobject.c | 58 ++++++++++++++++++++++++++++++---------
1366 json-glib/json-node.c | 61 +++++++++++++++++++++++++++++++++--------
1367 json-glib/json-object.c | 4 +-
1368 json-glib/json-types.h | 12 ++++----
1369 json-glib/tests/array-test.c | 2 +-
1370 json-glib/tests/node-test.c | 14 +++++-----
1371 json-glib/tests/object-test.c | 2 +-
1372 tests/test-generator.c | 4 +-
1373 tests/test-parser.c | 4 +-
1374 tests/test-serialize-full.c | 9 +-----
1375 12 files changed, 121 insertions(+), 57 deletions(-)
1377 commit 7411cadc0fdd9ffc2bd7004c9980913ac857a495
1378 Author: Emmanuele Bassi <ebassi@gnome.org>
1379 Date: Sun Jun 28 23:52:34 2009 +0100
1383 tests/test-parser.c | 98 +++++++++++++++++++++++++-------------------------
1384 1 files changed, 49 insertions(+), 49 deletions(-)
1386 commit 112a8ec8dfd9c46304008b62e8ab256ed7714644
1387 Author: Emmanuele Bassi <ebassi@gnome.org>
1388 Date: Sun Jun 28 23:49:51 2009 +0100
1390 [parser] Advance the tokenizer to avoid an infinite loop
1392 The tokenizer is not advanced when we peek a base value and return.
1393 This causes an endless loop which terminates only if the OOM killer
1394 in the kernel gets the right process.
1396 Thanks to Thomas Weidner for catching and reporting the issue.
1398 json-glib/json-parser.c | 16 +++++++++++-----
1399 1 files changed, 11 insertions(+), 5 deletions(-)
1401 commit 4ecdd6bedb7961f3a33971aa1f2338115a60f7f3
1402 Author: Emmanuele Bassi <ebassi@gnome.org>
1403 Date: Sun Jun 28 23:48:36 2009 +0100
1405 [tests] Verify parsing base values
1407 A JSON document containing just a base value (null, true/false, an
1408 integer, a floating point value or a string) is still a valid JSON
1409 document, and JsonParser must create the correct JsonNode.
1411 tests/test-parser.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
1412 1 files changed, 59 insertions(+), 0 deletions(-)
1414 commit 9a3b7a020716e23f1330915f1768a7c00bffbeb5
1415 Author: Emmanuele Bassi <ebassi@gnome.org>
1416 Date: Thu Jun 25 10:37:43 2009 +0100
1418 [docs] Fix typo in JsonObject::set_object_member()
1420 The passed value is a pointer to a JsonObject, not to a JsonArray.
1422 json-glib/json-object.c | 2 +-
1423 1 files changed, 1 insertions(+), 1 deletions(-)
1425 commit 68d872f15022217c0ff1cf516aec917d600fd762
1426 Author: Rodrigo Moya <rodrigo@gnome-db.org>
1427 Date: Wed Jun 24 14:07:18 2009 +0200
1429 Use JSON_NODE_OBJECT, not JSON_NODE_ARRAY when creating the node in json_object_set_object_member
1431 Reviewed by Emmanuele Bassi
1433 json-glib/json-object.c | 2 +-
1434 1 files changed, 1 insertions(+), 1 deletions(-)
1436 commit 6e706fb2b7a371f25c169ed25d4b617f2dc05b63
1437 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1438 Date: Sun Jun 21 10:58:24 2009 +0100
1440 [generator] Pre-compute the escape table
1442 Instead of allocating the escape table to be used with g_strescape()
1443 for each string we can have it unrolled already in code.
1445 Thanks to: Christian Persch <chpe@gnome.org>
1449 http://bugzilla.openedhand.com/show_bug.cgi?id=1648
1451 json-glib/json-generator.c | 43 +++++++++++++++++++++++++++++++++----------
1452 1 files changed, 33 insertions(+), 10 deletions(-)
1454 commit a9416b7e2823f1fffe639d90bb352a337815a70e
1455 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1456 Date: Thu Jun 18 11:23:56 2009 +0100
1458 Post-release bump to 0.7.3
1461 1 files changed, 1 insertions(+), 1 deletions(-)
1463 commit 1d13a409bb911141653a75d44e90feac9bfc2862
1464 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1465 Date: Thu Jun 18 11:20:35 2009 +0100
1470 1 files changed, 1 insertions(+), 1 deletions(-)
1472 commit ff97e679522c52be6b5dfe0f851416cdeac7f921
1473 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1474 Date: Thu Jun 18 11:14:37 2009 +0100
1476 [release] Update NEWS
1478 NEWS | 19 +++++++++++++++++++
1479 1 files changed, 19 insertions(+), 0 deletions(-)
1481 commit 182ca9cd9a3fabaa2533d841154856c61c570d08
1482 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1483 Date: Thu Jun 18 11:14:13 2009 +0100
1485 [build] Fixes for passing distcheck
1487 Makefile.am | 17 ++++++++++++-----
1488 build/Makefile.am | 2 ++
1489 build/autotools/Makefile.am | 4 +++-
1490 doc/reference/Makefile.am | 20 +++++++++++---------
1491 json-glib/Makefile.am | 27 ++++++++++++++-------------
1492 5 files changed, 42 insertions(+), 28 deletions(-)
1494 commit 019d8d4c1c56250cd507283c0fc478a38364e92a
1495 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1496 Date: Thu Jun 18 10:05:57 2009 +0100
1498 [build] Let gtk-doc ignore json-types-private.h
1500 The type definitions in json-types-private.h are not meant to be
1501 documented or scanned.
1503 doc/reference/Makefile.am | 1 +
1504 1 files changed, 1 insertions(+), 0 deletions(-)
1506 commit 41649f049637864cfce21f6615c7d8bcaf3f03b8
1507 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1508 Date: Thu Jun 18 10:03:23 2009 +0100
1510 [docs] Update the README file
1512 README | 30 ++++++++++++++++++++----------
1513 1 files changed, 20 insertions(+), 10 deletions(-)
1515 commit 97fc00b1a5e3878074488ee93d9b52570983da1f
1516 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1517 Date: Thu Jun 18 10:03:05 2009 +0100
1519 [build] Use AS_CASE m4 macro, instead of AS_IF
1521 configure.ac | 30 ++++++++++++++++--------------
1522 1 files changed, 16 insertions(+), 14 deletions(-)
1524 commit 610cd260ac50c09809d6273c328ecea5a21f51bb
1525 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1526 Date: Thu Jun 18 10:02:39 2009 +0100
1528 [build] Require automake 1.10
1530 configure.ac | 6 +++---
1531 1 files changed, 3 insertions(+), 3 deletions(-)
1533 commit bddc717b8b6f2f1501c30f78159c20394665d335
1534 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1535 Date: Tue Jun 9 11:48:02 2009 +0100
1537 [build] Add introspection generation
1539 Build the Introspection data when compiling JSON-GLib; this way, the
1540 API should be available to other languages automatically.
1543 build/autotools/Makefile.am | 7 +++-
1544 build/autotools/introspection.m4 | 88 ++++++++++++++++++++++++++++++++++++++
1545 configure.ac | 13 +++--
1546 json-glib/Makefile.am | 30 +++++++++++++
1547 5 files changed, 135 insertions(+), 6 deletions(-)
1549 commit 3ddeb7a8779a4c51453289aa15af130af480eea6
1550 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1551 Date: Tue Jun 9 11:24:54 2009 +0100
1553 [build] Add AS_COMPILER_FLAGS
1555 Use the m4 AS_COMPILER_FLAGS macro to check for the maintainer
1556 compiler flags supported by the C compiler. This should allow the
1557 build to handle gracefully different versions of GCC.
1561 build/autotools/Makefile.am | 2 +-
1562 build/autotools/as-compiler-flag.m4 | 62 +++++++++++++++++++++++++++++++++++
1563 configure.ac | 5 ++-
1564 5 files changed, 70 insertions(+), 2 deletions(-)
1566 commit 9f817eae9fe0d09441fa78b11ef148a3f4affe22
1567 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1568 Date: Tue Jun 9 11:21:19 2009 +0100
1570 [tests] Do not namespace with json-
1572 tests/test-generator.c | 10 +++++-----
1573 tests/test-parser.c | 18 +++++++++---------
1574 2 files changed, 14 insertions(+), 14 deletions(-)
1576 commit bde3da83b1a144fc0eff1db5a2aa790462bb685e
1577 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1578 Date: Tue Jun 9 11:15:53 2009 +0100
1580 [git ignore] Add m4 files under build/
1583 1 files changed, 3 insertions(+), 0 deletions(-)
1585 commit c12786444e0175464295fb9a98c600060bffa0ed
1586 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1587 Date: Tue Jun 9 11:13:30 2009 +0100
1589 Fix license and copyright notices
1591 THere is no such thing as the "Lesser General Public License
1592 version 2": the LGPL v2 is the "Library GPL", and has been
1593 superceded by v2.1 with the new "Lesser GPL" name.
1595 Also, the copyright is now Intel Corp.
1597 json-glib/json-array.c | 8 ++++++--
1598 json-glib/json-generator.c | 8 ++++++--
1599 json-glib/json-generator.h | 8 ++++++--
1600 json-glib/json-glib.h | 23 +++++++++++++++++++++++
1601 json-glib/json-gobject.h | 8 ++++++--
1602 json-glib/json-node.c | 8 ++++++--
1603 json-glib/json-object.c | 9 ++++++---
1604 json-glib/json-parser.c | 8 ++++++--
1605 json-glib/json-parser.h | 8 ++++++--
1606 json-glib/json-version.h.in | 8 ++++++--
1607 10 files changed, 77 insertions(+), 19 deletions(-)
1609 commit 069cdc8c4ea9024b1583f074815e16e9ddf7db7f
1610 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1611 Date: Tue Jun 9 11:05:23 2009 +0100
1613 [node] Make JsonNode completely private
1615 The JsonNode structure has always been meant to be completely
1616 opaque; we indirectly exposed the :type member, but only for
1617 access through the JSON_NODE_TYPE() macro.
1619 Since that macro has become a proxy for the json_node_get_node_type()
1620 function we can safely move everything into a private, uninstalled
1621 header file and let JsonNode be completely opaque to the developer.
1623 json-glib/Makefile.am | 1 +
1624 json-glib/json-array.c | 9 +-----
1625 json-glib/json-generator.c | 2 +
1626 json-glib/json-gobject.c | 2 +
1627 json-glib/json-node.c | 2 +-
1628 json-glib/json-object.c | 9 +-----
1629 json-glib/json-parser.c | 2 +
1630 json-glib/json-types-private.h | 61 ++++++++++++++++++++++++++++++++++++++++
1631 json-glib/json-types.h | 38 +++++++++---------------
1632 json-glib/tests/node-test.c | 8 ++--
1633 10 files changed, 89 insertions(+), 45 deletions(-)
1635 commit 930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8
1636 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1637 Date: Sun May 17 19:44:41 2009 +0100
1639 Add JsonArray iteration function
1641 Similarly to commit 3057a172 for JsonObject, the newly added
1642 json_array_foreach_element() iterates over a JSON array data
1645 doc/reference/json-glib-sections.txt | 2 +
1646 json-glib/json-array.c | 35 ++++++++++++++++++++++++
1647 json-glib/json-types.h | 21 +++++++++++++++
1648 json-glib/tests/array-test.c | 48 ++++++++++++++++++++++++++++++++++
1649 4 files changed, 106 insertions(+), 0 deletions(-)
1651 commit 3057a1722e27a13b39ddec4754fb6abda1aea199
1652 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1653 Date: Sat May 16 20:09:07 2009 +0100
1655 Add JsonObject iteration function
1657 The json_object_foreach_member() function iterates over a JsonObject
1660 doc/reference/json-glib-sections.txt | 2 +
1661 json-glib/json-object.c | 55 ++++++++++++++++++++++++++++++++
1662 json-glib/json-types.h | 25 +++++++++++++-
1663 json-glib/tests/object-test.c | 57 ++++++++++++++++++++++++++++++++++
1664 4 files changed, 137 insertions(+), 2 deletions(-)
1666 commit 5778210462b8b7a1a5d98466508276f712ea8c47
1667 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1668 Date: Sat May 16 13:53:58 2009 +0100
1670 Update the enum types templates
1672 The autogenerated enumeration types registration code should
1673 be using the same pattern used by the G_DEFINE_TYPE() macros,
1674 with GOnce to enable atomic (and thread-safe) type registration.
1676 json-glib/json-enum-types.c.in | 18 +++++++++++++-----
1677 1 files changed, 13 insertions(+), 5 deletions(-)
1679 commit 43d4bd151cd6979ecc6fdad5fab3e7988117c7be
1680 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1681 Date: Sun Apr 19 00:36:08 2009 +0100
1683 [doap] Add a category element
1685 json-glib.doap | 1 +
1686 1 files changed, 1 insertions(+), 0 deletions(-)
1688 commit 58999bddac74c176fbd8544fa2cd30e2f067d863
1689 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1690 Date: Fri Apr 17 15:45:42 2009 +0100
1692 [node] Add is_null() method
1694 The json_node_is_null() function is just a quick check for
1697 doc/reference/json-glib-sections.txt | 1 +
1698 json-glib/json-node.c | 20 ++++++++++++++++++++
1699 json-glib/json-types.h | 1 +
1700 3 files changed, 22 insertions(+), 0 deletions(-)
1702 commit ba46d8e07a8e2dd50a3b1fff8b8c3303e3686480
1703 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1704 Date: Fri Apr 17 15:38:40 2009 +0100
1706 [node] Make JSON_NODE_TYPE call a function
1708 Second pass at adding type safety to the JsonNode type checks.
1710 The JSON_NODE_TYPE macro now calls the json_node_get_node_type()
1711 function which hides the JsonNode.type structure field and gives
1712 us a little bit more of future compatibility.
1714 json-glib/json-types.h | 2 +-
1715 1 files changed, 1 insertions(+), 1 deletions(-)
1717 commit d1e7d1ecd05687624f7149dad75a5fac9a645e72
1718 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1719 Date: Fri Apr 17 15:36:09 2009 +0100
1721 [node] Add function version of JSON_NODE_TYPE macro
1723 First pass at adding some type safety to the JsonNode type checks,
1724 and at removing every mention of the JsonNode interna fields.
1726 doc/reference/json-glib-sections.txt | 1 +
1727 json-glib/json-node.c | 18 ++++++++++++++++++
1728 json-glib/json-types.h | 5 +++--
1729 3 files changed, 22 insertions(+), 2 deletions(-)
1731 commit f2f43d17254317d35ea0cc8206592ecbcb856b68
1732 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1733 Date: Fri Apr 17 15:22:04 2009 +0100
1735 Intern the remaining type names
1737 JsonArray and JsonSerializable type names should be interned like
1738 the rest of the types.
1740 json-glib/json-array.c | 2 +-
1741 json-glib/json-gobject.c | 3 ++-
1742 2 files changed, 3 insertions(+), 2 deletions(-)
1744 commit bfcc50d5b199e72ed3e5a7556ac2294442e3ac55
1745 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1746 Date: Fri Apr 17 15:19:42 2009 +0100
1748 [docs] Remove newline from the version template
1750 The newline at the end of the version.xml.in file is retained
1751 when using its contents as the version entity in the API reference
1754 doc/reference/version.xml.in | 2 +-
1755 1 files changed, 1 insertions(+), 1 deletions(-)
1757 commit cbc92b72b2d7870a916f24055f8c2aa2371aa4ea
1758 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1759 Date: Fri Apr 17 15:02:44 2009 +0100
1761 [tests] Use the typed accessors in test-generator
1763 Other than using the GValue-based methods we should also be using
1764 the typed JsonNode accessors and the newly added JsonObject and
1765 JsonArray typed accessors.
1767 tests/test-generator.c | 65 ++++++++---------------------------------------
1768 1 files changed, 11 insertions(+), 54 deletions(-)
1770 commit e437ce609e333c5b8ede21174dfba032c1bbfb00
1771 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1772 Date: Fri Apr 17 14:49:25 2009 +0100
1774 Add convenience accessors to JsonArray
1776 Like commit 5bb6ea91 did for JsonObject, we should add typed
1777 convenience accessors to JsonArray in order to cut down the
1778 amount of nodes needed when parsing and generating JSON data
1781 As for JsonObject, the amount of types is small enough to avoid
1782 the combinatorial API explosion.
1784 doc/reference/json-glib-sections.txt | 22 ++-
1785 json-glib/json-array.c | 386 ++++++++++++++++++++++++++++++++++
1786 json-glib/json-types.h | 57 ++++--
1787 3 files changed, 447 insertions(+), 18 deletions(-)
1789 commit 4819ca625d1b73270797f913495a3835297950c2
1790 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1791 Date: Fri Apr 17 11:44:01 2009 +0100
1793 Update after the json_object_add_member() deprecation
1795 Since json_object_add_member() has been deprecated and it's using
1796 a gcc compiler attribute to loudly complain while compiling the
1797 library, we should restore the sanity and use json_object_set_member()
1800 json-glib/json-gobject.c | 2 +-
1801 json-glib/json-parser.c | 6 +++---
1802 json-glib/tests/node-test.c | 2 +-
1803 json-glib/tests/object-test.c | 4 ++--
1804 tests/test-generator.c | 26 +++++++++++++-------------
1805 tests/test-serialize-complex.c | 4 ++--
1806 tests/test-serialize-full.c | 4 ++--
1807 7 files changed, 24 insertions(+), 24 deletions(-)
1809 commit 5bb6ea91accb1d35f0ea4dae8f2b8f71bdbd134d
1810 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1811 Date: Fri Apr 17 11:35:57 2009 +0100
1813 Deprecate add_member() and add set_member() and friends
1815 The add_member() method of JsonObject has wee bit weird semantics: if
1816 the member to be added already exists it prints a scary warning and
1817 returns - and yet it calls g_hash_table_replace() internally as if it
1818 overwrites the member.
1820 So, instead of changing semantics midway we can:
1822 - add a json_object_set_member() which adds a new member and
1823 overwrites existing members
1825 - deprecate json_object_add_member()
1827 While we're at it, we can add convenience wrappers for set_member()
1828 and get_member() that don't require us toying with nodes; luckily,
1829 since the amount of valid types we can add to a JsonObject is limited,
1830 this does not lead to a combinatorial API explosion.
1832 doc/reference/json-glib-sections.txt | 17 ++
1833 json-glib/json-object.c | 489 ++++++++++++++++++++++++++++++++--
1834 json-glib/json-types.h | 83 +++++--
1835 3 files changed, 555 insertions(+), 34 deletions(-)
1837 commit 2a768cb5e553afc4a9ac0d9bf1dc36a183821983
1838 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1839 Date: Thu Apr 16 19:57:11 2009 +0100
1841 [doap] Add GNOME extensions
1843 The GNOME project provides an extension to DOAP that allows the
1844 description of the maintainer/author of a project to specify the
1847 json-glib.doap | 3 +++
1848 1 files changed, 3 insertions(+), 0 deletions(-)
1850 commit 17822292acb4d1c9b4f414ea0e4b858809d3b858
1851 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1852 Date: Thu Apr 16 18:18:45 2009 +0100
1854 [doap] Add 0.6 releases
1856 Describe the releases of the 0.6 cycle.
1858 json-glib.doap | 18 ++++++++++++++++++
1859 1 files changed, 18 insertions(+), 0 deletions(-)
1861 commit 470f3a4299153362deea260c806d9b87870af3de
1862 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1863 Date: Thu Apr 16 18:03:31 2009 +0100
1865 Add JSON-GLib DOAP description
1867 Use DOAP (Description Of A Project) to describe JSON-GLib. The
1868 GNOME Cgit instance will pick up the DOAP file and update itself.
1870 json-glib.doap | 30 ++++++++++++++++++++++++++++++
1871 1 files changed, 30 insertions(+), 0 deletions(-)
1873 commit 764a3f79fe0d8d13e24bd921a16a46f4603bcbf1
1874 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1875 Date: Thu Apr 16 11:28:24 2009 +0100
1877 Add MAINTAINERS file
1879 Every GNOME project needs a MAINTAINERS file.
1882 1 files changed, 3 insertions(+), 0 deletions(-)
1884 commit f9956b4eadcfc9bbd5c0bc4b861ff782779e8a9a
1885 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1886 Date: Tue Apr 14 00:09:35 2009 +0100
1888 [node] Do not overwrite when copying
1890 Bug 1353 - Copying JSON_NODE_VALUE nodes unreliable at best
1892 When copying a JsonNode to another we do an implicit memcpy using:
1896 Which works well enough with pointers, but makes a mess out of the
1899 We should just copy the type of the original JsonNode and leave the
1900 rest to the switch() block.
1902 In order to catch potential regressions, we also need a more
1903 thorough test unit for the JsonNode copy operation.
1905 json-glib/json-node.c | 2 +-
1906 json-glib/tests/node-test.c | 45 +++++++++++++++++++++++++++++++++++++++++-
1907 2 files changed, 44 insertions(+), 3 deletions(-)
1909 commit e2c65a75d68aafa26f2084928e732961e48beb99
1910 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1911 Date: Mon Apr 13 23:46:52 2009 +0100
1913 [build] Improve the build system
1915 Clean up the configure.ac and Makefile.am files to use something
1916 that is not entirely made of FAIL.
1918 Also, use Shave to sanitize the libtool and compiler incantations
1919 and restore sanity to the build system.
1923 build/Makefile.am | 1 +
1924 build/autotools/Makefile.am | 3 +
1925 build/autotools/shave-libtool.in | 69 +++++++++++++++++++++++++++++
1926 build/autotools/shave.in | 79 +++++++++++++++++++++++++++++++++
1927 build/autotools/shave.m4 | 77 ++++++++++++++++++++++++++++++++
1928 configure.ac | 90 +++++++++++++++++++++----------------
1929 json-glib/Makefile.am | 89 +++++++++++++++++++------------------
1930 9 files changed, 340 insertions(+), 82 deletions(-)
1932 commit 8080df63b4b4eae3b59d1214fc67f48149f49773
1933 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1934 Date: Mon Apr 13 22:25:42 2009 +0100
1936 [parser] Prevent leaks on error codepaths
1938 Static analysis of the code showed some potential leaks inside
1939 error paths for JsonParser.
1941 Thanks to: Gordon Williams <gordon.williams@collabora.co.uk>
1943 json-glib/json-parser.c | 38 +++++++++++++++++++++++++++++++++-----
1944 1 files changed, 33 insertions(+), 5 deletions(-)
1946 commit ca329a7d5c1185cdf15fb85891693eca30295de1
1947 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1948 Date: Mon Apr 13 22:30:05 2009 +0100
1950 [docs] Show an example of assignment
1952 Since I decided to rant about assignments in JSON definitions,
1953 I also need to show what an assignment looks like.
1955 json-glib/json-parser.c | 17 ++++++++++++-----
1956 1 files changed, 12 insertions(+), 5 deletions(-)
1958 commit b28d5894060aac1239e23665f42be3946b5450e7
1959 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1960 Date: Mon Apr 13 22:29:36 2009 +0100
1964 Add more spaces and remove the ` from the error message.
1966 json-glib/json-parser.c | 18 ++++++++++++------
1967 1 files changed, 12 insertions(+), 6 deletions(-)
1969 commit a19a51df9e95e36edf949e68581731bd31959081
1970 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1971 Date: Mon Apr 13 22:08:21 2009 +0100
1973 [tests] Use 'static' when registering enum types
1975 Bug 1393 - Regression tests fails on OpenBSD
1977 When registering a GEnumClass we need to set the GEnumValue array
1978 as static const because g_enum_register_static() does not contain
1979 the word "static" just for fun.
1981 Reported by: Jasper <jasper@humppa.nl>
1983 tests/test-serialize-full.c | 2 +-
1984 1 files changed, 1 insertions(+), 1 deletions(-)
1986 commit e583a9ec95f3d157091ec1e1a2ac8c493f0e23b2
1987 Author: Emmanuele Bassi <ebassi@linux.intel.com>
1988 Date: Mon Apr 13 22:04:10 2009 +0100
1990 [build] Use gnome-autogen script
1992 When setting up the build environment we should use the tools that
1993 GNOME provides instead of calling autoreconf.
1995 autogen.sh | 21 ++++++++-------------
1996 1 files changed, 8 insertions(+), 13 deletions(-)
1998 commit 1d92c73bc05423872581d513f355783d4864edd5
1999 Author: Emmanuele Bassi <ebassi@gnome.org>
2000 Date: Fri Nov 28 17:24:15 2008 +0000
2002 Abstract the loading code into its own function
2004 The load_from_file() method must set the is_filename/filename fields
2005 of the JsonParserPrivate structure, so that the error handler can
2006 use them to print out the file, as well as the line in case of
2009 Since load_from_data() needs to unset those two fields, to avoid
2010 printing invalid/stale information, we need to have a generic "load"
2011 function that can be invoked by both load_from_data() and
2012 load_from_file(), and leave the JsonParser object set up to those
2015 Hence, a private json_parser_load() has been added, moving most of
2016 the code out of json_parser_load_from_data(). This function does not
2017 perform type checks and requires that the length of the memory buffer
2018 containing the JSON data stream is already a positive integer.
2020 json-glib/json-parser.c | 175 +++++++++++++++++++++++++++-------------------
2021 1 files changed, 103 insertions(+), 72 deletions(-)
2023 commit 6e7958785096806b3ffa60a4937642d713a051f2
2024 Author: Emmanuele Bassi <ebassi@gnome.org>
2025 Date: Fri Nov 28 17:19:17 2008 +0000
2027 Display the filename inside error messages
2029 Instead of just relaying the line number both when parsing files
2030 and memory buffers, JsonParser should also print out the file name
2031 in case it is available.
2033 The error message format should be make-like and emacs-friendly,
2036 filename:line_number: error message
2038 so that editors and development environments can parse the errors
2041 This commit adds the filename string, and a boolean flag for checking
2042 whether the filename is set, inside the JsonParser private data
2043 structure. The boolean flag is checked inside the JsonScanner error
2044 handler when populating the GError or when printing the warning
2047 json-glib/json-parser.c | 28 ++++++++++++++++++++++++++--
2048 1 files changed, 26 insertions(+), 2 deletions(-)
2050 commit a5bea353dead0bd69f9664df86050fc829a2dcd5
2051 Author: Emmanuele Bassi <ebassi@gnome.org>
2052 Date: Mon Nov 3 16:01:03 2008 +0000
2054 Bump to 0.7.1 after stable branch
2056 configure.ac | 6 +++---
2057 1 files changed, 3 insertions(+), 3 deletions(-)
2059 commit cf4c7360c69c0fe7587ec2456cd10839e1d0c1d6
2060 Author: Emmanuele Bassi <ebassi@gnome.org>
2061 Date: Mon Nov 3 15:51:21 2008 +0000
2063 Correctly terminate a string array
2065 When converting from a JsonArray of strings to a GStrv we need to
2066 add a NULL at the end of the GPtrArray we use to perform the
2069 This two lines patch fixes the issue.
2073 Patch by: Kouhei Sutou <kou@cozmixng.org>
2075 Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
2077 json-glib/json-gobject.c | 4 +++-
2078 1 files changed, 3 insertions(+), 1 deletions(-)
2080 commit 9b94bc7f99063f45a2725861369f36b53ec3d440
2081 Author: Emmanuele Bassi <ebassi@openedhand.com>
2082 Date: Fri Jun 13 11:56:46 2008 +0100
2084 Sync up with the current stable release numbers
2086 configure.ac | 4 ++--
2087 1 files changed, 2 insertions(+), 2 deletions(-)
2089 commit 4dd392342003147d55eee98db50e11d344b287d4
2090 Author: Emmanuele Bassi <ebassi@openedhand.com>
2091 Date: Fri Jun 13 11:27:50 2008 +0100
2093 Fix a variable shadowing
2095 json-glib/json-generator.c | 3 ++-
2096 1 files changed, 2 insertions(+), 1 deletions(-)
2098 commit a02a42ef47e61456747e511556097b903f07d68a
2099 Merge: fdbad1c bc5c722
2100 Author: Emmanuele Bassi <ebassi@openedhand.com>
2101 Date: Fri Jun 13 11:23:08 2008 +0100
2103 Merge the fix for bug #965
2105 Merge branch 'bug-965'
2107 commit bc5c7225535ef447743ac59ecdba8c237549a108
2108 Author: Emmanuele Bassi <ebassi@openedhand.com>
2109 Date: Fri Jun 13 11:22:35 2008 +0100
2111 Conditionally compile the test suite
2113 If the --disable-glibtest command line switch has been given to the
2114 configure script, the test suite should be disabled and not built.
2116 This commit disables recursion in the tests/ and json-glib/tests
2117 when the ENABLE_GLIB_TEST Makefile conditional has been set.
2119 Makefile.am | 6 +++++-
2120 configure.ac | 3 +++
2121 json-glib/Makefile.am | 2 ++
2122 3 files changed, 10 insertions(+), 1 deletions(-)
2124 commit fdbad1cfd6ad6da9fab631f945ab8d2e85228fdf
2125 Author: Emmanuele Bassi <ebassi@openedhand.com>
2126 Date: Fri Jun 13 11:06:15 2008 +0100
2128 Escape to special characters in JsonGenerator
2130 When using json-glib to write a blog system, some deserialized objects
2131 were not been interpreted by javascript because there were line breaks
2132 in generated strings.
2134 Patch from Lincoln de Sousa.
2136 Bug #958 - JsonGenerator does not escape special characters
2138 Signed-off-by: Emmanuele Bassi <ebassi@openedhand.com>
2140 json-glib/json-generator.c | 17 ++++++++++++++++-
2141 1 files changed, 16 insertions(+), 1 deletions(-)
2143 commit 81c02ef3db6901655f8a7117e5e2675d37096daf
2144 Author: Emmanuele Bassi <ebassi@openedhand.com>
2145 Date: Sun May 18 11:56:04 2008 +0100
2147 Remove the include for json-scanner.h
2149 The json-scanner.h header file is not shipped with JSON-GLib anymore.
2151 json-glib/json-glib.h | 1 -
2152 1 files changed, 0 insertions(+), 1 deletions(-)
2154 commit 9713843a4294b3e35a29125bf2bf1867a6443f27
2155 Author: Emmanuele Bassi <ebassi@openedhand.com>
2156 Date: Tue May 6 11:48:25 2008 +0100
2158 Remove debian packaging
2160 debian/changelog | 5 ---
2162 debian/control | 61 ---------------------------------------
2163 debian/copyright | 27 -----------------
2164 debian/libjson-glib-dev.install | 3 --
2165 debian/libjson-glib-doc.install | 1 -
2166 debian/libjson-glib-doc.links | 1 -
2167 debian/libjson-glib0.install | 1 -
2168 debian/rules | 12 -------
2169 9 files changed, 0 insertions(+), 112 deletions(-)
2171 commit d67000ab6c5ae6710f48f0517c98600af7cdaa0e
2172 Author: Emmanuele Bassi <ebassi@openedhand.com>
2173 Date: Mon May 5 23:17:58 2008 +0100
2175 Update changelog for the debian packages
2177 debian/changelog | 3 +--
2178 1 files changed, 1 insertions(+), 2 deletions(-)
2180 commit 0830873edc5203655f04868184cedb428b6d2d54
2181 Author: Emmanuele Bassi <ebassi@openedhand.com>
2182 Date: Mon May 5 23:16:38 2008 +0100
2184 Update git ignore file
2186 .gitignore | 72 ++++++++++++++++++-----------------------------------------
2187 1 files changed, 22 insertions(+), 50 deletions(-)
2189 commit eb1cd29f78ff52e3ec3b063716fb86b5f2c5ae4a
2190 Author: Emmanuele Bassi <ebassi@openedhand.com>
2191 Date: Mon May 5 23:13:17 2008 +0100
2193 Remove Vala bindings
2195 Vala bindings are maintained out of tree, directly inside the Vala
2196 repository and official packages, so there's no point in duplicating
2200 configure.ac | 15 -----
2201 contrib/Makefile.am | 6 --
2202 contrib/json-glib-1.0.deps | 1 -
2203 contrib/json-glib-1.0.vapi | 139 --------------------------------------------
2204 contrib/json-object.vala | 46 ---------------
2205 contrib/json-test.vala | 122 --------------------------------------
2206 7 files changed, 1 insertions(+), 334 deletions(-)
2208 commit 094acd1663210e803a8dab496f6de8066ef11f44
2209 Author: Emmanuele Bassi <ebassi@openedhand.com>
2210 Date: Mon May 5 12:44:29 2008 +0100
2215 1 files changed, 1 insertions(+), 1 deletions(-)
2217 commit a725bac9a287883f2d4f32130c7faedb121f754b
2218 Author: Emmanuele Bassi <ebassi@openedhand.com>
2219 Date: Mon May 5 12:39:01 2008 +0100
2223 configure.ac | 4 ++--
2224 1 files changed, 2 insertions(+), 2 deletions(-)
2226 commit cd598180b12a212525427a8cddf11bc0ed4f1836
2227 Author: Emmanuele Bassi <ebassi@openedhand.com>
2228 Date: Mon May 5 12:38:50 2008 +0100
2230 Update NEWS for 0.6.0
2233 1 files changed, 5 insertions(+), 0 deletions(-)
2235 commit 26479ec3c342889a2ee822bdf73f2e5fb6e170d7
2236 Merge: 8b5b5f6 7ff9134
2237 Author: Emmanuele Bassi <ebassi@openedhand.com>
2238 Date: Mon May 5 12:35:16 2008 +0100
2240 Add debian packaging to the master branch
2242 Merge branch 'debian-packaging'
2244 commit 8b5b5f6a4fdfb219897d75893889014f44ba4bb0
2245 Author: Emmanuele Bassi <ebassi@openedhand.com>
2246 Date: Mon May 5 12:34:35 2008 +0100
2248 Add json-scanner.h to the EXTRA_DIST content
2250 Fix a distcheck error because json-scanner.h is not packaged inside
2253 json-glib/Makefile.am | 1 +
2254 1 files changed, 1 insertions(+), 0 deletions(-)
2256 commit 705a73eb3dfa2323ec86c1d299b567a15acde7a6
2257 Author: Emmanuele Bassi <ebassi@openedhand.com>
2258 Date: Mon May 5 12:24:22 2008 +0100
2260 Style fixes for the configure output
2262 configure.ac | 10 +++++-----
2263 1 files changed, 5 insertions(+), 5 deletions(-)
2265 commit e017d392a281594e350a8d74c142cbe014753d7e
2266 Author: Emmanuele Bassi <ebassi@openedhand.com>
2267 Date: Mon May 5 12:24:00 2008 +0100
2269 Fix typo in the libtool flags arguments
2271 The correct syntax for passing the versioning information to
2272 libtool is '-version-info', not '-versio-info'.
2275 1 files changed, 1 insertions(+), 1 deletions(-)
2277 commit 2051be2f7185733bbc62d10ec096538fec924638
2278 Author: Emmanuele Bassi <ebassi@openedhand.com>
2279 Date: Mon May 5 12:22:59 2008 +0100
2281 Add the Bugzilla URL to AC_INIT
2283 JSON-GLib has a bugzilla product on bugzilla.openedhand.com. By adding
2284 the URL to the configure.ac template, the configure script will print
2285 it when invoked with the --help command line switch.
2287 configure.ac | 7 ++++++-
2288 1 files changed, 6 insertions(+), 1 deletions(-)
2290 commit 4cb8a9078172c5f56ac5d56417b8656a7053df4a
2291 Author: Emmanuele Bassi <ebassi@openedhand.com>
2292 Date: Mon May 5 12:21:40 2008 +0100
2296 Make autogen.sh test for the location of the current directory, and
2297 warn if the checkout is not complete.
2299 If gtk-doc is not installed (for instance, on an embedded minimal
2300 set up), do not fail and just provide a stub gtk-doc.make.
2302 autogen.sh | 28 +++++++++++++++++++++++++---
2303 1 files changed, 25 insertions(+), 3 deletions(-)
2305 commit 1571fcddd6f2a245f4bb6ad64f82d24fc9c4cec0
2306 Author: Emmanuele Bassi <ebassi@openedhand.com>
2307 Date: Thu May 1 23:00:28 2008 +0100
2309 Test the deserialization of arrays of strings
2311 Arrays of strings are handled automatically by the GObject
2312 deserialization and serialization code. We need to test that
2313 they are correctly parsed and assigned to the instance.
2315 tests/test-serialize-full.c | 29 +++++++++++++++++++++++++++--
2316 1 files changed, 27 insertions(+), 2 deletions(-)
2318 commit 4c11d0969a44bb70acf6463ef6305999ff443be2
2319 Author: Emmanuele Bassi <ebassi@openedhand.com>
2320 Date: Thu May 1 22:58:55 2008 +0100
2322 Use an array to hold the strings in a vector
2324 Instead of building a GString by concatenating every string inside
2325 an array to deserialize the array into a string vector property,
2326 use a GPtrArray. This is far more efficient (no reallocations are
2327 necessary, as we know the size of the array) and safe (the separator
2328 used to build the string buffer and then split it might exist in
2329 one of the original strings).
2331 json-glib/json-gobject.c | 15 +++++----------
2332 1 files changed, 5 insertions(+), 10 deletions(-)
2334 commit 7ff91344d21b0c26d3a3a2834dbf09286cb1f904
2335 Author: Emmanuele Bassi <ebassi@openedhand.com>
2336 Date: Thu May 1 16:08:15 2008 +0100
2338 Remove control re-generation rule
2340 We don't have a template control, so there's not need to clean it
2341 up and regenerate it.
2343 This is why copying existing debian/rules templates is not a good
2344 idea unless you read the Debian packaging rules.
2346 debian/rules | 3 ---
2347 1 files changed, 0 insertions(+), 3 deletions(-)
2349 commit e75321e64f17d69beac0c2e131572fe081680b08
2350 Author: Emmanuele Bassi <ebassi@openedhand.com>
2351 Date: Thu May 1 15:58:31 2008 +0100
2353 Add debian packaging files
2355 The debian packaging files are obviously needed to generate Debian
2356 packages for JSON-GLib.
2358 debian/changelog | 6 ++++
2360 debian/control | 61 +++++++++++++++++++++++++++++++++++++++
2361 debian/copyright | 27 +++++++++++++++++
2362 debian/libjson-glib-dev.install | 3 ++
2363 debian/libjson-glib-doc.install | 1 +
2364 debian/libjson-glib-doc.links | 1 +
2365 debian/libjson-glib0.install | 1 +
2366 debian/rules | 15 +++++++++
2367 9 files changed, 116 insertions(+), 0 deletions(-)
2369 commit 30f9d47ecf43a17610cd9c0074ff832bfa37593c
2370 Author: Emmanuele Bassi <ebassi@openedhand.com>
2371 Date: Thu Apr 24 15:47:11 2008 +0100
2373 Test the equality of the serialize string length
2375 tests/test-serialize-simple.c | 3 +++
2376 1 files changed, 3 insertions(+), 0 deletions(-)
2378 commit 07c2b916dadb4b40fbaabf49f0e80941993cc2cf
2379 Author: Emmanuele Bassi <ebassi@openedhand.com>
2380 Date: Thu Apr 24 15:02:33 2008 +0100
2382 Export only the public symbols
2384 All the symbols starting with an underscore or with something that
2385 is not "json" are to considered private, and thus are not global
2386 to the shared object.
2388 json-glib/Makefile.am | 6 +++++-
2389 1 files changed, 5 insertions(+), 1 deletions(-)
2391 commit 179899e5da801fda0981a1d446ba420efd4021c1
2392 Author: Emmanuele Bassi <ebassi@openedhand.com>
2393 Date: Thu Apr 24 14:55:51 2008 +0100
2395 Update git ignore file
2398 1 files changed, 4 insertions(+), 0 deletions(-)
2400 commit b0daf7e3a2529dd9950d77a96a10233d68778f32
2401 Author: Emmanuele Bassi <ebassi@openedhand.com>
2402 Date: Thu Apr 24 14:54:05 2008 +0100
2404 Include the newly added json-enum-types.h header
2406 When including json-glib/json-glib.h we get everything json-glib
2407 expose as a public symbol.
2409 json-glib/json-glib.h | 1 +
2410 1 files changed, 1 insertions(+), 0 deletions(-)
2412 commit c7a7f429565195fe7aba56a254abf3637cf6fa8a
2413 Author: Emmanuele Bassi <ebassi@openedhand.com>
2414 Date: Thu Apr 24 14:52:54 2008 +0100
2416 Ignore the enumeration types header and the stamp file
2418 We don't need gtk-doc to look at those files; the enumeration
2419 types are already documented, and the get_type() function and
2422 doc/reference/Makefile.am | 2 ++
2423 1 files changed, 2 insertions(+), 0 deletions(-)
2425 commit 053bf43c813799c5f59e9241217fe31c560b5885
2426 Author: Emmanuele Bassi <ebassi@openedhand.com>
2427 Date: Thu Apr 24 14:52:07 2008 +0100
2429 Install the autogenerated enum types header
2431 The enumeration GTypes are public and meant to be used by
2432 language bindings and other users of the library.
2434 json-glib/Makefile.am | 1 +
2435 1 files changed, 1 insertions(+), 0 deletions(-)
2437 commit 5977d95866cd9763e97a47d6c9909e6a2fbf0ed1
2438 Author: Emmanuele Bassi <ebassi@openedhand.com>
2439 Date: Thu Apr 24 14:50:34 2008 +0100
2441 Autogenerate the GTypes for the enumerations
2443 json-glib/Makefile.am | 70 +++++++++++++++++++++++++++++++++----------------
2444 1 files changed, 47 insertions(+), 23 deletions(-)
2446 commit 356413e8840a614914b84f40b1d8476ba036ded4
2447 Author: Emmanuele Bassi <ebassi@openedhand.com>
2448 Date: Thu Apr 24 14:49:45 2008 +0100
2450 Add enumeration types templates for glib-mkenums
2452 The templates for glib-mkenums keep the Makefile.am sane and
2453 editable by mere mortals.
2455 json-glib/json-enum-types.c.in | 31 +++++++++++++++++++++++++++++++
2456 json-glib/json-enum-types.h.in | 26 ++++++++++++++++++++++++++
2457 2 files changed, 57 insertions(+), 0 deletions(-)
2459 commit 7d57ffc03783defbfeb26e21a14e3df32555c29d
2460 Author: Emmanuele Bassi <ebassi@openedhand.com>
2461 Date: Mon Apr 21 10:57:05 2008 +0100
2463 Update git ignore file
2466 1 files changed, 1 insertions(+), 0 deletions(-)
2468 commit 7d259e03b9a556d155ade87417ab26830c3e7684
2469 Author: Emmanuele Bassi <ebassi@openedhand.com>
2470 Date: Sun Apr 20 22:43:32 2008 +0100
2472 Validate the variable name in the assignment test
2474 Make sure that not only we report that there is an assignment
2475 and that the returned variable is not NULL, but also that the
2476 returned variable name is correct.
2478 tests/test-parser.c | 16 ++++++++++------
2479 1 files changed, 10 insertions(+), 6 deletions(-)
2481 commit 6899bca0dcf72dac0cad9dcf1a7cd10159d471e5
2482 Author: Emmanuele Bassi <ebassi@openedhand.com>
2483 Date: Sat Apr 19 23:22:29 2008 +0100
2485 Add more cases for the nested array parsing unit
2487 Try more combinations of elements inside an array with a nested
2490 tests/test-parser.c | 2 ++
2491 1 files changed, 2 insertions(+), 0 deletions(-)
2493 commit 81addb645ac5fad28619bb660624902abe981377
2494 Author: Emmanuele Bassi <ebassi@openedhand.com>
2495 Date: Sat Apr 19 23:18:54 2008 +0100
2497 Add verbose messages
2499 The unicode escaping unit should have the same verbosity as the
2502 tests/test-parser.c | 4 ++++
2503 1 files changed, 4 insertions(+), 0 deletions(-)
2505 commit 22a0db88c14895f98db76bca3cb078fbd3a2b07d
2506 Author: Emmanuele Bassi <ebassi@openedhand.com>
2507 Date: Sat Apr 19 23:09:32 2008 +0100
2509 Whitespace fixes in the licensing notice
2511 json-glib/json-scanner.h | 2 +-
2512 1 files changed, 1 insertions(+), 1 deletions(-)
2514 commit 676592cef006de16d966a1ca0469ccd0556f0e4b
2515 Author: Emmanuele Bassi <ebassi@openedhand.com>
2516 Date: Sat Apr 19 23:09:20 2008 +0100
2518 Documentation fixes in JsonNode
2520 json-glib/json-node.c | 6 +++---
2521 1 files changed, 3 insertions(+), 3 deletions(-)
2523 commit bf2249a1855b6bebe0b3528b4d5321a1ebe4b9e7
2524 Author: Emmanuele Bassi <ebassi@openedhand.com>
2525 Date: Sat Apr 19 23:08:20 2008 +0100
2527 Do not copy node data if it's not there
2529 If the source JsonNode does not contain data yet, do not try
2532 json-glib/json-node.c | 17 +++++++++++++----
2533 1 files changed, 13 insertions(+), 4 deletions(-)
2535 commit c191b2f8a8159457db3333390be10d6c7c0d4336
2536 Author: Emmanuele Bassi <ebassi@openedhand.com>
2537 Date: Sat Apr 19 23:05:03 2008 +0100
2539 Ignore json-scanner.h and its types
2541 When generating the documentation, ignore the JsonScanner header
2542 as it will not be installed.
2544 Also, we moved JsonTokenType from json-parser.h to json-scanner.h,
2545 where it belongs, so we can remove it from the (private) subsection
2546 of the json-parser section.
2548 doc/reference/Makefile.am | 7 ++++++-
2549 doc/reference/json-glib-sections.txt | 1 -
2550 2 files changed, 6 insertions(+), 2 deletions(-)
2552 commit ffbd9063556a061ba3e7e4223b924ae4766adfbd
2553 Author: Emmanuele Bassi <ebassi@openedhand.com>
2554 Date: Sat Apr 19 23:01:26 2008 +0100
2556 Do not install the JsonScanner header
2558 The JsonScanner tokenizer is an internal copy of GScanner: it should
2559 not be used outside JSON-GLib - JsonParser is the public API for
2562 json-glib/Makefile.am | 5 +++--
2563 1 files changed, 3 insertions(+), 2 deletions(-)
2565 commit df2a310a6ed0a3b32415f53076ff4c053b3fd925
2566 Author: Emmanuele Bassi <ebassi@openedhand.com>
2567 Date: Sat Apr 19 22:59:28 2008 +0100
2569 Fix the external gtk-doc references
2571 Gtk-doc can try and resolve the external symbols using the data
2572 currently installed in other locations.
2574 Since we are using GLib and GObject it would be nice to backlink
2575 to them inside our API reference.
2577 doc/reference/Makefile.am | 7 ++++---
2578 1 files changed, 4 insertions(+), 3 deletions(-)
2580 commit 6a3d8266efe505b29555db21658c241eba20fe2d
2581 Author: Emmanuele Bassi <ebassi@openedhand.com>
2582 Date: Sat Apr 19 22:57:05 2008 +0100
2584 Add GLIB_PREFIX variable
2586 The gtk-doc-fixref script needs to know the location of the
2587 libraries documentation; in order to get it, we can ask the
2588 pkg-config file of the library for its prefix.
2590 configure.ac | 5 +++++
2591 1 files changed, 5 insertions(+), 0 deletions(-)
2593 commit 4e5ec69cce8ab27f965985ba69ea11224ae39ffd
2594 Author: Emmanuele Bassi <ebassi@openedhand.com>
2595 Date: Sat Apr 19 22:28:21 2008 +0100
2597 Update the description and dependencies
2600 1 files changed, 6 insertions(+), 1 deletions(-)
2602 commit f65a5d5e30a1242a899149b732d1139891876014
2603 Author: Emmanuele Bassi <ebassi@openedhand.com>
2604 Date: Sat Apr 19 18:05:45 2008 +0100
2609 1 files changed, 1 insertions(+), 1 deletions(-)
2611 commit ab0da7c61bde715e99dd16027b198c7760b30922
2612 Author: Emmanuele Bassi <ebassi@openedhand.com>
2613 Date: Sat Apr 19 18:01:57 2008 +0100
2615 Update for 0.5.0 release
2617 NEWS | 14 ++++++++++++++
2618 1 files changed, 14 insertions(+), 0 deletions(-)
2620 commit 203927c71231cf6cec6d88161211702b7105df2d
2621 Author: Emmanuele Bassi <ebassi@openedhand.com>
2622 Date: Sat Apr 19 17:20:50 2008 +0100
2627 1 files changed, 1 insertions(+), 1 deletions(-)
2629 commit 76921ac27534aa0a25b39790ce4d99cf6e19a20c
2630 Author: Emmanuele Bassi <ebassi@openedhand.com>
2631 Date: Sat Apr 19 17:19:30 2008 +0100
2633 Verify the correct handling of Unicode escaping
2635 Check that JsonParser correctly handles Unicode characters escaped
2636 using the \uXXXX notation, as per RFC.
2638 tests/test-parser.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
2639 1 files changed, 67 insertions(+), 0 deletions(-)
2641 commit 379a2fe972c6e7436be9f345fe018bf4fe575354
2642 Author: Emmanuele Bassi <ebassi@openedhand.com>
2643 Date: Sat Apr 19 17:16:28 2008 +0100
2645 Add support for parsing \uXXXX into Unicode
2647 JsonScanner was forked from GScanner in order to support the
2648 JSON-specific Unicode escaping.
2650 JsonScanner now intercepts the \u escape character and, if it
2651 is followed by a hexadecimal value, it will retrieve the
2652 Unicode character encoded in the following 4 values and insert
2653 the character itself in the buffer.
2655 This allows full compatibility with JSON.
2657 json-glib/json-scanner.c | 56 +++++++++++++++++++++++++++++++++++++++++-----
2658 1 files changed, 50 insertions(+), 6 deletions(-)
2660 commit 9429ecaa88cdb6705189b6970481911f11339ff6
2661 Merge: d313aa1 445a3f7
2662 Author: Emmanuele Bassi <ebassi@openedhand.com>
2663 Date: Sat Apr 19 15:33:15 2008 +0100
2665 Merge master branch back for testing JsonScanner
2667 Merge branch 'master' into json-scanner
2669 commit 445a3f71d046abed4ff99e0ab4cd9cc8e047f5be
2670 Author: Emmanuele Bassi <ebassi@openedhand.com>
2671 Date: Sat Apr 12 13:21:21 2008 +0100
2673 Allow null nodes to return a value without a warning
2675 Value nodes might contain 'null' as a valid value, so the fast accessors
2676 should not barf out when encountering a JSON_NODE_NULL instead of the
2677 expected JSON_NODE_VALUE.
2679 json-glib/json-node.c | 21 +++++++++++++++------
2680 1 files changed, 15 insertions(+), 6 deletions(-)
2682 commit 4e826d9f209a8f68023bae54c91b2bbbb202a54a
2683 Merge: 98b6e5e 2a579b5
2684 Author: Emmanuele Bassi <ebassi@openedhand.com>
2685 Date: Thu Apr 3 16:32:53 2008 +0100
2687 Merge branch 'test-framework'
2689 commit 2a579b51f38df1c009201703279a3e6cb4f57eea
2690 Author: Emmanuele Bassi <ebassi@openedhand.com>
2691 Date: Thu Apr 3 16:31:48 2008 +0100
2693 Wrap the test report information section inside an info element
2695 Makefile.decl | 6 ++++--
2696 1 files changed, 4 insertions(+), 2 deletions(-)
2698 commit 8e2e539d02b84e0fe452174f3dfab06f35a4e6a1
2699 Author: Emmanuele Bassi <ebassi@openedhand.com>
2700 Date: Sun Mar 9 20:52:29 2008 +0000
2702 Add value testing to the JsonNode unit
2704 Test the GValue API for storing fundamental types into a JsonNode.
2706 json-glib/tests/node-test.c | 29 +++++++++++++++++++++++++++++
2707 1 files changed, 29 insertions(+), 0 deletions(-)
2709 commit 646b90e79d3424a332064a6a1e9fc62d1ce99386
2710 Author: Emmanuele Bassi <ebassi@openedhand.com>
2711 Date: Wed Mar 5 17:43:06 2008 +0000
2713 Add package and version information to the test-report XML
2715 Makefile.decl | 2 ++
2716 1 files changed, 2 insertions(+), 0 deletions(-)
2718 commit b8943381b0df44d9e6e21ae8321df2376c8458a8
2719 Author: Emmanuele Bassi <ebassi@openedhand.com>
2720 Date: Wed Mar 5 16:03:24 2008 +0000
2722 Add JsonObject test unit
2724 Use a similar test unit as the JsonArray one, testing creation, empty
2725 objects, addition and removal of members.
2728 json-glib/tests/Makefile.am | 17 +++++++----
2729 json-glib/tests/object-test.c | 62 +++++++++++++++++++++++++++++++++++++++++
2730 3 files changed, 75 insertions(+), 6 deletions(-)
2732 commit 7eab612d9b200aef197fa1dffa4f89b936c76b1f
2733 Author: Emmanuele Bassi <ebassi@openedhand.com>
2734 Date: Wed Mar 5 15:46:41 2008 +0000
2736 Add element removal unit to the Array test
2738 Remove the json_array_remove_element() call from the add-element test unit
2739 and set up a separate test case for the element removal. This keeps the
2742 json-glib/tests/array-test.c | 12 ++++++++++++
2743 1 files changed, 12 insertions(+), 0 deletions(-)
2745 commit 6aa1ddb891594e0f567bc3ebeb3bf5d3ab8e7e0c
2746 Author: Emmanuele Bassi <ebassi@openedhand.com>
2747 Date: Tue Mar 4 13:07:08 2008 +0000
2749 Clean the test-report XML output, if found
2752 1 files changed, 1 insertions(+), 1 deletions(-)
2754 commit 6eee8282d327614380854d572b2680f40b2faaf5
2755 Author: Emmanuele Bassi <ebassi@openedhand.com>
2756 Date: Tue Mar 4 12:37:52 2008 +0000
2758 Update gitignore file
2760 .gitignore | 18 ++++++++----------
2761 1 files changed, 8 insertions(+), 10 deletions(-)
2763 commit d5cb48681c68c3d53d8ec331ef37fb60820a9421
2764 Author: Emmanuele Bassi <ebassi@openedhand.com>
2765 Date: Tue Mar 4 12:30:48 2008 +0000
2767 Build test-serialize-full
2769 Complete the porting of the old test suite into the new, GTest based one.
2771 The new test suite is automatically run with make test; make test-report
2772 will generate an XML report of the test.
2774 The API coverage for the data types is part of the json-glib/tests
2775 directory and will be expanded later.
2777 tests/Makefile.am | 8 ++++-
2778 tests/test-serialize-full.c | 56 ++++++++++++++++++++++++++----------------
2779 2 files changed, 41 insertions(+), 23 deletions(-)
2781 commit 1f6307ea2d7dc6ebe279d08b9f95f3074fbdd462
2782 Author: Emmanuele Bassi <ebassi@openedhand.com>
2783 Date: Tue Mar 4 12:18:19 2008 +0000
2785 Rename test-08 into test-serialize-full
2787 The test-08 case was the last numbered test unit.
2789 tests/test-08.c | 337 -------------------------------------------
2790 tests/test-serialize-full.c | 337 +++++++++++++++++++++++++++++++++++++++++++
2791 2 files changed, 337 insertions(+), 337 deletions(-)
2793 commit cdb194e8d64343e8bcb00e046c5fbeefd677b02a
2794 Author: Emmanuele Bassi <ebassi@openedhand.com>
2795 Date: Tue Mar 4 12:17:29 2008 +0000
2797 Rename test-07 into test-serialize-complex
2799 The new test-serialize-complex adds a test unit for the JsonSerializable
2800 interface; the TestObject implements the serialization interface to
2801 create a JSON data type from a boxed GType.
2803 tests/Makefile.am | 4 +
2804 tests/test-07.c | 252 --------------------------------------
2805 tests/test-serialize-complex.c | 261 ++++++++++++++++++++++++++++++++++++++++
2806 3 files changed, 265 insertions(+), 252 deletions(-)
2808 commit 4c766a029d8f6a2d06b749527020fd93fc4a4f99
2809 Author: Emmanuele Bassi <ebassi@openedhand.com>
2810 Date: Tue Mar 4 12:12:37 2008 +0000
2812 Fix compilation of test-serialize-simple and add it to the test suite
2814 The new test-serialize-simple tests the GObject integration for
2815 serializing simple GObjects into JSON.
2817 tests/Makefile.am | 4 ++++
2818 tests/test-serialize-simple.c | 5 +++--
2819 2 files changed, 7 insertions(+), 2 deletions(-)
2821 commit 325185c5955f8942ddf8d55a9e3b5d6a8c2723d1
2822 Author: Emmanuele Bassi <ebassi@openedhand.com>
2823 Date: Tue Mar 4 12:10:23 2008 +0000
2825 Rename test-06 to test-serialize-simple
2827 tests/test-06.c | 162 -----------------------------------------
2828 tests/test-serialize-simple.c | 162 +++++++++++++++++++++++++++++++++++++++++
2829 2 files changed, 162 insertions(+), 162 deletions(-)
2831 commit cbea4698c1b7284d8004fff659a7354fb3af29ee
2832 Author: Emmanuele Bassi <ebassi@openedhand.com>
2833 Date: Tue Mar 4 12:09:44 2008 +0000
2835 Move test-06 to GTest API
2837 First pass into replacing the last three numbered tests into named
2840 tests/test-06.c | 28 ++++++++++++++++++----------
2841 1 files changed, 18 insertions(+), 10 deletions(-)
2843 commit 5cc1d3d6061830de403ccbc10c2414f29cd1cf82
2844 Author: Emmanuele Bassi <ebassi@openedhand.com>
2845 Date: Tue Mar 4 10:52:51 2008 +0000
2847 Coalesce JsonGenerator test cases into a single test unit
2849 Like we did for JsonParser, JsonGenerator has now a test unit checking the
2850 output of a DOM built and dumped into a buffer.
2852 For the arrays is quite easy to verify that the output is correct;
2853 unfortunately, JsonObject does not guarantee any ordering on the members,
2854 with it being an associative array. Hence, for the object test case we
2855 just compare the length of the output.
2857 tests/Makefile.am | 4 +
2858 tests/test-04.c | 238 ----------------------------
2859 tests/test-05.c | 227 ---------------------------
2860 tests/test-generator.c | 399 ++++++++++++++++++++++++++++++++++++++++++++++++
2861 4 files changed, 403 insertions(+), 465 deletions(-)
2863 commit e100c69a4fca046cbeb6db3fc8ba49160796d87c
2864 Author: Emmanuele Bassi <ebassi@openedhand.com>
2865 Date: Tue Mar 4 10:44:56 2008 +0000
2867 Append to EXTRA_DIST, since it was defined elsewhere
2869 contrib/Makefile.am | 2 +-
2870 1 files changed, 1 insertions(+), 1 deletions(-)
2872 commit 98b6e5e2f151c4ee800754675bf01e585fee850b
2873 Author: Emmanuele Bassi <ebassi@openedhand.com>
2874 Date: Tue Mar 4 07:05:01 2008 +0000
2878 README | 36 ++++++++++++++++++++++++++++++++++++
2879 1 files changed, 36 insertions(+), 0 deletions(-)
2881 commit 1a078c783a5a03b3367ce59eb25248dd6e23b5c6
2882 Author: Emmanuele Bassi <ebassi@openedhand.com>
2883 Date: Tue Mar 4 07:05:01 2008 +0000
2887 README | 36 ++++++++++++++++++++++++++++++++++++
2888 1 files changed, 36 insertions(+), 0 deletions(-)
2890 commit 44891ea1040ceae95a994b646174696de7779ea1
2891 Author: Emmanuele Bassi <ebassi@openedhand.com>
2892 Date: Tue Mar 4 06:44:59 2008 +0000
2894 Update gitignore file
2896 .gitignore | 11 +++++------
2897 1 files changed, 5 insertions(+), 6 deletions(-)
2899 commit 3ea189acf52ea39653c6505c136f1f45a660a24c
2900 Author: Emmanuele Bassi <ebassi@openedhand.com>
2901 Date: Tue Mar 4 06:34:11 2008 +0000
2903 Add validation to the simple object test values
2905 Like for the simple arrays test case, add validation of the values types
2906 for the members of the simple objects test case.
2908 tests/test-parser.c | 31 ++++++++++++++++++++++++-------
2909 1 files changed, 24 insertions(+), 7 deletions(-)
2911 commit 40b3e9330f482e002aea90b0c1a4b9db2adffff0
2912 Author: Emmanuele Bassi <ebassi@openedhand.com>
2913 Date: Tue Mar 4 06:27:24 2008 +0000
2915 Add validation of the simple array test values
2917 Instead of just checking that the array contains something, the simple-array
2918 test case should validate the contents of the array.
2920 The test now uses a struct defining:
2922 - the size of the array
2923 - an element to check
2924 - the type of the node for the element
2925 - the type of the value for the node
2927 All the fields are checked for a match. This makes the simple arrays test
2930 tests/test-parser.c | 40 +++++++++++++++++++++++++++++++---------
2931 1 files changed, 31 insertions(+), 9 deletions(-)
2933 commit 7e6dab14302b94979672acf81eec8710ea95e288
2934 Author: Emmanuele Bassi <ebassi@openedhand.com>
2935 Date: Sun Mar 2 17:44:27 2008 +0000
2937 Add array-test to the JSON-GLib types unit tests
2939 This simple unit will test the JsonArray API, as part of the coverage
2940 test for the JSON-GLib types.
2942 json-glib/tests/Makefile.am | 10 ++++++--
2943 json-glib/tests/array-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++
2944 2 files changed, 57 insertions(+), 3 deletions(-)
2946 commit 441ee88a6e024fc5ab2cf8355adad1fecc276088
2947 Author: Emmanuele Bassi <ebassi@openedhand.com>
2948 Date: Sun Mar 2 15:09:05 2008 +0000
2950 Coalesce test-03 into test-parser
2952 The third test under the tests/ directory was the last JsonParser test,
2953 dealing with object parsing. Now, test-parser is complete and contains
2954 all the JsonParser test cases. It still needs further testing to
2955 verify the DOM created by the parser object.
2957 tests/test-02.c | 225 ---------------------------------------------------
2958 tests/test-03.c | 214 ------------------------------------------------
2959 tests/test-parser.c | 167 ++++++++++++++++++++++++++++++++++++--
2960 3 files changed, 161 insertions(+), 445 deletions(-)
2962 commit 71db86d84a5544d603b03721891e0ad14f92178d
2963 Author: Emmanuele Bassi <ebassi@openedhand.com>
2964 Date: Sun Mar 2 14:58:58 2008 +0000
2966 Update the tests build to be a testing unit
2968 Instead of having stand alone tests, use the GTest framework and start
2969 coalescing multiple test cases into one.
2971 The tests directory will be used for JsonParser, JsonGenerator and
2972 the JSON-GObject integration API, by reusing the previous test cases
2973 and remolding them into a more interesting test framework.
2975 tests/Makefile.am | 39 +++++----------------------------------
2976 1 files changed, 5 insertions(+), 34 deletions(-)
2978 commit 1e6aa16a2a6432cf96d0a86d4650c13e63c67e43
2979 Author: Emmanuele Bassi <ebassi@openedhand.com>
2980 Date: Sun Mar 2 14:56:56 2008 +0000
2982 Remove old, empty string test
2984 tests/test-01.c | 57 -------------------------------------------------------
2985 1 files changed, 0 insertions(+), 57 deletions(-)
2987 commit 989c807fd61cc65c1e4058c5d0794ae2fe438ba1
2988 Author: Emmanuele Bassi <ebassi@openedhand.com>
2989 Date: Sun Mar 2 14:56:28 2008 +0000
2991 Rename JsonParser test, and coaelesce basic parser and array tests
2993 Instead of using a single test for empty strings and another test for
2994 arrays, merge the two into a single test unit, using the GTest API.
2996 The JsonObject parsing test will also be merged later.
2998 tests/test-parser.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++
2999 1 files changed, 262 insertions(+), 0 deletions(-)
3001 commit f1e1c0e7796903abb725e8216fc54f53573ecdc9
3002 Author: Emmanuele Bassi <ebassi@openedhand.com>
3003 Date: Sun Mar 2 10:51:09 2008 +0000
3005 Port the empty string test to the GLib testing framework
3007 The old test-01 program tested the JsonParser with an empty string; instead
3008 of relying on the exit code and error messages on screen, it shoul use the
3011 This is the first test of the old test suite to be ported to the new test
3014 tests/test-01.c | 44 +++++++++++++++++++++++++++++++++++---------
3015 1 files changed, 35 insertions(+), 9 deletions(-)
3017 commit cb5b3d5fa6244b0d20258203bd9df7e3148af57b
3018 Author: Emmanuele Bassi <ebassi@openedhand.com>
3019 Date: Sun Mar 2 10:50:17 2008 +0000
3021 Add a JsonNode copy test unit
3023 The test unit copies a NULL JsonNode and checks that the copy and the
3024 original nodes are equivalent.
3026 json-glib/tests/node-test.c | 15 +++++++++++++++
3027 1 files changed, 15 insertions(+), 0 deletions(-)
3029 commit 40c757835e329fe01f8f22aba74d2e47f3a5e55c
3030 Author: Emmanuele Bassi <ebassi@openedhand.com>
3031 Date: Sun Mar 2 10:49:52 2008 +0000
3033 Update Makefile templates to include the testing framework
3035 contrib/Makefile.am | 2 ++
3036 doc/Makefile.am | 2 ++
3037 doc/reference/Makefile.am | 1 +
3038 tests/Makefile.am | 38 ++++++++++++++++++++++++++++++++------
3039 4 files changed, 37 insertions(+), 6 deletions(-)
3041 commit 75939c2b43430583150b18f0a8e82e3d60a4f4f1
3042 Author: Emmanuele Bassi <ebassi@openedhand.com>
3043 Date: Sat Mar 1 19:35:47 2008 +0000
3045 Update gitignore file
3048 1 files changed, 4 insertions(+), 0 deletions(-)
3050 commit e4be0d896359cc1d0ba99dd81a66855389ebd5df
3051 Author: Emmanuele Bassi <ebassi@openedhand.com>
3052 Date: Sat Mar 1 19:30:41 2008 +0000
3054 Add initial test suite support using GLib's new testing framework
3056 GLib 2.15 added a new test unit framework to the GLib API. It allows
3057 integrating unit testing into GLib and GObject based libraries and
3060 It requires a specially crafter Makefile holding a set of declarations,
3061 which must be included into the project own Makefile templates; then
3062 it is possible to drop tests inside a subdirectory, which will be built
3063 after the library or application, and executed upon "make check".
3065 At the moment, there is a simple test for the JsonNode API, with a
3066 single unit for the "null" node type.
3069 Makefile.decl | 57 +++++++++++++++++++++++++++++++++++++++++++
3071 json-glib/Makefile.am | 9 ++++++-
3072 json-glib/tests/Makefile.am | 15 +++++++++++
3073 json-glib/tests/node-test.c | 27 ++++++++++++++++++++
3074 6 files changed, 112 insertions(+), 3 deletions(-)
3076 commit d313aa1e9e472834252ec173c0409eba11ebcff9
3077 Author: Emmanuele Bassi <ebassi@openedhand.com>
3078 Date: Fri Feb 29 16:40:33 2008 +0000
3083 1 files changed, 1 insertions(+), 0 deletions(-)
3085 commit 8a2bb3c4400b9df6cd864eb29920a7767e8170c7
3086 Author: Emmanuele Bassi <ebassi@openedhand.com>
3087 Date: Fri Feb 29 16:37:18 2008 +0000
3089 Sanitize JsonScanner code
3091 Use a closure instead of (*eugh*) an array of gpointers and casting
3094 Also, use the Slice allocator for the ScannerKey structs.
3096 json-glib/json-scanner.c | 42 ++++++++++++++++++++----------------------
3097 1 files changed, 20 insertions(+), 22 deletions(-)
3099 commit 42f7800c5b1c30ff187fc824a9bb39565033488e
3100 Author: Emmanuele Bassi <ebassi@openedhand.com>
3101 Date: Fri Feb 29 16:01:48 2008 +0000
3103 Update JsonParser to fix compilation
3105 JsonParser now uses JsonScanner, the internal copy of GScanner.
3107 json-glib/json-parser.c | 33 +++++++++++++++++----------------
3108 1 files changed, 17 insertions(+), 16 deletions(-)
3110 commit 314f24fd0c8c6b024c93b1d8d275f9049ef22951
3111 Author: Emmanuele Bassi <ebassi@openedhand.com>
3112 Date: Fri Feb 29 16:00:55 2008 +0000
3114 Completely internalize the JsonScanner
3116 Rename all the API and the data types to the Json namespace, so we can
3117 use the internal copy instead of GScanner.
3119 json-glib/json-scanner.c | 639 +++++++++++++++++++++++-----------------------
3120 json-glib/json-scanner.h | 6 +-
3121 2 files changed, 328 insertions(+), 317 deletions(-)
3123 commit 65708000ab02d0a4080b662bb409ac4b79101488
3124 Author: Emmanuele Bassi <ebassi@openedhand.com>
3125 Date: Fri Feb 29 16:00:30 2008 +0000
3127 Add JsonScanner to the build
3129 json-glib/Makefile.am | 2 ++
3130 1 files changed, 2 insertions(+), 0 deletions(-)
3132 commit 8e27ac27a9b22361296564d740301c2c49b387f8
3133 Author: Emmanuele Bassi <ebassi@openedhand.com>
3134 Date: Fri Feb 29 15:59:57 2008 +0000
3136 Bump up autotools requirements
3138 Do not require an ancient version of automake, and settle for one slightly
3141 configure.ac | 4 ++--
3142 1 files changed, 2 insertions(+), 2 deletions(-)
3144 commit a475b0896d5760c893a099c9411f9790e5c492ba
3145 Author: Emmanuele Bassi <ebassi@openedhand.com>
3146 Date: Fri Feb 29 12:24:14 2008 +0000
3148 Update the JsonScanner default configuration
3150 json-glib/json-scanner.c | 84 +++++++++++++++++++--------------------------
3151 1 files changed, 36 insertions(+), 48 deletions(-)
3153 commit 10ac1734b326700257ef318d9a2000c538b5cd38
3154 Author: Emmanuele Bassi <ebassi@openedhand.com>
3155 Date: Fri Feb 29 12:22:02 2008 +0000
3157 Use JsonScanner API into JsonParser
3159 Rename the GScanner function calls into JsonScanner, to see what we
3160 actually need to have public.
3162 Also, remove the configuration: JsonScanner will provide us with one.
3164 json-glib/json-parser.c | 127 ++++++++++++++++------------------------------
3165 1 files changed, 44 insertions(+), 83 deletions(-)
3167 commit 4a4095c360fc29f766e8baba3529a78b6d736b19
3168 Author: Emmanuele Bassi <ebassi@openedhand.com>
3169 Date: Fri Feb 29 12:21:20 2008 +0000
3171 Add json-scanner.h to the exported headers
3173 json-glib/json-glib.h | 1 +
3174 1 files changed, 1 insertions(+), 0 deletions(-)
3176 commit 469a22e4f1fac6b4fd8110823322b7fbfa9b6552
3177 Author: Emmanuele Bassi <ebassi@openedhand.com>
3178 Date: Fri Feb 29 12:13:54 2008 +0000
3180 Include JsonScanner into JsonParser
3182 json-glib/json-parser.c | 1 +
3183 1 files changed, 1 insertions(+), 0 deletions(-)
3185 commit 8537549a5a65f3111a4436b69499664c167b1534
3186 Author: Emmanuele Bassi <ebassi@openedhand.com>
3187 Date: Fri Feb 29 12:10:16 2008 +0000
3189 Move JsonTokenType into JsonScanner
3191 The GTokenType extension enumeration belongs with the tokenizer.
3193 json-glib/json-parser.h | 15 ++-------------
3194 1 files changed, 2 insertions(+), 13 deletions(-)
3196 commit 1ddd45d36a3a25aa86a95c60e0c29e83687971bd
3197 Author: Emmanuele Bassi <ebassi@openedhand.com>
3198 Date: Fri Feb 29 12:06:19 2008 +0000
3200 Copy GScanner into JSON-GLib as JsonScanner
3202 Instead of writing our tokenizer we can fork GScanner and make a
3203 specialized version for JSON (as per RFC), luckily the licenses
3204 are compatible (LGPLv2.1 with "any later" clause).
3206 GScanner does not support Unicode "\uNNNN" escaping and we need to
3207 ensure UTF-8 strings as well.
3209 The API will mostly be the same, but the generic bits not used by
3210 JsonParser will be hidden: this is, after all, a specialized
3213 json-glib/json-scanner.c | 1809 ++++++++++++++++++++++++++++++++++++++++++++++
3214 json-glib/json-scanner.h | 167 +++++
3215 2 files changed, 1976 insertions(+), 0 deletions(-)
3217 commit 3a9ec8f1ca9bf525875c3fbfaf1ab2f3c708bf36
3218 Author: Emmanuele Bassi <ebassi@openedhand.com>
3219 Date: Tue Jan 29 19:13:15 2008 +0000
3221 Update the JSON-GLib Vala bindings
3223 Add a dependencies file, so that valac can simply use the json-glib-1.0
3224 package and correcly chain up all the dependencies needed (at the moment,
3227 Update the vapi file to match with the GLib bindings with regards to the
3228 out length parameters and some weak pointers. The only way to properly
3229 solve the weak assignments issue would be to make JsonNode, JsonObject
3230 and JsonArray proper GObjects, or at least add reference counting to
3231 JsonNode. Not going to happend in 0.6, but it's worth adding it to the
3234 contrib/json-glib-1.0.deps | 1 +
3235 contrib/json-glib-1.0.vapi | 14 +++++-----
3236 contrib/json-test.vala | 62 +++++++++++++++++++++----------------------
3237 3 files changed, 38 insertions(+), 39 deletions(-)
3239 commit e8a59f086f43e5abd5414033ea8c9a886eb112ed
3240 Author: Emmanuele Bassi <ebassi@openedhand.com>
3241 Date: Tue Jan 29 19:12:35 2008 +0000
3243 Remove % from the pkg-config file rule
3245 Rules starting with '%' are a make-isms, and automake 1.10 complains a
3249 1 files changed, 1 insertions(+), 1 deletions(-)
3251 commit b6963328f3d8d8e85ca0b21f9bdeca77b5611019
3252 Author: Emmanuele Bassi <ebassi@openedhand.com>
3253 Date: Tue Jan 29 18:19:16 2008 +0000
3255 Remove json_parser_peek_root from the gtk-doc sections
3257 The json_parser_peek_root() function has been removed, and so we do not
3258 its symbol in the json-glib-sections.txt file anymore.
3260 doc/reference/json-glib-sections.txt | 1 -
3261 1 files changed, 0 insertions(+), 1 deletions(-)
3263 commit 48079c2f580171235eecc298b0193022a67e0b79
3264 Author: Emmanuele Bassi <ebassi@openedhand.com>
3265 Date: Tue Jan 29 18:18:01 2008 +0000
3267 Update after the JsonParser::get_root change
3269 Do not free the root node returned by the get_root() method in the
3270 JSON-GObject API and in the JsonParser tests.
3272 json-glib/json-gobject.c | 4 +---
3273 tests/test-01.c | 2 +-
3274 tests/test-02.c | 2 --
3275 tests/test-03.c | 2 --
3276 4 files changed, 2 insertions(+), 8 deletions(-)
3278 commit a86a300fdc256ad4270881cf9b7b97367cd87c87
3279 Author: Emmanuele Bassi <ebassi@openedhand.com>
3280 Date: Tue Jan 29 18:14:49 2008 +0000
3282 Revert JsonParser::get_root semantics
3284 The get_root() method should not return a copy of the parsed node: it is
3285 up to the developer copying it, if it needs to be kept around across multiple
3288 This commit reverts the 0b6b09c0 commit, by removing the peek_root() method
3289 and restoring the previous get_root() method behaviour.
3291 json-glib/json-parser.c | 26 ++------------------------
3292 json-glib/json-parser.h | 1 -
3293 2 files changed, 2 insertions(+), 25 deletions(-)
3295 commit 9a167068edcde51b50a15bab4ee8623994eb9c04
3296 Author: Emmanuele Bassi <ebassi@openedhand.com>
3297 Date: Mon Jan 28 11:02:30 2008 +0000
3299 Use the normalized member name in has_member
3301 The json_object_has_member() used the passed in member name, instead of
3302 the correctly normalized one.
3304 json-glib/json-object.c | 2 +-
3305 1 files changed, 1 insertions(+), 1 deletions(-)
3307 commit f2f08d282ac6bc69ba9029d065979b1332abd5a5
3308 Author: Emmanuele Bassi <ebassi@openedhand.com>
3309 Date: Sun Jan 27 21:26:51 2008 +0000
3311 Extract the parser state clearing into its own function
3313 The JsonParser object clears its state upon starting the parsing sequence
3314 or during the instance destruction process. It's worth moving the free
3315 and unref calls into their own function to be called by the load_from_data()
3316 and dispose methods. As further optimisation, inlining them should be
3319 json-glib/json-parser.c | 51 +++++++++++++++++++++++++++-------------------
3320 1 files changed, 30 insertions(+), 21 deletions(-)
3322 commit 629d4a54913c578d7b612f10d9b04addc8e0c7fb
3323 Author: Emmanuele Bassi <ebassi@openedhand.com>
3324 Date: Tue Dec 25 21:44:03 2007 +0000
3326 Wrap config.h include with conditionals
3328 Including the autotools generated config.h should always be conditional
3329 on the HAVE_CONFIG_H definitions.
3331 json-glib/json-array.c | 2 ++
3332 json-glib/json-generator.c | 2 ++
3333 json-glib/json-gobject.c | 2 ++
3334 json-glib/json-node.c | 3 +++
3335 json-glib/json-object.c | 2 ++
3336 5 files changed, 11 insertions(+), 0 deletions(-)
3338 commit e172e9ccec88999e7d8433df08d8d92568537cf7
3339 Author: Emmanuele Bassi <ebassi@openedhand.com>
3340 Date: Tue Dec 25 21:41:44 2007 +0000
3342 Kill off a few indirections
3344 Use an intermediary pointer to avoid a lot of pointer dereferences
3346 json-glib/json-parser.c | 25 ++++++++++++++-----------
3347 1 files changed, 14 insertions(+), 11 deletions(-)
3349 commit 61a6a144a2182946be4fb975d05e1c26d814c323
3350 Author: Emmanuele Bassi <ebassi@openedhand.com>
3351 Date: Tue Dec 25 11:55:36 2007 +0000
3353 Some miscellaneous fixes to the Vala bindings
3355 Expose the properties as members and remove the accessor methods in case
3356 it's obvious that they are just function proxies.
3358 Also, start binding the basic GObject API, even though no serializable
3359 support is ready, yet.
3361 contrib/json-glib-1.0.vapi | 21 ++++++++++--
3362 contrib/json-object.vala | 10 ++++-
3363 contrib/json-test.vala | 81 ++++++++++++++++++++++++++++++++------------
3364 3 files changed, 85 insertions(+), 27 deletions(-)
3366 commit 8ec0c93715f6f43e4829a6f3ac534f9ec05e0363
3367 Author: Emmanuele Bassi <ebassi@openedhand.com>
3368 Date: Tue Dec 25 11:53:04 2007 +0000
3370 Provide a default implementation of JsonSerializable
3372 The JsonSerializable interface can provide a default implementation, using
3373 the powers of GTypeInterface. This means that classes implementing the
3374 interface can opt to implement both, either or none of the JsonSerializable
3375 methods, and still be able to retain some basic functionality for the methods
3376 they decide not to implement.
3378 json-glib/json-gobject.c | 208 ++++++++++++++++++++++++++-------------------
3379 1 files changed, 120 insertions(+), 88 deletions(-)
3381 commit 5bb6dd7b77dcd0d1996f484990223287d2144ff3
3382 Author: Emmanuele Bassi <ebassi@openedhand.com>
3383 Date: Tue Dec 25 11:51:20 2007 +0000
3385 Plug a leak when loading a new buffer with the same parser
3387 When the same JsonParser loads a different buffer it needs to clear out the
3388 current state; this means clearing the variable_name string it saves when
3389 the passed JSON stream is a JavaScript assignment.
3391 json-glib/json-parser.c | 2 ++
3392 1 files changed, 2 insertions(+), 0 deletions(-)
3394 commit a90a842f269314c4423de9d84d03391a8efbd7b5
3395 Author: Emmanuele Bassi <ebassi@openedhand.com>
3396 Date: Tue Dec 25 11:49:20 2007 +0000
3398 Use gssize for the buffer length parameter
3400 Since we allow a negative value, meaning "take the whole string", for the
3401 length parameter, when need a signed size_t. This also fixes the bug where
3402 we implicitly always computed the buffer length and discarded the passed
3405 json-glib/json-parser.c | 10 +++++-----
3406 json-glib/json-parser.h | 2 +-
3407 2 files changed, 6 insertions(+), 6 deletions(-)
3409 commit 7229b9bf0bd15c6c1e5b695f8e291218a041ab45
3410 Author: Emmanuele Bassi <ebassi@openedhand.com>
3411 Date: Tue Dec 25 11:47:10 2007 +0000
3413 Initialise to zero when creating/copying a JsonNode
3415 Avoid feeding garbage to the callers by using g_slice_new0().
3417 json-glib/json-node.c | 9 +++++----
3418 1 files changed, 5 insertions(+), 4 deletions(-)
3420 commit ba7282dd23e2980203208cb73942535bfefa5906
3421 Author: Emmanuele Bassi <ebassi@openedhand.com>
3422 Date: Tue Dec 25 11:45:56 2007 +0000
3424 Do not leak the intermediate strings when generating JSON
3426 Found this very dumb leak while using Valgrind.
3428 json-glib/json-generator.c | 6 ++++++
3429 1 files changed, 6 insertions(+), 0 deletions(-)
3431 commit 193aca9aabbfc3db8e1faca0a65b19ac7ba96341
3432 Author: Emmanuele Bassi <ebassi@openedhand.com>
3433 Date: Tue Dec 25 11:44:18 2007 +0000
3435 Do not free the pointer to the boxed type we get when serialising
3437 The pointer returned by g_value_get_boxed() is just a pointer to the internal
3438 copy inside GValue, and it's not ours to free, as Valgrind gently pointed
3441 tests/test-07.c | 2 --
3442 1 files changed, 0 insertions(+), 2 deletions(-)
3444 commit a6fae2d61b1cfefa742574761edc19c8d6f702f5
3445 Author: Emmanuele Bassi <ebassi@openedhand.com>
3446 Date: Thu Nov 22 16:00:35 2007 +0000
3448 Add a simple Vala serialization example
3450 We don't provide the Serializable interface at the moment, because it
3451 is too much C-oriented. This example shows how to serialize a class in
3452 Vala to a JSON string.
3454 contrib/json-object.vala | 40 ++++++++++++++++++++++++++++++++++++++++
3455 1 files changed, 40 insertions(+), 0 deletions(-)
3457 commit ea6cc8756f70d488eae128e4a01f63ce2766cc3a
3458 Author: Emmanuele Bassi <ebassi@openedhand.com>
3459 Date: Thu Nov 22 15:59:25 2007 +0000
3461 Omit the lenght argument now that we provide a default
3463 contrib/json-test.vala | 2 +-
3464 1 files changed, 1 insertions(+), 1 deletions(-)
3466 commit 9492f3439dd491bb5afadfe6b2bd49a72ec9bb1e
3467 Author: Emmanuele Bassi <ebassi@openedhand.com>
3468 Date: Thu Nov 22 15:58:23 2007 +0000
3470 Fix the Vala bindings
3472 Miscellaneous fixes for the Vala bindings of JSON-GLib:
3473 * add missing return values for a couple of methods
3474 * decorate the Object and Array constructors with their C names
3475 * correctly transfer the ownership when adding members/elements
3476 * add the non-null value marker for strings
3477 * provide default values for the length argument in from_data()/to_data()
3479 contrib/json-glib-1.0.vapi | 20 +++++++++++---------
3480 1 files changed, 11 insertions(+), 9 deletions(-)
3482 commit a255b4f5eb8769c444a9ac3a4cc7404fccd44ee3
3483 Author: Emmanuele Bassi <ebassi@openedhand.com>
3484 Date: Thu Nov 22 00:01:37 2007 +0000
3486 Recurse into the contrib directory only if Vala is available
3488 If Vala is not available then there's no point in getting into the
3489 contrib directory. This might change in the future, so we already
3490 have the HAVE_VALA conditional for the Makefiles.
3492 Makefile.am | 8 +++++++-
3493 configure.ac | 3 +++
3494 2 files changed, 10 insertions(+), 1 deletions(-)
3496 commit aa8911ca4d63bfb3dd34997f9a745d70d12673af
3497 Author: Emmanuele Bassi <ebassi@openedhand.com>
3498 Date: Wed Nov 21 20:44:08 2007 +0000
3500 Update the test case for the Vala bindings
3502 contrib/json-test.vala | 4 ++--
3503 1 files changed, 2 insertions(+), 2 deletions(-)
3505 commit 7083e9e6733611b5313f0708c4b93b9726ef26d0
3506 Author: Emmanuele Bassi <ebassi@openedhand.com>
3507 Date: Wed Nov 21 20:43:35 2007 +0000
3509 Wrap the newly added API in the Vala bindings
3511 Add the Json.Object.dup_member() and Json.Array.dup_element() functions.
3512 Also, export the JSON_NODE_TYPE() macro as Json.Node.type() method.
3514 contrib/json-glib-1.0.vapi | 8 ++++++--
3515 1 files changed, 6 insertions(+), 2 deletions(-)
3517 commit 9d4588e97a88960a4dd6a28debb3cb0f8d75f098
3518 Author: Emmanuele Bassi <ebassi@openedhand.com>
3519 Date: Wed Nov 21 20:42:07 2007 +0000
3521 Add symbols of the newly committed API
3523 doc/reference/json-glib-sections.txt | 3 +++
3524 1 files changed, 3 insertions(+), 0 deletions(-)
3526 commit cf2eceeb69ccbda4f2ff583ee7869c7fd3cda603
3527 Author: Emmanuele Bassi <ebassi@openedhand.com>
3528 Date: Wed Nov 21 20:41:42 2007 +0000
3530 Add API to retrieve copies of the nodes inside objects and arrays
3532 Getting copies of the nodes might work better for high level languages
3533 binding the JSON-GLib API, because they can manage the lifetime of the
3534 returned values using their own rules.
3536 json-glib/json-array.c | 29 +++++++++++++++++++++++++++++
3537 json-glib/json-object.c | 29 +++++++++++++++++++++++++++++
3538 json-glib/json-types.h | 4 ++++
3539 3 files changed, 62 insertions(+), 0 deletions(-)
3541 commit 5a4a8761af0562fbee8e1a56ce1771a20c1ad8e3
3542 Author: Emmanuele Bassi <ebassi@openedhand.com>
3543 Date: Wed Nov 21 20:07:12 2007 +0000
3545 Fix leaks in the test suite
3547 Dispose the root node when using the JsonParser and JsonGenerator
3548 objects after the change in sematics for their accessors.
3550 tests/test-01.c | 2 +-
3551 tests/test-02.c | 2 ++
3552 tests/test-03.c | 2 ++
3553 tests/test-04.c | 8 ++++++++
3554 tests/test-05.c | 6 ++++++
3555 5 files changed, 19 insertions(+), 1 deletions(-)
3557 commit ac699263493e09eeb203f9bf88c0a8296f9e4a8f
3558 Author: Emmanuele Bassi <ebassi@openedhand.com>
3559 Date: Wed Nov 21 20:06:06 2007 +0000
3561 Free the root node obtained using json_parser_get_root()
3563 Update json_construct_gobject() to the change of behaviour in the
3564 root node getter function of JsonParser.
3566 json-glib/json-gobject.c | 2 ++
3567 1 files changed, 2 insertions(+), 0 deletions(-)
3569 commit 0b6b09c0fe2fdd21b18593192e7213d1b0098f12
3570 Author: Emmanuele Bassi <ebassi@openedhand.com>
3571 Date: Wed Nov 21 20:05:07 2007 +0000
3573 Change json_parser_get_root() semantics
3575 The json_parser_get_root() returns a pointer to the root node. This does
3576 not conform to the API naming convention inherited from GLib, where
3577 functions returning an internal pointer are called "peek" and function
3578 returning a copy are called "get".
3580 Thus, json_parser_get_root() will now return a copy of the root node and
3581 it is left to the developer to free the returned JsonNode.
3583 A function returning the pointer has also been added, and it's called
3584 json_parser_peek_root().
3586 json-glib/json-parser.c | 26 ++++++++++++++++++++++++--
3587 json-glib/json-parser.h | 2 ++
3588 2 files changed, 26 insertions(+), 2 deletions(-)
3590 commit 5f110dc5ad338497c95418b9ad1b267c95fb8ded
3591 Author: Emmanuele Bassi <ebassi@openedhand.com>
3592 Date: Wed Nov 21 18:39:04 2007 +0000
3594 Add JSON-GLib Vala bindings
3596 Add bindings for the basic JSON-GLib API. GObject API will arrive later.
3599 configure.ac | 12 +++++
3600 contrib/Makefile.am | 4 ++
3601 contrib/json-glib-1.0.vapi | 118 ++++++++++++++++++++++++++++++++++++++++++++
3602 contrib/json-test.vala | 87 ++++++++++++++++++++++++++++++++
3603 5 files changed, 222 insertions(+), 1 deletions(-)
3605 commit 557a60b4e0f1fd6fc0fa79efc60f9bfd777e0670
3606 Author: Emmanuele Bassi <ebassi@openedhand.com>
3607 Date: Wed Nov 21 14:52:15 2007 +0000
3609 Use a unicode character for the indent-char property of JsonGenerator
3611 The indent character should be any Unicode character available instead
3614 json-glib/json-generator.c | 16 ++++++++--------
3615 tests/test-05.c | 6 +++++-
3616 2 files changed, 13 insertions(+), 9 deletions(-)
3618 commit 5fc37f8f2a1594821623419f75ceaa4b95fe07cf
3619 Author: Emmanuele Bassi <ebassi@openedhand.com>
3620 Date: Wed Nov 21 01:39:00 2007 +0000
3622 Add the indent-char property to JsonGenerator
3624 The JsonGenerator:indent-char can be used to control the character that
3625 indents the lines when pretty printing.
3627 json-glib/json-generator.c | 54 ++++++++++++++++++++++++++++++++-----------
3628 1 files changed, 40 insertions(+), 14 deletions(-)
3630 commit 58133b51152ca76b8cb5c93b5991f9b1a565e9a9
3631 Author: Emmanuele Bassi <ebassi@openedhand.com>
3632 Date: Wed Nov 21 01:20:20 2007 +0000
3634 Use G_TYPE_DOUBLE when dumping a value.
3636 JsonNode of type value for floating point numbers is G_TYPE_DOUBLE
3637 and not G_TYPE_FLOAT anymore.
3639 json-glib/json-generator.c | 4 ++--
3640 1 files changed, 2 insertions(+), 2 deletions(-)
3642 commit 80006db7bcea2bd8c44a648a64ba3da6a05a6fd1
3643 Author: Emmanuele Bassi <ebassi@openedhand.com>
3644 Date: Tue Nov 20 18:30:42 2007 +0000
3646 Test correct deserialization of enum values
3648 Update the GObject deserialization test suite to check for the correct
3649 deserialization of the enum/flags values.
3651 tests/test-08.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------
3652 1 files changed, 53 insertions(+), 7 deletions(-)
3654 commit 1110e098fa879abf7f67f24af2a1b736ce359dd6
3655 Author: Emmanuele Bassi <ebassi@openedhand.com>
3656 Date: Tue Nov 20 18:20:33 2007 +0000
3658 Allow deserialization of strings into enums/flags
3660 If the target value is a G_TYPE_ENUM or a G_TYPE_FLAGS we can effectively
3661 deserialize a string into the corresponding value (or bit mask) using
3662 the introspection API for the GEnum and GFlags types.
3664 This code is taken from ClutterScript and it was adapted from GtkBuilder.
3666 json-glib/json-gobject.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++
3667 1 files changed, 170 insertions(+), 0 deletions(-)
3669 commit 2674ce68e574cebeca147944cf748b41fbe27507
3670 Author: Emmanuele Bassi <ebassi@openedhand.com>
3671 Date: Tue Nov 13 11:34:05 2007 +0000
3676 1 files changed, 1 insertions(+), 1 deletions(-)
3678 commit c1547eb3aba6f09b3ce4c23bd66a798e03b35a34
3679 Author: Emmanuele Bassi <ebassi@openedhand.com>
3680 Date: Tue Nov 13 11:29:19 2007 +0000
3686 2 files changed, 10 insertions(+), 1 deletions(-)
3688 commit 03325e108e40d5deba979852ee402d7d6579ac81
3689 Author: Emmanuele Bassi <ebassi@openedhand.com>
3690 Date: Tue Nov 13 11:20:34 2007 +0000
3692 Fix variable shadowing for distcheck
3694 json-glib/json-parser.c | 4 ++--
3695 1 files changed, 2 insertions(+), 2 deletions(-)
3697 commit afeec9b40468d289351c78007b5122ff716bb977
3698 Author: Emmanuele Bassi <ebassi@openedhand.com>
3699 Date: Tue Nov 13 11:16:51 2007 +0000
3701 Add 0.4 symbols index
3703 doc/reference/json-glib-docs.sgml | 4 ++++
3704 1 files changed, 4 insertions(+), 0 deletions(-)
3706 commit 32023e03ca9c976e66b9af949d4aea36e1d4d874
3707 Author: Emmanuele Bassi <ebassi@openedhand.com>
3708 Date: Tue Nov 13 10:59:14 2007 +0000
3710 Change "responsible" to "asked" in the (de)serialization functions docs
3712 We provide fallbacks in case a JsonSerializable object does not translate
3713 a property into a JSON object member and vice versa.
3715 json-glib/json-gobject.c | 15 ++++++++-------
3716 1 files changed, 8 insertions(+), 7 deletions(-)
3718 commit c669a28d37795be68f3a51e9353f6f9d8e695a52
3719 Author: Emmanuele Bassi <ebassi@openedhand.com>
3720 Date: Tue Nov 13 10:55:23 2007 +0000
3722 Add new symbols to the documentation
3724 doc/reference/json-glib-sections.txt | 7 ++++++-
3725 1 files changed, 6 insertions(+), 1 deletions(-)
3727 commit b83a2bfa96885837ca48bacb6492fd68a2b5b564
3728 Merge: 1f9b3e5 198ed83
3729 Author: Emmanuele Bassi <ebassi@openedhand.com>
3730 Date: Tue Nov 13 10:51:58 2007 +0000
3732 Merge branch 'gobject-deserialize' into work
3734 commit 198ed839424dc7791d22dede152f4d7abc16a8b2
3735 Author: Emmanuele Bassi <ebassi@openedhand.com>
3736 Date: Tue Nov 13 10:51:31 2007 +0000
3738 Use the fallback value-to-node generator even for serializables
3740 To avoid reimplementing the same code all over again, if the implementation
3741 of the serialize_property virtual function of JsonSerializable returns NULL
3742 we will fall back to the simple value-to-node generator we provide for
3743 non-serializable classes.
3745 json-glib/json-gobject.c | 17 +++++++++++------
3746 tests/test-07.c | 13 +------------
3747 2 files changed, 12 insertions(+), 18 deletions(-)
3749 commit 10e937a68bd802a4f5948d900aa2201344cfc138
3750 Author: Emmanuele Bassi <ebassi@openedhand.com>
3751 Date: Tue Nov 13 10:46:02 2007 +0000
3753 Add test unit for the GObject deserialization
3756 tests/Makefile.am | 4 +-
3757 tests/test-08.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3758 3 files changed, 296 insertions(+), 1 deletions(-)
3760 commit 7b93db7ad996b29a6c576db33803029dc94e16fc
3761 Author: Emmanuele Bassi <ebassi@openedhand.com>
3762 Date: Tue Nov 13 10:45:23 2007 +0000
3764 Fix a couple of dumb typos in the GObject deserialization code
3766 We need to skip if the CONSTRUCT_ONLY flag is set, not unset. We also need
3767 to copy the value from the JSON node into the target GValue, not the other
3770 json-glib/json-gobject.c | 6 ++++--
3771 1 files changed, 4 insertions(+), 2 deletions(-)
3773 commit 9e61004365982017bfe9b76889e2a7d1a0320350
3774 Author: Emmanuele Bassi <ebassi@openedhand.com>
3775 Date: Tue Nov 13 10:11:34 2007 +0000
3777 Update git ignore file
3780 1 files changed, 2 insertions(+), 0 deletions(-)
3782 commit 4b496c7d906c81dceafe6a5f442b55b6e161f762
3783 Author: Emmanuele Bassi <ebassi@openedhand.com>
3784 Date: Tue Nov 13 10:11:00 2007 +0000
3786 Add node-to-property simple fallback parser for deserialization
3788 The fallback parser for json_construct_gobject() is invoked if the GType
3789 does not implement the JsonSerializable interface, or if the interface
3790 was not handling the property.
3792 It will natively convert integers, booleans, strings and double precision
3793 floating point values; it also handles string vectors in form of arrays.
3795 json-glib/json-gobject.c | 94 +++++++++++++++++++++++++++++++++++++++++----
3796 1 files changed, 85 insertions(+), 9 deletions(-)
3798 commit a7c39c910e08093ee0d0723685005623f26b9eae
3799 Author: Emmanuele Bassi <ebassi@openedhand.com>
3800 Date: Tue Nov 13 09:28:57 2007 +0000
3802 Add the JsonGenerator:root property
3804 JsonGenerator now has a :root property, so it can be constructed using
3805 just g_object_new():
3807 generator = g_object_new (JSON_TYPE_GENERATOR,
3813 This means that the root node is copied inside the generator, instead of
3814 just taking ownership (it was quite confusing). The documentation now
3815 clearly states what happens, and that you can safely free the node after
3816 feeding it to the JsonGenerator.
3818 json-glib/json-generator.c | 30 ++++++++++++++++++++++++++++--
3819 1 files changed, 28 insertions(+), 2 deletions(-)
3821 commit 6132d7325c33e26740b4c955d8ccbe53fd817cd8
3822 Author: Emmanuele Bassi <ebassi@openedhand.com>
3823 Date: Tue Nov 13 09:26:02 2007 +0000
3825 Fix member name in json_node_get_value_type()
3827 JsonNode payload is inside a union.
3829 json-glib/json-node.c | 2 +-
3830 1 files changed, 1 insertions(+), 1 deletions(-)
3832 commit f051b948714e4928a7d7f903e891639ce4ba82fd
3833 Author: Emmanuele Bassi <ebassi@openedhand.com>
3834 Date: Tue Nov 13 09:17:22 2007 +0000
3836 Add a GType for JsonNode
3838 We need a GType for nodes if we want to add JsonNode properties or signal
3839 marshallers to a GObject class. We could use pointers, but we'd loose type
3840 safety, so it's a no-no.
3842 json-glib/json-node.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
3843 json-glib/json-types.h | 8 ++++++--
3844 2 files changed, 54 insertions(+), 2 deletions(-)
3846 commit 1f9b3e50282f8aa4a421c83ad596f6186ef82ec9
3847 Author: Emmanuele Bassi <ebassi@openedhand.com>
3848 Date: Sat Nov 10 15:12:20 2007 +0000
3850 When parsing a full assignment, also swallow any trailing semi-colon
3852 There's no end to web developers insanity when they can twist and turn a
3853 perfectly simple and elegant notation into something that allows lazyness
3856 json-glib/json-parser.c | 12 +++++++++++-
3857 tests/test-02.c | 1 +
3858 2 files changed, 12 insertions(+), 1 deletions(-)
3860 commit 261d05a4cdcc1f64824615cdc81b4b467d0a5f57
3861 Author: Emmanuele Bassi <ebassi@openedhand.com>
3862 Date: Sat Nov 10 02:15:44 2007 +0000
3864 Add support for parsing assignments
3866 Some JSON web APIs return a full JavaScript assignment instead of just
3867 the data structure (and I'm looking at you, Tumblr). This is done in clear
3868 violation of the grammar published in the RFC 4627, and it's evidently
3869 done because most web developers are too lazy for doing a
3871 var foo = eval('(' + text ')');
3873 and want everything defined for them. JsonParser will blissfully ignore
3874 the left-hand part of the assignment but, in the interest of the developer
3875 who cares, will record: 1. that the parsed statement was in fact an
3876 assignment and 2. the name of the variable used.
3878 The function json_parser_has_assignment() can be used to query both the
3879 presence of an assignment and the variable name at the same time.
3881 doc/reference/json-glib-sections.txt | 1 +
3882 json-glib/json-parser.c | 80 +++++++++++++++++++++++++++++++++-
3883 json-glib/json-parser.h | 5 ++
3884 tests/test-02.c | 5 ++
3885 4 files changed, 89 insertions(+), 2 deletions(-)
3887 commit 45c697263364a975fd6a54373f999f2932436b6f
3888 Author: Emmanuele Bassi <ebassi@openedhand.com>
3889 Date: Sat Nov 10 01:26:46 2007 +0000
3891 Initial implementation of GObject deserialization function
3893 The json_construct_gobject() function takes a GType and a JSON data stream
3894 and constructs a new instance for the given type. If the type is a
3895 JsonSerializable, it will use the JsonSerializable interface for parsing
3896 the JsonNodes of each object member.
3898 This is the initial implementation of the function: the JsonNode-to-GValue
3899 fallback parser is just a stub.
3901 doc/reference/json-glib-sections.txt | 1 +
3902 json-glib/json-gobject.c | 182 +++++++++++++++++++++++++++++++---
3903 json-glib/json-gobject.h | 8 +-
3904 3 files changed, 177 insertions(+), 14 deletions(-)
3906 commit 4eade1089355ebcf0614d0cfbc9c441513b7d97a
3907 Author: Emmanuele Bassi <ebassi@openedhand.com>
3908 Date: Mon Oct 29 22:23:36 2007 +0000
3910 Fix objects test suite to match the arrays one
3912 tests/test-03.c | 8 ++++----
3913 1 files changed, 4 insertions(+), 4 deletions(-)
3915 commit 3948d83795d68d665b8b969c08b6c40498eb2661
3916 Author: Emmanuele Bassi <ebassi@openedhand.com>
3917 Date: Mon Oct 29 22:23:07 2007 +0000
3919 More sanity checks for objects
3921 Add a check for commas after complex data types inside object members.
3923 json-glib/json-parser.c | 8 +++++++-
3924 1 files changed, 7 insertions(+), 1 deletions(-)
3926 commit 6182457fa305a1f159e9009d3fbef42a93f2768e
3927 Author: Emmanuele Bassi <ebassi@openedhand.com>
3928 Date: Mon Oct 29 22:17:44 2007 +0000
3930 Fix the test suite for arrays
3932 Fix a typo in test number 7 (missing comma to separate the C strings) and
3933 use G_TYPE_DOUBLE instead of G_TYPE_FLOAT for the floating point values.
3935 tests/test-02.c | 8 ++++----
3936 1 files changed, 4 insertions(+), 4 deletions(-)
3938 commit 25cdc18be8acdad54561f919c5805ad4fa9b3ac9
3939 Author: Emmanuele Bassi <ebassi@openedhand.com>
3940 Date: Mon Oct 29 22:16:31 2007 +0000
3942 Add more sanity checks to the parser
3944 Catch missing commas after an array element or an object member.
3946 json-glib/json-parser.c | 10 ++++++++++
3947 1 files changed, 10 insertions(+), 0 deletions(-)
3949 commit 812422e4ed4df83374cdda6d94637448ab94dfef
3950 Author: Emmanuele Bassi <ebassi@openedhand.com>
3951 Date: Mon Oct 29 18:18:34 2007 +0000
3953 Backport fixes from Clutter trunk
3955 The copy of JSON-GLib in Clutter trunk has two fixes for the JsonParser
3958 * support for negative numbers (ints and floats);
3959 * correct parse error propagation
3961 which should make the JsonParser hopefully complete.
3963 json-glib/json-parser.c | 123 +++++++++++++++++++++++++++++++++++++++--------
3964 1 files changed, 103 insertions(+), 20 deletions(-)
3966 commit 72d007d865a822875dfa311698fb2d13f5d3df69
3967 Author: Emmanuele Bassi <ebassi@openedhand.com>
3968 Date: Mon Oct 29 18:16:24 2007 +0000
3970 Check if the payload is set in json_node_free()
3972 Before calling json_object_unref() or json_array_unref() in json_node_free()
3973 we need to check if the payload of JsonNode is set to avoid a critical.
3975 json-glib/json-node.c | 6 ++++--
3976 1 files changed, 4 insertions(+), 2 deletions(-)
3978 commit 59a66484befba457eda2ee7a9540f2b33ff04031
3979 Author: Emmanuele Bassi <ebassi@openedhand.com>
3980 Date: Tue Oct 16 23:20:22 2007 +0100
3982 Add test unit for the JsonSerializable interface
3984 This should have been done before relasing 0.2.0. Well, that's what
3985 point releases are for.
3987 tests/Makefile.am | 4 +-
3988 tests/test-07.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3989 2 files changed, 268 insertions(+), 1 deletions(-)
3991 commit 34515af7bb1d69317b9e52d0ced92beaf6770e7d
3992 Author: Emmanuele Bassi <ebassi@openedhand.com>
3993 Date: Tue Oct 16 23:19:35 2007 +0100
3995 We need the actual implementation of the JsonSerializable GType function
3997 A placeholder, while syntactically correct, won't do.
3999 json-glib/json-gobject.c | 6 ++++++
4000 1 files changed, 6 insertions(+), 0 deletions(-)
4002 commit 0656c4bee8e14c375481c89a62f0e6e95be758ce
4003 Author: Emmanuele Bassi <ebassi@openedhand.com>
4004 Date: Tue Oct 16 23:18:47 2007 +0100
4006 Fix the compiler fixes
4008 This is what happens when you fix a compiler warning about a shadowing
4009 variable and you don't run the test suite to check the results.
4011 json-glib/json-generator.c | 10 ++++++----
4012 1 files changed, 6 insertions(+), 4 deletions(-)
4014 commit 88794df33e08cb409f71d1aaf702cd509b600954
4015 Author: Emmanuele Bassi <ebassi@openedhand.com>
4016 Date: Tue Oct 16 19:53:27 2007 +0100
4021 1 files changed, 1 insertions(+), 1 deletions(-)
4023 commit 0ce3bf30d84aedcf5f8f75e6c1112d91dcc1d654
4024 Author: Emmanuele Bassi <ebassi@openedhand.com>
4025 Date: Tue Oct 16 19:49:42 2007 +0100
4030 1 files changed, 1 insertions(+), 1 deletions(-)
4032 commit 77248800533f3dabfb09dfa8ba32e3084ea62d5f
4033 Author: Emmanuele Bassi <ebassi@openedhand.com>
4034 Date: Tue Oct 16 19:43:27 2007 +0100
4036 Fix DISTCHECK configure flags
4039 1 files changed, 1 insertions(+), 1 deletions(-)
4041 commit 70be36c97a8cd598af061eb9ac5a9a5852858682
4042 Author: Emmanuele Bassi <ebassi@openedhand.com>
4043 Date: Tue Oct 16 19:42:05 2007 +0100
4045 Fix compilation errors with extra maintainer CFLAGS
4047 json-glib/json-array.c | 2 +-
4048 json-glib/json-generator.c | 16 ++++++++--------
4049 json-glib/json-parser.c | 4 ++--
4050 3 files changed, 11 insertions(+), 11 deletions(-)
4052 commit 57c39582818b8a6579fed327f5c6e2fc34e93694
4053 Author: Emmanuele Bassi <ebassi@openedhand.com>
4054 Date: Tue Oct 16 19:41:18 2007 +0100
4056 Drop -Wextra from the maintainer CFLAGS
4058 Some autogenerated code caused -Werror to croak, so -Wextra has to go.
4061 1 files changed, 1 insertions(+), 1 deletions(-)
4063 commit 9c690da734ee4513f19841f93a08ae35bbaa65b1
4064 Author: Emmanuele Bassi <ebassi@openedhand.com>
4065 Date: Tue Oct 16 18:20:19 2007 +0100
4067 Autogenerate the ChangeLog when disting
4069 Makefile.am | 5 +++++
4070 1 files changed, 5 insertions(+), 0 deletions(-)
4072 commit 95fc9c4fb5af82c766d2f4f515b361028bc348e7
4073 Author: Emmanuele Bassi <ebassi@openedhand.com>
4074 Date: Tue Oct 16 18:20:01 2007 +0100
4076 Fix EXTRA_DIST files for distcheck
4078 json-glib/Makefile.am | 16 +++++++++-------
4079 1 files changed, 9 insertions(+), 7 deletions(-)
4081 commit 87a36b8a5e23f3cf80730627f9b89061934a5bbf
4082 Author: Emmanuele Bassi <ebassi@openedhand.com>
4083 Date: Tue Oct 16 17:40:06 2007 +0100
4085 Add the JsonSerializable interface
4087 The JsonSerializable interface allows implementations to override the
4088 GObject-to-JSON serialization process, by providing two virtual methods
4089 to control the (de)serialization of GObject properties. This way it's
4090 possible to serialize GObjects with properties holding complex data types.
4092 doc/reference/json-glib-sections.txt | 15 +++
4093 json-glib/json-gobject.c | 188 ++++++++++++++++++++++++++++------
4094 json-glib/json-gobject.h | 51 +++++++++
4095 json-glib/json-types.h | 1 +
4096 4 files changed, 224 insertions(+), 31 deletions(-)
4098 commit 85cb0f44c4c7297a75141999674f3eb0fdf6a308
4099 Author: Emmanuele Bassi <ebassi@openedhand.com>
4100 Date: Tue Oct 16 17:25:08 2007 +0100
4102 Add a method for getting all the nodes from a JsonObject
4104 To map json_array_get_elements(), a json_object_get_values() method has
4105 been added which returns the list of JsonNodes contained by a JsonObject.
4107 doc/reference/json-glib-sections.txt | 1 +
4108 json-glib/json-object.c | 41 ++++++++++++++++++++++++++++++++++
4109 json-glib/json-types.h | 1 +
4110 3 files changed, 43 insertions(+), 0 deletions(-)
4112 commit 474ecf1cc6aae35b184edffc75fc8626c3f12f61
4113 Author: Emmanuele Bassi <ebassi@openedhand.com>
4114 Date: Tue Oct 16 16:40:57 2007 +0100
4116 Add a note in the JsonObject documentation for the member name normalization
4118 json-glib/json-object.c | 6 +++++-
4119 1 files changed, 5 insertions(+), 1 deletions(-)
4121 commit 93e26b94d9bb1909f3b16a4b0500f27660d7e621
4122 Author: Emmanuele Bassi <ebassi@openedhand.com>
4123 Date: Tue Oct 16 16:37:01 2007 +0100
4125 Normalize every member name before using it
4127 Every member name is stored inside the internal hash table of JsonObject
4128 using a normalized string: every delimiter found matching G_STR_DELIMITERS
4129 is automatically transformed in an underscore ('_').
4131 This means that "member-name" and "member_name" are completely equivalent
4134 json-glib/json-object.c | 31 ++++++++++++++++++++++++++-----
4135 1 files changed, 26 insertions(+), 5 deletions(-)
4137 commit 73a7671dedfd3bb9bc1a8c197a68dcef90e627f7
4138 Author: Emmanuele Bassi <ebassi@openedhand.com>
4139 Date: Mon Oct 15 10:28:39 2007 +0100
4141 Provide an internal g_hash_table_get_keys() and bump down GLib dependency
4143 Even though GLib 2.14 is now available, many systems still come out with
4144 GLib 2.12. Since we are using just a single 2.14 function for retrieving
4145 the members from a JsonObject, we can provide an internal version of that
4146 function and hideit behind a pre-processor macro.
4149 json-glib/json-object.c | 25 +++++++++++++++++++++++++
4150 2 files changed, 26 insertions(+), 1 deletions(-)
4152 commit 28928a2f1cbe83a2f1bf699c915daa6eca80f587
4153 Author: Emmanuele Bassi <ebassi@openedhand.com>
4154 Date: Mon Oct 15 10:25:09 2007 +0100
4156 Add API for removing nodes from arrays and objects
4158 Write and document json_object_remove_member() and json_array_remove_element()
4159 which can be used to remove a JsonNode from a JsonObject or a JsonArray
4160 respectively. This way, the JsonObject and JsonArray are API-complete and
4161 the object model can be manipulated in code.
4163 doc/reference/json-glib-sections.txt | 2 +
4164 json-glib/json-array.c | 18 +++++
4165 json-glib/json-object.c | 17 +++++
4166 json-glib/json-types.h | 126 +++++++++++++++++----------------
4167 4 files changed, 102 insertions(+), 61 deletions(-)
4169 commit b3ecd6e2fbdd58250427f406c43d60b8cb8d2644
4170 Author: Emmanuele Bassi <ebassi@openedhand.com>
4171 Date: Wed Oct 10 12:03:59 2007 +0100
4173 Parse bare root values
4175 If the root node contains just a bare value (true, false, null, fundamental
4176 type) then it's still valid JSON.
4178 Also, use the commodity JsonNode API to avoid using values in the parser
4181 json-glib/json-parser.c | 79 +++++++++++++++++-----------------------------
4182 1 files changed, 29 insertions(+), 50 deletions(-)
4184 commit a7839a06da53d32eb372b4813e5883a04e1c36b7
4185 Author: Emmanuele Bassi <ebassi@openedhand.com>
4186 Date: Tue Oct 9 20:52:56 2007 +0100
4188 Add the forgotten JsonGenerator type function
4190 doc/reference/json-glib.types | 1 +
4191 1 files changed, 1 insertions(+), 0 deletions(-)
4193 commit daeef3345c3a7f3325cea8c945f0e1d814defcc1
4194 Author: Emmanuele Bassi <ebassi@openedhand.com>
4195 Date: Mon Oct 8 18:29:44 2007 +0100
4197 Add json_node_dup_string()
4199 The newly added json_node_dup_string() is a convenience function for
4200 getting a copy of the string contained inside a JsonNode.
4202 doc/reference/json-glib-sections.txt | 1 +
4203 json-glib/json-node.c | 20 ++++++++++++++++++++
4204 json-glib/json-types.h | 1 +
4205 3 files changed, 22 insertions(+), 0 deletions(-)
4207 commit b12efcec57fff6e7637fc924fc50333b97eb2594
4208 Author: Emmanuele Bassi <ebassi@openedhand.com>
4209 Date: Sun Oct 7 00:47:32 2007 +0100
4211 Fix documentation about the ownership of the nodes
4213 When adding a JsonNode to a JsonObject or a JsonArray, the containers
4214 take ownership of the node.
4216 json-glib/json-array.c | 7 +++++--
4217 json-glib/json-object.c | 13 ++++++++-----
4218 2 files changed, 13 insertions(+), 7 deletions(-)
4220 commit bd5a60ca658257752993ccea47950b97cdc45246
4221 Author: Emmanuele Bassi <ebassi@openedhand.com>
4222 Date: Fri Oct 5 18:24:27 2007 +0100
4224 Add convenience accessors for fundamental types in JsonNode
4226 This commit adds some convenience accessors for setting and
4227 getting fundamental types in and from a JsonNode, to avoid
4228 jumping through all the GValue hoops.
4230 doc/reference/json-glib-sections.txt | 8 ++
4231 json-glib/json-node.c | 201 ++++++++++++++++++++++++++++++++++
4232 json-glib/json-types.h | 12 ++
4233 3 files changed, 221 insertions(+), 0 deletions(-)
4235 commit ad95c8bf8e4103058d42ae71f47e6980e3b52c34
4236 Author: Emmanuele Bassi <ebassi@openedhand.com>
4237 Date: Fri Oct 5 18:23:15 2007 +0100
4239 Use doubles when parsing, not floats
4241 GScanner advertise the floating point values as floats, but it really
4242 uses doubles. Hence, we need to use G_TYPE_DOUBLE when saving the
4243 parsed constants into a GValue.
4245 json-glib/json-parser.c | 8 ++++----
4246 1 files changed, 4 insertions(+), 4 deletions(-)
4248 commit 220838e4e61c5a8fd9cf627da7309acf44fa82f0
4249 Author: Emmanuele Bassi <ebassi@openedhand.com>
4250 Date: Fri Oct 5 16:39:10 2007 +0100
4252 Add line/position getters to JsonParser
4254 Add two methods to JsonParser to retrieve the currently parsed line
4255 and position within that line. These methods works only while parsing,
4256 so within the signal handlers and inside subclasses.
4258 doc/reference/json-glib-sections.txt | 6 ++++
4259 json-glib/json-parser.c | 46 +++++++++++++++++++++++++++++++--
4260 json-glib/json-parser.h | 21 +++++++++------
4261 3 files changed, 61 insertions(+), 12 deletions(-)
4263 commit ea5ee264a5b82fd1d09fa84ec81e17c4ea0d0c4a
4264 Author: Emmanuele Bassi <ebassi@openedhand.com>
4265 Date: Fri Oct 5 15:13:21 2007 +0100
4267 Document the newly added signals
4269 json-glib/json-parser.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++
4270 json-glib/json-parser.h | 10 ++++++-
4271 2 files changed, 73 insertions(+), 1 deletions(-)
4273 commit fa9d1676da588306be5a14bcab100ad58a41b799
4274 Author: Emmanuele Bassi <ebassi@openedhand.com>
4275 Date: Fri Oct 5 11:59:44 2007 +0100
4277 Add more signals to the JsonParser class
4279 JsonParser should emit signals in critical places, like: start/end of
4280 the parsing process; start and end of a JsonObject and a JsonArray;
4281 completion of every member and element of a JsonObject and a JsonArray.
4282 These signals require the addition of some custom marshaller.
4284 json-glib/json-marshal.list | 4 ++
4285 json-glib/json-parser.c | 118 +++++++++++++++++++++++++++++++++++++++++-
4286 json-glib/json-parser.h | 25 ++++++++-
4287 3 files changed, 141 insertions(+), 6 deletions(-)
4289 commit aa2b31234f7cfac63b870e8d9d74e682b3121d4a
4290 Author: Emmanuele Bassi <ebassi@openedhand.com>
4291 Date: Fri Oct 5 11:57:53 2007 +0100
4293 Implement the GType functions for JsonObject and JsonArray
4295 The type functions for the JsonObject and JsonArray types were declared,
4296 albeit with the wrong return value, but not implemented. This commit
4297 fixed the return value and implements them.
4299 JsonObject and JsonArray are boxed types because we don't need them to
4300 be GObjects (no signals, no inheritance and their implementation must be
4301 completely opaque for the developer).
4303 json-glib/json-array.c | 13 +++++++++++++
4304 json-glib/json-object.c | 13 +++++++++++++
4305 json-glib/json-types.h | 4 ++--
4306 3 files changed, 28 insertions(+), 2 deletions(-)
4308 commit bd41854505f47d2176ea4cfba8083ce998c482cc
4309 Author: Emmanuele Bassi <ebassi@openedhand.com>
4310 Date: Tue Oct 2 12:13:23 2007 +0100
4312 Document the GObject integration API into the API reference
4314 doc/reference/json-glib-docs.sgml | 6 ++++++
4315 doc/reference/json-glib-sections.txt | 6 ++++++
4316 2 files changed, 12 insertions(+), 0 deletions(-)
4318 commit cea3f69f2cde1cb4e6ea9242f6014b31864ad80f
4319 Author: Emmanuele Bassi <ebassi@openedhand.com>
4320 Date: Tue Oct 2 12:12:49 2007 +0100
4322 Add test case for GObject integration
4325 tests/Makefile.am | 4 +-
4326 tests/test-06.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4327 3 files changed, 159 insertions(+), 1 deletions(-)
4329 commit 3666613e47b66d67a28bc06c6dcf678fe97eae50
4330 Author: Emmanuele Bassi <ebassi@openedhand.com>
4331 Date: Tue Oct 2 12:11:55 2007 +0100
4333 Add GObject serialization support for JSON-GLib
4335 This commit adds json-gobject.h and json_serialize_gobject() to
4336 JSON-GLib, to serialize a GObject instance into a JSON data stream.
4339 json-glib/Makefile.am | 2 +
4340 json-glib/json-gobject.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++
4341 json-glib/json-gobject.h | 33 +++++++++
4342 4 files changed, 205 insertions(+), 0 deletions(-)
4344 commit 8398253c76cf5dda23891b49b1aaa49e57d95a8d
4345 Author: Emmanuele Bassi <ebassi@openedhand.com>
4346 Date: Tue Oct 2 10:03:00 2007 +0100
4348 Complete the tests suite with the object deserialization
4350 Add a test unit for JSON object generation using JsonGenerator. The
4351 empty, simple (1-depth) and complex (nested object and array) cases
4354 The complex object generation is taken from the RFC 4627, Examples
4358 tests/Makefile.am | 4 +-
4359 tests/test-05.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4360 3 files changed, 222 insertions(+), 1 deletions(-)
4362 commit 2b25dbfa802f9af6e76fbe72140b687535cae8e5
4363 Author: Emmanuele Bassi <ebassi@openedhand.com>
4364 Date: Tue Oct 2 08:07:56 2007 +0100
4368 JsonGenerator can now create objects and array-nested objects, with and without
4369 pretty printing. The test suite has been updated accordingly.
4371 json-glib/json-generator.c | 125 ++++++++++++++++++++++++++++++++++++++++++-
4372 tests/test-04.c | 68 ++++++++++++++++++++++++
4373 2 files changed, 190 insertions(+), 3 deletions(-)
4375 commit 326cdead6f1c7b1bbaae0961d28bfe5ca3af0a1a
4376 Author: Emmanuele Bassi <ebassi@openedhand.com>
4377 Date: Mon Oct 1 23:07:18 2007 +0100
4379 Add nested arrays support
4381 JsonGenerator now supports nested arrays, both with and without pretty
4382 printing. The tests suite has been updated accordingly.
4384 json-glib/json-generator.c | 10 +++++++
4385 tests/test-04.c | 61 ++++++++++++++++++++++++++++++++++++++++++++
4386 2 files changed, 71 insertions(+), 0 deletions(-)
4388 commit 6f4dd6b154a150e8b4221800b61f85e5c4277d1b
4389 Author: Emmanuele Bassi <ebassi@openedhand.com>
4390 Date: Mon Oct 1 22:58:04 2007 +0100
4392 Simple arrays generation
4394 JsonGenerator now can create simple arrays, with "pretty" enabled and disabled.
4395 Simple arrays are just one-level, value-only arrays.
4397 The test unit has been updated to exercise this new feature.
4399 json-glib/json-generator.c | 160 ++++++++++++++++++++++++++++++++++++++++++--
4400 tests/test-04.c | 86 ++++++++++++++++++++++--
4401 2 files changed, 234 insertions(+), 12 deletions(-)
4403 commit 7f0232eaab0af434e2e086c83b68395146e410f9
4404 Author: Emmanuele Bassi <ebassi@openedhand.com>
4405 Date: Mon Oct 1 22:22:12 2007 +0100
4407 Update list of git ignored files
4409 .gitignore | 5 +++++
4410 1 files changed, 5 insertions(+), 0 deletions(-)
4412 commit 47b34271f989cb5f2ba01a633d003adb6052cbd1
4413 Author: Emmanuele Bassi <ebassi@openedhand.com>
4414 Date: Mon Oct 1 22:20:23 2007 +0100
4416 Add initial test unit for the JsonGenerator object
4418 tests/Makefile.am | 4 +++-
4419 tests/test-04.c | 29 +++++++++++++++++++++++++++++
4420 2 files changed, 32 insertions(+), 1 deletions(-)
4422 commit 8edb4ef3232428ac9e548ae6c1dfa2328bf7198c
4423 Author: Emmanuele Bassi <ebassi@openedhand.com>
4424 Date: Mon Oct 1 22:19:28 2007 +0100
4426 Add missing json-generator.h header
4428 json-glib/json-glib.h | 1 +
4429 1 files changed, 1 insertions(+), 0 deletions(-)
4431 commit f09acae8e0d6ceba5d13de75551491835a7e71de
4432 Author: Emmanuele Bassi <ebassi@openedhand.com>
4433 Date: Mon Oct 1 19:49:43 2007 +0100
4435 Document the new public functions
4437 Now that we moved the constructors and setters for the JSON data types into
4438 the public symbols we need to document them to get back to 100% doc coverage.
4440 doc/reference/json-glib-sections.txt | 26 ++++++++++-
4441 json-glib/json-array.c | 22 ++++++++++
4442 json-glib/json-node.c | 78 ++++++++++++++++++++++++++++++++++
4443 json-glib/json-object.c | 15 +++++++
4444 json-glib/json-types.h | 2 +
4445 5 files changed, 141 insertions(+), 2 deletions(-)
4447 commit 228a5e4efe65995778847f48d2be43f3df988e10
4448 Author: Emmanuele Bassi <ebassi@openedhand.com>
4449 Date: Mon Oct 1 18:01:20 2007 +0100
4451 Move data types ctors and setters into the public headers
4453 Now that we are providing a generator class we need to provide the
4454 constructors and setters for JsonNode, JsonObject and JsonArray. This
4455 also means that the json-private.h header is now useless, so we can
4456 remove it from the build and repository.
4458 json-glib/Makefile.am | 2 +-
4459 json-glib/json-array.c | 1 -
4460 json-glib/json-generator.c | 1 -
4461 json-glib/json-node.c | 1 -
4462 json-glib/json-object.c | 1 -
4463 json-glib/json-parser.c | 1 -
4464 json-glib/json-private.h | 35 -----------------------------------
4465 json-glib/json-types.h | 38 +++++++++++++++++++++++++++++++-------
4466 8 files changed, 32 insertions(+), 48 deletions(-)
4468 commit bfa60e9ef9da71e3c0d171f81cd08e8eac749061
4469 Author: Emmanuele Bassi <ebassi@openedhand.com>
4470 Date: Mon Oct 1 17:48:34 2007 +0100
4472 Add stub class for JsonGenerator
4474 JsonGenerator is an object that creates JSON data streams from a data
4475 model tree. This commit adds the JsonGenerator class to the build and
4478 doc/reference/json-glib-docs.sgml | 1 +
4479 doc/reference/json-glib-sections.txt | 25 ++++
4480 json-glib/Makefile.am | 2 +
4481 json-glib/json-generator.c | 255 ++++++++++++++++++++++++++++++++++
4482 json-glib/json-generator.h | 82 +++++++++++
4483 5 files changed, 365 insertions(+), 0 deletions(-)
4485 commit 41849494890f1f51bc7c4429f0ee7b5d168da302
4486 Author: Emmanuele Bassi <ebassi@openedhand.com>
4487 Date: Mon Oct 1 16:37:14 2007 +0100
4489 Fix ids inside the main documentation index
4491 doc/reference/json-glib-docs.sgml | 4 ++--
4492 1 files changed, 2 insertions(+), 2 deletions(-)
4494 commit c3f8ea960ef7f8733969d9fb0f71531bc7449a16
4495 Author: Emmanuele Bassi <ebassi@openedhand.com>
4496 Date: Mon Oct 1 16:25:47 2007 +0100
4498 Complete API reference of JSON-GLib
4500 With this commit, we reach 100% coverage.
4502 json-glib/json-parser.h | 19 +++++++++++++++++++
4503 json-glib/json-types.h | 20 ++++++++++++++++++++
4504 2 files changed, 39 insertions(+), 0 deletions(-)
4506 commit 2211e4e60b90b92d868c9b5f6b61e133d2435b4d
4507 Author: Emmanuele Bassi <ebassi@openedhand.com>
4508 Date: Mon Oct 1 16:25:11 2007 +0100
4510 Implement json_node_get_parent()
4512 It seems that the parent accessor fell through. This commit implements
4513 the declared json_node_get_parent() function.
4515 json-glib/json-node.c | 16 ++++++++++++++++
4516 1 files changed, 16 insertions(+), 0 deletions(-)
4518 commit 29feafc236f888021b817fdfe0cfe685f5e3b65e
4519 Author: Emmanuele Bassi <ebassi@openedhand.com>
4520 Date: Mon Oct 1 16:16:15 2007 +0100
4522 Add licensing informations to the source code
4524 json-glib/json-array.c | 29 ++++++++++++++++++++++++
4525 json-glib/json-node.c | 52 ++++++++++++++++++++++++++++++++++++------
4526 json-glib/json-object.c | 34 ++++++++++++++++++++++++---
4527 json-glib/json-parser.c | 28 +++++++++++++++++++++-
4528 json-glib/json-parser.h | 19 +++++++++++++++
4529 json-glib/json-types.h | 35 +++++++++++++++++++++++++++++
4530 json-glib/json-version.h.in | 19 +++++++++++++++
4531 7 files changed, 202 insertions(+), 14 deletions(-)
4533 commit 6eb1a5e94957d3555e7de5f6744a8777cd89efaf
4534 Author: Emmanuele Bassi <ebassi@openedhand.com>
4535 Date: Mon Oct 1 15:55:04 2007 +0100
4537 Fix a stray newline in the documentation
4539 doc/reference/json-glib-docs.sgml | 3 +--
4540 1 files changed, 1 insertions(+), 2 deletions(-)
4542 commit a5ecf553082816a1ce6c4354ff23e8addf8d9c80
4543 Author: Emmanuele Bassi <ebassi@openedhand.com>
4544 Date: Mon Oct 1 15:52:54 2007 +0100
4546 Update git ignore file
4548 .gitignore | 22 ++++++++++++++++++++++
4549 1 files changed, 22 insertions(+), 0 deletions(-)
4551 commit 9bdee4c01adef7e9d7ed18d5dd94671057f1459b
4552 Author: Emmanuele Bassi <ebassi@openedhand.com>
4553 Date: Mon Oct 1 15:50:49 2007 +0100
4555 Add API reference for JSON-GLib
4557 Use gtk-doc to build the various bits and pieces of the API reference
4560 doc/Makefile.am | 1 +
4561 doc/reference/Makefile.am | 2 +-
4562 doc/reference/json-glib-docs.sgml | 153 ++++++++++++++++++++++++++++++++++
4563 doc/reference/json-glib-sections.txt | 92 ++++++++++++++++++++
4564 doc/reference/json-glib.types | 1 +
4565 json-glib/json-node.c | 2 +-
4566 json-glib/json-version.h.in | 8 ++
4567 7 files changed, 257 insertions(+), 2 deletions(-)
4569 commit 2e362edd46f11f2fd1fa327877372b902b70c280
4570 Author: Emmanuele Bassi <ebassi@openedhand.com>
4571 Date: Mon Oct 1 14:57:39 2007 +0100
4573 Add more test cases for the object parsing
4575 tests/test-03.c | 3 +++
4576 1 files changed, 3 insertions(+), 0 deletions(-)
4578 commit 79423943a8588a8ed6d5bedbc038255111897261
4579 Author: Emmanuele Bassi <ebassi@openedhand.com>
4580 Date: Mon Oct 1 14:57:25 2007 +0100
4582 Swallow the comma earlier in the parser
4584 The comma is used as a member and element separator, so it should be
4585 swallowed by the parser as soon as possible.
4587 json-glib/json-parser.c | 25 ++++++++++++++++---------
4588 1 files changed, 16 insertions(+), 9 deletions(-)
4590 commit e711b883dba88d68b6986d87f14a06361cf54be7
4591 Author: Emmanuele Bassi <ebassi@openedhand.com>
4592 Date: Mon Oct 1 14:46:31 2007 +0100
4597 1 files changed, 3 insertions(+), 0 deletions(-)
4599 commit 591989c80b16fe68bdd79bcc7759a4249fdaf129
4600 Author: Emmanuele Bassi <ebassi@openedhand.com>
4601 Date: Mon Oct 1 14:45:42 2007 +0100
4605 Add JSON object parsing testing to the test units.
4607 tests/Makefile.am | 8 +-
4608 tests/test-02.c | 73 +++++++++++++++++-
4609 tests/test-03.c | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4610 3 files changed, 285 insertions(+), 7 deletions(-)
4612 commit ba3a6e6afed0d4fe3853b8e7400516557a20f775
4613 Author: Emmanuele Bassi <ebassi@openedhand.com>
4614 Date: Mon Oct 1 14:44:51 2007 +0100
4616 Add JSON object parsing
4618 This commit completes the JsonParser class by adding the ability to
4619 parse JSON objects, either alone or inside arrays. JsonParser is now
4622 json-glib/json-parser.c | 235 ++++++++++++++++++++++++++++++++++++++++++++---
4623 1 files changed, 220 insertions(+), 15 deletions(-)
4625 commit fd89ad3d7127e68df06345fa52863e73ada93689
4626 Author: Emmanuele Bassi <ebassi@openedhand.com>
4627 Date: Mon Oct 1 14:43:12 2007 +0100
4629 Declare json_node_take_object() and json_node_take_array()
4631 JsonParser uses the take variant of JsonNode setters for objects and arrays
4632 since it's the one creating the objects. This way, we avoid leaks and the
4633 extra complexity of unreffing the newly created complex containers after
4634 setting them into the JsonNodes.
4636 json-glib/json-private.h | 4 ++++
4637 1 files changed, 4 insertions(+), 0 deletions(-)
4639 commit b2ee98f9b0baac019540020e177189b6a3780b83
4640 Author: Emmanuele Bassi <ebassi@openedhand.com>
4641 Date: Mon Oct 1 13:01:32 2007 +0100
4643 Chain up nodes to their parent
4645 When parsing a JSON node we need to correctly set up the parent node
4646 of the newly created ones.
4648 json-glib/json-parser.c | 6 +++++-
4649 1 files changed, 5 insertions(+), 1 deletions(-)
4651 commit 88b11be5eec1da769328e93189bc2f3316c9cd0a
4652 Author: Emmanuele Bassi <ebassi@openedhand.com>
4653 Date: Mon Oct 1 12:57:46 2007 +0100
4655 Add JsonNode, a generic container for JSON types
4657 This huge commit removes JsonData and adds JsonNode, the generic container
4658 for fundamental and complex data types extracted from a JSON stream. The
4659 contents of a JsonNode can be extracted from it in form of a GValue for
4660 fundamental types (integers, floats, strings, booleans) or in form of
4661 JsonObject and JsonArray objects. JsonObject and JsonArray now accept
4662 JsonNodes instead of GValues.
4664 The JsonParser object builds the data model tree when parsing a JSON stream;
4665 the tree can be recursed by getting the root node and walking it using the
4666 GValue API for the fundamental types and the objects/arrays API for complex
4669 The API has been updated and the tests now recurse through the generated
4672 json-glib/Makefile.am | 2 +-
4673 json-glib/json-array.c | 64 +++++------
4674 json-glib/json-data.c | 93 ----------------
4675 json-glib/json-node.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++
4676 json-glib/json-object.c | 44 ++------
4677 json-glib/json-parser.c | 87 +++++++++++----
4678 json-glib/json-parser.h | 2 +-
4679 json-glib/json-private.h | 38 +++----
4680 json-glib/json-types.h | 59 ++++++-----
4681 tests/test-01.c | 2 +-
4682 tests/test-02.c | 112 ++++++++++++++++++-
4683 11 files changed, 535 insertions(+), 237 deletions(-)
4685 commit c11ebd32f73a1e21d6097bf9eba8e12f7e35497a
4686 Author: Emmanuele Bassi <ebassi@openedhand.com>
4687 Date: Fri Sep 21 21:07:12 2007 +0100
4689 Add JsonData, an opaque container for JSON data types
4691 JsonData is like GValue, but it stores JSON data types (objects and
4692 arrays) and allows us to retrieve them safely. This way we can actually
4693 know the type of the objects returned by the parser and by the other
4694 object walking functions.
4696 json-glib/Makefile.am | 1 +
4697 json-glib/json-data.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++
4698 json-glib/json-private.h | 7 +++
4699 json-glib/json-types.h | 53 ++++++++++++++++++--------
4700 4 files changed, 138 insertions(+), 16 deletions(-)
4702 commit f661c7e1a04c2fb198279030c9dd812f357240a3
4703 Author: Emmanuele Bassi <ebassi@openedhand.com>
4704 Date: Fri Sep 21 21:05:12 2007 +0100
4706 Skip the token check after parsing a nested array
4708 Since there cannot be any other token except for the comma, which we
4709 eat anyway, there's no point in going through the switch() check
4710 after we have finished parsing a nested array.
4712 json-glib/json-parser.c | 2 ++
4713 1 files changed, 2 insertions(+), 0 deletions(-)
4715 commit ae3a66e6a90b6cfd71cb8c41c0d752fd1b0a67cc
4716 Author: Emmanuele Bassi <ebassi@openedhand.com>
4717 Date: Fri Sep 21 20:15:52 2007 +0100
4719 Update gitignore file
4721 .gitignore | 7 +++++++
4722 1 files changed, 7 insertions(+), 0 deletions(-)
4724 commit 7875c5f573fdc6c2a39e958d2032f4c26d1f91ff
4725 Author: Emmanuele Bassi <ebassi@openedhand.com>
4726 Date: Fri Sep 21 20:14:49 2007 +0100
4728 Start the test suite
4730 Add the first two test units:
4732 - test-01.c: build/empty test unit
4733 - test-02.c: array test unit
4735 Every test unit must follow the same naming policy, so we can add
4736 a run-tests script later on and a pre-commit hook to invoke it
4737 and catch regressions automagically.
4739 tests/Makefile.am | 12 ++++++++++++
4740 tests/test-01.c | 31 +++++++++++++++++++++++++++++++
4741 tests/test-02.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
4742 3 files changed, 95 insertions(+), 0 deletions(-)
4744 commit 81ad2e5c61db2391d2d98a6b5df1247e3abf16ec
4745 Author: Emmanuele Bassi <ebassi@openedhand.com>
4746 Date: Fri Sep 21 20:12:02 2007 +0100
4750 Add the array parsing code. The parser identifies and builds nested
4751 levels of arrays, but the storage is not quite right. That is a problem
4752 of the parser object, though, so this can be considered a first raw
4753 pass at the problem.
4755 json-glib/json-parser.c | 114 ++++++++++++++++++++++++++++++++++++++++-------
4756 1 files changed, 97 insertions(+), 17 deletions(-)
4758 commit b433703db6722785e33f968830e23c5806230ac2
4759 Author: Emmanuele Bassi <ebassi@openedhand.com>
4760 Date: Fri Sep 21 12:16:15 2007 +0100
4762 Add RFC 4627 text, where JSON is defined
4764 doc/rfc4627.txt | 563 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
4765 1 files changed, 563 insertions(+), 0 deletions(-)
4767 commit c77af0ec13e3e11cdb784510e6a75125bb8ef667
4768 Author: Emmanuele Bassi <ebassi@openedhand.com>
4769 Date: Fri Sep 21 12:08:09 2007 +0100
4771 Top-levels in JSON can only be objects or arrays
4773 JSON is an object serialisation format (thanks, RFC4627), so it can
4774 only express objects and/or arrays as top-levels.
4776 json-glib/json-parser.c | 24 ++++++++++++++----------
4777 1 files changed, 14 insertions(+), 10 deletions(-)
4779 commit 0ff67fb63c5e021b88d6a3d17c5e34dc95ac2676
4780 Author: Emmanuele Bassi <ebassi@openedhand.com>
4781 Date: Fri Sep 21 11:58:00 2007 +0100
4783 Update gitignore file
4786 1 files changed, 4 insertions(+), 0 deletions(-)
4788 commit d98d8c3d245192abe6ec5a531c9d0d678b07d061
4789 Author: Emmanuele Bassi <ebassi@openedhand.com>
4790 Date: Fri Sep 21 11:54:40 2007 +0100
4792 Add stubs to JsonParser for actually parsing a JSON stream
4794 Initial commit for getting JsonParser to work. Because GScanner API
4795 is old and mostly sucks, we need to do some magic with signals.
4797 If json_parser_load_from_data() fails, the passed GError will be set
4798 with a JSON_PARSER_ERROR code and message; unfortunately, we can't get
4799 the nice error message out of GScanner. We can, however, override the
4800 default message handler and make it emit a signal on the JsonParser
4803 So, to make a long story short: the GError passed to the load_from_data()
4804 method is filled with a short error message; the *real* error message
4805 is passed to the ::error signal handlers so they can actually use it.
4807 GScanner should really get a way to retrieve the last error message.
4809 json-glib/json-parser.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++-
4810 json-glib/json-parser.h | 28 +++++-
4811 2 files changed, 290 insertions(+), 4 deletions(-)
4813 commit cd1040e2fb6f6da50aaf72017746b33234c39704
4814 Author: Emmanuele Bassi <ebassi@openedhand.com>
4815 Date: Fri Sep 21 11:08:06 2007 +0100
4817 Add marshallers generation to the build
4819 Use glib-genmarshal to generate the marshallers we need. For the
4820 time being, we just need a (void,pointer).
4822 json-glib/Makefile.am | 30 +++++++++++++++++++++++++-----
4823 json-glib/json-marshal.list | 1 +
4824 2 files changed, 26 insertions(+), 5 deletions(-)
4826 commit 821ac3e602f936318f9a2c3b831f135408ca5d74
4827 Author: Emmanuele Bassi <ebassi@openedhand.com>
4828 Date: Thu Sep 20 20:41:09 2007 +0100
4832 .gitignore | 29 +++++++++++++++++++++++++++++
4833 1 files changed, 29 insertions(+), 0 deletions(-)
4835 commit c5bfb22f964b8f1feecdc8fb29d8a74b36861d32
4836 Author: Emmanuele Bassi <ebassi@openedhand.com>
4837 Date: Thu Sep 20 17:33:28 2007 +0100
4839 Initial import of JSON-GLib
4841 JSON-GLib is a JSON parser library written with GLib and GObject.
4843 JSON is the JavaScript Object Notation, and it's used to define objects
4844 and object hierarchies in a human-readable way.
4847 COPYING | 504 +++++++++++++++++++++++++++++++++++++
4852 configure.ac | 119 +++++++++
4853 doc/reference/Makefile.am | 82 ++++++
4854 doc/reference/version.xml.in | 1 +
4855 json-glib.pc.in | 11 +
4856 json-glib/Makefile.am | 52 ++++
4857 json-glib/json-array.c | 176 +++++++++++++
4858 json-glib/json-glib.h | 8 +
4859 json-glib/json-object.c | 201 +++++++++++++++
4860 json-glib/json-parser.c | 152 +++++++++++
4861 json-glib/json-parser.h | 57 +++++
4862 json-glib/json-private.h | 26 ++
4863 json-glib/json-types.h | 32 +++
4864 json-glib/json-version.h.in | 65 +++++
4865 19 files changed, 1551 insertions(+), 0 deletions(-)