Merge pull request #1382 from informalsystems/1298/fixes-and-utils

Add fixes towards polymorphic type declarations

Author: Shon Feder

examples/cosmos/lightclient/typedefs.qnt

@@ -13,8 +13,8 @@ module typedefs {
         Commits: Set[str]
     }
 
-    type Blockchain = int -> blockHeader
-    type LightBlockMap = int -> lightBlock
+    type Blockchain = int -> BlockHeader
+    type LightBlockMap = int -> LightBlock
     type LightBlockStatus = int -> str    
 
-}
+}

quint/src/generated/Quint.g4

@@ -68,7 +68,7 @@ typeDef
     | 'type' typeDefHead '=' sumTypeDefinition  # typeSumDef
     ;
 
-typeDefHead : typeName=qualId ('[' typeVars+=typeVar(',' typeVars+=typeVar)* ']')?;
+typeDefHead : typeName=qualId ('[' typeVars+=LOW_ID(',' typeVars+=LOW_ID)* ']')?;
 
 sumTypeDefinition : '|'? typeSumVariant ('|' typeSumVariant)* ;
 
@@ -127,7 +127,7 @@ type
     | typeVar                                                    # typeVarCase
     | qualId                                                     # typeConst
     | '(' type ')'                                               # typeParen
-    | typeCtor=type ('[' typeArg+=type (',' typeArg+=type)* ']') # typeApp
+    | typeCtor=qualId ('[' typeArg+=type (',' typeArg+=type)* ']') # typeApp
     ;
 
 typeVar: LOW_ID;