From 9e408967cbdfa1d04e4bd4bc963399e7be78c0a7 Mon Sep 17 00:00:00 2001
From: lemon <lsof@mailbox.org>
Date: Fri, 19 Aug 2022 13:01:16 +0200
Subject: fix hashing and typeeq for enums

---
 bootstrap/test.cff | 2 +-
 src/parse.cff      | 4 +++-
 src/type.cff       | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bootstrap/test.cff b/bootstrap/test.cff
index 4475b0b..0fd9333 100644
--- a/bootstrap/test.cff
+++ b/bootstrap/test.cff
@@ -6,7 +6,7 @@ union Val {
 }
 
 
-enum Color {
+enum Color : i16 {
    Red, Green, Blue
 }
 
diff --git a/src/parse.cff b/src/parse.cff
index 5caa998..cbeccb1 100644
--- a/src/parse.cff
+++ b/src/parse.cff
@@ -737,7 +737,9 @@ fn parseagg(P *Parser, loc Loc, kind AggKind, name *const u8, retdecl **Decl) *c
       if kind == :EUnion {
          // add enum tag field on top and offset every other field down
          static id int = 0;
-         let enumty Type = { .u: :Enum { #null, name, .id: --id }};
+         let enumname [200]u8 = {};
+         snprintf(enumname, sizeof(enumname) - 1, "%s#tag",name);
+         let enumty Type = { .u: :Enum { #null, internstr(enumname), .id: --id }};
          let n = flds.len;
          enumty.u.Enum.vals = (as(*EnumVal)malloc(n * sizeof EnumVal))[0::n];
          if n < 256 {
diff --git a/src/type.cff b/src/type.cff
index 593ec3c..713716b 100644
--- a/src/type.cff
+++ b/src/type.cff
@@ -40,6 +40,9 @@ struct TypeTraits {
 
       case Agg agg;
          h = fnv1a_i(h, agg.id);
+
+      case Enum enu;
+         h = fnv1a_i(h, enu.id);
       }
 
       return h;
@@ -87,6 +90,9 @@ struct TypeTraits {
       case Agg agg;
          let bgg = b.u.Agg;
          return agg.id == bgg.id;
+
+      case Enum enu;
+         return enu.id == b.u.Enum.id;
       }
       return #f;
    }
-- 
cgit v1.2.3