Skip to content

Commit 14133f4

Browse files
dearbluedearblue
committed
Fix macro arguments with paren
1 parent 11071b9 commit 14133f4

8 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎include/mruby.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -995,8 +995,8 @@ MRB_API char* mrb_locale_from_utf8(const char *p, int len);
995995
#define mrb_locale_free(p) free(p)
996996
#define mrb_utf8_free(p) free(p)
997997
#else
998-
#define mrb_utf8_from_locale(p, l) ((char*)p)
999-
#define mrb_locale_from_utf8(p, l) ((char*)p)
998+
#define mrb_utf8_from_locale(p, l) ((char*)(p))
999+
#define mrb_locale_from_utf8(p, l) ((char*)(p))
10001000
#define mrb_locale_free(p)
10011001
#define mrb_utf8_free(p)
10021002
#endif

‎include/mruby/boxing_nan.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ typedef struct mrb_value {
8181
} while (0)
8282

8383
#define SET_FLOAT_VALUE(mrb,r,v) do { \
84-
if (v != v) { \
84+
if ((v) != (v)) { \
8585
(r).value.ttt = 0x7ff80000; \
8686
(r).value.i = 0; \
8787
} \

‎include/mruby/boxing_word.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ mrb_type(mrb_value o)
129129
} while (0)
130130

131131
#ifndef MRB_WITHOUT_FLOAT
132-
#define SET_FLOAT_VALUE(mrb,r,v) r = mrb_word_boxing_float_value(mrb, v)
132+
#define SET_FLOAT_VALUE(mrb,r,v) (r) = mrb_word_boxing_float_value(mrb, v)
133133
#endif
134-
#define SET_CPTR_VALUE(mrb,r,v) r = mrb_word_boxing_cptr_value(mrb, v)
134+
#define SET_CPTR_VALUE(mrb,r,v) (r) = mrb_word_boxing_cptr_value(mrb, v)
135135
#define SET_NIL_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_FALSE, value.i, 0)
136136
#define SET_FALSE_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_FALSE, value.i, 1)
137137
#define SET_TRUE_VALUE(r) BOXWORD_SET_VALUE(r, MRB_TT_TRUE, value.i, 1)
138-
#define SET_BOOL_VALUE(r,b) BOXWORD_SET_VALUE(r, b ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1)
138+
#define SET_BOOL_VALUE(r,b) BOXWORD_SET_VALUE(r, (b) ? MRB_TT_TRUE : MRB_TT_FALSE, value.i, 1)
139139
#define SET_INT_VALUE(r,n) BOXWORD_SET_VALUE(r, MRB_TT_FIXNUM, value.i, (n))
140140
#define SET_SYM_VALUE(r,v) BOXWORD_SET_VALUE(r, MRB_TT_SYMBOL, value.sym, (v))
141141
#define SET_OBJ_VALUE(r,v) BOXWORD_SET_VALUE(r, (((struct RObject*)(v))->tt), value.p, (v))

