Skip to content

Conversation

@jpobst
Copy link
Contributor

@jpobst jpobst commented May 8, 2020

In dotnet/java-interop#646, we added a "v2" version of the map.csv file format used to bundle Java constant fields into enumerations.

This PR converts Mono.Android.dll's enum map to this new version to make enumification easier going forward. It does not add any new enumifications.

Additionally the new enum code standardizes on using $ to denote nested classes. ~Half of this existing file used $ and half used .. This resulted in needing acceptable-breakage fixes as this signature changed in the [IntDefinition] attribute.

@jpobst jpobst force-pushed the new-enum-parse branch 2 times, most recently from 561e344 to f5dc30f Compare May 15, 2020 14:39
@jpobst jpobst changed the title [generator] Test new enum parsing code. [Mono.Android.dll] Convert map.csv to v2 format. May 20, 2020
@jpobst jpobst marked this pull request as ready for review May 20, 2020 14:16
@jpobst jpobst requested a review from jonpryor as a code owner May 20, 2020 14:16
@jonpryor jonpryor merged commit 91970b1 into master May 20, 2020
@jonpryor jonpryor deleted the new-enum-parse branch May 20, 2020 16:52
jonpryor pushed a commit that referenced this pull request May 26, 2020
Context: dotnet/java-interop@b00e644

Changes: dotnet/java-interop@d6024f1...76d1ac7

  * dotnet/java-interop@76d1ac7: [Java.Interop.Tools.Generator] Create a v2 version of map.csv (#646)
  * dotnet/java-interop@b6c15399: [XAT.Bytecode] Bind Kotlin internal interfaces as package-private (#645)

In dotnet/java-interop@b00e644e, we added support for a "v2" version
of the `map.csv` file format used to bundle Java constant fields into
enumerations.

Convert `src/Mono.Android/map.csv` to use this new format to make
enumification easier going forward.

This does not add any new enumifications.

Additionally, the new enum code standardizes on using `$` to denote
nested classes, e.g. `java/lang/Thread$State`, not
`java/lang/Thread.State`.  `$` is correct JNI syntax or nested types.

~Half of this existing file used `$` and half used `.`.  This resulted
in needing `acceptable-breakage` fixes as this signature changed in the
`[IntDefinition]` attribute.
@github-actions github-actions bot locked and limited conversation to collaborators Jan 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants