Add wrapper types for map keys and values #73
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrewparmet
commented
Jun 19, 2020
| @@ -127,7 +127,7 @@ private constructor( | |||
| <companion()> | |||
| <if (nested)> | |||
|
|
|||
| <nested><\\> | |||
| <nested:{n | <n>}; separator="\n"><\\> | |||
There was a problem hiding this comment.
formatting cleanup
| @@ -62,6 +62,6 @@ deserializeVar(p) ::= <% | |||
|
|
|||
| orDefault(p) ::= <% | |||
| <if (isMessage.(p.messageType))> | |||
| ?: <value.propertyType> {} | |||
| <\ >?: <value.propertyType> {} | |||
There was a problem hiding this comment.
formatting cleanup
| @@ -44,7 +44,7 @@ companion object Deserializer : KtDeserializer\<<name>\> { | |||
|
|
|||
| while (true) { | |||
| when (deserializer.readTag()) { | |||
| 0 -> return <name>(key, value <orDefault(value)>) | |||
| 0 -> return <name>(key, value<orDefault(value)>) | |||
There was a problem hiding this comment.
formatting cleanup
Comment on lines
-36
to
+37
| <deserialize:{d | <d.tag> -> <d.assignment.fieldName> = <\\> | ||
| <if ((!d.std || d.repeated || d.assignment.long))><\n><t()><endif><\\> | ||
| <deserialize:{d | <d.tag> -> <d.assignment.fieldName> =<\\> | ||
| <if ((!d.std || d.repeated || d.assignment.long))><\n><t()><else><\ ><endif><\\> |
There was a problem hiding this comment.
formatting cleanup
| .fold( | ||
| { null }, | ||
| { | ||
| resolveMapEntry( |
There was a problem hiding this comment.
Instead of duplicating this search once annotating, convert it to a message here and extract the fields for later use.
| @@ -169,24 +200,40 @@ serializer.write(Tag(<tag>)).write(<box>)<\\> | |||
| <endif> | |||
| >> | |||
|
|
|||
| deserialize(field, read, lhs, options, packed) ::= << | |||
There was a problem hiding this comment.
This and the others in this file: removed meaningful whitespace in favor of easier-to-read branch logic, and extracted Map variants.
ogolberg
approved these changes
Jun 20, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This revealed that it seems to be a cleaner interface to Wrapper.kt to expose the converter as a nullable type than to try to pass through and replace field accesses. I'll probably revisit the existing wrapper type code and see if that cleans things up a bit, since it's not pretty.
Fixes #26.