@@ -425,7 +425,8 @@ doMacros' n inp = do
425 getargs argmap rest
425 getargs argmap rest
426 getargs argmap (ArgNum i : Pattern toks : rest) =
426 getargs argmap (ArgNum i : Pattern toks : rest) =
428+ x <- mconcat <$> manyTill (braced <|> ((:[]) <$> anyTok))
428− x <- mconcat <$> manyTill bracedOrToken (matchPattern toks)
429+ (matchPattern toks)
429 getargs (M.insert i x argmap) rest
430 getargs (M.insert i x argmap) rest
430 getargs argmap (ArgNum i : rest) = do
431 getargs argmap (ArgNum i : rest) = do
431 x <- try $ spaces >> bracedOrToken
432 x <- try $ spaces >> bracedOrToken