add macro parsing (but not yet expansion)