Integrate new types into the rest of the project

11/parser.y

@@ -5,6 +5,7 @@
 #include "ast.hpp"
 #include "definition.hpp"
 #include "parser.hpp"
+#include "parsed_type.hpp"
 
 std::map<std::string, definition_data_ptr> defs_data;
 std::map<std::string, definition_defn_ptr> defs_defn;
@@ -36,9 +37,11 @@ extern yy::parser::symbol_type yylex();
 %define api.value.type variant
 %define api.token.constructor
 
-%type <std::vector<std::string>> lowercaseParams uppercaseParams
+%type <std::vector<std::string>> lowercaseParams
 %type <std::vector<branch_ptr>> branches
 %type <std::vector<constructor_ptr>> constructors
+%type <std::vector<parsed_type_ptr>> typeList
+%type <parsed_type_ptr> type nullaryType
 %type <ast_ptr> aAdd aMul case app appBase
 %type <definition_data_ptr> data 
 %type <definition_defn_ptr> defn
@@ -75,11 +78,6 @@ lowercaseParams
     | lowercaseParams LID { $$ = std::move($1); $$.push_back(std::move($2)); }
     ;
 
-uppercaseParams
-    : %empty { $$ = std::vector<std::string>(); }
-    | uppercaseParams UID { $$ = std::move($1); $$.push_back(std::move($2)); }
-    ;
-
 aAdd
     : aAdd PLUS aMul { $$ = ast_ptr(new ast_binop(PLUS, std::move($1), std::move($3))); }
     | aAdd MINUS aMul { $$ = ast_ptr(new ast_binop(MINUS, std::move($1), std::move($3))); }
@@ -127,8 +125,8 @@ pattern
     ;
 
 data
-    : DATA UID EQUAL OCURLY constructors CCURLY
-        { $$ = definition_data_ptr(new definition_data(std::move($2), std::move($5))); }
+    : DATA UID lowercaseParams EQUAL OCURLY constructors CCURLY
+        { $$ = definition_data_ptr(new definition_data(std::move($2), std::move($3), std::move($6))); }
     ;
 
 constructors
@@ -138,7 +136,22 @@ constructors
     ;
 
 constructor
-    : UID uppercaseParams
+    : UID typeList
         { $$ = constructor_ptr(new constructor(std::move($1), std::move($2))); }
     ;
 
+type
+    : nullaryType ARROW type { $$ = parsed_type_ptr(new parsed_type_arr(std::move($1), std::move($3))); }
+    | nullaryType { $$ = std::move($1); }
+    ;
+
+nullaryType
+    : OPAREN UID typeList CPAREN { $$ = parsed_type_ptr(new parsed_type_app(std::move($2), std::move($3))); }
+    | UID { $$ = parsed_type_ptr(new parsed_type_app(std::move($1), { })); }
+    | LID { $$ = parsed_type_ptr(new parsed_type_var(std::move($1))); }
+    ;
+
+typeList
+    : %empty { $$ = std::vector<parsed_type_ptr>(); }
+    | typeList type { $$ = std::move($1); $$.push_back(std::move($2)); }
+    ;