Skip to content

Commit

Permalink
Added '-' conversion for class names
Browse files Browse the repository at this point in the history
  • Loading branch information
andreehallengren committed Aug 21, 2019
1 parent aa4f611 commit fa8ca68
Showing 2 changed files with 12 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/main/java/com/vizor/unreal/convert/ProtoProcessor.java
Original file line number Diff line number Diff line change
@@ -60,6 +60,7 @@
import static com.vizor.unreal.tree.CppType.plain;
import static com.vizor.unreal.util.Misc.reorder;
import static com.vizor.unreal.util.Misc.snakeCaseToCamelCase;
import static com.vizor.unreal.util.Misc.dashToUnderscore;
import static com.vizor.unreal.util.Misc.stringIsNullOrEmpty;
import static com.vizor.unreal.util.Tuple.of;
import static java.io.File.separator;
@@ -102,8 +103,8 @@ class ProtoProcessor implements Runnable
this.moduleName = requireNonNull(moduleName);

this.wrapperName = removeExtension(pathToProto.toFile().getName());

this.className = snakeCaseToCamelCase(wrapperName);
this.className = snakeCaseToCamelCase(dashToUnderscore(wrapperName));

// if (parse.packageName() == null)
// throw new RuntimeException("package filed in proto file is required for cornerstone");
@@ -118,8 +119,8 @@ public void run()

for (final TypeElement t : parse.types())
{
ueProvider.register(t.name(), ueNamedType(className, t));
protoProvider.register(t.name(), cppNamedType(t));
ueProvider.register(dashToUnderscore(t.name()), ueNamedType(className, t));
protoProvider.register(dashToUnderscore(t.name()), cppNamedType(t));
}

final List<Tuple<CppStruct, CppStruct>> castAssociations = new ArrayList<>();
@@ -332,9 +333,9 @@ private CppEnum extractEnum(final TypesProvider provider, final EnumElement ee)
private CppType ueNamedType(final String serviceName, final TypeElement el)
{
if (el instanceof MessageElement)
return plain("F" + serviceName + "_" + el.name(), Struct);
return plain("F" + serviceName + "_" + dashToUnderscore(el.name()), Struct);
else if (el instanceof EnumElement)
return plain("E" + serviceName + "_" + el.name(), Enum);
return plain("E" + serviceName + "_" + dashToUnderscore(el.name()), Enum);
else
throw new RuntimeException("Unknown type: '" + el.getClass().getName() + "'");
}
5 changes: 5 additions & 0 deletions src/main/java/com/vizor/unreal/util/Misc.java
Original file line number Diff line number Diff line change
@@ -244,6 +244,11 @@ public static <T> void reorder(final List<T> list, final int[] indices)
}
}

public static String dashToUnderscore(final String dashedString)
{
return dashedString.replace("-", "_");
}

/**
* Transforms snake_case_string into camelCaseString.
* @param snakeCaseString String in snake_case.

0 comments on commit fa8ca68

Please sign in to comment.