From 0e79f6b34b196259977b1ac6a61777cfaf945a9d Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Fri, 3 Jan 2025 19:12:40 +0900
Subject: [PATCH] include/object.h: rename `color` to `gccolor`

To clarify the color is for garbage collection.
---
 include/mruby/object.h |  2 +-
 src/class.c            |  2 +-
 src/gc.c               | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/mruby/object.h b/include/mruby/object.h
index a6ecab1eb..f54729f01 100644
--- a/include/mruby/object.h
+++ b/include/mruby/object.h
@@ -11,7 +11,7 @@
   struct RClass *c;       \
   struct RBasic *gcnext;  \
   enum mrb_vtype tt:8;    \
-  uint32_t color:3;       \
+  uint32_t gccolor:3;     \
   uint32_t flags:21
 
 #define MRB_FLAG_TEST(obj, flag) ((obj)->flags & (flag))
diff --git a/src/class.c b/src/class.c
index 1eb9dcb5c..ab98a73fe 100644
--- a/src/class.c
+++ b/src/class.c
@@ -759,7 +759,7 @@ mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_method_
 
     ptr.proc = p;
     if (p) {
-      if (p->color != MRB_GC_RED) {
+      if (p->gccolor != MRB_GC_RED) {
         p->flags |= MRB_PROC_SCOPE;
         p->c = NULL;
         mrb_field_write_barrier(mrb, (struct RBasic*)c, (struct RBasic*)p);
diff --git a/src/gc.c b/src/gc.c
index 7e944d886..bbe7c4cda 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -170,17 +170,17 @@ typedef struct mrb_heap_page {
 #define GC_COLOR_MASK 7
 mrb_static_assert(MRB_GC_RED <= GC_COLOR_MASK);
 
-#define paint_gray(o) ((o)->color = GC_GRAY)
-#define paint_black(o) ((o)->color = GC_BLACK)
-#define paint_white(o) ((o)->color = GC_WHITES)
-#define paint_partial_white(s, o) ((o)->color = (s)->current_white_part)
-#define is_gray(o) ((o)->color == GC_GRAY)
-#define is_white(o) ((o)->color & GC_WHITES)
-#define is_black(o) ((o)->color == GC_BLACK)
-#define is_red(o) ((o)->color == GC_RED)
+#define paint_gray(o) ((o)->gccolor = GC_GRAY)
+#define paint_black(o) ((o)->gccolor = GC_BLACK)
+#define paint_white(o) ((o)->gccolor = GC_WHITES)
+#define paint_partial_white(s, o) ((o)->gccolor = (s)->current_white_part)
+#define is_gray(o) ((o)->gccolor == GC_GRAY)
+#define is_white(o) ((o)->gccolor & GC_WHITES)
+#define is_black(o) ((o)->gccolor == GC_BLACK)
+#define is_red(o) ((o)->gccolor == GC_RED)
 #define flip_white_part(s) ((s)->current_white_part = other_white_part(s))
 #define other_white_part(s) ((s)->current_white_part ^ GC_WHITES)
-#define is_dead(s, o) (((o)->color & other_white_part(s) & GC_WHITES) || (o)->tt == MRB_TT_FREE)
+#define is_dead(s, o) (((o)->gccolor & other_white_part(s) & GC_WHITES) || (o)->tt == MRB_TT_FREE)
 
 mrb_noreturn void mrb_raise_nomemory(mrb_state *mrb);