aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 87c8e31b: Merge "Fixed packed repeated serialization."Ulas Kirazci2013-07-313-30/+48
|\ | | | | | | | | * commit '87c8e31b8c0baa78f979863a9ed10654a1cdca1f': Fixed packed repeated serialization.
| * Merge "Fixed packed repeated serialization."Ulas Kirazci2013-07-313-30/+48
| |\
| | * Fixed packed repeated serialization.Ulas Kirazci2013-07-313-30/+48
| | | | | | | | | | | | | | | | | | | | | Remove buggy memoization. Memoization also is too fragile for the api because the repeated field is public. Change-Id: I538b8426d274b22df2eeea5935023abbe7df49fe
* | | am be47f55e: Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-2910-31/+273
|\ \ \ | |/ / | | | | | | | | | * commit 'be47f55e2f93df84abb55759e49cf381d2745cc5': Add an option to inspect "has" state upon parse.
| * | Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-2910-31/+273
| |\ \ | | |/ | |/|
| | * Add an option to inspect "has" state upon parse.Ulas Kirazci2013-07-2910-31/+273
| |/ | | | | | | | | | | If has is set, also always serialize. Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
* | am 021f8f1b: Merge "Add test for passing in proto params."Ulas Kirazci2013-07-262-1/+25
|\ \ | |/ | | | | | | * commit '021f8f1badf1c4db519e3f35d600dec4b5c52eff': Add test for passing in proto params.
| * Merge "Add test for passing in proto params."Ulas Kirazci2013-07-262-1/+25
| |\
| | * Add test for passing in proto params.Ulas Kirazci2013-07-252-1/+25
| | | | | | | | | | | | | | | | | | Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0 Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
* | | am ac5a239e: Merge "Per-file java_multiple_files flag."Ulas Kirazci2013-07-2516-43/+230
|\ \ \ | |/ / | | | | | | | | | * commit 'ac5a239e7d90613cb9404098b70c036a52531a74': Per-file java_multiple_files flag.
| * | Merge "Per-file java_multiple_files flag."Ulas Kirazci2013-07-2616-43/+230
| |\ \ | | |/ | |/|
| | * Per-file java_multiple_files flag.Max Cai2013-07-2516-43/+230
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported source files may have different values for the 'java_multiple_files' option to the main source file's. Whether the fully qualified Java name of an entity should include the outer class name depends on the flag value in the file defining the referenced entity, not the main file. This CL loads the flag values from the main and all transitively imported files into the params, and generates the fully qualified Java names accordingly. If the generator option 'java_multiple_files' is set, its value overrides any in-file values in all source/imported files. This is because this generator option is typically used on either none or all source files. Change-Id: Id6a4a42426d68961dc669487d38f35530deb7d8e
* | am 3099f911: am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
|\ \ | |/ | | | | | | * commit '3099f911382d143d9b702d36e5e52d2f37d8edd9': Allow NaN/+inf/-inf defaults in micro/nano.
| * am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
| |\ | | | | | | | | | | | | * commit '19c4090eddf0eb4d65d1b41f283368c5e0f615a1': Allow NaN/+inf/-inf defaults in micro/nano.
| | * Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
| | |\
| | | * Allow NaN/+inf/-inf defaults in micro/nano.Chris Smith2013-07-237-8/+141
| | |/ | | | | | | | | | | | | | | | | | | | | | Adds support for default values of NaN, infinity and negative infinity for floats and doubles in both the nano and micro java compiler. Change-Id: Ibc43e5ebb073e51d9a8181f3aa23b72e10015dca
* | | am f604f71a: am a400007e: Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
|\ \ \ | |/ / | | | | | | | | | * commit 'f604f71aed9bb28f1bf06875272797b24da1dd66': Add contribution instructions for nano.
| * | am a400007e: Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
| |\ \ | | |/ | | | | | | | | | * commit 'a400007ed570bbcc638c05c59727b3527238ec70': Add contribution instructions for nano.
| | * Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
| | |\
| | | * Add contribution instructions for nano.Ulas Kirazci2013-07-191-0/+18
| | | | | | | | | | | | | | | | Change-Id: Ie110d182a84258ab5bb3ba1f67c6ada6be476c7e
* | | | am 4c18ce2d: am aad4b307: Merge "Update nano to serialize java keywords ↵Ulas Kirazci2013-07-1910-11/+72
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | properly." * commit '4c18ce2df954bc6e75b164fd008797e92beed7e1': Update nano to serialize java keywords properly.
| * | | am aad4b307: Merge "Update nano to serialize java keywords properly."Ulas Kirazci2013-07-1910-11/+72
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'aad4b3074456fb1acec6e64596d5c18d716ac146': Update nano to serialize java keywords properly.
| | * | Merge "Update nano to serialize java keywords properly."Ulas Kirazci2013-07-1910-11/+72
| | |\ \ | | | |/ | | |/|
| | | * Update nano to serialize java keywords properly.Tom Chao2013-07-1910-11/+72
| | |/ | | | | | | | | | Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
* | | Added micro/nano configurations to protobuf in gradle.Adam Metcalf2013-07-151-36/+36
| | | | | | | | | | | | Change-Id: I7655fafcb4ca3bd6e090d7fd549eda2eb989bfcf
* | | am 67b43035: am 8cf17a8f: Merge "Make it possible to use ↵Ulas Kirazci2013-07-113-4/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | MessageNano.mergeFrom without casting." * commit '67b4303516bb01e485aa9bad9d2f372c4b2844a3': Make it possible to use MessageNano.mergeFrom without casting.
| * | am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without ↵Ulas Kirazci2013-07-093-4/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | casting." * commit '8cf17a8fbab128bda57c573e2ef7e0fafea39269': Make it possible to use MessageNano.mergeFrom without casting.
| | * Merge "Make it possible to use MessageNano.mergeFrom without casting."Ulas Kirazci2013-07-093-4/+13
| | |\
| | | * Make it possible to use MessageNano.mergeFrom without casting.Brian Duff2013-07-083-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now do: MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes); without having to cast the message returned from mergeFrom. Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9
* | | | am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build."Ulas Kirazci2013-07-112-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7bb086c897ce5ba7d5053d6b112f7b9d37e3ae72': Fix vanilla make build.
| * | | am eda87c5c: Merge "Fix vanilla make build."Ulas Kirazci2013-07-092-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'eda87c5cad8cf84768bcb31d4762c6ec35a6b87d': Fix vanilla make build.
| | * | Merge "Fix vanilla make build."Ulas Kirazci2013-07-092-0/+2
| | |\ \
| | | * | Fix vanilla make build.Ulas Kirazci2013-07-092-0/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | Nano extension sources were missing. Change-Id: Ic3278edae2db5e41e5aa2e7d58e0daa8e29f20b7
* | | | am 08891725: am 728a8b78: Merge "Fix the build"Wink Saville2013-07-112-4/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '088917256bbdd7f28d20ed8f5abb2e723b68f4de': Fix the build
| * | | am 728a8b78: Merge "Fix the build"Wink Saville2013-07-092-4/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '728a8b78917ded5ea0f3f9c331810aedcb5353f9': Fix the build
| | * | Merge "Fix the build"Wink Saville2013-07-092-4/+14
| | |\ \ | | | |/ | | |/|
| | | * Fix the buildEvan Charlton2013-07-092-4/+14
| | |/ | | | | | | | | | | | | | | | | | | javanano_extension needed to be added to the Makefile.{am,in} in addition to the Android.mk file. Change-Id: I8b917fd72d1dec13e64b3c3d13bd204c83f31402
* | | am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown ↵Wink Saville2013-06-2515-25/+812
|\ \ \ | |/ / | | | | | | | | | | | | | | | fields." * commit 'd1b8322fccad8946d3b32dda9f75048865a94209': Nano support for extensions and unknown fields.
| * | am 0a1429cc: Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2515-25/+812
| |\ \ | | |/ | | | | | | | | | * commit '0a1429cc5ee4865550bcdddfae681a30cef58a5a': Nano support for extensions and unknown fields.
| | * Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2515-25/+812
| | |\
| | | * Nano support for extensions and unknown fields.Brian Duff2013-06-2415-25/+812
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can use the processor option store_unknown_fields to switch this support on: aprotoc --javanano_out=store_unknown_fields=true:/tmp/out A separate option for extensions isn't required. Support for unknown fields must be turned on to allow storing and retrieving extensions, because they are just stored as unknown fields. If unknown fields are switched on, extension related code will be generated when a proto message includes an extension range, or an extension is encountered. By default, store_unknown_fields is false. No additional code is generated, and the generator will error out if protos contain extension ranges or extensions. Change-Id: I1e034c9e8f3305612953f72438189a7da6ed2167
* | | Gradle project file.Adam Metcalf2013-06-171-0/+51
|/ / | | | | | | | | | | | | Adds a gradle project file so that other projects can use the :micro and :nano libraries. Change-Id: I7e5aeb584acd11d39e57bf9d4ecfc3af175ffbb2
* | am 9459b5c4: Merge "Fix enum field references with java_multiple_files."Wink Saville2013-06-072-4/+18
|\ \ | |/ | | | | | | * commit '9459b5c45b0ad33bea9376c2afb66cf93da610ac': Fix enum field references with java_multiple_files.
| * Merge "Fix enum field references with java_multiple_files."Wink Saville2013-06-072-4/+18
| |\
| | * Fix enum field references with java_multiple_files.Brian Duff2013-06-072-4/+18
| |/ | | | | | | | | | | | | | | | | When the java_multiple_files option is on, enums are placed in java class files based on the name of the original enum type. This fixes field references to such enum values to point to the correct class name when setting the default. Change-Id: I51a2e251c0d0ab1e45a182ba849d314232a74bac
* | am 6f59b383: Merge "Add toString() method to MessageNano."Wink Saville2013-06-063-0/+241
|\ \ | |/ | | | | | | * commit '6f59b38386c8ff883c8e9e0a76068fa07d95bfb1': Add toString() method to MessageNano.
| * Merge "Add toString() method to MessageNano."Wink Saville2013-06-063-0/+241
| |\
| | * Add toString() method to MessageNano.Andrew Flynn2013-06-043-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - All of the real work for printing the proto is actually done in MessageNanoPrinter. - Uses reflection to find proto-defined fields and prints those. - Prints all fields, even defaults and nulls. - Also added a simple test to make sure it handles all proto types well. Tried not to make the test too brittle (but hey it's testing a toString() so how flexible can it be) Change-Id: I3e360ef8b0561041e010c1f3445ec45ecdcd2559
* | | am 4e76e72b: Merge "Fix javanano compiler generating uncompileable java ↵Wink Saville2013-06-053-0/+65
|\ \ \ | |/ / | | | | | | | | | | | | | | | code. This happened for enums when java_multiple_files=true." * commit '4e76e72b03f6dafc9ad650864b6a12b665801b9b': Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true.
| * | Merge "Fix javanano compiler generating uncompileable java code. This ↵Wink Saville2013-06-063-0/+65
| |\ \ | | |/ | |/| | | | happened for enums when java_multiple_files=true."