gensym fix, offset fix, str statics

2 files changed, 11 insertions, 3 deletions

diff --git a/src/llvm.cff b/src/llvm.cff
index a33ca56..c4528e8 100644
--- a/src/llvm.cff
+++ b/src/llvm.cff
@@ -1017,7 +1017,8 @@ fn genstmt(f *Fn, block *Block, st *Stmt) void {
          if c.capt {
             gen("\t%%%s.%d = alloca %t\n", c.capt, c.captid, c.captty);
             let valaddr = mktmp(mkptrtype(c.fld.ty));
-            gen("\t%v = getelementptr i8, %t %v, i32 %d\n", valaddr, exaddr.ty, exaddr, as(int)c.fld.off);
+            gen("\t%v = getelementptr i8, %t %v, i32 %d\n", valaddr, exaddr.ty, exaddr,
+                as(int)c.fld.off);
             if c.captptr {
                gen("\tstore %t %v, %t %%%s.%d\n", valaddr.ty, valaddr, mkptrtype(c.captty), c.capt, c.captid);
             } else {
@@ -1167,6 +1168,13 @@ fn gendata(ty *const Type, ex *Expr) void {
    case BoolLit b; return gen("%d", b);
    case NullLit;   return gen("null");
    case ZeroIni;   return gen("zeroinitializer");
+   case StrLit s;
+      if ty->is(:Arr) {
+         return gen("c%S", s);
+      } else {
+         strs->push(s);
+         return gen("@.str.%z", strs.len - 1);
+      }
    }
    assert(#f, "bad static");
 }
diff --git a/src/parse.cff b/src/parse.cff
index e1b5f58..b0b96cb 100644
--- a/src/parse.cff
+++ b/src/parse.cff
@@ -733,7 +733,7 @@ fn parseagg(P *Parser, loc Loc, kind AggKind, name *const u8, retdecl **Decl) *c
       let size = 0z, align = 1z;
       let flds Vec<AggField> = {};
       let havedecls = #f;
-      let f0align = -1zs;
+      let f0align = 0zs;
       while !lexmatch(P, &tok, '}') {
          if isdecltokt(lexpeek(P).t) {
             havedecls = #t;
@@ -2745,7 +2745,7 @@ fn parsemacro(P *Parser, loc Loc, name *const u8) *Decl {
                gs.tok.t = :ident;
                gs.tok.loc = tok.loc;
                let s [300]u8 = {};
-               snprintf(s, sizeof(s) - 1, "#<gensym %s %d>", tok.u.ident, gensymid++); 
+               snprintf(s, sizeof(s) - 1, ".gensym.%s.%d", tok.u.ident, gensymid++); 
                gs.tok.u.ident = internstr(s);
                tok = gs.tok;
                gs.next = gensyms;