set template

3 files changed, 20 insertions, 9 deletions

diff --git a/bootstrap/cgen.c b/bootstrap/cgen.c
index b164905..14f36f1 100644
--- a/bootstrap/cgen.c
+++ b/bootstrap/cgen.c
@@ -554,7 +554,9 @@ liftdecl(struct decl *decl) {
    case Dfn:
       if ((decl->fn.body || (decl->container && !decl->externp)) && !*decl->_cname) {
          if (decl->container)
-            *decl->_cname = xasprintf("__m%s_%s%d", decl->container->agg.name, decl->fn.name, decl->fn.id);
+            *decl->_cname = xasprintf("__m%s_%s%d",
+                  decl->container->agg.name ? decl->container->agg.name : "_",
+                  decl->fn.name, decl->fn.id);
          else
             *decl->_cname = xasprintf("__f%s_%d", decl->fn.name, decl->fn.id);
          genfn(decl->externp, *decl->_cname, &decl->fn);
@@ -841,6 +843,8 @@ cgen(FILE *fp, const struct comfile *cf) {
    visittypes(defctype, NULL);
    
    for (int i = 0; i < cf->decls.n; ++i) {
+      if (cf->decls.d[i]->t != Dfn && cf->decls.d[i]->t != Dstatic)
+         liftdecl(cf->decls.d[i]);
       gendecl(cf->decls.d[i], 1);
    }
 }
diff --git a/bootstrap/dump.c b/bootstrap/dump.c
index bf63d22..d4fe7e2 100644
--- a/bootstrap/dump.c
+++ b/bootstrap/dump.c
@@ -144,6 +144,12 @@ tok2str(struct tok tok) {
       strcat(buf, "'");
    } else if (tok.t == TKeof) {
       return "<eof>";
+   } else if (tok.t == TKtype) {
+      return "<type parameter>";
+   } else if (tok.t == TKexpr) {
+      return "<const parameter>";
+   } else if (tok.t == TKstrify) {
+      return "#strify";
    } else if (tok.t < NUM_KEYWORDS) {
       snprintf(buf, sizeof buf - 1, "`%s'", keyword2str[tok.t]);
    } else if (tok.t > 0xFF) {
@@ -157,12 +163,6 @@ tok2str(struct tok tok) {
       }
       buf[i] = '\0';
       strcat(buf, "'");
-   } else if (tok.t == TKtype) {
-      return "<type parameter>";
-   } else if (tok.t == TKexpr) {
-      return "<const parameter>";
-   } else if (tok.t == TKstrify) {
-      return "#strify";
    } else {
       snprintf(buf, sizeof buf - 1, "`%c'", tok.t);
    }
diff --git a/bootstrap/parse.c b/bootstrap/parse.c
index 74ab2e2..874b54d 100644
--- a/bootstrap/parse.c
+++ b/bootstrap/parse.c
@@ -800,6 +800,9 @@ parsetype(struct parser *P) {
       struct decl *_decl;
       return parseagg(P, NULL, TYunion, &_decl);
    } else if (lexmatch(P, &tok, TKkw_enum)) {
+      struct decl *_decl;
+      if (lexmatch(P, NULL, TKkw_union))
+            return parseagg(P, NULL, TYeunion, &_decl);
       return parseenum(P, NULL, (struct attr){0});
    } else if (lexmatch(P, &tok, TKkw_typeof)) {
       const struct type *ty = NULL, *ty2, *ty0;
@@ -1027,6 +1030,7 @@ static struct expr
 pexprimary(struct parser *P) {
    struct expr ex = {0};
    struct tok tok;
+   const struct type *ty;
 
    P->used_targty = 0;
 
@@ -1071,7 +1075,6 @@ pexprimary(struct parser *P) {
    decl:
       if (!decl)
          fatal(P, tok.span, "%T is not defined", tok);
-      const struct type *ty;
       if (decl->t == Dtype) {
          ty = decl->ty;
       typedecl:
@@ -1123,6 +1126,9 @@ pexprimary(struct parser *P) {
             ex.ty = decl->fn.selfty;
          } else assert(0);
       }
+   } else if (lexmatch(P, &tok, TKtype)) {
+      ty = tok.ty;
+      goto typedecl;
    } else if (lexmatch(P, &tok, '(')) {
       if (lexpeek(P).t == TKkw_do) {
          struct blockstmt block;
@@ -2789,7 +2795,7 @@ parseagg(struct parser *P, const char *name, int kind, struct decl **retdecl) {
          const char *fnam = (tok = lexexpect(P, TKident)).str;
          const struct type *ty = NULL;
          size_t off = size;
-         if (kind != TYeunion || ((tok = lexpeek(P)).t != ',' && tok.t != '}' && !isdecltokt(tok.t))) {
+         if (kind != TYeunion || ((tok = lexpeek(P)).t != ',' && tok.t != '}' && tok.t != TKkw_fn)) {
                ty = parsetype(P);
                if (f0align < 0)
                   f0align = ty->align;
@@ -2857,6 +2863,7 @@ parseagg(struct parser *P, const char *name, int kind, struct decl **retdecl) {
          size_t off = f0align < 0 ? 0 : ALIGNUP(enumty.size, f0align);
          ppty->size += off;
          align = MAX(align, enumty.align);
+         ppty->size = ALIGNUP(ppty->size, align);
 
          for (int i = 0; i < ppty->agg.flds.n; ++i)
             ppty->agg.flds.d[i].off += off;