parse defmacro

1 files changed, 10 insertions, 1 deletions

diff --git a/src/type.cff b/src/type.cff
index e3989c7..980a83a 100644
--- a/src/type.cff
+++ b/src/type.cff
@@ -10,7 +10,10 @@ struct TypeTraits {
       h = fnv1a_i(h, ty.konst ? 1 : 0);
 
       switch ty.u {
-      case Void; case Bool;
+      case Void;
+
+      case Bool;
+         h = fnv1a_i(h, ty.size);
 
       case Flo;
          h = fnv1a_i(h, ty.size);
@@ -121,12 +124,14 @@ extern fn completetype(ty *const Type) bool {
    case Void; return #f;
    case Fn; return #f;
    case Arr a; return a.length >= 0;
+   case Agg agg; return !agg.fwd;
    }
    return #t;
 }
 
 extern static ty_void    *const Type = {},
               ty_bool    *const Type = {},
+              ty_intbool *const Type = {},
               ty_i8      *const Type = {},
               ty_u8      *const Type = {},
               ty_i16     *const Type = {},
@@ -159,6 +164,7 @@ extern fn putprimtypes(env *Env) void {
       { "u32",    &ty_u32,  { .size: 4, .u: :Int { .sgn: #f }}},
       { "int",    &ty_int,  { g_targ.intsize, .u: :Int { .sgn: #t }}},
       { "uint",   &ty_uint, { g_targ.intsize, .u: :Int { .sgn: #f }}},
+      { "intbool",&ty_intbool,{ .size: g_targ.intsize, .u: :Bool }},
       { "isize",  &ty_isize,{ g_targ.sizesize, .u: :Int { .sgn: #t }}},
       { "usize",  &ty_usize,{ g_targ.sizesize, .u: :Int { .sgn: #f }}},
       { "i64",    &ty_i64,  { .size: 8, g_targ.i64align, .u: :Int { .sgn: #t }}},
@@ -242,6 +248,9 @@ extern fn typeof2(a *const Type, b *const Type) *const Type {
    if a == unconstify(b) {
       return b;
    }
+   if a->is(:Bool) and b->is(:Bool) {
+      return a.size > b.size ? a : b;
+   }
    if a->is(:Arr) and b->is(:Arr) {
       a = arraydecay(a);
    }