shithub: mc

Info  •  Files  •  Log  •  Branches

Allow nullary union constructors.

--- a/parse/gram.y

+++ b/parse/gram.y

@@ -327,8 +327,10 @@

         ;

 unionelt

-        : Tident type Tendln

-            {$$ = mkdecl($1->line, mkname($1->line, $1->str), $2);}

+        : Ttick Tident type Tendln

+            {$$ = mkdecl($2->line, mkname($2->line, $2->str), $3);}

+        | Ttick Tident Tendln

+            {$$ = mkdecl($2->line, mkname($2->line, $2->str), NULL);}

         | visdef Tendln

             {$$ = NULL;}

         | Tendln

@@ -402,6 +404,8 @@

 unioncons

         : Ttick Tident addexpr

             {$$ = mkexpr($1->line, Ocons, $2, $3, NULL);}

+        | Ttick Tident

+            {$$ = mkexpr($1->line, Ocons, $2, NULL);}

         | addexpr

         ;

--- /dev/null

+++ b/test/union.myr

@@ -1,0 +1,10 @@

+type u = union

+	`Some int

+	`None

+;;

+

+const main = {

+	var v : u

+

+	v = `None

+}