fixs

1 files changed, 32 insertions, 14 deletions

diff --git a/bootstrap/cgen.c b/bootstrap/cgen.c
index 4a80bfb..4e4d53f 100644
--- a/bootstrap/cgen.c
+++ b/bootstrap/cgen.c
@@ -12,7 +12,7 @@ gentype(const struct type *ty) {
       pri("void");
       break;
    case TYbool:
-      pri("bool");
+      pri("_Bool");
       break;
    case TYint:
       pri("%sint%z_t", ty->int_signed ? "" : "u",
@@ -145,7 +145,7 @@ geniniex(struct expr *ex) {
          if (ex->ty->t == TYarr)
             pri("[%I] = %e, ", arg->idx, &arg->ex);
          else
-            pri(".%s = %e, ", arg->fld, &arg->ex);
+            pri(".%s_ = %e, ", arg->fld, &arg->ex);
       }
 
       pri("}");
@@ -159,7 +159,7 @@ geneuiniex(struct expr *ex) {
    else {
       assert(ex->t == Eeuini);
       if (ex->euini.ini)
-      pri("{ /* %s */ %I, .u.%s = %e }", ex->euini.fnam, ex->euini.tag,
+      pri("{ /* %s */ %I, .u.%s_ = %e }", ex->euini.fnam, ex->euini.tag,
             ex->euini.fnam, ex->euini.ini);
       else 
          pri("{ /* %s */ %I }", ex->euini.fnam, ex->euini.tag);
@@ -249,7 +249,7 @@ genexpr(struct expr *ex) {
       pri("((%t)%n)", ty, ex);
       break;
    case Eget:
-      pri("%e%s%s%s", ex->get.lhs, ex->get.lhs->ty->t == TYptr ? "->" : ".",
+      pri("%e%s%s%s_", ex->get.lhs, ex->get.lhs->ty->t == TYptr ? "->" : ".",
           (ex->get.lhs->ty->t == TYeunion
            || (ex->get.lhs->ty->t == TYptr && ex->get.lhs->ty->child->t == TYeunion) ? "u." : ""),
            ex->get.fld);
@@ -396,9 +396,9 @@ genstmt(struct stmt *stmt) {
             struct euswitchcase c = stmt->euswitch.cs.d[i];
             pri("case /* %s */ %d: ", c.fld->name, c.vval);
             if (c.capt && c.captptr)
-               pri("{ %t %s_%d__ = &__stmp->u.%s;\n", c.captty, c.capt, c.captid, c.fld->name);
+               pri("{ %t %s_%d__ = &__stmp->u.%s_;\n", c.captty, c.capt, c.captid, c.fld->name);
             if (c.capt && !c.captptr)
-               pri("{ %t %s_%d__ = __stmp->u.%s;\n", c.captty, c.capt, c.captid, c.fld->name);
+               pri("{ %t %s_%d__ = __stmp->u.%s_;\n", c.captty, c.capt, c.captid, c.fld->name);
             genblock(c.t);
             if (c.capt)
                pri("}\n");
@@ -503,12 +503,22 @@ liftnestedex(struct expr *ex) {
 }
 
 static void
+lifttype(const struct type *ty) {
+   if (ty->t == TYstruct || ty->t == TYunion || ty->t == TYeunion)
+      for (int i = 0; i < ty->agg.decls.n; ++i)
+         liftdecl(ty->agg.decls.d[i]);
+}
+
+static void
 liftdecl(struct decl *decl) {
    static int id;
    switch (decl->t) {
    case Dfn:
       if (decl->fn.body) {
-         *decl->_cname = xasprintf("__f%s_%d", decl->fn.name, id++);
+         if (decl->container)
+            *decl->_cname = xasprintf("__m%s_%s%d", decl->container->agg.name, decl->fn.name, id++);
+         else
+            *decl->_cname = xasprintf("__f%s_%d", decl->fn.name, id++);
          genfn(decl->externp, *decl->_cname, &decl->fn);
       }
       break;
@@ -522,6 +532,16 @@ liftdecl(struct decl *decl) {
    case Dlet:
       liftnestedex(decl->var.ini);
       break;
+   case Dtype:
+      lifttype(decl->ty);
+      break;
+   case Dtepl:
+      for (struct teplcache *cache = decl->tepl.cache; cache; cache = cache->next) {
+         for (int i = 0; i < cache->args.n; ++i) {
+            if (cache->args.d[i].typ)
+               lifttype(cache->args.d[i].ty);
+         }
+      }
    default:
       break;
    }
@@ -634,11 +654,7 @@ gendecl(struct decl *decl, bool toplevel) {
    case Dlet:
       assert(!toplevel);
       break;
-   case Dtype:
-      if (decl->ty->t == TYstruct || decl->ty->t == TYunion)
-         for (int i = 0; i < decl->ty->agg.decls.n; ++i)
-            liftdecl(decl->ty->agg.decls.d[i]);
-   case Ddef: case Dtepl: case Dmacro: case Dlabel:
+   case Dtype: case Ddef: case Dtepl: case Dmacro: case Dlabel:
       break;
    }
 }
@@ -712,7 +728,7 @@ defctype(const struct type *ty, void *_) {
             pri("char _;\n");
          for (int i = 0; i < ty->agg.flds.n; ++i) {
             struct aggfield fld = ty->agg.flds.d[i];
-            pri("%t %s;\n", fld.ty, fld.name);
+            pri("%t %s_;\n", fld.ty, fld.name);
          }
          pri("};\n");
          pri("_Static_assert(sizeof(%s) == %U, \"sizeof(%t) == %U\");\n",
@@ -720,6 +736,7 @@ defctype(const struct type *ty, void *_) {
          pri("_Static_assert(__alignof__(%s) == %U, \"__alignof__(%t) == %U\");\n",
                *cname, (u64)ty->align, ty, (u64)ty->align);
       }
+      lifttype(ty);
       break;
    case TYeunion:
       if (ty->konst) {
@@ -736,7 +753,7 @@ defctype(const struct type *ty, void *_) {
          for (int i = 0; i < ty->agg.flds.n; ++i) {
             struct aggfield *fld = &ty->agg.flds.d[i];
             if (fld->ty)
-               pri("%t %s;\n", fld->ty, fld->name);
+               pri("%t %s_;\n", fld->ty, fld->name);
          }
          pri("} u;\n};\n");
          pri("_Static_assert(sizeof(%s) == %U, \"sizeof(%t) == %U\");\n",
@@ -744,6 +761,7 @@ defctype(const struct type *ty, void *_) {
          pri("_Static_assert(__alignof__(%s) == %U, \"__alignof__(%t) == %U\");\n",
                *cname, (u64)ty->align, ty, (u64)ty->align);
       }
+      lifttype(ty);
       break;
    }