65f433d24eea85ceaf96c65e7187c17384601d54 2598668709c25667b342e99265f69d518b8fcd71 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/3a5f0d2fb3ad43fce9e50c340401416e13c5585e 3a5f0d2fb3ad43fce9e50c340401416e13c5585e 2009-12-05T05:13:32-08:00 2009-12-05T05:11:02-08:00 Merge branch 'v1.2' 79e7a9304cac47fd4bf3bd7b59344e50c1b7fb5b Daniel Luz dev@mernen.com 1c282a139c2a87de678b9e9513393ddd00a53bfb Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/2598668709c25667b342e99265f69d518b8fcd71 2598668709c25667b342e99265f69d518b8fcd71 2009-12-05T05:06:14-08:00 2009-12-05T05:04:10-08:00 Fix deprecation warnings on Parser, and suppress those on GeneratorMethodsLoader The proper solution to GeneratorMethodsLoader is in the large refactoring on the main branch 973e19e47c907f4651eeff8ab9fa44931611cd1b Daniel Luz dev@mernen.com 5b1ed2b20bdcdaa5dfb173e3065ea2b4c54425f4 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/1c282a139c2a87de678b9e9513393ddd00a53bfb 1c282a139c2a87de678b9e9513393ddd00a53bfb 2009-12-05T04:36:31-08:00 2009-12-05T04:28:07-08:00 Code style changes in Parser 0f42026ee0504adb3939a57955776b6c63329be2 Daniel Luz dev@mernen.com 4f1cb4000ab566d422d154553c818123a47bdaaa Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/5b1ed2b20bdcdaa5dfb173e3065ea2b4c54425f4 5b1ed2b20bdcdaa5dfb173e3065ea2b4c54425f4 2009-12-05T04:36:31-08:00 2009-11-29T18:12:32-08:00 Removed autogenerated Parser.java from repository (cherry picked from commit 481be2b6d9732fdb11153989cca50b5541785ad0) 3feec7dac32d33247841d04240cf3167eec2253f Daniel Luz dev@mernen.com 9026c6565adee2591c368b4862af063957c3d540 4f1cb4000ab566d422d154553c818123a47bdaaa Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/65f433d24eea85ceaf96c65e7187c17384601d54 65f433d24eea85ceaf96c65e7187c17384601d54 2009-12-05T03:54:59-08:00 2009-12-05T03:54:59-08:00 Merge branch 'v1.2' 79e7a9304cac47fd4bf3bd7b59344e50c1b7fb5b Daniel Luz dev@mernen.com aca08c8641c16e7ee6e984203afb06d67ede19dd Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/9026c6565adee2591c368b4862af063957c3d540 9026c6565adee2591c368b4862af063957c3d540 2009-12-05T03:54:53-08:00 2009-12-05T03:37:41-08:00 GeneratorState setters should convert given strings to UTF-8 792351e5b20da7e4aa79679da7174013b87fe234 Daniel Luz dev@mernen.com 5b6cf3e84c8e72eb5d63ec16519b30127131192c Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/aca08c8641c16e7ee6e984203afb06d67ede19dd aca08c8641c16e7ee6e984203afb06d67ede19dd 2009-12-05T03:54:53-08:00 2009-12-05T03:11:53-08:00 Simplified method signatures for GeneratorState 8d8cc83dd0ec59cf2e97af16b4dc9256cbf06f65 Daniel Luz dev@mernen.com 930ac21a3bc641073942b722e5d7d40b55f41bed Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/5b6cf3e84c8e72eb5d63ec16519b30127131192c 5b6cf3e84c8e72eb5d63ec16519b30127131192c 2009-12-05T03:54:53-08:00 2009-12-05T03:05:54-08:00 Applied commit 64c9ee30 from flori/json: implemented prototype feature 90767c507327f7f28e276a185d8e163b4a476b02 Daniel Luz dev@mernen.com af99b276f2df625844af3b10e8a450d6020e4830 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/4f1cb4000ab566d422d154553c818123a47bdaaa 4f1cb4000ab566d422d154553c818123a47bdaaa 2009-12-05T03:54:24-08:00 2009-12-05T02:20:58-08:00 Added gitattributes file for better hunk-headers 7d5dc04ee7a39f5cabb4e7ab2e8d1b779699ae4e Daniel Luz dev@mernen.com c2fece4efd6a620a2b872d605ad3da67794cd3c9 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/af99b276f2df625844af3b10e8a450d6020e4830 af99b276f2df625844af3b10e8a450d6020e4830 2009-12-05T03:53:18-08:00 2009-12-05T01:49:22-08:00 Enable compiler warnings cb7c09c3a63f0a7ae16105e599ae65c347d0109b Daniel Luz dev@mernen.com a70aa78343cafed50e612a189ef0a910bdb3264a Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/930ac21a3bc641073942b722e5d7d40b55f41bed 930ac21a3bc641073942b722e5d7d40b55f41bed 2009-12-04T23:33:28-08:00 2009-12-04T23:33:28-08:00 Slight reorganization of internal methods for generators 96c317afed6ceffc11f803321c392fc8d1b4922d Daniel Luz dev@mernen.com 08ef520d49c1d71e5867acf78a1d1b19f194cafb Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/a70aa78343cafed50e612a189ef0a910bdb3264a a70aa78343cafed50e612a189ef0a910bdb3264a 2009-12-04T23:24:55-08:00 2009-12-04T23:24:55-08:00 Removed unused block parameters, removed upper limit on number of arguments for generators 97ee71532b992a04e0a2346682e304aae170b890 Daniel Luz dev@mernen.com cd06a445c2c65347d692cb3dc3a99496566d42cf Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/08ef520d49c1d71e5867acf78a1d1b19f194cafb 08ef520d49c1d71e5867acf78a1d1b19f194cafb 2009-12-04T22:17:34-08:00 2009-12-04T22:17:34-08:00 Define constants for default values in GeneratorState ffc396a7db54549e3b60545beb6c8f416a05972f Daniel Luz dev@mernen.com 99e4df019a9be31389e2183aeedbdc67839c8857 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/cd06a445c2c65347d692cb3dc3a99496566d42cf cd06a445c2c65347d692cb3dc3a99496566d42cf 2009-12-04T22:16:46-08:00 2009-12-04T22:04:56-08:00 Strict type checking, don't just convert things that shouldn't be of the wrong type b20f4ceb1cfb2118d8d66e34b9d222482c1ad01e Daniel Luz dev@mernen.com 0d879d9afc0cb073086b87610e305d13d3f2feb0 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/99e4df019a9be31389e2183aeedbdc67839c8857 99e4df019a9be31389e2183aeedbdc67839c8857 2009-12-04T21:56:37-08:00 2009-12-04T21:56:37-08:00 Removed unused parameter 2af1f50ca7be87774cc11eabcb4f06dcafd141d6 Daniel Luz dev@mernen.com 9cedd3b5aa5aa922b9d15c8e1b61cce4fc011432 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/0d879d9afc0cb073086b87610e305d13d3f2feb0 0d879d9afc0cb073086b87610e305d13d3f2feb0 2009-12-04T21:24:21-08:00 2009-12-04T21:22:34-08:00 Utils goes through a diet Seriously, exceptions are rare/exceptional enough that I shouldn't bother passing RuntimeInfo around. 70b47dd184d443e269c6c4c969a2170a18d9b8dd Daniel Luz dev@mernen.com 5a62451f3868c7c72ba66f9666f951c158068c86 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/9cedd3b5aa5aa922b9d15c8e1b61cce4fc011432 9cedd3b5aa5aa922b9d15c8e1b61cce4fc011432 2009-12-04T21:16:10-08:00 2009-12-04T21:16:10-08:00 Minor code style and comment adjustments 8f18891fb153da91ffc9a5515836fdab736c151b Daniel Luz dev@mernen.com 4a75d4785b2e32cedffb81b654e3b9f84794c00f Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/5a62451f3868c7c72ba66f9666f951c158068c86 5a62451f3868c7c72ba66f9666f951c158068c86 2009-12-04T21:09:26-08:00 2009-12-04T21:09:26-08:00 Write directly to a ByteList rather than wrapping everything into String's modification guard. Duh! a88dc41f53b215b08c007e52d7ffd5a3934be766 Daniel Luz dev@mernen.com d1df388d02ff3d875d9493d113c6ba0981a25446 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/4a75d4785b2e32cedffb81b654e3b9f84794c00f 4a75d4785b2e32cedffb81b654e3b9f84794c00f 2009-12-04T20:40:52-08:00 2009-12-04T20:37:19-08:00 Improved the reading of \uXXXX escapes on the parser ea783c35a75850ea1c3a4d67e3308793fdc884e4 Daniel Luz dev@mernen.com 14e38c0c2ff16e4c8048c348e376ffca20959e73 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/d1df388d02ff3d875d9493d113c6ba0981a25446 d1df388d02ff3d875d9493d113c6ba0981a25446 2009-12-04T20:00:17-08:00 2009-12-04T20:00:17-08:00 Removed the runtime field from ParserSession 150725e1817b78ece538a2efe0083aef56e11551 Daniel Luz dev@mernen.com 60248c5d1de9f9de940323bba3c8d121ffe5ffcd Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/14e38c0c2ff16e4c8048c348e376ffca20959e73 14e38c0c2ff16e4c8048c348e376ffca20959e73 2009-12-04T19:54:16-08:00 2009-12-04T19:53:53-08:00 Some tweaks to GeneratorState (getRuntime(), code style) 38ef9566be63b69e0967a0f4dbee25b087a12f78 Daniel Luz dev@mernen.com b652043d9eeb87b1d16b26059ef140720e915be8 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/60248c5d1de9f9de940323bba3c8d121ffe5ffcd 60248c5d1de9f9de940323bba3c8d121ffe5ffcd 2009-12-04T19:42:51-08:00 2009-12-04T19:38:50-08:00 Optimize RuntimeInfo for the single-runtime case, getting rid of the hash map b333f021d00660a12fa6fecee259c81698d7b338 Daniel Luz dev@mernen.com f6048c739c1383b5f295d8b7c4b8d50e4cc3f48d Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/b652043d9eeb87b1d16b26059ef140720e915be8 b652043d9eeb87b1d16b26059ef140720e915be8 2009-12-04T19:37:07-08:00 2009-12-04T18:34:09-08:00 Pass ThreadContext to checkMaxNesting 59ad2b86bcc9e8e9ee2abb9903e50f46a194c78d Daniel Luz dev@mernen.com 767c6225596bc65fe1304a7198dc1b69b4b71695 0f64708bc4eb5819dda1ae7d5466811468a557f3 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/f6048c739c1383b5f295d8b7c4b8d50e4cc3f48d f6048c739c1383b5f295d8b7c4b8d50e4cc3f48d 2009-12-04T19:36:41-08:00 2009-12-04T19:36:41-08:00 Merge branch 'generator-methods-classes' 908d07ed188d5dab1576320481bd9999eede12ad Daniel Luz dev@mernen.com bb2f6ed1c990ab57dbde9c80001c15a97a4423ba Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/0f64708bc4eb5819dda1ae7d5466811468a557f3 0f64708bc4eb5819dda1ae7d5466811468a557f3 2009-12-04T19:31:54-08:00 2009-12-04T18:16:54-08:00 GeneratorMethodsLoader renamed to GeneratorMethods 908d07ed188d5dab1576320481bd9999eede12ad Daniel Luz dev@mernen.com 09434eaa7fd339ced811841d4caf6e08a5efdada Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/bb2f6ed1c990ab57dbde9c80001c15a97a4423ba bb2f6ed1c990ab57dbde9c80001c15a97a4423ba 2009-12-04T19:31:50-08:00 2009-12-04T19:31:50-08:00 Use annotated classes for GeneratorMethodsLoader 354850af184ed61da839e0d23ea2f9a5ad05d8b7 Daniel Luz dev@mernen.com 767c6225596bc65fe1304a7198dc1b69b4b71695 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/09434eaa7fd339ced811841d4caf6e08a5efdada 09434eaa7fd339ced811841d4caf6e08a5efdada 2009-12-04T18:15:08-08:00 2009-12-04T18:15:08-08:00 New set of GeneratorState instantiators 1eb18e2dfb53cb2b546f7f82ee42d78d573daa8d Daniel Luz dev@mernen.com 20b5eaf7d556c34ffae51b518e180770dd0e7419 Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/767c6225596bc65fe1304a7198dc1b69b4b71695 767c6225596bc65fe1304a7198dc1b69b4b71695 2009-12-04T17:53:47-08:00 2009-12-04T17:51:31-08:00 Removed unused import, added missing copyright/license statement b9dcd1c418e02e7619a32acfdd1dbeb794fd3daf Daniel Luz dev@mernen.com 8ab981a450b8a46468935a1d1c8011e51e57936d Daniel Luz dev@mernen.com http://github.com/mernen/json-jruby/commit/20b5eaf7d556c34ffae51b518e180770dd0e7419 20b5eaf7d556c34ffae51b518e180770dd0e7419 2009-12-04T17:49:13-08:00 2009-12-04T17:49:13-08:00 RuntimeInfo: perform manual synching of map rather than relying on Collections.synchronizedMap 524786d0f13003aabead8ac34c898d841747adc6 Daniel Luz dev@mernen.com d844a4ae00584fef79880ec1ee9d02f2df0f1d53 Florian Frank flori@ping.de http://github.com/mernen/json-jruby/commit/8ab981a450b8a46468935a1d1c8011e51e57936d 8ab981a450b8a46468935a1d1c8011e51e57936d 2009-12-03T02:35:39-08:00 2009-11-19T23:25:11-08:00 check circular is deprecated 0601b32cc1f063b7c4497c8edd83f0712a09a2cc Daniel Luz dev@mernen.com