heck
/
heck_orca-c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Cleanup oper name def ordering

master
cancel 6 years ago
parent
199f056146
commit
d18d5e6c06
1 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      sim.c

34
sim.c
View File

@ -71,10 +71,10 @@ static inline void oper_move_relative_or_explode(Gbuffer gbuf, Mbuffer mbuf,
gbuf[y * width + x] = '.'; gbuf[y * width + x] = '.';
} }
#define ORCA_EXPAND_SOLO_OPER_CHARS(_oper_name, _oper_char) \ #define ORCA_EXPAND_SOLO_OPER_CHARS(_oper_char, _oper_name) \
Orca_oper_char_##_oper_name = _oper_char, Orca_oper_char_##_oper_name = _oper_char,
#define ORCA_EXPAND_DUAL_OPER_CHARS(_oper_name, _upper_oper_char, \ #define ORCA_EXPAND_DUAL_OPER_CHARS(_upper_oper_char, _lower_oper_char, \
_lower_oper_char) \ _oper_name) \
Orca_oper_upper_char_##_oper_name = _upper_oper_char, \ Orca_oper_upper_char_##_oper_name = _upper_oper_char, \
Orca_oper_lower_char_##_oper_name = _lower_oper_char, Orca_oper_lower_char_##_oper_name = _lower_oper_char,
#define ORCA_DEFINE_OPER_CHARS(_solo_defs, _dual_defs) \ #define ORCA_DEFINE_OPER_CHARS(_solo_defs, _dual_defs) \
@ -195,16 +195,16 @@ static inline void oper_move_relative_or_explode(Gbuffer gbuf, Mbuffer mbuf,
//////// Operators //////// Operators
#define ORCA_SOLO_OPERATORS(_) _(bang, '*') #define ORCA_SOLO_OPERATORS(_) _('*', bang)
#define ORCA_DUAL_OPERATORS(_) \ #define ORCA_DUAL_OPERATORS(_) \
_(north, 'N', 'n') \ _('N', 'n', north) \
_(east, 'E', 'e') \ _('E', 'e', east) \
_(south, 'S', 's') \ _('S', 's', south) \
_(west, 'W', 'w') \ _('W', 'w', west) \
_(add, 'A', 'a') \ _('A', 'a', add) \
_(modulo, 'M', 'm') \ _('M', 'm', modulo) \
_(increment, 'I', 'i') _('I', 'i', increment)
ORCA_DECLARE_OPERATORS(ORCA_SOLO_OPERATORS, ORCA_DUAL_OPERATORS) ORCA_DECLARE_OPERATORS(ORCA_SOLO_OPERATORS, ORCA_DUAL_OPERATORS)
@ -270,24 +270,24 @@ END_PHASE
//////// Run simulation //////// Run simulation
#define SIM_EXPAND_SOLO_PHASE_0(_oper_name, _oper_char) \ #define SIM_EXPAND_SOLO_PHASE_0(_oper_char, _oper_name) \
case _oper_char: \ case _oper_char: \
oper_phase0_##_oper_name(gbuf, mbuf, height, width, iy, ix, cell_flags); \ oper_phase0_##_oper_name(gbuf, mbuf, height, width, iy, ix, cell_flags); \
break; break;
#define SIM_EXPAND_SOLO_PHASE_1(_oper_name, _oper_char) \ #define SIM_EXPAND_SOLO_PHASE_1(_oper_char, _oper_name) \
case _oper_char: \ case _oper_char: \
oper_phase1_##_oper_name(gbuf, mbuf, height, width, iy, ix); \ oper_phase1_##_oper_name(gbuf, mbuf, height, width, iy, ix); \
break; break;
#define SIM_EXPAND_DUAL_PHASE_0(_oper_name, _upper_oper_char, \ #define SIM_EXPAND_DUAL_PHASE_0(_upper_oper_char, _lower_oper_char, \
_lower_oper_char) \ _oper_name) \
case _upper_oper_char: \ case _upper_oper_char: \
case _lower_oper_char: \ case _lower_oper_char: \
oper_phase0_##_oper_name(gbuf, mbuf, height, width, iy, ix, cell_flags, \ oper_phase0_##_oper_name(gbuf, mbuf, height, width, iy, ix, cell_flags, \
glyph_char); \ glyph_char); \
break; break;
#define SIM_EXPAND_DUAL_PHASE_1(_oper_name, _upper_oper_char, \ #define SIM_EXPAND_DUAL_PHASE_1(_upper_oper_char, _lower_oper_char, \
_lower_oper_char) \ _oper_name) \
case _upper_oper_char: \ case _upper_oper_char: \
case _lower_oper_char: \ case _lower_oper_char: \
oper_phase1_##_oper_name(gbuf, mbuf, height, width, iy, ix, glyph_char); \ oper_phase1_##_oper_name(gbuf, mbuf, height, width, iy, ix, glyph_char); \

Write Preview
Loading…
Cancel
Save