feat: Allow generics of generics

sand-lang · Jul 20, 2020 · 649e91a · 649e91a
1 parent 14c0422
commit 649e91a
Show file tree

Hide file tree

Showing 4 changed files with 854 additions and 845 deletions.
diff --git a/src/grammar/SanParser.g4 b/src/grammar/SanParser.g4
@@ -53,7 +53,7 @@ expression:
 
 scopedName: scopeResolver? name;
 
-name: VariableName classTypeNameGenerics?;
+name: VariableName classTypeNameGenerics*;
 
 scopedNameNoGeneric: scopeResolver? nameNoGeneric;
 

diff --git a/src/grammar/Visitor.hpp b/src/grammar/Visitor.hpp
@@ -2723,9 +2723,9 @@ class Visitor
 
         if (!names->empty())
         {
-            if (auto generics_context = context->classTypeNameGenerics())
+            for (auto &generics_context : context->classTypeNameGenerics())
             {
-                return this->visitTypeNameClassGenerics(generics_context, names);
+                names = this->visitTypeNameClassGenerics(generics_context, names);
             }
 
             return names;
@@ -2747,7 +2747,7 @@ class Visitor
 
             if (!names->empty())
             {
-                if (auto generics_context = context->classTypeNameGenerics())
+                for (auto &generics_context : context->classTypeNameGenerics())
                 {
                     names = this->visitTypeNameClassGenerics(generics_context, names);
                 }