diff --git a/src/asm/lexer.cpp b/src/asm/lexer.cpp index 151dcc9b..8fd23faf 100644 --- a/src/asm/lexer.cpp +++ b/src/asm/lexer.cpp @@ -518,9 +518,7 @@ static uint32_t readDecimalNumber(int initial); static uint32_t readBracketedMacroArgNum() { bool disableExpansions = lexerState->disableExpansions; lexerState->disableExpansions = false; - Defer restoreExpansions{[&] { - lexerState->disableExpansions = disableExpansions; - }}; + Defer restoreExpansions{[&] { lexerState->disableExpansions = disableExpansions; }}; int32_t num = 0; int c = peek(); @@ -704,7 +702,7 @@ int LexerState::peekCharAhead() { } // Forward declarations for `peek` -static std::shared_ptr readInterpolation(size_t depth); +static std::pair> readInterpolation(size_t depth); static int peek() { int c = lexerState->peekChar(); @@ -739,8 +737,8 @@ static int peek() { } else if (c == '{') { // If character is an open brace, do symbol interpolation shiftChar(); - if (std::shared_ptr str = readInterpolation(0); str) { - beginExpansion(str, *str); + if (auto interp = readInterpolation(0); interp.first && interp.second) { + beginExpansion(interp.second, interp.first->name); } return peek(); // Tail recursion @@ -824,9 +822,7 @@ static void handleCRLF(int c) { static auto scopedDisableExpansions() { lexerState->disableExpansions = true; - return Defer{[&] { - lexerState->disableExpansions = false; - }}; + return Defer{[&] { lexerState->disableExpansions = false; }}; } // "Services" provided by the lexer to the rest of the program @@ -1219,7 +1215,7 @@ static Token readIdentifier(char firstChar, bool raw) { // Functions to read strings -static std::shared_ptr readInterpolation(size_t depth) { +static std::pair> readInterpolation(size_t depth) { if (depth > options.maxRecursionDepth) { fatal("Recursion limit (%zu) exceeded", options.maxRecursionDepth); } @@ -1231,8 +1227,8 @@ static std::shared_ptr readInterpolation(size_t depth) { // Use `consumeChar()` since `peek()` might expand nested interpolations and recursively // call `readInterpolation()`, which can cause stack overflow. if (consumeChar('{')) { - if (std::shared_ptr str = readInterpolation(depth + 1); str) { - beginExpansion(str, *str); + if (auto interp = readInterpolation(depth + 1); interp.first && interp.second) { + beginExpansion(interp.second, interp.first->name); } continue; // Restart, reading from the new buffer } else if (int c = peek(); c == EOF || c == '\r' || c == '\n' || c == '"') { @@ -1267,7 +1263,7 @@ static std::shared_ptr readInterpolation(size_t depth) { "symbol", fmtBuf.c_str() ); - return nullptr; + return {nullptr, nullptr}; } if (Symbol const *sym = sym_FindScopedValidSymbol(fmtBuf); !sym || !sym->isDefined()) { @@ -1276,18 +1272,19 @@ static std::shared_ptr readInterpolation(size_t depth) { } else { error("Interpolated symbol \"%s\" does not exist", fmtBuf.c_str()); } + return {sym, nullptr}; } else if (sym->type == SYM_EQUS) { auto buf = std::make_shared(); fmt.appendString(*buf, *sym->getEqus()); - return buf; + return {sym, buf}; } else if (sym->isNumeric()) { auto buf = std::make_shared(); fmt.appendNumber(*buf, sym->getConstantValue()); - return buf; + return {sym, buf}; } else { error("Interpolated symbol \"%s\" is not a numeric or string symbol", fmtBuf.c_str()); + return {sym, nullptr}; } - return nullptr; } static void appendExpandedString(std::string &str, std::string const &expanded) { @@ -1334,8 +1331,8 @@ static void appendCharInLiteral(std::string &str, int c) { if (c == '{') { // We'll be exiting the string/character scope, so re-enable expansions lexerState->disableExpansions = false; - if (std::shared_ptr interpolation = readInterpolation(0); interpolation) { - appendExpandedString(str, *interpolation); + if (auto interp = readInterpolation(0); interp.second) { + appendExpandedString(str, *interp.second); } lexerState->disableExpansions = true; return; diff --git a/test/asm/blue-paint.err b/test/asm/blue-paint.err index e603b804..ceba093f 100644 --- a/test/asm/blue-paint.err +++ b/test/asm/blue-paint.err @@ -14,10 +14,10 @@ error: blue-paint.asm(26) -> blue-paint.asm::endless(24): syntax error, unexpected number FATAL: blue-paint.asm(30): Recursion limit (5) exceeded -while expanding symbol "{infinite}" -while expanding symbol "{infinite}" -while expanding symbol "{infinite}" -while expanding symbol "{infinite}" -while expanding symbol "{infinite}" -while expanding symbol "{infinite}" -while expanding symbol "{infinite}" +while expanding symbol "infinite" +while expanding symbol "infinite" +while expanding symbol "infinite" +while expanding symbol "infinite" +while expanding symbol "infinite" +while expanding symbol "infinite" +while expanding symbol "infinite" diff --git a/test/asm/fixed-point-magnitude.err b/test/asm/fixed-point-magnitude.err index 7871ddbf..b9de5bd5 100644 --- a/test/asm/fixed-point-magnitude.err +++ b/test/asm/fixed-point-magnitude.err @@ -1,183 +1,183 @@ warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~1(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = -2147483648.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~2(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 1073741824.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~2(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 1073741866.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~3(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 536870912.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~3(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 536870954.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~4(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 268435456.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~4(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 268435498.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~5(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 134217728.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~5(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 134217770.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~6(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 67108864.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~6(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 67108906.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~7(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 33554432.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~7(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 33554474.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~8(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 16777216.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~8(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 16777258.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~9(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 8388608.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~9(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 8388650.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~10(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 4194304.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~10(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 4194346.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~11(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 2097152.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~11(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 2097194.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~12(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 1048576.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~12(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 1048618.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~13(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 524288.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~13(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 524330.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~14(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 262144.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~14(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 262186.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~15(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 131072.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~15(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 131114.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~16(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 65536.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~16(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 65578.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~17(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 32768.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~17(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 32810.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~18(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 16384.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~18(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 16426.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~19(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 8192.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~19(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 8234.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~20(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 4096.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~20(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 4138.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~21(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 2048.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~21(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 2090.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~22(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 1024.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~22(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 1066.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~23(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 512.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~23(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 554.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~24(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 256.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~24(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 298.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~25(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 128.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~25(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 170.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~26(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 64.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~26(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 106.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~27(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 32.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~27(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 74.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~28(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 16.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~28(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 58.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~29(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 8.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~29(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 50.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~30(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 4.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~30(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 46.0" +while expanding symbol "defWorseValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~31(12): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def minBadValue = 2.0" +while expanding symbol "defMinBadValue" warning: fixed-point-magnitude.asm(1) -> fixed-point-magnitude.asm::REPT~31(17): [-Wlarge-constant] Magnitude of fixed-point constant is too large -while expanding symbol "def worseValue = 44.0" +while expanding symbol "defWorseValue" diff --git a/test/asm/interpolation-after-string.asm b/test/asm/interpolation-after-string.asm index 7599627c..372f6341 100644 --- a/test/asm/interpolation-after-string.asm +++ b/test/asm/interpolation-after-string.asm @@ -5,4 +5,4 @@ def greeting equs "hello" println ""{greeting} def string equs "\"goodbye\"" -println ""{goodbye}"" +println ""{string}"" diff --git a/test/asm/interpolation-after-string.err b/test/asm/interpolation-after-string.err index 187d35a0..478508cf 100644 --- a/test/asm/interpolation-after-string.err +++ b/test/asm/interpolation-after-string.err @@ -1,8 +1,7 @@ error: interpolation-after-string.asm(5): syntax error, unexpected symbol -while expanding symbol "hello" -error: interpolation-after-string.asm(8): - Interpolated symbol "goodbye" does not exist +while expanding symbol "greeting" error: interpolation-after-string.asm(8): syntax error, unexpected string -Assembly aborted with 3 errors! +while expanding symbol "string" +Assembly aborted with 2 errors! diff --git a/test/asm/interpolation-overflow.err b/test/asm/interpolation-overflow.err index 5b8bf1c2..e48164ed 100644 --- a/test/asm/interpolation-overflow.err +++ b/test/asm/interpolation-overflow.err @@ -2,7 +2,7 @@ error: interpolation-overflow.asm(4): Fractional width 99999999 too long, limiting to 255 warning: interpolation-overflow.asm(4): [-Wlarge-constant] Precision of fixed-point constant is too large -while expanding symbol "0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" +while expanding symbol "x" error: interpolation-overflow.asm(4): '\1' cannot be used outside of a macro error: interpolation-overflow.asm(4): diff --git a/test/asm/interpolation-recursion.err b/test/asm/interpolation-recursion.err index 5f3c7a25..4e607f7e 100644 --- a/test/asm/interpolation-recursion.err +++ b/test/asm/interpolation-recursion.err @@ -1,68 +1,68 @@ FATAL: interpolation-recursion.asm(2): Recursion limit (64) exceeded -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" -while expanding symbol "{recurse}" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" +while expanding symbol "recurse" diff --git a/test/asm/negative-macro-args.err b/test/asm/negative-macro-args.err index 8bed3357..ce7b5410 100644 --- a/test/asm/negative-macro-args.err +++ b/test/asm/negative-macro-args.err @@ -14,13 +14,13 @@ error: negative-macro-args.asm(21) -> negative-macro-args.asm::mac(14): Macro argument '\<-2147483648>' not defined error: negative-macro-args.asm(21) -> negative-macro-args.asm::mac(14): Number in bracketed macro argument is too large -while expanding symbol "-2147483648" +while expanding symbol "i" error: negative-macro-args.asm(21) -> negative-macro-args.asm::mac(15): Macro argument '\<-2147483648>' not defined error: negative-macro-args.asm(21) -> negative-macro-args.asm::mac(15): Number in bracketed macro argument is too large -while expanding symbol "2147483648" +while expanding symbol "i" error: negative-macro-args.asm(21) -> negative-macro-args.asm::mac(18): Number in bracketed macro argument is too large -while expanding symbol "4294967295" +while expanding symbol "i" Assembly aborted with 11 errors!