Merge pull request #341 from SergeyTeplyakov/bugs/bug340

Fix for #340.
microsoft · Feb 7, 2016 · 4c215e2 · 4c215e2
2 parents c3576bd + 9051a97
commit 4c215e2
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/System.Compiler/Reader.cs b/System.Compiler/Reader.cs
@@ -4257,6 +4257,18 @@ private string GetIdentifier(TypeNameIdentifiers identifierType) {
             this.currentItr++;
             switch (c) {
               case ',':
+                    // A comma may separate a type name from its assembly name or a type argument from
+                    // another type argument.
+                    // If processing non-type argument or a type argument with assembly name,
+                    // process the characters after the comma as an assembly name.
+                    //
+                    // If the next character is whitespace, assume that it delineates the start of an assembly name so
+                    // end the current identifier by going to done label.
+                    if (this.currentItr < this.typeNameString.Length && char.IsWhiteSpace(this.typeNameString[this.currentItr]))
+                    {
+                        goto done;
+                    }
+                    break;
               case '[':
               case ']':
               case '&':