[ROASTER-64] Improve the handling of generics - RFC #33
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
|
Build 48 outcome was FAILURE using a merge of 4ee164e Build problems:Failed tests detected Failed tests |
|
Build 48 outcome was FAILURE using a merge of 4ee164e Build problems:Failed tests detected Failed tests |
|
|
||
| private static final Pattern SIMPLE_ARRAY_PATTERN = Pattern | ||
| .compile("^((.)+)(\\[\\])+$"); | ||
| private static final Pattern IDENTIFIER_PATTERN = Pattern |
There was a problem hiding this comment.
These regexps are the critical issue to be discussed
There was a problem hiding this comment.
Generics, due to the balanced angular brackets, require a context-free grammar, e.g.
T -> ID Gen
Gen -> '<' T '>'
And context-free grammars are not regular, which means that they can't be recognized by a regular expression
There was a problem hiding this comment.
This is excellent. I actually had no idea you could call Character methods through the POSIX \p. Looks like I need to add something to my regular expression tutorials!
|
I still need to complete the work and fix a few failing tests, but I'd like some feedback on the regexp issue |
| String stub = "public class Stub { public void method( " + Types.toSimpleName(Types.fixArray(type, false)) + " " | ||
| + name + " ) {} }"; | ||
| String resolvedType = TypeImpl.ensureImports(getOrigin(), new TypeImpl<O>(getOrigin(),null,type)); | ||
| String stub = "public class Stub { public void method( " + resolvedType + name + " ) {} }"; |
There was a problem hiding this comment.
Tests fail just because a + " " + was lost between resolvedType and name :)
If we agree on the rest, I'll amend the PR
| @@ -722,6 +723,11 @@ public boolean isAnnotation() | |||
| } | |||
|
|
|||
| @Override | |||
| public String ensureImports(Type<?> type) { | |||
| throw new UnsupportedOperationException("Imports cannot be added at the package-info level"); | |||
There was a problem hiding this comment.
right, you can import package level annotations among other things.. I'll fix it
Conflicts: impl/src/main/java/org/jboss/forge/roaster/model/impl/MethodImpl.java
| * @return The name (simple or fully qualified) that should be used to reference the imported type in the code | ||
| * @seeAlso org.jboss.forge.roaster.model.Type | ||
| */ | ||
| public Import addImport(Type<?> type); |
|
Merged in http://github.com/forge/roaster/commit/541472e80. Thanks! |
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.
Some further formatting fixes may be needed, but need the approach validated first