Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[generator] Fix issue where generic types couldn't be found in SymbolTable (#543) #552

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 2 commits into from
Jan 7, 2020
Merged

[generator] Fix issue where generic types couldn't be found in SymbolTable (#543) #552

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82a518b
[generator] Fix issue where generic types couldn't be found in Symbol…
jpobst Jan 3, 2020
95698bc
Add additional test and fix exposed error in nested generic types.
jpobst Jan 6, 2020
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
Prev Previous commit
Add additional test and fix exposed error in nested generic types.
  • Loading branch information
@jpobst
jpobst committed Jan 6, 2020
commit 95698bcc3ddc08e3ef7c46168f5f6ebcc5b0fe1d
10 changes: 6 additions & 4 deletions tests/generator-Tests/Unit-Tests/SymbolTableTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ public void FindGenericTypes ()

table.AddType (dict);

Assert.NotNull (table.Lookup ("System.Collections.Generic.IList<Java.Util.Locale.LanguageRange>"));
Assert.NotNull (table.Lookup ("System.Collections.Generic.IList<List<Java.Util.Locale.LanguageRange>>"));
Assert.AreEqual ("System.Collections.Generic.IList`1", table.Lookup ("System.Collections.Generic.IList<Java.Util.Locale.LanguageRange>").FullName);
Assert.AreEqual ("System.Collections.Generic.IList`1", table.Lookup ("System.Collections.Generic.IList<List<Java.Util.Locale.LanguageRange>>").FullName);

Assert.NotNull (table.Lookup ("System.Collections.Generic.IDictionary<string, Java.Util.Locale.LanguageRange>"));
Assert.NotNull (table.Lookup ("System.Collections.Generic.IDictionary<string, List<Java.Util.Locale.LanguageRange>>"));
Assert.AreEqual ("System.Collections.Generic.IDictionary`2", table.Lookup ("System.Collections.Generic.IDictionary<string, Java.Util.Locale.LanguageRange>").FullName);
Assert.AreEqual ("System.Collections.Generic.IDictionary`2", table.Lookup ("System.Collections.Generic.IDictionary<string, List<Java.Util.Locale.LanguageRange>>").FullName);

Assert.AreEqual ("System.Collections.Generic.IList`1", table.Lookup ("System.Collections.Generic.IList<Dictionary<string, Java.Util.Locale.LanguageRange>>").FullName);
}
}
}
18 changes: 5 additions & 13 deletions tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/SymbolTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,21 +311,13 @@ private string AddArity (string key, string typeParams)
typeParams = typeParams.Substring (1, typeParams.Length - 2);

foreach (var c in typeParams) {
if (nested_count > 0) {
if (c == '>') {
nested_count--;
continue;
}

if (c == '<') {
nested_count++;
continue;
}
if (c == '>')
nested_count--;

continue;
}
if (c == '<')
nested_count++;

if (c == ',')
if (nested_count == 0 && c == ',')
arity++;
}

Expand Down