Skip to content

[generator] add [IntDefinition (JniField = ...)] everywhere. #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2017
Merged

[generator] add [IntDefinition (JniField = ...)] everywhere. #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tools/generator/EnumMappings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ internal List<string> WriteEnumerations (string output_dir, Dictionary<string, E

foreach (var member in enu.Value.Members) {
var managedMember = FindManagedMember (ns, enoom, enu.Value, member.Key, gens);
if (managedMember != null)
sw.WriteLine (" [global::Android.Runtime.IntDefinition (\"" + managedMember + "\")]");
sw.WriteLine (" [global::Android.Runtime.IntDefinition (" + (managedMember != null? "\"" + managedMember + "\"" : "null") + ", JniField = \"" + StripExtraInterfaceSpec (enu.Value.JniNames [member.Key]) + "\")]");
sw.WriteLine (" {0} = {1},", member.Key.Trim (), member.Value.Trim ());
}
sw.WriteLine (" }");
Expand All @@ -163,6 +162,11 @@ internal List<string> WriteEnumerations (string output_dir, Dictionary<string, E
return files;
}

string StripExtraInterfaceSpec (string jniFieldSpec)
{
return jniFieldSpec.StartsWith ("I:", StringComparison.Ordinal) ? jniFieldSpec.Substring (2) : jniFieldSpec;
}

string FindManagedMember (string ns, string enumName, EnumDescription desc, string enumFieldName, IEnumerable<GenBase> gens)
{
if (desc.FieldsRemoved)
Expand Down
1 change: 1 addition & 0 deletions tools/generator/Tests-Core/expected.ji/Android.Text.SpanTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace Android.Text {
public enum SpanTypes {
[global::Android.Runtime.IntDefinition (null, JniField = "android/text/Spanned.SPAN_COMPOSING")]
Composing = 256,
}
}
1 change: 1 addition & 0 deletions tools/generator/Tests-Core/expected/Android.Text.SpanTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace Android.Text {
public enum SpanTypes {
[global::Android.Runtime.IntDefinition (null, JniField = "android/text/Spanned.SPAN_COMPOSING")]
Composing = 256,
}
}
17 changes: 17 additions & 0 deletions tools/generator/Tests/SupportFiles/IntDefinitionAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System;

namespace Android.Runtime
{
[AttributeUsage (AttributeTargets.Field)]
public class IntDefinitionAttribute : Attribute
{
public IntDefinitionAttribute (string constantMember)
{
ConstantMember = constantMember;
}

public string ConstantMember { get; set; }
public string JniField { get; set; }
}
}

2 changes: 2 additions & 0 deletions tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
namespace Xamarin.Test {
public enum SomeValues {
[global::Android.Runtime.IntDefinition (null, JniField = "xamarin/test/SomeObject.SOME_VALUE")]
SomeValue = 0,
[global::Android.Runtime.IntDefinition (null, JniField = "xamarin/test/SomeObject.SOME_VALUE2")]
SomeValue2 = 1,
}
}
3 changes: 3 additions & 0 deletions tools/generator/Tests/generator-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@
<Content Include="SupportFiles\IJavaObject.cs">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="SupportFiles\IntDefinitionAttribute.cs">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="SupportFiles\JavaArray.cs">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down