Skip to content

BEGIN_PUBLIC #2642

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

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

BEGIN_PUBLIC #2642

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
9 changes: 8 additions & 1 deletion translator/src/main/java/com/google/devtools/j2objc/translate/EnumRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,13 @@ private void addExtraNativeDecls(EnumDeclaration node) {
"- (%s)enumValue {\n" + " return (%s)[self ordinal];\n" + "}\n\n",
nativeName, nativeName)));

node.addBodyDeclaration(
NativeDeclaration.newInnerDeclaration(
UnicodeUtils.format("@property(readonly) %s nsEnum%s;", nativeName, segmentName),
UnicodeUtils.format(
"- (%s)nsEnum {\n" + " return (%s)[self ordinal];\n" + "}\n\n",
nativeName, nativeName)));

node.addBodyDeclaration(
NativeDeclaration.newInnerDeclaration(
UnicodeUtils.format("+ (%s *)fromNSEnum:(%s)value;\n", typeName, nativeName),
Expand All @@ -368,7 +375,7 @@ private void addExtraNativeDecls(EnumDeclaration node) {
node.addBodyDeclaration(
NativeDeclaration.newInnerDeclaration(
UnicodeUtils.format(
"- (%s)ordinal NS_SWIFT_UNAVAILABLE(\"Use .enumValue\")%s;\n",
"- (%s)ordinal NS_SWIFT_UNAVAILABLE(\"Use .nsEnum\")%s;\n",
ordinalName, segmentName),
UnicodeUtils.format(
"- (%s)ordinal {\n" + " return (%s)[super ordinal];\n" + "}\n\n",
Expand Down
4 changes: 4 additions & 0 deletions translator/src/test/java/com/google/devtools/j2objc/translate/EnumRewriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ public void testToNsEnumConversion() throws Exception {
"- (Test_Enum)toNSEnum {",
" return (Test_Enum)[self ordinal];",
"}");
assertTranslatedLines(
translation, "- (Test_Enum)nsEnum {",
" return (Test_Enum)[self ordinal];",
"}");
assertTranslatedLines(
translation,
"+ (Test *)fromNSEnum:(Test_Enum)nativeValue {",
Expand Down