shithub: mc

Info  •  Files  •  Log  •  Branches

Fix constructor function names

--- a/parse/gram.y

+++ b/parse/gram.y

@@ -260,7 +260,7 @@

 tydef   : Ttype typeid Tasn type

             {$$ = $2;

-             $$.type = mktyalias($2.line, mkname($2.line, $2.name), $4);}

+             $$.type = mktyname($2.line, mkname($2.line, $2.name), $4);}

         | Ttype typeid

             {$$ = $2;}

         ;

@@ -316,8 +316,8 @@

         | type Tosqbrac expr Tcsqbrac {$$ = mktyarray($2->line, $1, $3);}

         | type Tstar {$$ = mktyptr($2->line, $1);}

         | Tat Tident {$$ = mktyparam($1->line, $2->str);}

-        | name       {$$ = mktynamed($1->line, $1);}

-        | name Toparen typelist Tcparen {$$ = mktynamed($1->line, $1);}

+        | name       {$$ = mktyunres($1->line, $1);}

+        | name Toparen typelist Tcparen {$$ = mktyunres($1->line, $1);}

         ;

 functype: Toparen funcsig Tcparen {$$ = $2;}

--- a/parse/parse.h

+++ b/parse/parse.h

@@ -338,8 +338,8 @@

 Type *tydup(Type *t); /* shallow duplicate; all subtypes/members/... kept */

 Type *mktyvar(int line);

 Type *mktyparam(int line, char *name);

-Type *mktyalias(int line, Node *name, Type *base);

-Type *mktynamed(int line, Node *name);

+Type *mktyname(int line, Node *name, Type *base);

+Type *mktyunres(int line, Node *name);

 Type *mktyarray(int line, Type *base, Node *sz);

 Type *mktyslice(int line, Type *base);

 Type *mktyidxhack(int line, Type *base);

--- a/parse/type.c

+++ b/parse/type.c

@@ -118,7 +118,7 @@

     return t;

 }

-Type *mktynamed(int line, Node *name)

+Type *mktyunres(int line, Node *name)

 {

     Type *t;

@@ -128,7 +128,7 @@

     return t;

 }

-Type *mktyalias(int line, Node *name, Type *base)

+Type *mktyname(int line, Node *name, Type *base)

 {

     Type *t;