Add production for function-definer macro

Fix #13
else and elseif are not NONDEFINING_BEGIN_WORDs

Fix #12