‎include/mruby/class.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ mrb_class(mrb_state *mrb, mrb_value v)
6161
#define MRB_FL_CLASS_IS_PREPENDED (1 << 19)
6262
#define MRB_FL_CLASS_IS_ORIGIN (1 << 18)
6363
#define MRB_CLASS_ORIGIN(c) do {\
64-
if (c->flags & MRB_FL_CLASS_IS_PREPENDED) {\
65-
c = c->super;\
66-
while (!(c->flags & MRB_FL_CLASS_IS_ORIGIN)) {\
67-
c = c->super;\
64+
if ((c)->flags & MRB_FL_CLASS_IS_PREPENDED) {\
65+
(c) = (c)->super;\
66+
while (!((c)->flags & MRB_FL_CLASS_IS_ORIGIN)) {\
67+
(c) = (c)->super;\
6868
}\
6969
}\
7070
} while (0)
7171
#define MRB_FL_CLASS_IS_INHERITED (1 << 17)
7272
#define MRB_INSTANCE_TT_MASK (0xFF)
73-
#define MRB_SET_INSTANCE_TT(c, tt) c->flags = ((c->flags & ~MRB_INSTANCE_TT_MASK) | (char)tt)
74-
#define MRB_INSTANCE_TT(c) (enum mrb_vtype)(c->flags & MRB_INSTANCE_TT_MASK)
73+
#define MRB_SET_INSTANCE_TT(c, tt) (c)->flags = (((c)->flags & ~MRB_INSTANCE_TT_MASK) | (char)(tt))
74+
#define MRB_INSTANCE_TT(c) (enum mrb_vtype)((c)->flags & MRB_INSTANCE_TT_MASK)
7575

7676
MRB_API struct RClass* mrb_define_class_id(mrb_state*, mrb_sym, struct RClass*);
7777
MRB_API struct RClass* mrb_define_module_id(mrb_state*, mrb_sym);

‎include/mruby/data.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ MRB_API struct RData *mrb_data_object_alloc(mrb_state *mrb, struct RClass* klass
4040
mrb_data_object_alloc(mrb,klass,ptr,type)
4141

4242
#define Data_Make_Struct(mrb,klass,strct,type,sval,data) do { \
43-
sval = mrb_malloc(mrb, sizeof(strct)); \
44-
{ static const strct zero = { 0 }; *sval = zero; };\
45-
data = Data_Wrap_Struct(mrb,klass,type,sval);\
43+
(sval) = mrb_malloc(mrb, sizeof(strct)); \
44+
{ static const strct zero = { 0 }; *(sval) = zero; };\
45+
(data) = Data_Wrap_Struct(mrb,klass,type,sval);\
4646
} while (0)
4747

4848
#define RDATA(obj) ((struct RData *)(mrb_ptr(obj)))

‎include/mruby/object.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
struct RClass *c;\
1515
struct RBasic *gcnext
1616

17-
#define MRB_FLAG_TEST(obj, flag) ((obj)->flags & flag)
17+
#define MRB_FLAG_TEST(obj, flag) ((obj)->flags & (flag))
1818

1919

2020
struct RBasic {

‎include/mruby/proc.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ struct RProc {
6969
#define MRB_PROC_SET_TARGET_CLASS(p,tc) do {\
7070
if (MRB_PROC_ENV_P(p)) {\
7171
(p)->e.env->c = (tc);\
72-
mrb_field_write_barrier(mrb, (struct RBasic*)(p)->e.env, (struct RBasic*)tc);\
72+
mrb_field_write_barrier(mrb, (struct RBasic*)(p)->e.env, (struct RBasic*)(tc));\
7373
}\
7474
else {\
7575
(p)->e.target_class = (tc);\
76-
mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)tc);\
76+
mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)(tc));\
7777
}\
7878
} while (0)
7979
#define MRB_PROC_SCOPE 2048
@@ -101,8 +101,8 @@ MRB_API mrb_value mrb_proc_cfunc_env_get(mrb_state*, mrb_int);
101101
#define MRB_METHOD_FUNC_FL ((uintptr_t)1)
102102
#define MRB_METHOD_FUNC_P(m) (((uintptr_t)(m))&MRB_METHOD_FUNC_FL)
103103
#define MRB_METHOD_FUNC(m) ((mrb_func_t)((uintptr_t)(m)&(~MRB_METHOD_FUNC_FL)))
104-
#define MRB_METHOD_FROM_FUNC(m,fn) m=(mrb_method_t)((struct RProc*)((uintptr_t)(fn)|MRB_METHOD_FUNC_FL))
105-
#define MRB_METHOD_FROM_PROC(m,pr) m=(mrb_method_t)(struct RProc*)(pr)
104+
#define MRB_METHOD_FROM_FUNC(m,fn) (m)=(mrb_method_t)((struct RProc*)((uintptr_t)(fn)|MRB_METHOD_FUNC_FL))
105+
#define MRB_METHOD_FROM_PROC(m,pr) (m)=(mrb_method_t)(struct RProc*)(pr)
106106
#define MRB_METHOD_PROC_P(m) (!MRB_METHOD_FUNC_P(m))
107107
#define MRB_METHOD_PROC(m) ((struct RProc*)(m))
108108
#define MRB_METHOD_UNDEF_P(m) ((m)==0)

‎include/mruby/string.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ struct RString {
3939
#define RSTR_UNSET_EMBED_FLAG(s) ((s)->flags &= ~(MRB_STR_EMBED|MRB_STR_EMBED_LEN_MASK))
4040
#define RSTR_SET_EMBED_LEN(s, n) do {\
4141
size_t tmp_n = (n);\
42-
s->flags &= ~MRB_STR_EMBED_LEN_MASK;\
43-
s->flags |= (tmp_n) << MRB_STR_EMBED_LEN_SHIFT;\
42+
(s)->flags &= ~MRB_STR_EMBED_LEN_MASK;\
43+
(s)->flags |= (tmp_n) << MRB_STR_EMBED_LEN_SHIFT;\
4444
} while (0)
4545
#define RSTR_SET_LEN(s, n) do {\
4646
if (RSTR_EMBED_P(s)) {\
4747
RSTR_SET_EMBED_LEN((s),(n));\
4848
}\
4949
else {\
50-
s->as.heap.len = (mrb_int)(n);\
50+
(s)->as.heap.len = (mrb_int)(n);\
5151
}\
5252
} while (0)
5353
#define RSTR_EMBED_LEN(s)\

0 commit comments

Comments
 (0)