add - parsing for "DEF" command
mod - add member to track macro state
mod - use class state for error handling