diff --git a/CHANGES b/CHANGES index 0dc9cc30d..72392d87b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +1.10.0-dev.129 | 2024-01-23 17:48:19 +0100 + + * Adjust end of Bison-generated locations. (Robin Sommer, Corelight) + + The Bison-side end column points one beyond the element, which isn't + that nice in error messages, so we adjust them now. + + * Extend location printing to include single-line ranges. (Robin Sommer, Corelight) + + For a location of, e.g., "line 1, column 5 to 10", we now print + `1:5-10`, whereas we used to print it as only `1:5`, hence dropping + information. + + * Fix Bison locations. (Robin Sommer, Corelight) + + If a Bison rule started with an optional element, its location would + start at the end of the *previous* token if that optional element + wasn't present. We now skip token locations that are zero-sized at the + beginning of a rule. + 1.10.0-dev.125 | 2024-01-23 16:27:43 +0100 * Bump 3rdparty/any from `e88b1bf` to `7c76129` diff --git a/VERSION b/VERSION index 3d49c8b46..acab0c8b6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.0-dev.125 +1.10.0-dev.129 diff --git a/hilti/toolchain/src/ast/location.cc b/hilti/toolchain/src/ast/location.cc index 4ea648359..91c94d7ec 100644 --- a/hilti/toolchain/src/ast/location.cc +++ b/hilti/toolchain/src/ast/location.cc @@ -18,7 +18,7 @@ std::string Location::render(bool no_path) const { else lines = util::fmt(":%d", _from_line); - if ( _to_line >= 0 && _to_line != _from_line ) { + if ( _to_line >= 0 ) { if ( _to_character >= 0 ) lines += util::fmt("-%d:%d", _to_line, _to_character); else diff --git a/hilti/toolchain/src/compiler/parser/parser.yy b/hilti/toolchain/src/compiler/parser/parser.yy index aad822a2d..45821e8de 100644 --- a/hilti/toolchain/src/compiler/parser/parser.yy +++ b/hilti/toolchain/src/compiler/parser/parser.yy @@ -44,7 +44,8 @@ namespace hilti { namespace detail { class Parser; } } #define yylex driver->scanner()->lex static hilti::Meta toMeta(hilti::detail::parser::location l) { - return hilti::Meta(hilti::Location(*l.begin.filename, l.begin.line, l.end.line, l.begin.column, l.end.column)); + return hilti::Meta(hilti::Location(*l.begin.filename, l.begin.line, l.end.line, l.begin.column, + (l.end.column > 0 ? l.end.column - 1 : 0))); } static hilti::Type iteratorForType(hilti::Type t, bool const_, hilti::Meta m) { @@ -67,6 +68,22 @@ static hilti::Type viewForType(hilti::Type t, hilti::Meta m) { #define __loc__ toMeta(yylhs.location) +#define YYLLOC_DEFAULT(Current, Rhs, N) \ +do { \ + bool done = false; \ + for ( int i = 1; i <= N; i++ ) { \ + if ( YYRHSLOC(Rhs, i).begin.line != YYRHSLOC(Rhs, i).end.line || \ + YYRHSLOC(Rhs, i).begin.column != YYRHSLOC(Rhs, i).end.column ) { \ + (Current).begin = YYRHSLOC(Rhs, i).begin; \ + (Current).end = YYRHSLOC(Rhs, N).end; \ + done = true; \ + break; \ + } \ + } \ + if ( ! done ) \ + (Current).begin = (Current).end = YYRHSLOC(Rhs, 0).end; \ +} while ( false ) + static int _field_width = 0; %} diff --git a/spicy/toolchain/src/compiler/parser/parser.yy b/spicy/toolchain/src/compiler/parser/parser.yy index 9c24c6fe7..f63973ca1 100644 --- a/spicy/toolchain/src/compiler/parser/parser.yy +++ b/spicy/toolchain/src/compiler/parser/parser.yy @@ -45,7 +45,8 @@ namespace spicy { namespace detail { class Parser; } } #define yylex driver->scanner()->lex static hilti::Meta toMeta(spicy::detail::parser::location l) { - return hilti::Meta(hilti::Location(*l.begin.filename, l.begin.line, l.end.line, l.begin.column, l.end.column)); + return hilti::Meta(hilti::Location(*l.begin.filename, l.begin.line, l.end.line, l.begin.column, + (l.end.column > 0 ? l.end.column - 1 : 0))); } static hilti::Type iteratorForType(hilti::Type t, bool const_, hilti::Meta m) { @@ -87,6 +88,22 @@ static uint64_t check_int64_range(uint64_t x, bool positive, const hilti::Meta& #define __loc__ toMeta(yylhs.location) +#define YYLLOC_DEFAULT(Current, Rhs, N) \ +do { \ + bool done = false; \ + for ( int i = 1; i <= N; i++ ) { \ + if ( YYRHSLOC(Rhs, i).begin.line != YYRHSLOC(Rhs, i).end.line || \ + YYRHSLOC(Rhs, i).begin.column != YYRHSLOC(Rhs, i).end.column ) { \ + (Current).begin = YYRHSLOC(Rhs, i).begin; \ + (Current).end = YYRHSLOC(Rhs, N).end; \ + done = true; \ + break; \ + } \ + } \ + if ( ! done ) \ + (Current).begin = (Current).end = YYRHSLOC(Rhs, 0).end; \ +} while ( false ) + static int _field_width = 0; // We keep a stack of doc strings here that's maintained during parsing. There diff --git a/tests/Baseline/hilti.ast.basic-module/output b/tests/Baseline/hilti.ast.basic-module/output index 0f409d754..ad7a9444f 100644 --- a/tests/Baseline/hilti.ast.basic-module/output +++ b/tests/Baseline/hilti.ast.basic-module/output @@ -17,30 +17,30 @@ [debug/compiler] [HILTI] coercing nodes in module Foo [debug/compiler] [HILTI] resolving nodes in module Foo [debug/ast-final] # [HILTI] Foo: Final AST (round 1) -[debug/ast-final] - Module %4 (basic-module.hlt:5:1-11:2) [@m:XXX] +[debug/ast-final] - Module %4 (basic-module.hlt:5:1-11:1) [@m:XXX] [debug/ast-final] | Foo -> declaration::Module %6 [canon-id: Foo] [@d:XXX] ([@d:XXX]) [debug/ast-final] | X -> declaration::Type %1 [canon-id: Foo::X] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | foo -> declaration::Function %2 [canon-id: Foo::foo] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - ID (basic-module.hlt:5:8) [@i:XXX] -[debug/ast-final] - statement::Block (basic-module.hlt:5:1-11:2) [@s:XXX] -[debug/ast-final] - declaration::Type %1 (basic-module.hlt:5:13-7:15) [canon-id: Foo::X] (resolved) [@d:XXX] -[debug/ast-final] - ID (basic-module.hlt:7:6) [@i:XXX] -[debug/ast-final] - type::Bool (basic-module.hlt:7:10) (const) (type-id: Foo::X) (resolved) [@t:XXX] -[debug/ast-final] - node::None (basic-module.hlt:5:13-7:15) [@n:XXX] -[debug/ast-final] - declaration::Function %2 (basic-module.hlt:9:1) [canon-id: Foo::foo] [@d:XXX] +[debug/ast-final] - ID (basic-module.hlt:5:8-5:10) [@i:XXX] +[debug/ast-final] - statement::Block (basic-module.hlt:5:1-11:1) [@s:XXX] +[debug/ast-final] - declaration::Type %1 (basic-module.hlt:7:1-7:14) [canon-id: Foo::X] (resolved) [@d:XXX] +[debug/ast-final] - ID (basic-module.hlt:7:6-7:6) [@i:XXX] +[debug/ast-final] - type::Bool (basic-module.hlt:7:10-7:13) (const) (type-id: Foo::X) (resolved) [@t:XXX] +[debug/ast-final] - node::None (basic-module.hlt:7:1-7:14) [@n:XXX] +[debug/ast-final] - declaration::Function %2 (basic-module.hlt:9:1-9:29) [canon-id: Foo::foo] [@d:XXX] [debug/ast-final] | bar -> declaration::Parameter %3 [canon-id: Foo::foo::bar] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - Function "> (basic-module.hlt:9:8) [@f:XXX] -[debug/ast-final] - ID (basic-module.hlt:9:16) [@i:XXX] -[debug/ast-final] - type::Function (basic-module.hlt:9:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::function::Result (basic-module.hlt:9:9) [@t:XXX] -[debug/ast-final] - type::String (basic-module.hlt:9:9) (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::Parameter %3 (basic-module.hlt:9:20) [canon-id: Foo::foo::bar] [@d:XXX] -[debug/ast-final] - ID (basic-module.hlt:9:25) [@i:XXX] -[debug/ast-final] - type::Real (basic-module.hlt:9:20) (const) (resolved) [@t:XXX] -[debug/ast-final] - node::None (basic-module.hlt:5:13-7:15) [@n:XXX] -[debug/ast-final] - node::None (basic-module.hlt:5:13-7:15) [@n:XXX] -[debug/ast-final] - node::None (basic-module.hlt:5:13-7:15) [@n:XXX] -[debug/ast-final] - node::None (basic-module.hlt:5:13-7:15) [@n:XXX] +[debug/ast-final] - Function "> (basic-module.hlt:9:9-9:28) [@f:XXX] +[debug/ast-final] - ID (basic-module.hlt:9:16-9:18) [@i:XXX] +[debug/ast-final] - type::Function (basic-module.hlt:9:9-9:28) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::function::Result (basic-module.hlt:9:9-9:14) [@t:XXX] +[debug/ast-final] - type::String (basic-module.hlt:9:9-9:14) (const) (resolved) [@t:XXX] +[debug/ast-final] - declaration::Parameter %3 (basic-module.hlt:9:20-9:27) [canon-id: Foo::foo::bar] [@d:XXX] +[debug/ast-final] - ID (basic-module.hlt:9:25-9:27) [@i:XXX] +[debug/ast-final] - type::Real (basic-module.hlt:9:20-9:23) (const) (resolved) [@t:XXX] +[debug/ast-final] - node::None (basic-module.hlt:7:1-7:14) [@n:XXX] +[debug/ast-final] - node::None (basic-module.hlt:7:1-7:14) [@n:XXX] +[debug/ast-final] - node::None (basic-module.hlt:7:1-7:14) [@n:XXX] +[debug/ast-final] - node::None (basic-module.hlt:7:1-7:14) [@n:XXX] [debug/compiler] [HILTI] validating module Foo (post) [debug/compiler] finalized module Foo [debug/compiler] compiling module Foo to C++ diff --git a/tests/Baseline/hilti.ast.coercion/output b/tests/Baseline/hilti.ast.coercion/output index 558517465..d265698f9 100644 --- a/tests/Baseline/hilti.ast.coercion/output +++ b/tests/Baseline/hilti.ast.coercion/output @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. [debug/ast-final] # [HILTI] Foo: Final AST (round 2) -[debug/ast-final] - Module %10 (coercion.hlt:5:1-31:2) [@m:XXX] +[debug/ast-final] - Module %10 (coercion.hlt:5:1-31:1) [@m:XXX] [debug/ast-final] | A -> declaration::GlobalVariable %1 [canon-id: Foo::A] [@d:XXX] ([@d:XXX]) [debug/ast-final] | B -> declaration::GlobalVariable %2 [canon-id: Foo::B] [@d:XXX] ([@d:XXX]) [debug/ast-final] | C -> declaration::GlobalVariable %3 [canon-id: Foo::C] [@d:XXX] ([@d:XXX]) @@ -11,163 +11,163 @@ [debug/ast-final] | y -> declaration::Function %6 [canon-id: Foo::y] [@d:XXX] ([@d:XXX]) [debug/ast-final] | z -> declaration::Function %7 [canon-id: Foo::z] [@d:XXX] ([@d:XXX]) [debug/ast-final] | z2 -> declaration::Function %8 [canon-id: Foo::z2] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - ID (coercion.hlt:5:8) [@i:XXX] -[debug/ast-final] - statement::Block (coercion.hlt:5:1-31:2) [@s:XXX] -[debug/ast-final] - declaration::GlobalVariable %1 (coercion.hlt:5:13-7:19) [canon-id: Foo::A] [@d:XXX] -[debug/ast-final] - ID (coercion.hlt:7:13) [@i:XXX] -[debug/ast-final] - type::Real (coercion.hlt:7:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:7:17) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Coerced (coercion.hlt:7:17) [@c:XXX] -[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:7:17) [@c:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:7:17) (const) (resolved) [@t:XXX] -[debug/ast-final] - ctor::Real (coercion.hlt:7:17) [@c:XXX] +[debug/ast-final] - ID (coercion.hlt:5:8-5:10) [@i:XXX] +[debug/ast-final] - statement::Block (coercion.hlt:5:1-31:1) [@s:XXX] +[debug/ast-final] - declaration::GlobalVariable %1 (coercion.hlt:7:1-7:18) [canon-id: Foo::A] [@d:XXX] +[debug/ast-final] - ID (coercion.hlt:7:13-7:13) [@i:XXX] +[debug/ast-final] - type::Real (coercion.hlt:7:8-7:11) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:7:17-7:17) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Coerced (coercion.hlt:7:17-7:17) [@c:XXX] +[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:7:17-7:17) [@c:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:7:17-7:17) (const) (resolved) [@t:XXX] +[debug/ast-final] - ctor::Real (coercion.hlt:7:17-7:17) [@c:XXX] [debug/ast-final] - type::Real (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::GlobalVariable %2 (coercion.hlt:7:19-8:20) [canon-id: Foo::B] [@d:XXX] -[debug/ast-final] - ID (coercion.hlt:8:13) [@i:XXX] -[debug/ast-final] - type::Real (coercion.hlt:8:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:8:17) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Coerced (coercion.hlt:8:17) [@c:XXX] -[debug/ast-final] - ctor::SignedInteger (coercion.hlt:8:17) [@c:XXX] -[debug/ast-final] - type::SignedInteger (coercion.hlt:8:17) (const) (resolved) [@t:XXX] -[debug/ast-final] - ctor::Real (coercion.hlt:8:17) [@c:XXX] +[debug/ast-final] - declaration::GlobalVariable %2 (coercion.hlt:8:1-8:19) [canon-id: Foo::B] [@d:XXX] +[debug/ast-final] - ID (coercion.hlt:8:13-8:13) [@i:XXX] +[debug/ast-final] - type::Real (coercion.hlt:8:8-8:11) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:8:17-8:18) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Coerced (coercion.hlt:8:17-8:18) [@c:XXX] +[debug/ast-final] - ctor::SignedInteger (coercion.hlt:8:17-8:18) [@c:XXX] +[debug/ast-final] - type::SignedInteger (coercion.hlt:8:17-8:18) (const) (resolved) [@t:XXX] +[debug/ast-final] - ctor::Real (coercion.hlt:8:17-8:18) [@c:XXX] [debug/ast-final] - type::Real (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::GlobalVariable %3 (coercion.hlt:8:20-9:24) [canon-id: Foo::C] [@d:XXX] -[debug/ast-final] - ID (coercion.hlt:9:15) [@i:XXX] -[debug/ast-final] - type::Stream (coercion.hlt:9:8) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::stream::View (coercion.hlt:9:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::stream::Iterator (coercion.hlt:9:8) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:9:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Coerced (coercion.hlt:9:19) (non-const) (resolved) [@e:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:9:19) (non-const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Bytes (coercion.hlt:9:19) [@c:XXX] -[debug/ast-final] - type::Bytes (coercion.hlt:9:19) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:9:19) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::bytes::Iterator (coercion.hlt:9:19) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:9:19) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::Stream (coercion.hlt:9:8) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::stream::View (coercion.hlt:9:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::stream::Iterator (coercion.hlt:9:8) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:9:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::GlobalVariable %4 (coercion.hlt:9:24-10:24) [canon-id: Foo::D] [@d:XXX] -[debug/ast-final] - ID (coercion.hlt:10:15) [@i:XXX] -[debug/ast-final] - type::String (coercion.hlt:10:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:10:19) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::String (coercion.hlt:10:19) [@c:XXX] -[debug/ast-final] - type::String (coercion.hlt:10:19) (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::Function %5 (coercion.hlt:10:24-14:2) [canon-id: Foo::x] [@d:XXX] -[debug/ast-final] - Function "> (coercion.hlt:12:9-14:2) [@f:XXX] -[debug/ast-final] - ID (coercion.hlt:12:15) [@i:XXX] -[debug/ast-final] - type::Function (coercion.hlt:12:9-14:2) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::function::Result (coercion.hlt:12:10) [@t:XXX] -[debug/ast-final] - type::Bool (coercion.hlt:12:10) (const) (resolved) [@t:XXX] -[debug/ast-final] - statement::Block (coercion.hlt:12:19-14:2) [@s:XXX] -[debug/ast-final] - statement::Return (coercion.hlt:13:5) [@s:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:13:12) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Bool (coercion.hlt:13:12) [@c:XXX] -[debug/ast-final] - type::Bool (coercion.hlt:13:12) (const) (resolved) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - declaration::Function %6 (coercion.hlt:14:2-18:2) [canon-id: Foo::y] [@d:XXX] -[debug/ast-final] - Function "> (coercion.hlt:16:9-18:2) [@f:XXX] -[debug/ast-final] - ID (coercion.hlt:16:15) [@i:XXX] -[debug/ast-final] - type::Function (coercion.hlt:16:9-18:2) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::function::Result (coercion.hlt:16:10) [@t:XXX] -[debug/ast-final] - type::Real (coercion.hlt:16:10) (const) (resolved) [@t:XXX] -[debug/ast-final] - statement::Block (coercion.hlt:16:19-18:2) [@s:XXX] -[debug/ast-final] - statement::Return (coercion.hlt:17:5) [@s:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:17:12) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Coerced (coercion.hlt:17:12) [@c:XXX] -[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:17:12) [@c:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:17:12) (const) (resolved) [@t:XXX] -[debug/ast-final] - ctor::Real (coercion.hlt:17:12) [@c:XXX] +[debug/ast-final] - declaration::GlobalVariable %3 (coercion.hlt:9:1-9:23) [canon-id: Foo::C] [@d:XXX] +[debug/ast-final] - ID (coercion.hlt:9:15-9:15) [@i:XXX] +[debug/ast-final] - type::Stream (coercion.hlt:9:8-9:13) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::stream::View (coercion.hlt:9:8-9:13) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::stream::Iterator (coercion.hlt:9:8-9:13) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:9:8-9:13) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Coerced (coercion.hlt:9:19-9:22) (non-const) (resolved) [@e:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:9:19-9:22) (non-const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Bytes (coercion.hlt:9:19-9:22) [@c:XXX] +[debug/ast-final] - type::Bytes (coercion.hlt:9:19-9:22) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:9:19-9:22) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::bytes::Iterator (coercion.hlt:9:19-9:22) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:9:19-9:22) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::Stream (coercion.hlt:9:8-9:13) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::stream::View (coercion.hlt:9:8-9:13) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::stream::Iterator (coercion.hlt:9:8-9:13) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:9:8-9:13) (const) (resolved) [@t:XXX] +[debug/ast-final] - declaration::GlobalVariable %4 (coercion.hlt:10:1-10:23) [canon-id: Foo::D] [@d:XXX] +[debug/ast-final] - ID (coercion.hlt:10:15-10:15) [@i:XXX] +[debug/ast-final] - type::String (coercion.hlt:10:8-10:13) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:10:19-10:22) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::String (coercion.hlt:10:19-10:22) [@c:XXX] +[debug/ast-final] - type::String (coercion.hlt:10:19-10:22) (const) (resolved) [@t:XXX] +[debug/ast-final] - declaration::Function %5 (coercion.hlt:12:1-14:1) [canon-id: Foo::x] [@d:XXX] +[debug/ast-final] - Function "> (coercion.hlt:12:10-14:1) [@f:XXX] +[debug/ast-final] - ID (coercion.hlt:12:15-12:15) [@i:XXX] +[debug/ast-final] - type::Function (coercion.hlt:12:10-14:1) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::function::Result (coercion.hlt:12:10-12:13) [@t:XXX] +[debug/ast-final] - type::Bool (coercion.hlt:12:10-12:13) (const) (resolved) [@t:XXX] +[debug/ast-final] - statement::Block (coercion.hlt:12:19-14:1) [@s:XXX] +[debug/ast-final] - statement::Return (coercion.hlt:13:5-13:16) [@s:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:13:12-13:15) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Bool (coercion.hlt:13:12-13:15) [@c:XXX] +[debug/ast-final] - type::Bool (coercion.hlt:13:12-13:15) (const) (resolved) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - declaration::Function %6 (coercion.hlt:16:1-18:1) [canon-id: Foo::y] [@d:XXX] +[debug/ast-final] - Function "> (coercion.hlt:16:10-18:1) [@f:XXX] +[debug/ast-final] - ID (coercion.hlt:16:15-16:15) [@i:XXX] +[debug/ast-final] - type::Function (coercion.hlt:16:10-18:1) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::function::Result (coercion.hlt:16:10-16:13) [@t:XXX] +[debug/ast-final] - type::Real (coercion.hlt:16:10-16:13) (const) (resolved) [@t:XXX] +[debug/ast-final] - statement::Block (coercion.hlt:16:19-18:1) [@s:XXX] +[debug/ast-final] - statement::Return (coercion.hlt:17:5-17:13) [@s:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:17:12-17:12) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Coerced (coercion.hlt:17:12-17:12) [@c:XXX] +[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:17:12-17:12) [@c:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:17:12-17:12) (const) (resolved) [@t:XXX] +[debug/ast-final] - ctor::Real (coercion.hlt:17:12-17:12) [@c:XXX] [debug/ast-final] - type::Real (const) (resolved) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - declaration::Function %7 (coercion.hlt:18:2-22:2) [canon-id: Foo::z] [@d:XXX] -[debug/ast-final] - Function "> (coercion.hlt:20:9-22:2) [@f:XXX] -[debug/ast-final] - ID (coercion.hlt:20:23) [@i:XXX] -[debug/ast-final] - type::Function (coercion.hlt:20:9-22:2) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::function::Result (coercion.hlt:20:10) [@t:XXX] -[debug/ast-final] - type::stream::View (coercion.hlt:20:15) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::stream::Iterator (coercion.hlt:20:15) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:20:15) (const) (resolved) [@t:XXX] -[debug/ast-final] - statement::Block (coercion.hlt:20:27-22:2) [@s:XXX] -[debug/ast-final] - statement::Return (coercion.hlt:21:5) [@s:XXX] -[debug/ast-final] - expression::Coerced (coercion.hlt:21:12) (non-const) (resolved) [@e:XXX] -[debug/ast-final] - expression::ResolvedID (type: stream [@t:XXX]) (coercion.hlt:21:12) (non-const) (resolved) [@e:XXX] -[debug/ast-final] - ID (coercion.hlt:21:12) [@i:XXX] -[debug/ast-final] - type::stream::View (coercion.hlt:20:15) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::stream::Iterator (coercion.hlt:20:15) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:20:15) (const) (resolved) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - declaration::Function %8 (coercion.hlt:22:2-26:2) [canon-id: Foo::z2] [@d:XXX] -[debug/ast-final] - Function "> (coercion.hlt:24:9-26:2) [@f:XXX] -[debug/ast-final] - ID (coercion.hlt:24:15) [@i:XXX] -[debug/ast-final] - type::Function (coercion.hlt:24:9-26:2) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::function::Result (coercion.hlt:24:10) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - declaration::Function %7 (coercion.hlt:20:1-22:1) [canon-id: Foo::z] [@d:XXX] +[debug/ast-final] - Function "> (coercion.hlt:20:10-22:1) [@f:XXX] +[debug/ast-final] - ID (coercion.hlt:20:23-20:23) [@i:XXX] +[debug/ast-final] - type::Function (coercion.hlt:20:10-22:1) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::function::Result (coercion.hlt:20:10-20:21) [@t:XXX] +[debug/ast-final] - type::stream::View (coercion.hlt:20:15-20:20) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::stream::Iterator (coercion.hlt:20:15-20:20) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:20:15-20:20) (const) (resolved) [@t:XXX] +[debug/ast-final] - statement::Block (coercion.hlt:20:27-22:1) [@s:XXX] +[debug/ast-final] - statement::Return (coercion.hlt:21:5-21:13) [@s:XXX] +[debug/ast-final] - expression::Coerced (coercion.hlt:21:12-21:12) (non-const) (resolved) [@e:XXX] +[debug/ast-final] - expression::ResolvedID (type: stream [@t:XXX]) (coercion.hlt:21:12-21:12) (non-const) (resolved) [@e:XXX] +[debug/ast-final] - ID (coercion.hlt:21:12-21:12) [@i:XXX] +[debug/ast-final] - type::stream::View (coercion.hlt:20:15-20:20) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::stream::Iterator (coercion.hlt:20:15-20:20) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:20:15-20:20) (const) (resolved) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - declaration::Function %8 (coercion.hlt:24:1-26:1) [canon-id: Foo::z2] [@d:XXX] +[debug/ast-final] - Function "> (coercion.hlt:24:10-26:1) [@f:XXX] +[debug/ast-final] - ID (coercion.hlt:24:15-24:16) [@i:XXX] +[debug/ast-final] - type::Function (coercion.hlt:24:10-26:1) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::function::Result (coercion.hlt:24:10-24:13) [@t:XXX] [debug/ast-final] - type::Void () (const) (resolved) [@t:XXX] -[debug/ast-final] - statement::Block (coercion.hlt:24:20-26:2) [@s:XXX] -[debug/ast-final] - statement::Return (coercion.hlt:25:5) [@s:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - declaration::GlobalVariable %9 (coercion.hlt:26:2-28:55) [canon-id: Foo::E] [@d:XXX] -[debug/ast-final] - ID (coercion.hlt:28:37) [@i:XXX] -[debug/ast-final] - type::Tuple (coercion.hlt:28:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (coercion.hlt:28:14) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - type::Real (coercion.hlt:28:14) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (coercion.hlt:28:20) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - type::SignedInteger (coercion.hlt:28:20) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (coercion.hlt:28:29) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - type::String (coercion.hlt:28:29) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:28:41) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Coerced (coercion.hlt:28:41) [@c:XXX] -[debug/ast-final] - ctor::Tuple (coercion.hlt:28:41) [@c:XXX] -[debug/ast-final] - type::Tuple (coercion.hlt:28:41) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (coercion.hlt:28:42) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:42) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (coercion.hlt:28:45) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:45) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (coercion.hlt:28:48) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - type::String (coercion.hlt:28:48) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:28:42) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:28:42) [@c:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:42) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:28:45) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:28:45) [@c:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:45) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:28:48) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::String (coercion.hlt:28:48) [@c:XXX] -[debug/ast-final] - type::String (coercion.hlt:28:48) (const) (resolved) [@t:XXX] -[debug/ast-final] - ctor::Tuple (coercion.hlt:28:41) [@c:XXX] -[debug/ast-final] - type::Tuple (coercion.hlt:28:41) (const) (resolved) [@t:XXX] +[debug/ast-final] - statement::Block (coercion.hlt:24:20-26:1) [@s:XXX] +[debug/ast-final] - statement::Return (coercion.hlt:25:5-25:11) [@s:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - declaration::GlobalVariable %9 (coercion.hlt:28:1-28:54) [canon-id: Foo::E] [@d:XXX] +[debug/ast-final] - ID (coercion.hlt:28:37-28:37) [@i:XXX] +[debug/ast-final] - type::Tuple (coercion.hlt:28:8-28:35) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (coercion.hlt:28:14-28:17) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - type::Real (coercion.hlt:28:14-28:17) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (coercion.hlt:28:20-28:26) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - type::SignedInteger (coercion.hlt:28:20-28:26) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (coercion.hlt:28:29-28:34) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - type::String (coercion.hlt:28:29-28:34) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:28:41-28:53) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Coerced (coercion.hlt:28:41-28:53) [@c:XXX] +[debug/ast-final] - ctor::Tuple (coercion.hlt:28:41-28:53) [@c:XXX] +[debug/ast-final] - type::Tuple (coercion.hlt:28:41-28:53) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (coercion.hlt:28:42-28:42) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:42-28:42) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (coercion.hlt:28:45-28:45) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:45-28:45) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (coercion.hlt:28:48-28:52) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - type::String (coercion.hlt:28:48-28:52) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:28:42-28:42) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:28:42-28:42) [@c:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:42-28:42) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:28:45-28:45) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:28:45-28:45) [@c:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:45-28:45) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:28:48-28:52) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::String (coercion.hlt:28:48-28:52) [@c:XXX] +[debug/ast-final] - type::String (coercion.hlt:28:48-28:52) (const) (resolved) [@t:XXX] +[debug/ast-final] - ctor::Tuple (coercion.hlt:28:41-28:53) [@c:XXX] +[debug/ast-final] - type::Tuple (coercion.hlt:28:41-28:53) (const) (resolved) [@t:XXX] [debug/ast-final] - type::tuple::Element [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] [debug/ast-final] - type::Real (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (coercion.hlt:28:45) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - type::SignedInteger (coercion.hlt:28:45) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (coercion.hlt:28:48) [@t:XXX] -[debug/ast-final] - node::None (coercion.hlt:12:9-14:2) [@n:XXX] -[debug/ast-final] - type::String (coercion.hlt:28:48) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:28:42) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Coerced (coercion.hlt:28:42) [@c:XXX] -[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:28:42) [@c:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:42) (const) (resolved) [@t:XXX] -[debug/ast-final] - ctor::Real (coercion.hlt:28:42) [@c:XXX] +[debug/ast-final] - type::tuple::Element (coercion.hlt:28:45-28:45) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - type::SignedInteger (coercion.hlt:28:45-28:45) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (coercion.hlt:28:48-28:52) [@t:XXX] +[debug/ast-final] - node::None (coercion.hlt:12:10-14:1) [@n:XXX] +[debug/ast-final] - type::String (coercion.hlt:28:48-28:52) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:28:42-28:42) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Coerced (coercion.hlt:28:42-28:42) [@c:XXX] +[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:28:42-28:42) [@c:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:42-28:42) (const) (resolved) [@t:XXX] +[debug/ast-final] - ctor::Real (coercion.hlt:28:42-28:42) [@c:XXX] [debug/ast-final] - type::Real (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:28:45) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Coerced (coercion.hlt:28:45) [@c:XXX] -[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:28:45) [@c:XXX] -[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:45) (const) (resolved) [@t:XXX] -[debug/ast-final] - ctor::SignedInteger (coercion.hlt:28:45) [@c:XXX] -[debug/ast-final] - type::SignedInteger (coercion.hlt:28:45) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (coercion.hlt:28:48) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::String (coercion.hlt:28:48) [@c:XXX] -[debug/ast-final] - type::String (coercion.hlt:28:48) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:28:45-28:45) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Coerced (coercion.hlt:28:45-28:45) [@c:XXX] +[debug/ast-final] - ctor::UnsignedInteger (coercion.hlt:28:45-28:45) [@c:XXX] +[debug/ast-final] - type::UnsignedInteger (coercion.hlt:28:45-28:45) (const) (resolved) [@t:XXX] +[debug/ast-final] - ctor::SignedInteger (coercion.hlt:28:45-28:45) [@c:XXX] +[debug/ast-final] - type::SignedInteger (coercion.hlt:28:45-28:45) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (coercion.hlt:28:48-28:52) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::String (coercion.hlt:28:48-28:52) [@c:XXX] +[debug/ast-final] - type::String (coercion.hlt:28:48-28:52) (const) (resolved) [@t:XXX] module Foo { global real A = 3; diff --git a/tests/Baseline/hilti.ast.imported-id/output b/tests/Baseline/hilti.ast.imported-id/output index e2a2ec785..c6a351a43 100644 --- a/tests/Baseline/hilti.ast.imported-id/output +++ b/tests/Baseline/hilti.ast.imported-id/output @@ -11,10 +11,10 @@ [debug/compiler] [HILTI] resolving nodes in module Foo [debug/compiler] parsing file "./bar.hlt" as HILTI code [debug/compiler] registering ".hlt" AST for module Bar ("<...>//bar.hlt") -[debug/resolver] [hilti::declaration::ImportedModule] import Bar; -> imported (foo.hlt:4:1) -[debug/resolver] [hilti::declaration::Type] setting type ID to Foo::Foo1 (foo.hlt:6:1) -[debug/resolver] [hilti::declaration::Type] setting type ID to Foo::Foo2 (foo.hlt:7:1) -[debug/resolver] [hilti::type::UnresolvedID] Foo1 -> type Foo::Foo1 (foo.hlt:9:20) +[debug/resolver] [hilti::declaration::ImportedModule] import Bar; -> imported (foo.hlt:4:1-4:11) +[debug/resolver] [hilti::declaration::Type] setting type ID to Foo::Foo1 (foo.hlt:6:1-6:24) +[debug/resolver] [hilti::declaration::Type] setting type ID to Foo::Foo2 (foo.hlt:7:1-7:29) +[debug/resolver] [hilti::type::UnresolvedID] Foo1 -> type Foo::Foo1 (foo.hlt:9:20-9:27) [debug/compiler] -> modified [debug/compiler] new dependency to process: Bar (".hlt") [debug/compiler] processing ASTs, round 1 @@ -25,17 +25,17 @@ [debug/compiler] [HILTI] normalizing nodes in module Foo [debug/compiler] [HILTI] coercing nodes in module Foo [debug/compiler] [HILTI] resolving nodes in module Foo -[debug/resolver] [hilti::type::UnresolvedID] Foo::Foo2 -> type Bar::Bar1 (foo.hlt:7:1) -[debug/resolver] [hilti::type::UnresolvedID] Bar::Bar1 -> type Bar::Bar1 (foo.hlt:9:29) +[debug/resolver] [hilti::type::UnresolvedID] Foo::Foo2 -> type Bar::Bar1 (foo.hlt:7:1-7:29) +[debug/resolver] [hilti::type::UnresolvedID] Bar::Bar1 -> type Bar::Bar1 (foo.hlt:9:30-9:42) [debug/compiler] -> modified [debug/compiler] [HILTI] normalizing nodes in module Bar [debug/compiler] [HILTI] coercing nodes in module Bar [debug/compiler] [HILTI] resolving nodes in module Bar -[debug/resolver] [hilti::declaration::ImportedModule] import Foo; -> imported (./bar.hlt:4:1) -[debug/resolver] [hilti::declaration::Type] setting type ID to Bar::Bar1 (./bar.hlt:6:1) -[debug/resolver] [hilti::type::UnresolvedID] Foo::Foo1 -> type Foo::Foo1 (./bar.hlt:7:1) -[debug/resolver] [hilti::type::UnresolvedID] Bar1 -> type Bar::Bar1 (./bar.hlt:9:20) -[debug/resolver] [hilti::type::UnresolvedID] Foo::Foo1 -> type Foo::Foo1 (./bar.hlt:9:29) +[debug/resolver] [hilti::declaration::ImportedModule] import Foo; -> imported (./bar.hlt:4:1-4:11) +[debug/resolver] [hilti::declaration::Type] setting type ID to Bar::Bar1 (./bar.hlt:6:1-6:26) +[debug/resolver] [hilti::type::UnresolvedID] Foo::Foo1 -> type Foo::Foo1 (./bar.hlt:7:1-7:29) +[debug/resolver] [hilti::type::UnresolvedID] Bar1 -> type Bar::Bar1 (./bar.hlt:9:20-9:27) +[debug/resolver] [hilti::type::UnresolvedID] Foo::Foo1 -> type Foo::Foo1 (./bar.hlt:9:30-9:42) [debug/compiler] -> modified [debug/compiler] processing ASTs, round 2 [debug/compiler] resetting nodes for module Foo @@ -49,93 +49,93 @@ [debug/compiler] [HILTI] coercing nodes in module Bar [debug/compiler] [HILTI] resolving nodes in module Bar [debug/ast-final] # [HILTI] Foo: Final AST (round 2) -[debug/ast-final] - Module %6 (foo.hlt:2:1-11:2) [@m:XXX] +[debug/ast-final] - Module %6 (foo.hlt:2:1-11:1) [@m:XXX] [debug/ast-final] | Bar -> declaration::ImportedModule %18 [canon-id: Bar] [@d:XXX] ([@d:XXX]) [debug/ast-final] | Foo -> declaration::Module %19 [canon-id: Foo] [@d:XXX] ([@d:XXX]) [debug/ast-final] | Foo1 -> declaration::Type %1 [canon-id: Foo::Foo1] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | Foo2 -> declaration::Type %2 [canon-id: Foo::Foo2] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | foo -> declaration::Function %3 [canon-id: Foo::foo] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - ID (foo.hlt:2:8) [@i:XXX] -[debug/ast-final] - statement::Block (foo.hlt:2:1-11:2) [@s:XXX] -[debug/ast-final] - declaration::ImportedModule (foo.hlt:4:1) [canon-id: Bar] [@d:XXX] +[debug/ast-final] - ID (foo.hlt:2:8-2:10) [@i:XXX] +[debug/ast-final] - statement::Block (foo.hlt:2:1-11:1) [@s:XXX] +[debug/ast-final] - declaration::ImportedModule (foo.hlt:4:1-4:11) [canon-id: Bar] [@d:XXX] [debug/ast-final] | Bar -> declaration::Module %21 [canon-id: Bar] [@d:XXX] ([@d:XXX]) [debug/ast-final] | Bar1 -> declaration::Type %12 [canon-id: Bar::Bar1] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | Bar2 -> declaration::Type %13 [canon-id: Bar::Bar2] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | Foo -> declaration::ImportedModule %20 [canon-id: Foo] [@d:XXX] ([@d:XXX]) [debug/ast-final] | bar -> declaration::Function %14 [canon-id: Bar::bar] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - ID (foo.hlt:4:8) [@i:XXX] -[debug/ast-final] - declaration::Type %1 (foo.hlt:6:1) [canon-id: Foo::Foo1] (resolved) [@d:XXX] -[debug/ast-final] - ID (foo.hlt:6:13) [@i:XXX] -[debug/ast-final] - type::Bool (foo.hlt:6:20) (const) (type-id: Foo::Foo1) (resolved) [@t:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - declaration::Type %2 (foo.hlt:7:1) [canon-id: Foo::Foo2] (resolved) [@d:XXX] -[debug/ast-final] - ID (foo.hlt:7:13) [@i:XXX] -[debug/ast-final] - type::String (prune) (bar.hlt:6:20) (const) (type-id: Bar::Bar1) (resolved) [@t:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - declaration::Function %3 (foo.hlt:9:1) [canon-id: Foo::foo] [@d:XXX] +[debug/ast-final] - ID (foo.hlt:4:8-4:10) [@i:XXX] +[debug/ast-final] - declaration::Type %1 (foo.hlt:6:1-6:24) [canon-id: Foo::Foo1] (resolved) [@d:XXX] +[debug/ast-final] - ID (foo.hlt:6:13-6:16) [@i:XXX] +[debug/ast-final] - type::Bool (foo.hlt:6:20-6:23) (const) (type-id: Foo::Foo1) (resolved) [@t:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - declaration::Type %2 (foo.hlt:7:1-7:29) [canon-id: Foo::Foo2] (resolved) [@d:XXX] +[debug/ast-final] - ID (foo.hlt:7:13-7:16) [@i:XXX] +[debug/ast-final] - type::String (prune) (bar.hlt:6:20-6:25) (const) (type-id: Bar::Bar1) (resolved) [@t:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - declaration::Function %3 (foo.hlt:9:1-9:44) [canon-id: Foo::foo] [@d:XXX] [debug/ast-final] | bar -> declaration::Parameter %5 [canon-id: Foo::foo::bar] [@d:XXX] ([@d:XXX]) [debug/ast-final] | foo -> declaration::Parameter %4 [canon-id: Foo::foo::foo] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - Function "> (foo.hlt:9:8) [@f:XXX] -[debug/ast-final] - ID (foo.hlt:9:16) [@i:XXX] -[debug/ast-final] - type::Function (foo.hlt:9:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::function::Result (foo.hlt:9:9) [@t:XXX] -[debug/ast-final] - type::String (foo.hlt:9:9) (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::Parameter %4 (foo.hlt:9:20) [canon-id: Foo::foo::foo] [@d:XXX] -[debug/ast-final] - ID (foo.hlt:9:25) [@i:XXX] -[debug/ast-final] - type::Bool (prune) (foo.hlt:6:20) (const) (type-id: Foo::Foo1) (resolved) [@t:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - declaration::Parameter %5 (foo.hlt:9:29) [canon-id: Foo::foo::bar] [@d:XXX] -[debug/ast-final] - ID (foo.hlt:9:40) [@i:XXX] -[debug/ast-final] - type::String (prune) (bar.hlt:6:20) (const) (type-id: Bar::Bar1) (resolved) [@t:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] +[debug/ast-final] - Function "> (foo.hlt:9:9-9:43) [@f:XXX] +[debug/ast-final] - ID (foo.hlt:9:16-9:18) [@i:XXX] +[debug/ast-final] - type::Function (foo.hlt:9:9-9:43) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::function::Result (foo.hlt:9:9-9:14) [@t:XXX] +[debug/ast-final] - type::String (foo.hlt:9:9-9:14) (const) (resolved) [@t:XXX] +[debug/ast-final] - declaration::Parameter %4 (foo.hlt:9:20-9:27) [canon-id: Foo::foo::foo] [@d:XXX] +[debug/ast-final] - ID (foo.hlt:9:25-9:27) [@i:XXX] +[debug/ast-final] - type::Bool (prune) (foo.hlt:6:20-6:23) (const) (type-id: Foo::Foo1) (resolved) [@t:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - declaration::Parameter %5 (foo.hlt:9:30-9:42) [canon-id: Foo::foo::bar] [@d:XXX] +[debug/ast-final] - ID (foo.hlt:9:40-9:42) [@i:XXX] +[debug/ast-final] - type::String (prune) (bar.hlt:6:20-6:25) (const) (type-id: Bar::Bar1) (resolved) [@t:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] [debug/ast-final] # [HILTI] Bar: Final AST (round 2) -[debug/ast-final] - Module %8 (bar.hlt:2:1-11:2) [@m:XXX] +[debug/ast-final] - Module %8 (bar.hlt:2:1-11:1) [@m:XXX] [debug/ast-final] | Bar -> declaration::Module %21 [canon-id: Bar] [@d:XXX] ([@d:XXX]) [debug/ast-final] | Bar1 -> declaration::Type %12 [canon-id: Bar::Bar1] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | Bar2 -> declaration::Type %13 [canon-id: Bar::Bar2] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | Foo -> declaration::ImportedModule %20 [canon-id: Foo] [@d:XXX] ([@d:XXX]) [debug/ast-final] | bar -> declaration::Function %14 [canon-id: Bar::bar] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - ID (bar.hlt:2:8) [@i:XXX] -[debug/ast-final] - statement::Block (bar.hlt:2:1-11:2) [@s:XXX] -[debug/ast-final] - declaration::ImportedModule (bar.hlt:4:1) [canon-id: Foo] [@d:XXX] +[debug/ast-final] - ID (bar.hlt:2:8-2:10) [@i:XXX] +[debug/ast-final] - statement::Block (bar.hlt:2:1-11:1) [@s:XXX] +[debug/ast-final] - declaration::ImportedModule (bar.hlt:4:1-4:11) [canon-id: Foo] [@d:XXX] [debug/ast-final] | Bar -> declaration::ImportedModule %18 [canon-id: Bar] [@d:XXX] ([@d:XXX]) [debug/ast-final] | Foo -> declaration::Module %19 [canon-id: Foo] [@d:XXX] ([@d:XXX]) [debug/ast-final] | Foo1 -> declaration::Type %1 [canon-id: Foo::Foo1] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | Foo2 -> declaration::Type %2 [canon-id: Foo::Foo2] (resolved) [@d:XXX] ([@d:XXX]) [debug/ast-final] | foo -> declaration::Function %3 [canon-id: Foo::foo] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - ID (bar.hlt:4:8) [@i:XXX] -[debug/ast-final] - declaration::Type %12 (bar.hlt:6:1) [canon-id: Bar::Bar1] (resolved) [@d:XXX] -[debug/ast-final] - ID (bar.hlt:6:13) [@i:XXX] -[debug/ast-final] - type::String (bar.hlt:6:20) (const) (type-id: Bar::Bar1) (resolved) [@t:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - declaration::Type %13 (bar.hlt:7:1) [canon-id: Bar::Bar2] (resolved) [@d:XXX] -[debug/ast-final] - ID (bar.hlt:7:13) [@i:XXX] -[debug/ast-final] - type::Bool (prune) (foo.hlt:6:20) (const) (type-id: Foo::Foo1) (resolved) [@t:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - declaration::Function %14 (bar.hlt:9:1) [canon-id: Bar::bar] [@d:XXX] +[debug/ast-final] - ID (bar.hlt:4:8-4:10) [@i:XXX] +[debug/ast-final] - declaration::Type %12 (bar.hlt:6:1-6:26) [canon-id: Bar::Bar1] (resolved) [@d:XXX] +[debug/ast-final] - ID (bar.hlt:6:13-6:16) [@i:XXX] +[debug/ast-final] - type::String (bar.hlt:6:20-6:25) (const) (type-id: Bar::Bar1) (resolved) [@t:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - declaration::Type %13 (bar.hlt:7:1-7:29) [canon-id: Bar::Bar2] (resolved) [@d:XXX] +[debug/ast-final] - ID (bar.hlt:7:13-7:16) [@i:XXX] +[debug/ast-final] - type::Bool (prune) (foo.hlt:6:20-6:23) (const) (type-id: Foo::Foo1) (resolved) [@t:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - declaration::Function %14 (bar.hlt:9:1-9:44) [canon-id: Bar::bar] [@d:XXX] [debug/ast-final] | bar -> declaration::Parameter %15 [canon-id: Bar::bar::bar] [@d:XXX] ([@d:XXX]) [debug/ast-final] | foo -> declaration::Parameter %16 [canon-id: Bar::bar::foo] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - Function "> (bar.hlt:9:8) [@f:XXX] -[debug/ast-final] - ID (bar.hlt:9:16) [@i:XXX] -[debug/ast-final] - type::Function (bar.hlt:9:8) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::function::Result (bar.hlt:9:9) [@t:XXX] -[debug/ast-final] - type::String (bar.hlt:9:9) (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::Parameter %15 (bar.hlt:9:20) [canon-id: Bar::bar::bar] [@d:XXX] -[debug/ast-final] - ID (bar.hlt:9:25) [@i:XXX] -[debug/ast-final] - type::String (prune) (bar.hlt:6:20) (const) (type-id: Bar::Bar1) (resolved) [@t:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - declaration::Parameter %16 (bar.hlt:9:29) [canon-id: Bar::bar::foo] [@d:XXX] -[debug/ast-final] - ID (bar.hlt:9:40) [@i:XXX] -[debug/ast-final] - type::Bool (prune) (foo.hlt:6:20) (const) (type-id: Foo::Foo1) (resolved) [@t:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] -[debug/ast-final] - node::None (foo.hlt:6:1) [@n:XXX] +[debug/ast-final] - Function "> (bar.hlt:9:9-9:43) [@f:XXX] +[debug/ast-final] - ID (bar.hlt:9:16-9:18) [@i:XXX] +[debug/ast-final] - type::Function (bar.hlt:9:9-9:43) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::function::Result (bar.hlt:9:9-9:14) [@t:XXX] +[debug/ast-final] - type::String (bar.hlt:9:9-9:14) (const) (resolved) [@t:XXX] +[debug/ast-final] - declaration::Parameter %15 (bar.hlt:9:20-9:27) [canon-id: Bar::bar::bar] [@d:XXX] +[debug/ast-final] - ID (bar.hlt:9:25-9:27) [@i:XXX] +[debug/ast-final] - type::String (prune) (bar.hlt:6:20-6:25) (const) (type-id: Bar::Bar1) (resolved) [@t:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - declaration::Parameter %16 (bar.hlt:9:30-9:42) [canon-id: Bar::bar::foo] [@d:XXX] +[debug/ast-final] - ID (bar.hlt:9:40-9:42) [@i:XXX] +[debug/ast-final] - type::Bool (prune) (foo.hlt:6:20-6:23) (const) (type-id: Foo::Foo1) (resolved) [@t:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] +[debug/ast-final] - node::None (foo.hlt:6:1-6:24) [@n:XXX] [debug/compiler] [HILTI] validating module Foo (post) [debug/compiler] [HILTI] validating module Bar (post) [debug/compiler] finalized module Foo diff --git a/tests/Baseline/hilti.ast.types/output b/tests/Baseline/hilti.ast.types/output index f8677224e..2aa93fd41 100644 --- a/tests/Baseline/hilti.ast.types/output +++ b/tests/Baseline/hilti.ast.types/output @@ -10,39 +10,39 @@ [debug/compiler] [HILTI] coercing nodes in module Foo [debug/compiler] [HILTI] resolving nodes in module Foo [debug/ast-final] # [HILTI] Foo: Final AST -[debug/ast-final] - Module %3 (types.hlt:5:1-10:2) [@m:XXX] +[debug/ast-final] - Module %3 (types.hlt:5:1-10:1) [@m:XXX] [debug/ast-final] | Foo -> declaration::Module %4 [canon-id: Foo] [@d:XXX] ([@d:XXX]) [debug/ast-final] | x1 -> declaration::GlobalVariable %1 [canon-id: Foo::x1] [@d:XXX] ([@d:XXX]) [debug/ast-final] | x2 -> declaration::GlobalVariable %2 [canon-id: Foo::x2] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - ID (types.hlt:5:8) [@i:XXX] -[debug/ast-final] - statement::Block (types.hlt:5:1-10:2) [@s:XXX] -[debug/ast-final] - declaration::GlobalVariable %1 (types.hlt:5:13-7:20) [canon-id: Foo::x1] [@d:XXX] -[debug/ast-final] - ID (types.hlt:7:8) [@i:XXX] -[debug/ast-final] - node::None (types.hlt:5:13-7:20) [@n:XXX] -[debug/ast-final] - expression::Ctor (types.hlt:7:13) (non-const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Bytes (types.hlt:7:13) [@c:XXX] -[debug/ast-final] - type::Bytes (types.hlt:7:13) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::UnsignedInteger (types.hlt:7:13) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::bytes::Iterator (types.hlt:7:13) (non-const) (resolved) [@t:XXX] -[debug/ast-final] - type::UnsignedInteger (types.hlt:7:13) (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::GlobalVariable %2 (types.hlt:7:20-8:20) [canon-id: Foo::x2] [@d:XXX] -[debug/ast-final] - ID (types.hlt:8:8) [@i:XXX] -[debug/ast-final] - node::None (types.hlt:5:13-7:20) [@n:XXX] -[debug/ast-final] - expression::Ctor (types.hlt:8:13) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::Tuple (types.hlt:8:13) [@c:XXX] -[debug/ast-final] - type::Tuple (types.hlt:8:13) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (types.hlt:8:14) [@t:XXX] -[debug/ast-final] - node::None (types.hlt:5:13-7:20) [@n:XXX] -[debug/ast-final] - type::UnsignedInteger (types.hlt:8:14) (const) (resolved) [@t:XXX] -[debug/ast-final] - type::tuple::Element (types.hlt:8:17) [@t:XXX] -[debug/ast-final] - node::None (types.hlt:5:13-7:20) [@n:XXX] -[debug/ast-final] - type::UnsignedInteger (types.hlt:8:17) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (types.hlt:8:14) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::UnsignedInteger (types.hlt:8:14) [@c:XXX] -[debug/ast-final] - type::UnsignedInteger (types.hlt:8:14) (const) (resolved) [@t:XXX] -[debug/ast-final] - expression::Ctor (types.hlt:8:17) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::UnsignedInteger (types.hlt:8:17) [@c:XXX] -[debug/ast-final] - type::UnsignedInteger (types.hlt:8:17) (const) (resolved) [@t:XXX] +[debug/ast-final] - ID (types.hlt:5:8-5:10) [@i:XXX] +[debug/ast-final] - statement::Block (types.hlt:5:1-10:1) [@s:XXX] +[debug/ast-final] - declaration::GlobalVariable %1 (types.hlt:7:1-7:19) [canon-id: Foo::x1] [@d:XXX] +[debug/ast-final] - ID (types.hlt:7:8-7:9) [@i:XXX] +[debug/ast-final] - node::None (types.hlt:7:1-7:19) [@n:XXX] +[debug/ast-final] - expression::Ctor (types.hlt:7:13-7:18) (non-const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Bytes (types.hlt:7:13-7:18) [@c:XXX] +[debug/ast-final] - type::Bytes (types.hlt:7:13-7:18) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::UnsignedInteger (types.hlt:7:13-7:18) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::bytes::Iterator (types.hlt:7:13-7:18) (non-const) (resolved) [@t:XXX] +[debug/ast-final] - type::UnsignedInteger (types.hlt:7:13-7:18) (const) (resolved) [@t:XXX] +[debug/ast-final] - declaration::GlobalVariable %2 (types.hlt:8:1-8:19) [canon-id: Foo::x2] [@d:XXX] +[debug/ast-final] - ID (types.hlt:8:8-8:9) [@i:XXX] +[debug/ast-final] - node::None (types.hlt:7:1-7:19) [@n:XXX] +[debug/ast-final] - expression::Ctor (types.hlt:8:13-8:18) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::Tuple (types.hlt:8:13-8:18) [@c:XXX] +[debug/ast-final] - type::Tuple (types.hlt:8:13-8:18) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (types.hlt:8:14-8:14) [@t:XXX] +[debug/ast-final] - node::None (types.hlt:7:1-7:19) [@n:XXX] +[debug/ast-final] - type::UnsignedInteger (types.hlt:8:14-8:14) (const) (resolved) [@t:XXX] +[debug/ast-final] - type::tuple::Element (types.hlt:8:17-8:17) [@t:XXX] +[debug/ast-final] - node::None (types.hlt:7:1-7:19) [@n:XXX] +[debug/ast-final] - type::UnsignedInteger (types.hlt:8:17-8:17) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (types.hlt:8:14-8:14) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::UnsignedInteger (types.hlt:8:14-8:14) [@c:XXX] +[debug/ast-final] - type::UnsignedInteger (types.hlt:8:14-8:14) (const) (resolved) [@t:XXX] +[debug/ast-final] - expression::Ctor (types.hlt:8:17-8:17) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::UnsignedInteger (types.hlt:8:17-8:17) [@c:XXX] +[debug/ast-final] - type::UnsignedInteger (types.hlt:8:17-8:17) (const) (resolved) [@t:XXX] [debug/compiler] [HILTI] validating module Foo (post) [debug/compiler] finalized module Foo module Foo { diff --git a/tests/Baseline/hilti.ast.validation/output b/tests/Baseline/hilti.ast.validation/output index b67d86dad..f8642ac97 100644 --- a/tests/Baseline/hilti.ast.validation/output +++ b/tests/Baseline/hilti.ast.validation/output @@ -1,11 +1,11 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/validation.hlt:11:8: integer type's width must be one of 8<...>/64, but is 65 -[error] <...>/validation.hlt:12:8: integer type's width must be one of 8<...>/64, but is 0 -[error] <...>/validation.hlt:12:17-14:15: type 'void' cannot be used for variable declaration -[error] <...>/validation.hlt:15:12-16:12: type 'Foo::U' cannot be used for variable declaration -[error] <...>/validation.hlt:19:5: function must return a value -[error] <...>/validation.hlt:23:5: cannot coerce expression '42' of type 'uint<64>' to type 'void' -[error] <...>/validation.hlt:23:5: void function cannot return a value -[error] <...>/validation.hlt:31:5: cannot coerce expression '("1" == "2")' of type 'bool' to type 'real' -[error] <...>/validation.hlt:32:10: unsupported operator: == > +[error] <...>/validation.hlt:11:8-11:14: integer type's width must be one of 8<...>/64, but is 65 +[error] <...>/validation.hlt:12:8-12:13: integer type's width must be one of 8<...>/64, but is 0 +[error] <...>/validation.hlt:14:1-14:14: type 'void' cannot be used for variable declaration +[error] <...>/validation.hlt:16:1-16:11: type 'Foo::U' cannot be used for variable declaration +[error] <...>/validation.hlt:19:5-19:11: function must return a value +[error] <...>/validation.hlt:23:5-23:14: cannot coerce expression '42' of type 'uint<64>' to type 'void' +[error] <...>/validation.hlt:23:5-23:14: void function cannot return a value +[error] <...>/validation.hlt:31:5-31:20: cannot coerce expression '("1" == "2")' of type 'bool' to type 'real' +[error] <...>/validation.hlt:32:10-32:17: unsupported operator: == > [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.expressions.ctor-replacement/output b/tests/Baseline/hilti.expressions.ctor-replacement/output index 2fcdcd803..d9c8daa8f 100644 --- a/tests/Baseline/hilti.expressions.ctor-replacement/output +++ b/tests/Baseline/hilti.expressions.ctor-replacement/output @@ -1,30 +1,30 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. [debug/ast-final] # [HILTI] Test: Final AST (round 1) -[debug/ast-final] - Module %4 (ctor-replacement.hlt:6:1-12:2) [@m:XXX] +[debug/ast-final] - Module %4 (ctor-replacement.hlt:6:1-12:1) [@m:XXX] [debug/ast-final] | Test -> declaration::Module %6 [canon-id: Test] [@d:XXX] ([@d:XXX]) [debug/ast-final] | x -> declaration::GlobalVariable %1 [canon-id: Test::x] [@d:XXX] ([@d:XXX]) [debug/ast-final] | y -> declaration::GlobalVariable %2 [canon-id: Test::y] [@d:XXX] ([@d:XXX]) [debug/ast-final] | z -> declaration::GlobalVariable %3 [canon-id: Test::z] [@d:XXX] ([@d:XXX]) -[debug/ast-final] - ID (ctor-replacement.hlt:6:8) [@i:XXX] -[debug/ast-final] - statement::Block (ctor-replacement.hlt:6:1-12:2) [@s:XXX] -[debug/ast-final] - declaration::GlobalVariable %1 (ctor-replacement.hlt:6:14-8:22) [canon-id: Test::x] [@d:XXX] -[debug/ast-final] - ID (ctor-replacement.hlt:8:8) [@i:XXX] -[debug/ast-final] - node::None (ctor-replacement.hlt:6:14-8:22) [@n:XXX] -[debug/ast-final] - expression::Ctor (ctor-replacement.hlt:8:12) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::SignedInteger (ctor-replacement.hlt:8:12) [@c:XXX] +[debug/ast-final] - ID (ctor-replacement.hlt:6:8-6:11) [@i:XXX] +[debug/ast-final] - statement::Block (ctor-replacement.hlt:6:1-12:1) [@s:XXX] +[debug/ast-final] - declaration::GlobalVariable %1 (ctor-replacement.hlt:8:1-8:21) [canon-id: Test::x] [@d:XXX] +[debug/ast-final] - ID (ctor-replacement.hlt:8:8-8:8) [@i:XXX] +[debug/ast-final] - node::None (ctor-replacement.hlt:8:1-8:21) [@n:XXX] +[debug/ast-final] - expression::Ctor (ctor-replacement.hlt:8:12-8:20) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::SignedInteger (ctor-replacement.hlt:8:12-8:20) [@c:XXX] [debug/ast-final] - type::SignedInteger (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::GlobalVariable %2 (ctor-replacement.hlt:8:22-9:22) [canon-id: Test::y] [@d:XXX] -[debug/ast-final] - ID (ctor-replacement.hlt:9:8) [@i:XXX] -[debug/ast-final] - node::None (ctor-replacement.hlt:6:14-8:22) [@n:XXX] -[debug/ast-final] - expression::Ctor (ctor-replacement.hlt:9:12) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::UnsignedInteger (ctor-replacement.hlt:9:12) [@c:XXX] +[debug/ast-final] - declaration::GlobalVariable %2 (ctor-replacement.hlt:9:1-9:21) [canon-id: Test::y] [@d:XXX] +[debug/ast-final] - ID (ctor-replacement.hlt:9:8-9:8) [@i:XXX] +[debug/ast-final] - node::None (ctor-replacement.hlt:8:1-8:21) [@n:XXX] +[debug/ast-final] - expression::Ctor (ctor-replacement.hlt:9:12-9:20) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::UnsignedInteger (ctor-replacement.hlt:9:12-9:20) [@c:XXX] [debug/ast-final] - type::UnsignedInteger (const) (resolved) [@t:XXX] -[debug/ast-final] - declaration::GlobalVariable %3 (ctor-replacement.hlt:9:22-10:15) [canon-id: Test::z] [@d:XXX] -[debug/ast-final] - ID (ctor-replacement.hlt:10:8) [@i:XXX] -[debug/ast-final] - node::None (ctor-replacement.hlt:6:14-8:22) [@n:XXX] -[debug/ast-final] - expression::Ctor (ctor-replacement.hlt:10:12) (const) (resolved) [@e:XXX] -[debug/ast-final] - ctor::SignedInteger (ctor-replacement.hlt:10:12) [@c:XXX] -[debug/ast-final] - type::SignedInteger (ctor-replacement.hlt:10:12) (const) (resolved) [@t:XXX] +[debug/ast-final] - declaration::GlobalVariable %3 (ctor-replacement.hlt:10:1-10:14) [canon-id: Test::z] [@d:XXX] +[debug/ast-final] - ID (ctor-replacement.hlt:10:8-10:8) [@i:XXX] +[debug/ast-final] - node::None (ctor-replacement.hlt:8:1-8:21) [@n:XXX] +[debug/ast-final] - expression::Ctor (ctor-replacement.hlt:10:12-10:13) (const) (resolved) [@e:XXX] +[debug/ast-final] - ctor::SignedInteger (ctor-replacement.hlt:10:12-10:13) [@c:XXX] +[debug/ast-final] - type::SignedInteger (ctor-replacement.hlt:10:12-10:13) (const) (resolved) [@t:XXX] module Test { global int<32> x = int32(-1); diff --git a/tests/Baseline/hilti.hiltic.cc.exception/output b/tests/Baseline/hilti.hiltic.cc.exception/output index 52d9ca0bf..5aa7bef6d 100644 --- a/tests/Baseline/hilti.hiltic.cc.exception/output +++ b/tests/Baseline/hilti.hiltic.cc.exception/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. HILTI - Begin -Caught exception: test exception (<...>/exception.hlt:20:5) +Caught exception: test exception (<...>/exception.hlt:20:5-20:40) diff --git a/tests/Baseline/hilti.hiltic.jit.exception/output b/tests/Baseline/hilti.hiltic.jit.exception/output index 73be2d4f8..8e680f4f7 100644 --- a/tests/Baseline/hilti.hiltic.jit.exception/output +++ b/tests/Baseline/hilti.hiltic.jit.exception/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. HILTI - Begin -Caught exception: test exception (<...>/exception.hlt:13:5) +Caught exception: test exception (<...>/exception.hlt:13:5-13:40) diff --git a/tests/Baseline/hilti.hiltic.print.globals/output b/tests/Baseline/hilti.hiltic.print.globals/output index 1329c8c0e..73e9ea5fd 100644 --- a/tests/Baseline/hilti.hiltic.print.globals/output +++ b/tests/Baseline/hilti.hiltic.print.globals/output @@ -29,7 +29,7 @@ extern void __hlt::Foo::__init_globals(::hilti::rt::Context* ctx) { } extern void __hlt::Foo::__init_module() { - __location__("<...>/globals.hlt:16:1"); + __location__("<...>/globals.hlt:16:1-16:15"); ::hilti::rt::print(Foo::__globals()->X, ::hilti::rt::Bool(true)); } diff --git a/tests/Baseline/hilti.hiltic.print.globals/output2 b/tests/Baseline/hilti.hiltic.print.globals/output2 index 8660366f6..8f8a8dcd4 100644 --- a/tests/Baseline/hilti.hiltic.print.globals/output2 +++ b/tests/Baseline/hilti.hiltic.print.globals/output2 @@ -23,7 +23,7 @@ extern void __hlt::Foo::__destroy_globals(::hilti::rt::Context* ctx) { ::__hlt:: extern void __hlt::Foo::__init_globals(::hilti::rt::Context* ctx) { ::__hlt::Foo::X = std::string("Hello, world!"); } extern void __hlt::Foo::__init_module() { - __location__("<...>/globals.hlt:16:1"); + __location__("<...>/globals.hlt:16:1-16:15"); ::hilti::rt::print((*__hlt::Foo::X), ::hilti::rt::Bool(true)); } diff --git a/tests/Baseline/hilti.hiltic.print.hello-world/output b/tests/Baseline/hilti.hiltic.print.hello-world/output index 4dfda2796..9b19b2144 100644 --- a/tests/Baseline/hilti.hiltic.print.hello-world/output +++ b/tests/Baseline/hilti.hiltic.print.hello-world/output @@ -16,7 +16,7 @@ namespace __hlt::Foo { HILTI_PRE_INIT(__hlt::Foo::__register_module) extern void __hlt::Foo::__init_module() { - __location__("<...>/hello-world.hlt:10:1"); + __location__("<...>/hello-world.hlt:10:1-10:29"); ::hilti::rt::print(std::string("Hello, world!"), ::hilti::rt::Bool(true)); } diff --git a/tests/Baseline/hilti.hiltic.print.import/output b/tests/Baseline/hilti.hiltic.print.import/output index 465235bf4..621f10855 100644 --- a/tests/Baseline/hilti.hiltic.print.import/output +++ b/tests/Baseline/hilti.hiltic.print.import/output @@ -42,11 +42,11 @@ extern void __hlt::Foo::__init_globals(::hilti::rt::Context* ctx) { } extern void __hlt::Foo::__init_module() { - __location__("foo.hlt:10:1"); + __location__("foo.hlt:10:1-10:38"); ::hilti::rt::print(std::string("Hello, world from Foo!"), ::hilti::rt::Bool(true)); - __location__("foo.hlt:11:1"); + __location__("foo.hlt:11:1-11:17"); ::hilti::rt::print(Foo::__globals()->foo, ::hilti::rt::Bool(true)); - __location__("foo.hlt:12:1"); + __location__("foo.hlt:12:1-12:22"); ::hilti::rt::print(Bar::__globals()->bar, ::hilti::rt::Bool(true)); } @@ -99,11 +99,11 @@ extern void __hlt::Bar::__init_globals(::hilti::rt::Context* ctx) { } extern void __hlt::Bar::__init_module() { - __location__("bar.hlt:10:1"); + __location__("bar.hlt:10:1-10:38"); ::hilti::rt::print(std::string("Hello, world from Bar!"), ::hilti::rt::Bool(true)); - __location__("bar.hlt:11:1"); + __location__("bar.hlt:11:1-11:22"); ::hilti::rt::print(Foo::__globals()->foo, ::hilti::rt::Bool(true)); - __location__("bar.hlt:12:1"); + __location__("bar.hlt:12:1-12:17"); ::hilti::rt::print(Bar::__globals()->bar, ::hilti::rt::Bool(true)); } diff --git a/tests/Baseline/hilti.hiltic.print.import/output2 b/tests/Baseline/hilti.hiltic.print.import/output2 index dc5bf0848..008b9dc7a 100644 --- a/tests/Baseline/hilti.hiltic.print.import/output2 +++ b/tests/Baseline/hilti.hiltic.print.import/output2 @@ -27,11 +27,11 @@ extern void __hlt::Foo::__destroy_globals(::hilti::rt::Context* ctx) { ::__hlt:: extern void __hlt::Foo::__init_globals(::hilti::rt::Context* ctx) { ::__hlt::Foo::foo = std::string("Foo!"); } extern void __hlt::Foo::__init_module() { - __location__("foo.hlt:10:1"); + __location__("foo.hlt:10:1-10:38"); ::hilti::rt::print(std::string("Hello, world from Foo!"), ::hilti::rt::Bool(true)); - __location__("foo.hlt:11:1"); + __location__("foo.hlt:11:1-11:17"); ::hilti::rt::print((*__hlt::Foo::foo), ::hilti::rt::Bool(true)); - __location__("foo.hlt:12:1"); + __location__("foo.hlt:12:1-12:22"); ::hilti::rt::print((*__hlt::Bar::bar), ::hilti::rt::Bool(true)); } @@ -69,11 +69,11 @@ extern void __hlt::Bar::__destroy_globals(::hilti::rt::Context* ctx) { ::__hlt:: extern void __hlt::Bar::__init_globals(::hilti::rt::Context* ctx) { ::__hlt::Bar::bar = std::string("Bar!"); } extern void __hlt::Bar::__init_module() { - __location__("bar.hlt:10:1"); + __location__("bar.hlt:10:1-10:38"); ::hilti::rt::print(std::string("Hello, world from Bar!"), ::hilti::rt::Bool(true)); - __location__("bar.hlt:11:1"); + __location__("bar.hlt:11:1-11:22"); ::hilti::rt::print((*__hlt::Foo::foo), ::hilti::rt::Bool(true)); - __location__("bar.hlt:12:1"); + __location__("bar.hlt:12:1-12:17"); ::hilti::rt::print((*__hlt::Bar::bar), ::hilti::rt::Bool(true)); } diff --git a/tests/Baseline/hilti.hiltic.print.yield/output b/tests/Baseline/hilti.hiltic.print.yield/output index e487b2c9f..afc4c69e5 100644 --- a/tests/Baseline/hilti.hiltic.print.yield/output +++ b/tests/Baseline/hilti.hiltic.print.yield/output @@ -23,23 +23,23 @@ extern void __hlt::Foo::__register_module() { ::hilti::rt::detail::registerModul extern auto __hlt::Foo::test(const std::string& x) -> std::string { ::hilti::rt::detail::checkStack(); - __location__("<...>/yield.hlt:12:5"); + __location__("<...>/yield.hlt:12:5-12:49"); ::hilti::rt::print(std::string("HILTI - 1 - argument: "), ::hilti::rt::Bool(false)); - __location__("<...>/yield.hlt:13:5"); + __location__("<...>/yield.hlt:13:5-13:19"); ::hilti::rt::print(x, ::hilti::rt::Bool(true)); - __location__("<...>/yield.hlt:15:5"); + __location__("<...>/yield.hlt:15:5-15:10"); ::hilti::rt::detail::yield(); - __location__("<...>/yield.hlt:16:5"); + __location__("<...>/yield.hlt:16:5-16:29"); ::hilti::rt::print(std::string("HILTI - 2"), ::hilti::rt::Bool(true)); - __location__("<...>/yield.hlt:17:5"); + __location__("<...>/yield.hlt:17:5-17:10"); ::hilti::rt::detail::yield(); - __location__("<...>/yield.hlt:18:5"); + __location__("<...>/yield.hlt:18:5-18:29"); ::hilti::rt::print(std::string("HILTI - 3"), ::hilti::rt::Bool(true)); - __location__("<...>/yield.hlt:19:5"); + __location__("<...>/yield.hlt:19:5-19:10"); ::hilti::rt::detail::yield(); - __location__("<...>/yield.hlt:20:5"); + __location__("<...>/yield.hlt:20:5-20:32"); ::hilti::rt::print(std::string("HILTI - Done"), ::hilti::rt::Bool(true)); - __location__("<...>/yield.hlt:22:5"); + __location__("<...>/yield.hlt:22:5-22:25"); return std::string("test-result"); } diff --git a/tests/Baseline/hilti.rt.exception-location/output b/tests/Baseline/hilti.rt.exception-location/output index dd4e7abbc..aa526a0b8 100644 --- a/tests/Baseline/hilti.rt.exception-location/output +++ b/tests/Baseline/hilti.rt.exception-location/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -uncaught exception hilti::rt::InvalidIterator: bound object has expired (<...>/exception-location.hlt:11:1) +uncaught exception hilti::rt::InvalidIterator: bound object has expired (<...>/exception-location.hlt:11:1-11:17) diff --git a/tests/Baseline/hilti.statements.assert/output b/tests/Baseline/hilti.statements.assert/output index 218ca5841..60c971fea 100644 --- a/tests/Baseline/hilti.statements.assert/output +++ b/tests/Baseline/hilti.statements.assert/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -uncaught exception hilti::rt::AssertionFailure: failed expression 'False' (false1.hlt:1:14) -uncaught exception hilti::rt::AssertionFailure: Test message (false2.hlt:1:14) -uncaught exception hilti::rt::AssertionFailure: Test message for missing exception (false3.hlt:1:14) +uncaught exception hilti::rt::AssertionFailure: failed expression 'False' (false1.hlt:1:14-1:26) +uncaught exception hilti::rt::AssertionFailure: Test message (false2.hlt:1:14-1:44) +uncaught exception hilti::rt::AssertionFailure: Test message for missing exception (false3.hlt:1:14-1:87) diff --git a/tests/Baseline/hilti.types.address.unpack-fail/output b/tests/Baseline/hilti.types.address.unpack-fail/output index 78abcc55a..4f4dec8d1 100644 --- a/tests/Baseline/hilti.types.address.unpack-fail/output +++ b/tests/Baseline/hilti.types.address.unpack-fail/output @@ -1,9 +1,9 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/unpack-fail.hlt:10:1: not enough arguments for pack operator -[error] <...>/unpack-fail.hlt:11:1: invalid arguments for integer packing; want (, ) -[error] <...>/unpack-fail.hlt:12:1: invalid arguments for integer packing; want (, ) -[error] <...>/unpack-fail.hlt:14:1: not enough arguments for unpack operator -[error] <...>/unpack-fail.hlt:15:1: unpack() can be used only with bytes or a stream view as input -[error] <...>/unpack-fail.hlt:16:1: invalid arguments for address unpacking; want (, , ) -[error] <...>/unpack-fail.hlt:17:1: invalid arguments for address unpacking; want (, , ) +[error] <...>/unpack-fail.hlt:10:1-10:6: not enough arguments for pack operator +[error] <...>/unpack-fail.hlt:11:1-11:8: invalid arguments for integer packing; want (, ) +[error] <...>/unpack-fail.hlt:12:1-12:40: invalid arguments for integer packing; want (, ) +[error] <...>/unpack-fail.hlt:14:1-14:14: not enough arguments for unpack operator +[error] <...>/unpack-fail.hlt:15:1-15:16: unpack() can be used only with bytes or a stream view as input +[error] <...>/unpack-fail.hlt:16:1-16:43: invalid arguments for address unpacking; want (, , ) +[error] <...>/unpack-fail.hlt:17:1-17:77: invalid arguments for address unpacking; want (, , ) [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.enum.duplicate-value-fail/output b/tests/Baseline/hilti.types.enum.duplicate-value-fail/output index b8a1ffe07..1cc5d370f 100644 --- a/tests/Baseline/hilti.types.enum.duplicate-value-fail/output +++ b/tests/Baseline/hilti.types.enum.duplicate-value-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/duplicate-value-fail.hlt:7:10-12:2: enum values are not unique +[error] <...>/duplicate-value-fail.hlt:7:10-12:1: enum values are not unique [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.enum.equal-ops-fail/output b/tests/Baseline/hilti.types.enum.equal-ops-fail/output index fa24f8b25..5f82c4bb9 100644 --- a/tests/Baseline/hilti.types.enum.equal-ops-fail/output +++ b/tests/Baseline/hilti.types.enum.equal-ops-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/equal-ops-fail.hlt:11:8: unsupported operator: != -[error] <...>/equal-ops-fail.hlt:15:8: unsupported operator: != +[error] <...>/equal-ops-fail.hlt:11:8-11:19: unsupported operator: != +[error] <...>/equal-ops-fail.hlt:15:8-15:13: unsupported operator: != [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.function.hook-priorities-fail/.stderr b/tests/Baseline/hilti.types.function.hook-priorities-fail/.stderr index 57db22b81..b320e51f1 100644 --- a/tests/Baseline/hilti.types.function.hook-priorities-fail/.stderr +++ b/tests/Baseline/hilti.types.function.hook-priorities-fail/.stderr @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/hook-priorities-fail.hlt:10:5: value for attribute '&priority' must be an integer -[error] <...>/hook-priorities-fail.hlt:11:5: attribute '&priority' requires an integer -[error] <...>/hook-priorities-fail.hlt:12:9: only hooks can have priorities +[error] <...>/hook-priorities-fail.hlt:10:6-10:33: value for attribute '&priority' must be an integer +[error] <...>/hook-priorities-fail.hlt:11:6-11:27: attribute '&priority' requires an integer +[error] <...>/hook-priorities-fail.hlt:12:10-12:34: only hooks can have priorities [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.function.param-attrs-fail/output b/tests/Baseline/hilti.types.function.param-attrs-fail/output index c1c730015..b3891ae57 100644 --- a/tests/Baseline/hilti.types.function.param-attrs-fail/output +++ b/tests/Baseline/hilti.types.function.param-attrs-fail/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/param-attrs-fail.hlt:8:18: invalid attribute '&bogus_attr' for function parameter -[error] <...>/param-attrs-fail.hlt:9:18: attribute '&requires-type-feature' requires a string -[error] <...>/param-attrs-fail.hlt:10:18: value for attribute '&requires-type-feature' must be a string +[error] <...>/param-attrs-fail.hlt:8:18-8:37: invalid attribute '&bogus_attr' for function parameter +[error] <...>/param-attrs-fail.hlt:9:18-9:48: attribute '&requires-type-feature' requires a string +[error] <...>/param-attrs-fail.hlt:10:18-10:50: value for attribute '&requires-type-feature' must be a string [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.id.validation/output b/tests/Baseline/hilti.types.id.validation/output index cc985d6e8..115ddce0c 100644 --- a/tests/Baseline/hilti.types.id.validation/output +++ b/tests/Baseline/hilti.types.id.validation/output @@ -1,7 +1,7 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/validation.hlt:6:7: Invalid ID 'a-b': cannot contain '-' -[error] <...>/validation.hlt:7:7: Invalid ID '__private_name': cannot start with '__' -[error] <...>/validation.hlt:9:6: Invalid ID 'Bar-Baz': cannot contain '-' -[error] <...>/validation.hlt:14:11: Invalid ID 'a-b': cannot contain '-' -[error] <...>/validation.hlt:17:15: Invalid ID 'f-1': cannot contain '-' +[error] <...>/validation.hlt:6:7-6:9: Invalid ID 'a-b': cannot contain '-' +[error] <...>/validation.hlt:7:7-7:20: Invalid ID '__private_name': cannot start with '__' +[error] <...>/validation.hlt:9:6-9:12: Invalid ID 'Bar-Baz': cannot contain '-' +[error] <...>/validation.hlt:14:11-14:13: Invalid ID 'a-b': cannot contain '-' +[error] <...>/validation.hlt:17:15-17:17: Invalid ID 'f-1': cannot contain '-' [error] hiltic: parse error diff --git a/tests/Baseline/hilti.types.integer.coercion-fail/output b/tests/Baseline/hilti.types.integer.coercion-fail/output index ac9482428..9e1ed6f81 100644 --- a/tests/Baseline/hilti.types.integer.coercion-fail/output +++ b/tests/Baseline/hilti.types.integer.coercion-fail/output @@ -1,19 +1,19 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/coercion-fail.hlt:9:14-13:32: cannot coerce expression '256' of type 'uint<64>' to type 'uint<8>' -[error] <...>/coercion-fail.hlt:13:32-14:34: cannot coerce expression '65536' of type 'uint<64>' to type 'uint<16>' -[error] <...>/coercion-fail.hlt:14:34-15:38: cannot coerce expression '4294967296' of type 'uint<64>' to type 'uint<32>' -[error] <...>/coercion-fail.hlt:15:38-19:29: cannot coerce expression '-1' of type 'int<64>' to type 'uint<8>' -[error] <...>/coercion-fail.hlt:19:29-20:29: cannot coerce expression '-1' of type 'int<64>' to type 'uint<16>' -[error] <...>/coercion-fail.hlt:20:29-21:29: cannot coerce expression '-1' of type 'int<64>' to type 'uint<32>' -[error] <...>/coercion-fail.hlt:21:29-22:29: cannot coerce expression '-1' of type 'int<64>' to type 'uint<64>' -[error] <...>/coercion-fail.hlt:22:29-24:29: cannot coerce expression '128' of type 'uint<64>' to type 'int<8>' -[error] <...>/coercion-fail.hlt:24:29-25:29: cannot coerce expression '-129' of type 'int<64>' to type 'int<8>' -[error] <...>/coercion-fail.hlt:25:29-27:33: cannot coerce expression '32768' of type 'uint<64>' to type 'int<16>' -[error] <...>/coercion-fail.hlt:27:33-28:33: cannot coerce expression '-32769' of type 'int<64>' to type 'int<16>' -[error] <...>/coercion-fail.hlt:28:33-30:37: cannot coerce expression '2147483648' of type 'uint<64>' to type 'int<32>' -[error] <...>/coercion-fail.hlt:30:37-31:37: cannot coerce expression '-2147483649' of type 'int<64>' to type 'int<32>' -[error] <...>/coercion-fail.hlt:31:37-33:46: cannot coerce expression '9223372036854775808' of type 'uint<64>' to type 'int<64>' -[error] <...>/coercion-fail.hlt:33:46-39:46: cannot coerce expression '9007199254740993' of type 'uint<64>' to type 'real' -[error] <...>/coercion-fail.hlt:39:46-40:47: cannot coerce expression '-9007199254740993' of type 'int<64>' to type 'real' -[error] <...>/coercion-fail.hlt:42:23-44:19: cannot coerce expression 'Foo::i' of type 'int<32>' to type 'bool' +[error] <...>/coercion-fail.hlt:13:1-13:31: cannot coerce expression '256' of type 'uint<64>' to type 'uint<8>' +[error] <...>/coercion-fail.hlt:14:1-14:33: cannot coerce expression '65536' of type 'uint<64>' to type 'uint<16>' +[error] <...>/coercion-fail.hlt:15:1-15:37: cannot coerce expression '4294967296' of type 'uint<64>' to type 'uint<32>' +[error] <...>/coercion-fail.hlt:19:1-19:28: cannot coerce expression '-1' of type 'int<64>' to type 'uint<8>' +[error] <...>/coercion-fail.hlt:20:1-20:28: cannot coerce expression '-1' of type 'int<64>' to type 'uint<16>' +[error] <...>/coercion-fail.hlt:21:1-21:28: cannot coerce expression '-1' of type 'int<64>' to type 'uint<32>' +[error] <...>/coercion-fail.hlt:22:1-22:28: cannot coerce expression '-1' of type 'int<64>' to type 'uint<64>' +[error] <...>/coercion-fail.hlt:24:1-24:28: cannot coerce expression '128' of type 'uint<64>' to type 'int<8>' +[error] <...>/coercion-fail.hlt:25:1-25:28: cannot coerce expression '-129' of type 'int<64>' to type 'int<8>' +[error] <...>/coercion-fail.hlt:27:1-27:32: cannot coerce expression '32768' of type 'uint<64>' to type 'int<16>' +[error] <...>/coercion-fail.hlt:28:1-28:32: cannot coerce expression '-32769' of type 'int<64>' to type 'int<16>' +[error] <...>/coercion-fail.hlt:30:1-30:36: cannot coerce expression '2147483648' of type 'uint<64>' to type 'int<32>' +[error] <...>/coercion-fail.hlt:31:1-31:36: cannot coerce expression '-2147483649' of type 'int<64>' to type 'int<32>' +[error] <...>/coercion-fail.hlt:33:1-33:45: cannot coerce expression '9223372036854775808' of type 'uint<64>' to type 'int<64>' +[error] <...>/coercion-fail.hlt:39:1-39:45: cannot coerce expression '9007199254740993' of type 'uint<64>' to type 'real' +[error] <...>/coercion-fail.hlt:40:1-40:46: cannot coerce expression '-9007199254740993' of type 'int<64>' to type 'real' +[error] <...>/coercion-fail.hlt:44:1-44:18: cannot coerce expression 'Foo::i' of type 'int<32>' to type 'bool' [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.ctor-fail-2/output b/tests/Baseline/hilti.types.integer.ctor-fail-2/output index e5434e650..3b4aa02de 100644 --- a/tests/Baseline/hilti.types.integer.ctor-fail-2/output +++ b/tests/Baseline/hilti.types.integer.ctor-fail-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:2:18: integer value out of range +[error] <...>/ctor-fail.hlt:2:18-2:37: integer value out of range [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.ctor-fail-3/output b/tests/Baseline/hilti.types.integer.ctor-fail-3/output index b0679a2ac..6c75702f9 100644 --- a/tests/Baseline/hilti.types.integer.ctor-fail-3/output +++ b/tests/Baseline/hilti.types.integer.ctor-fail-3/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:2:12: integer value out of range +[error] <...>/ctor-fail.hlt:2:12-2:21: integer value out of range [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.ctor-fail-4/output b/tests/Baseline/hilti.types.integer.ctor-fail-4/output index 8e97ec7e3..ebd00c251 100644 --- a/tests/Baseline/hilti.types.integer.ctor-fail-4/output +++ b/tests/Baseline/hilti.types.integer.ctor-fail-4/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:2:12: integer value out of range for type +[error] <...>/ctor-fail.hlt:2:12-2:21: integer value out of range for type [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.ctor-fail-5/output b/tests/Baseline/hilti.types.integer.ctor-fail-5/output index b0679a2ac..01a1de08d 100644 --- a/tests/Baseline/hilti.types.integer.ctor-fail-5/output +++ b/tests/Baseline/hilti.types.integer.ctor-fail-5/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:2:12: integer value out of range +[error] <...>/ctor-fail.hlt:2:12-2:22: integer value out of range [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.ctor-fail-6/output b/tests/Baseline/hilti.types.integer.ctor-fail-6/output index b0679a2ac..f3109da23 100644 --- a/tests/Baseline/hilti.types.integer.ctor-fail-6/output +++ b/tests/Baseline/hilti.types.integer.ctor-fail-6/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:2:12: integer value out of range +[error] <...>/ctor-fail.hlt:2:12-2:20: integer value out of range [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.ctor-fail-7/output b/tests/Baseline/hilti.types.integer.ctor-fail-7/output index 8e97ec7e3..10eb6e8e4 100644 --- a/tests/Baseline/hilti.types.integer.ctor-fail-7/output +++ b/tests/Baseline/hilti.types.integer.ctor-fail-7/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:2:12: integer value out of range for type +[error] <...>/ctor-fail.hlt:2:12-2:20: integer value out of range for type [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.ctor-fail-8/output b/tests/Baseline/hilti.types.integer.ctor-fail-8/output index d118fbe3a..876090617 100644 --- a/tests/Baseline/hilti.types.integer.ctor-fail-8/output +++ b/tests/Baseline/hilti.types.integer.ctor-fail-8/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:2:12: integer constant out of range +[error] <...>/ctor-fail.hlt:2:12-2:31: integer constant out of range [error] hiltic: parse error diff --git a/tests/Baseline/hilti.types.integer.ctor-fail/output b/tests/Baseline/hilti.types.integer.ctor-fail/output index 3f962fae9..fe0a60362 100644 --- a/tests/Baseline/hilti.types.integer.ctor-fail/output +++ b/tests/Baseline/hilti.types.integer.ctor-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:7:12: integer value out of range +[error] <...>/ctor-fail.hlt:7:12-7:37: integer value out of range [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.mixed-operands-overflow/output.log b/tests/Baseline/hilti.types.integer.mixed-operands-overflow/output.log index 8165d4b12..eb1e6c3a2 100644 --- a/tests/Baseline/hilti.types.integer.mixed-operands-overflow/output.log +++ b/tests/Baseline/hilti.types.integer.mixed-operands-overflow/output.log @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/mixed-operands-overflow.hlt:7:6: unsupported operator: > + > +[error] <...>/mixed-operands-overflow.hlt:7:6-7:13: unsupported operator: > + > [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.overflow-diag/output b/tests/Baseline/hilti.types.integer.overflow-diag/output index b29949691..4ca8a9685 100644 --- a/tests/Baseline/hilti.types.integer.overflow-diag/output +++ b/tests/Baseline/hilti.types.integer.overflow-diag/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -uncaught exception hilti::rt::Overflow: integer overflow (<...>/overflow-diag.hlt:11:1) +uncaught exception hilti::rt::Overflow: integer overflow (<...>/overflow-diag.hlt:11:1-11:19) diff --git a/tests/Baseline/hilti.types.integer.signed-out-of-range/output b/tests/Baseline/hilti.types.integer.signed-out-of-range/output index 3fa26244d..855c8b385 100644 --- a/tests/Baseline/hilti.types.integer.signed-out-of-range/output +++ b/tests/Baseline/hilti.types.integer.signed-out-of-range/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/signed-out-of-range.hlt:10:26: integer value out of range +[error] <...>/signed-out-of-range.hlt:10:26-10:44: integer value out of range [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.integer.unpack-fail/output b/tests/Baseline/hilti.types.integer.unpack-fail/output index 950d963af..d1b28350d 100644 --- a/tests/Baseline/hilti.types.integer.unpack-fail/output +++ b/tests/Baseline/hilti.types.integer.unpack-fail/output @@ -1,9 +1,9 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/unpack-fail.hlt:10:1: not enough arguments for pack operator -[error] <...>/unpack-fail.hlt:11:1: invalid arguments for integer packing; want (, ) -[error] <...>/unpack-fail.hlt:12:1: invalid arguments for integer packing; want (, ) -[error] <...>/unpack-fail.hlt:14:1: not enough arguments for unpack operator -[error] <...>/unpack-fail.hlt:15:1: unpack() can be used only with bytes or a stream view as input -[error] <...>/unpack-fail.hlt:16:1: invalid arguments for integer unpacking; want (, ) -[error] <...>/unpack-fail.hlt:17:1: invalid arguments for integer unpacking; want (, ) +[error] <...>/unpack-fail.hlt:10:1-10:6: not enough arguments for pack operator +[error] <...>/unpack-fail.hlt:11:1-11:8: invalid arguments for integer packing; want (, ) +[error] <...>/unpack-fail.hlt:12:1-12:40: invalid arguments for integer packing; want (, ) +[error] <...>/unpack-fail.hlt:14:1-14:18: not enough arguments for unpack operator +[error] <...>/unpack-fail.hlt:15:1-15:20: unpack() can be used only with bytes or a stream view as input +[error] <...>/unpack-fail.hlt:16:1-16:21: invalid arguments for integer unpacking; want (, ) +[error] <...>/unpack-fail.hlt:17:1-17:53: invalid arguments for integer unpacking; want (, ) [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.list.ctor-fail/output b/tests/Baseline/hilti.types.list.ctor-fail/output index 1bba34d2f..bb27cba3b 100644 --- a/tests/Baseline/hilti.types.list.ctor-fail/output +++ b/tests/Baseline/hilti.types.list.ctor-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:8:15: list elements have inconsistent types +[error] <...>/ctor-fail.hlt:8:15-8:24: list elements have inconsistent types [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.map.ctor-fail/output b/tests/Baseline/hilti.types.map.ctor-fail/output index f649e36a1..4c7451898 100644 --- a/tests/Baseline/hilti.types.map.ctor-fail/output +++ b/tests/Baseline/hilti.types.map.ctor-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:6:1: inconsistent key types in map +[error] <...>/ctor-fail.hlt:6:1-6:29: inconsistent key types in map [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.map.index-type-mismatch/output b/tests/Baseline/hilti.types.map.index-type-mismatch/output index ab6c3824c..cd700e2f0 100644 --- a/tests/Baseline/hilti.types.map.index-type-mismatch/output +++ b/tests/Baseline/hilti.types.map.index-type-mismatch/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/index-type-mismatch.hlt:9:1: unsupported operator: , uint<64>>, uint<64>>>[>] +[error] <...>/index-type-mismatch.hlt:9:1-9:4: unsupported operator: , uint<64>>, uint<64>>>[>] [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.map.invalid-key-type/output b/tests/Baseline/hilti.types.map.invalid-key-type/output index e33191f07..3638cb9f0 100644 --- a/tests/Baseline/hilti.types.map.invalid-key-type/output +++ b/tests/Baseline/hilti.types.map.invalid-key-type/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/invalid-key-type.hlt:9:8: type cannot be used as key type for maps (because type 'foo::X' is not sortable) -[error] <...>/invalid-key-type.hlt:11:8: type cannot be used as key type for maps (because type 'set>' is not sortable) -[error] <...>/invalid-key-type.hlt:12:8: type cannot be used as key type for maps (because type 'set>' is not sortable) +[error] <...>/invalid-key-type.hlt:9:8-9:21: type cannot be used as key type for maps (because type 'foo::X' is not sortable) +[error] <...>/invalid-key-type.hlt:11:8-11:40: type cannot be used as key type for maps (because type 'set>' is not sortable) +[error] <...>/invalid-key-type.hlt:12:8-12:47: type cannot be used as key type for maps (because type 'set>' is not sortable) [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.map.ops-fail/output b/tests/Baseline/hilti.types.map.ops-fail/output index 035345391..d9e8ff542 100644 --- a/tests/Baseline/hilti.types.map.ops-fail/output +++ b/tests/Baseline/hilti.types.map.ops-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ops-fail.hlt:8:1: cannot coerce expression 'b""' of type 'bytes' to type 'uint<64>' +[error] <...>/ops-fail.hlt:8:1-8:37: cannot coerce expression 'b""' of type 'bytes' to type 'uint<64>' [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.real.coercion-fail/output b/tests/Baseline/hilti.types.real.coercion-fail/output index 07ff71a98..31bce3b9f 100644 --- a/tests/Baseline/hilti.types.real.coercion-fail/output +++ b/tests/Baseline/hilti.types.real.coercion-fail/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/coercion-fail.hlt:6:14-8:27: cannot coerce expression '0x1.028f5c28f5c29p+0' of type 'real' to type 'bool' -[error] <...>/coercion-fail.hlt:8:27-9:26: cannot coerce expression '0x0p+0' of type 'real' to type 'bool' -[error] <...>/coercion-fail.hlt:9:26-13:34: cannot coerce expression '9007199254740993' of type 'uint<64>' to type 'real' +[error] <...>/coercion-fail.hlt:8:1-8:26: cannot coerce expression '0x1.028f5c28f5c29p+0' of type 'real' to type 'bool' +[error] <...>/coercion-fail.hlt:9:1-9:25: cannot coerce expression '0x0p+0' of type 'real' to type 'bool' +[error] <...>/coercion-fail.hlt:13:1-13:33: cannot coerce expression '9007199254740993' of type 'uint<64>' to type 'real' [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.real.nops/output b/tests/Baseline/hilti.types.real.nops/output index f95e375a9..532424961 100644 --- a/tests/Baseline/hilti.types.real.nops/output +++ b/tests/Baseline/hilti.types.real.nops/output @@ -38,9 +38,9 @@ extern void __hlt::Foo::__init_globals(::hilti::rt::Context* ctx) { } extern void __hlt::Foo::__init_module() { - __location__("<...>/nops.hlt:11:1"); + __location__("<...>/nops.hlt:11:1-11:35"); if ( ! (0x1.999999999999ap-4 == 0x1.999999999999ap-4) ) { - throw ::hilti::rt::AssertionFailure("failed expression '0x1.999999999999ap-4 == 0x1.999999999999ap-4'", "<...>/nops.hlt:11:1"); + throw ::hilti::rt::AssertionFailure("failed expression '0x1.999999999999ap-4 == 0x1.999999999999ap-4'", "<...>/nops.hlt:11:1-11:35"); } } diff --git a/tests/Baseline/hilti.types.real.unpack-fail/output b/tests/Baseline/hilti.types.real.unpack-fail/output index 4b5d382b9..24b432987 100644 --- a/tests/Baseline/hilti.types.real.unpack-fail/output +++ b/tests/Baseline/hilti.types.real.unpack-fail/output @@ -1,9 +1,9 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/unpack-fail.hlt:10:1: not enough arguments for pack operator -[error] <...>/unpack-fail.hlt:11:1: invalid arguments for integer packing; want (, ) -[error] <...>/unpack-fail.hlt:12:1: invalid arguments for integer packing; want (, ) -[error] <...>/unpack-fail.hlt:14:1: not enough arguments for unpack operator -[error] <...>/unpack-fail.hlt:15:1: unpack() can be used only with bytes or a stream view as input -[error] <...>/unpack-fail.hlt:16:1: invalid arguments for real unpacking; want (, , ) -[error] <...>/unpack-fail.hlt:17:1: invalid arguments for real unpacking; want (, , ) +[error] <...>/unpack-fail.hlt:10:1-10:6: not enough arguments for pack operator +[error] <...>/unpack-fail.hlt:11:1-11:8: invalid arguments for integer packing; want (, ) +[error] <...>/unpack-fail.hlt:12:1-12:40: invalid arguments for integer packing; want (, ) +[error] <...>/unpack-fail.hlt:14:1-14:14: not enough arguments for unpack operator +[error] <...>/unpack-fail.hlt:15:1-15:16: unpack() can be used only with bytes or a stream view as input +[error] <...>/unpack-fail.hlt:16:1-16:17: invalid arguments for real unpacking; want (, , ) +[error] <...>/unpack-fail.hlt:17:1-17:49: invalid arguments for real unpacking; want (, , ) [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.result.exceptions-2/output b/tests/Baseline/hilti.types.result.exceptions-2/output index 1f9017fa4..4d89ffc72 100644 --- a/tests/Baseline/hilti.types.result.exceptions-2/output +++ b/tests/Baseline/hilti.types.result.exceptions-2/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -uncaught exception hilti::rt::result::NoError: (<...>/exceptions.hlt:8:9) +uncaught exception hilti::rt::result::NoError: (<...>/exceptions.hlt:8:9-8:23) diff --git a/tests/Baseline/hilti.types.result.exceptions/output b/tests/Baseline/hilti.types.result.exceptions/output index 1398d0d98..5494ec5f4 100644 --- a/tests/Baseline/hilti.types.result.exceptions/output +++ b/tests/Baseline/hilti.types.result.exceptions/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -uncaught exception hilti::rt::result::NoResult: trouble... (<...>/exceptions.hlt:12:9) +uncaught exception hilti::rt::result::NoResult: trouble... (<...>/exceptions.hlt:12:9-12:35) diff --git a/tests/Baseline/hilti.types.set.ctor-fail/output b/tests/Baseline/hilti.types.set.ctor-fail/output index b56e14416..176744bb2 100644 --- a/tests/Baseline/hilti.types.set.ctor-fail/output +++ b/tests/Baseline/hilti.types.set.ctor-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:6:1: type mismatch in set elements -[error] <...>/ctor-fail.hlt:6:1: set elements have inconsistent types +[error] <...>/ctor-fail.hlt:6:1-6:14: type mismatch in set elements +[error] <...>/ctor-fail.hlt:6:1-6:14: set elements have inconsistent types [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.set.ops-fail/output b/tests/Baseline/hilti.types.set.ops-fail/output index 035345391..2c2162ae5 100644 --- a/tests/Baseline/hilti.types.set.ops-fail/output +++ b/tests/Baseline/hilti.types.set.ops-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ops-fail.hlt:8:1: cannot coerce expression 'b""' of type 'bytes' to type 'uint<64>' +[error] <...>/ops-fail.hlt:8:1-8:19: cannot coerce expression 'b""' of type 'bytes' to type 'uint<64>' [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.errors-2/output b/tests/Baseline/hilti.types.struct.errors-2/output index 2ed26e09f..04e69c113 100644 --- a/tests/Baseline/hilti.types.struct.errors-2/output +++ b/tests/Baseline/hilti.types.struct.errors-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/errors.hlt:12:1: field 's' is not &optional +[error] <...>/errors.hlt:12:1-12:10: field 's' is not &optional [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.errors-method-2/output b/tests/Baseline/hilti.types.struct.errors-method-2/output index ced72c5e4..c6953b6c0 100644 --- a/tests/Baseline/hilti.types.struct.errors-method-2/output +++ b/tests/Baseline/hilti.types.struct.errors-method-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/errors-method.hlt:6:34: unknown ID 'self' +[error] <...>/errors-method.hlt:6:34-6:37: unknown ID 'self' [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.errors-method/output b/tests/Baseline/hilti.types.struct.errors-method/output index 53156c531..b2467908b 100644 --- a/tests/Baseline/hilti.types.struct.errors-method/output +++ b/tests/Baseline/hilti.types.struct.errors-method/output @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/errors-method.hlt:15:1: type X does not have a method 'x' matching the signature -[error] <...>/errors-method.hlt:16:1: type X does not have a method 'y' -[error] <...>/errors-method.hlt:17:1: X::s is not a method -[error] <...>/errors-method.hlt:18:1: method lacks a type namespace +[error] <...>/errors-method.hlt:15:1-15:30: type X does not have a method 'x' matching the signature +[error] <...>/errors-method.hlt:16:1-16:30: type X does not have a method 'y' +[error] <...>/errors-method.hlt:17:1-17:30: X::s is not a method +[error] <...>/errors-method.hlt:18:1-18:27: method lacks a type namespace [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.errors-no-self/output b/tests/Baseline/hilti.types.struct.errors-no-self/output index d9df96be4..1e5f244c6 100644 --- a/tests/Baseline/hilti.types.struct.errors-no-self/output +++ b/tests/Baseline/hilti.types.struct.errors-no-self/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/errors-no-self.hlt:13:34: unknown ID 'self' +[error] <...>/errors-no-self.hlt:13:34-13:37: unknown ID 'self' [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.errors/output b/tests/Baseline/hilti.types.struct.errors/output index ecb22ef45..fdb35cef3 100644 --- a/tests/Baseline/hilti.types.struct.errors/output +++ b/tests/Baseline/hilti.types.struct.errors/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/errors.hlt:14:14: type does not have field 'DoesNotExist' +[error] <...>/errors.hlt:14:14-14:27: type does not have field 'DoesNotExist' [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.finally-fail-2/output b/tests/Baseline/hilti.types.struct.finally-fail-2/output index 3edc80d00..807dca9f5 100644 --- a/tests/Baseline/hilti.types.struct.finally-fail-2/output +++ b/tests/Baseline/hilti.types.struct.finally-fail-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/finally-fail.hlt:4:10-6:2: ~finally must have return type void +[error] <...>/finally-fail.hlt:4:10-6:1: ~finally must have return type void [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.finally-fail-3/output b/tests/Baseline/hilti.types.struct.finally-fail-3/output index b4b571321..a3bf049cb 100644 --- a/tests/Baseline/hilti.types.struct.finally-fail-3/output +++ b/tests/Baseline/hilti.types.struct.finally-fail-3/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/finally-fail.hlt:4:10-6:2: ~finally cannot take any parameters +[error] <...>/finally-fail.hlt:4:10-6:1: ~finally cannot take any parameters [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.finally-fail/output b/tests/Baseline/hilti.types.struct.finally-fail/output index 1474c7de9..c3e882982 100644 --- a/tests/Baseline/hilti.types.struct.finally-fail/output +++ b/tests/Baseline/hilti.types.struct.finally-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/finally-fail.hlt:8:10-10:2: ~finally must be a hook +[error] <...>/finally-fail.hlt:8:10-10:1: ~finally must be a hook [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.params-fail/output b/tests/Baseline/hilti.types.struct.params-fail/output index 4c6ff3aa4..e0ecf68a7 100644 --- a/tests/Baseline/hilti.types.struct.params-fail/output +++ b/tests/Baseline/hilti.types.struct.params-fail/output @@ -1,12 +1,12 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/params-fail.hlt:30:17: type expects string for parameter 1, but receives uint<64> -[error] <...>/params-fail.hlt:12:3-14:18: type expects 0 parameter, but receives 1 -[error] <...>/params-fail.hlt:15:18: type expects 0 parameter, but receives 1 -[error] <...>/params-fail.hlt:15:34-16:18: type expects 0 parameter, but receives 1 -[error] <...>/params-fail.hlt:17:18: type expects 0 parameter, but receives 1 -[error] <...>/params-fail.hlt:17:29-19:17: type expects string for parameter 1, but receives uint<64> -[error] <...>/params-fail.hlt:20:18: type expects string for parameter 1, but receives uint<64> -[error] <...>/params-fail.hlt:20:33-21:17: type expects string for parameter 1, but receives uint<64> -[error] <...>/params-fail.hlt:22:18: type expects string for parameter 1, but receives uint<64> -[error] <...>/params-fail.hlt:23:18: type parameter 1 is missing (X) +[error] <...>/params-fail.hlt:30:17-30:41: type expects string for parameter 1, but receives uint<64> +[error] <...>/params-fail.hlt:14:1-14:17: type expects 0 parameter, but receives 1 +[error] <...>/params-fail.hlt:15:18-15:32: type expects 0 parameter, but receives 1 +[error] <...>/params-fail.hlt:16:1-16:17: type expects 0 parameter, but receives 1 +[error] <...>/params-fail.hlt:17:18-17:27: type expects 0 parameter, but receives 1 +[error] <...>/params-fail.hlt:19:1-19:16: type expects string for parameter 1, but receives uint<64> +[error] <...>/params-fail.hlt:20:18-20:31: type expects string for parameter 1, but receives uint<64> +[error] <...>/params-fail.hlt:21:1-21:16: type expects string for parameter 1, but receives uint<64> +[error] <...>/params-fail.hlt:22:18-22:26: type expects string for parameter 1, but receives uint<64> +[error] <...>/params-fail.hlt:23:18-23:22: type parameter 1 is missing (X) [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.struct.params-write-fail/output b/tests/Baseline/hilti.types.struct.params-write-fail/output index 915f026da..44d2c9072 100644 --- a/tests/Baseline/hilti.types.struct.params-write-fail/output +++ b/tests/Baseline/hilti.types.struct.params-write-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/params-write-fail.hlt:17:5: cannot assign to expression: X = True -[error] <...>/params-write-fail.hlt:18:5: unsupported operator: add >[] +[error] <...>/params-write-fail.hlt:17:5-17:12: cannot assign to expression: X = True +[error] <...>/params-write-fail.hlt:18:5-18:15: unsupported operator: add >[] [error] spicyc: aborting after errors diff --git a/tests/Baseline/hilti.types.tuple.coercion/output b/tests/Baseline/hilti.types.tuple.coercion/output index bb3ea26a7..57667a8ff 100644 --- a/tests/Baseline/hilti.types.tuple.coercion/output +++ b/tests/Baseline/hilti.types.tuple.coercion/output @@ -17,7 +17,7 @@ namespace __hlt::Foo { HILTI_PRE_INIT(__hlt::Foo::__register_module) extern void __hlt::Foo::__init_module() { - __location__("<...>/coercion.hlt:14:1"); + __location__("<...>/coercion.hlt:14:1-14:17"); ::hilti::rt::print(f(), ::hilti::rt::Bool(true)); } @@ -25,7 +25,7 @@ extern void __hlt::Foo::__register_module() { ::hilti::rt::detail::registerModul static auto __hlt::Foo::f() -> std::tuple<::hilti::rt::integer::safe, std::string> { ::hilti::rt::detail::checkStack(); - __location__("<...>/coercion.hlt:11:5"); + __location__("<...>/coercion.hlt:11:5-11:24"); return std::make_tuple(::hilti::rt::integer::safe{123U}, std::string("abc")); } diff --git a/tests/Baseline/hilti.types.tuple.index-fail/output b/tests/Baseline/hilti.types.tuple.index-fail/output index 07dc33aa8..1913153db 100644 --- a/tests/Baseline/hilti.types.tuple.index-fail/output +++ b/tests/Baseline/hilti.types.tuple.index-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/index-fail.hlt:12:14: tuple index out of range +[error] <...>/index-fail.hlt:12:14-12:17: tuple index out of range [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.tuple.index-not-constant-fail/output b/tests/Baseline/hilti.types.tuple.index-not-constant-fail/output index 50533c984..c48045ae4 100644 --- a/tests/Baseline/hilti.types.tuple.index-not-constant-fail/output +++ b/tests/Baseline/hilti.types.tuple.index-not-constant-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/index-not-constant-fail.hlt:13:14: tuple index must be an integer constant +[error] <...>/index-not-constant-fail.hlt:13:14-13:17: tuple index must be an integer constant [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.tuple.index-not-unsigned-integer-fail/output b/tests/Baseline/hilti.types.tuple.index-not-unsigned-integer-fail/output index d497b0a89..78e7826fe 100644 --- a/tests/Baseline/hilti.types.tuple.index-not-unsigned-integer-fail/output +++ b/tests/Baseline/hilti.types.tuple.index-not-unsigned-integer-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/index-not-unsigned-integer-fail.hlt:12:14: unsupported operator: >[>] +[error] <...>/index-not-unsigned-integer-fail.hlt:12:14-12:18: unsupported operator: >[>] [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.types.vector.ctor-fail/output b/tests/Baseline/hilti.types.vector.ctor-fail/output index b8cd32de7..f54bca21c 100644 --- a/tests/Baseline/hilti.types.vector.ctor-fail/output +++ b/tests/Baseline/hilti.types.vector.ctor-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.hlt:6:1: type mismatch in vector elements -[error] <...>/ctor-fail.hlt:6:1: vector elements have inconsistent types +[error] <...>/ctor-fail.hlt:6:1-6:17: type mismatch in vector elements +[error] <...>/ctor-fail.hlt:6:1-6:17: vector elements have inconsistent types [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.validation.const-violations/output b/tests/Baseline/hilti.validation.const-violations/output index 111e4e3d7..7980f7300 100644 --- a/tests/Baseline/hilti.validation.const-violations/output +++ b/tests/Baseline/hilti.validation.const-violations/output @@ -1,12 +1,12 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/const-violations.hlt:22:5: unsupported operator: >>.push_back(>) -[error] <...>/const-violations.hlt:23:5: cannot assign to expression: v = v2 -[error] <...>/const-violations.hlt:24:5: cannot assign to expression: v[5] = 1 -[error] <...>/const-violations.hlt:25:5: cannot assign to expression: v -[error] <...>/const-violations.hlt:26:5: call does not match any function: p2(>>) -[error] <...>/const-violations.hlt:26:5: candidate functions: -[error] <...>/const-violations.hlt:26:5: - p2(>>) -[error] <...>/const-violations.hlt:29:5: call does not match any method: .x(>>) -[error] <...>/const-violations.hlt:29:5: candidate methods: -[error] <...>/const-violations.hlt:29:5: - .x(>>) +[error] <...>/const-violations.hlt:22:5-22:18: unsupported operator: >>.push_back(>) +[error] <...>/const-violations.hlt:23:5-23:10: cannot assign to expression: v = v2 +[error] <...>/const-violations.hlt:24:5-24:12: cannot assign to expression: v[5] = 1 +[error] <...>/const-violations.hlt:25:5-25:21: cannot assign to expression: v +[error] <...>/const-violations.hlt:26:5-26:9: call does not match any function: p2(>>) +[error] <...>/const-violations.hlt:26:5-26:9: candidate functions: +[error] <...>/const-violations.hlt:26:5-26:9: - p2(>>) +[error] <...>/const-violations.hlt:29:5-29:10: call does not match any method: .x(>>) +[error] <...>/const-violations.hlt:29:5-29:10: candidate methods: +[error] <...>/const-violations.hlt:29:5-29:10: - .x(>>) [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.validation.declaration-cycle/output b/tests/Baseline/hilti.validation.declaration-cycle/output index b489bd36b..77b8c86c5 100644 --- a/tests/Baseline/hilti.validation.declaration-cycle/output +++ b/tests/Baseline/hilti.validation.declaration-cycle/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/declaration-cycle.hlt:5:19: ID cannot be used inside its own declaration +[error] <...>/declaration-cycle.hlt:5:19-5:19: ID cannot be used inside its own declaration [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.validation.duplicate-2/output b/tests/Baseline/hilti.validation.duplicate-2/output index c01819c65..01e90052e 100644 --- a/tests/Baseline/hilti.validation.duplicate-2/output +++ b/tests/Baseline/hilti.validation.duplicate-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/duplicate.hlt:5:30-6:14: redefinition of 'f' defined in <...>/duplicate.hlt:2:13-5:30 +[error] <...>/duplicate.hlt:6:1-6:13: redefinition of 'f' defined in <...>/duplicate.hlt:5:1-5:29 [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.validation.duplicate/output b/tests/Baseline/hilti.validation.duplicate/output index c42c39db2..43916a916 100644 --- a/tests/Baseline/hilti.validation.duplicate/output +++ b/tests/Baseline/hilti.validation.duplicate/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/duplicate.hlt:15:14-16:14: redefinition of 'i' defined in <...>/duplicate.hlt:12:14-15:14 +[error] <...>/duplicate.hlt:16:1-16:13: redefinition of 'i' defined in <...>/duplicate.hlt:15:1-15:13 [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.validation.local-variables/output b/tests/Baseline/hilti.validation.local-variables/output index 6e3ccd8e5..d7ad97001 100644 --- a/tests/Baseline/hilti.validation.local-variables/output +++ b/tests/Baseline/hilti.validation.local-variables/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/local-variables.hlt:8:1: local variables cannot be declared at module scope +[error] <...>/local-variables.hlt:8:1-8:17: local variables cannot be declared at module scope [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.validation.self-decl-fail/output b/tests/Baseline/hilti.validation.self-decl-fail/output index 8ec68847d..824c48be0 100644 --- a/tests/Baseline/hilti.validation.self-decl-fail/output +++ b/tests/Baseline/hilti.validation.self-decl-fail/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/self-decl-fail.hlt:4:13-6:17: cannot use 'self' as identifier -[error] <...>/self-decl-fail.hlt:8:19: cannot use 'self' as identifier -[error] <...>/self-decl-fail.hlt:9:5: cannot use 'self' as identifier +[error] <...>/self-decl-fail.hlt:6:1-6:16: cannot use 'self' as identifier +[error] <...>/self-decl-fail.hlt:8:19-8:29: cannot use 'self' as identifier +[error] <...>/self-decl-fail.hlt:9:5-9:19: cannot use 'self' as identifier [error] hiltic: aborting after errors diff --git a/tests/Baseline/hilti.validation.wildcard-types/output b/tests/Baseline/hilti.validation.wildcard-types/output index 82b2fbd14..77e19ec88 100644 --- a/tests/Baseline/hilti.validation.wildcard-types/output +++ b/tests/Baseline/hilti.validation.wildcard-types/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/wildcard-types.hlt:4:13-6:17: cannot use wildcard type for variables -[error] <...>/wildcard-types.hlt:8:17: parameter 't' cannot have wildcard type; only allowed with runtime library functions declared with &cxxname -[error] <...>/wildcard-types.hlt:9:5: cannot use wildcard type for variables +[error] <...>/wildcard-types.hlt:6:1-6:16: cannot use wildcard type for variables +[error] <...>/wildcard-types.hlt:8:17-8:26: parameter 't' cannot have wildcard type; only allowed with runtime library functions declared with &cxxname +[error] <...>/wildcard-types.hlt:9:5-9:19: cannot use wildcard type for variables [error] hiltic: aborting after errors diff --git a/tests/Baseline/spicy.attributes.byte-order/output b/tests/Baseline/spicy.attributes.byte-order/output index 445a763d3..5a9adaab9 100644 --- a/tests/Baseline/spicy.attributes.byte-order/output +++ b/tests/Baseline/spicy.attributes.byte-order/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/byte-order.spicy:9:15: &byte-order requires an expression -[error] <...>/byte-order.spicy:6:1: %byte-order expression must be of spicy::ByteOrder, but is of type uint<64> +[error] <...>/byte-order.spicy:9:15-9:25: &byte-order requires an expression +[error] <...>/byte-order.spicy:6:1-6:14: %byte-order expression must be of spicy::ByteOrder, but is of type uint<64> [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.attributes.spicy-version-fail-2/output b/tests/Baseline/spicy.attributes.spicy-version-fail-2/output index 4c718e72d..f5e6cce53 100644 --- a/tests/Baseline/spicy.attributes.spicy-version-fail-2/output +++ b/tests/Baseline/spicy.attributes.spicy-version-fail-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/spicy-version-fail.spicy:1:1-2:27: module Test requires at least Spicy version 10.0.1 (XXXXXX) +[error] <...>/spicy-version-fail.spicy:1:1-2:26: module Test requires at least Spicy version 10.0.1 (XXXXXX) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.attributes.spicy-version-fail-3/output b/tests/Baseline/spicy.attributes.spicy-version-fail-3/output index 29cc7eca1..d9ad86ece 100644 --- a/tests/Baseline/spicy.attributes.spicy-version-fail-3/output +++ b/tests/Baseline/spicy.attributes.spicy-version-fail-3/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/spicy-version-fail.spicy:1:1-2:24: %spicy-version requires argument of the form x.y[.z] (XXXXXX) +[error] <...>/spicy-version-fail.spicy:1:1-2:23: %spicy-version requires argument of the form x.y[.z] (XXXXXX) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.attributes.spicy-version-fail-4/output b/tests/Baseline/spicy.attributes.spicy-version-fail-4/output index 22704baca..209b3a9bf 100644 --- a/tests/Baseline/spicy.attributes.spicy-version-fail-4/output +++ b/tests/Baseline/spicy.attributes.spicy-version-fail-4/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/spicy-version-fail.spicy:1:1-2:30: %spicy-version requires argument of the form x.y[.z] (XXXXXX) +[error] <...>/spicy-version-fail.spicy:1:1-2:29: %spicy-version requires argument of the form x.y[.z] (XXXXXX) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.attributes.spicy-version-fail-5/output b/tests/Baseline/spicy.attributes.spicy-version-fail-5/output index 22704baca..209b3a9bf 100644 --- a/tests/Baseline/spicy.attributes.spicy-version-fail-5/output +++ b/tests/Baseline/spicy.attributes.spicy-version-fail-5/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/spicy-version-fail.spicy:1:1-2:30: %spicy-version requires argument of the form x.y[.z] (XXXXXX) +[error] <...>/spicy-version-fail.spicy:1:1-2:29: %spicy-version requires argument of the form x.y[.z] (XXXXXX) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.attributes.spicy-version-fail-6/output b/tests/Baseline/spicy.attributes.spicy-version-fail-6/output index f05d30a24..7c0a2f4dc 100644 --- a/tests/Baseline/spicy.attributes.spicy-version-fail-6/output +++ b/tests/Baseline/spicy.attributes.spicy-version-fail-6/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/spicy-version-fail.spicy:1:1-2:22: %spicy-version requires argument of the form x.y[.z] (XXXXXX) +[error] <...>/spicy-version-fail.spicy:1:1-2:21: %spicy-version requires argument of the form x.y[.z] (XXXXXX) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.attributes.spicy-version-fail-7/output b/tests/Baseline/spicy.attributes.spicy-version-fail-7/output index 8ad1c1b43..63ec0a0d9 100644 --- a/tests/Baseline/spicy.attributes.spicy-version-fail-7/output +++ b/tests/Baseline/spicy.attributes.spicy-version-fail-7/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/spicy-version-fail.spicy:1:1-2:16: %spicy-version requires an argument +[error] <...>/spicy-version-fail.spicy:1:1-2:15: %spicy-version requires an argument [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.attributes.spicy-version-fail/output b/tests/Baseline/spicy.attributes.spicy-version-fail/output index d6dd9b870..c9a0eb1a7 100644 --- a/tests/Baseline/spicy.attributes.spicy-version-fail/output +++ b/tests/Baseline/spicy.attributes.spicy-version-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/spicy-version-fail.spicy:7:1-8:25: module Test requires at least Spicy version 10.0 (XXXXXX) +[error] <...>/spicy-version-fail.spicy:7:1-8:24: module Test requires at least Spicy version 10.0 (XXXXXX) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.attributes.synchronize/output b/tests/Baseline/spicy.attributes.synchronize/output index a8b3d61fe..5ea2a794b 100644 --- a/tests/Baseline/spicy.attributes.synchronize/output +++ b/tests/Baseline/spicy.attributes.synchronize/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] non-literal.spicy:5:7: &synchronize cannot be used on field, look-ahead contains non-literals +[error] non-literal.spicy:5:7-5:11: &synchronize cannot be used on field, look-ahead contains non-literals [error] spicyc: aborting after errors -[error] unit.spicy:4:7: &synchronize cannot be used on field, look-ahead contains non-literals +[error] unit.spicy:4:7-4:11: &synchronize cannot be used on field, look-ahead contains non-literals [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.expressions.assignment-fail/output b/tests/Baseline/spicy.expressions.assignment-fail/output index 67bfb694c..cc75d0e06 100644 --- a/tests/Baseline/spicy.expressions.assignment-fail/output +++ b/tests/Baseline/spicy.expressions.assignment-fail/output @@ -1,7 +1,7 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/assignment-fail.spicy:8:1: cannot assign to expression: b"" = b"bytes" -[error] <...>/assignment-fail.spicy:9:1: cannot coerce expression '"string"' of type 'string' to type 'bytes' -[error] <...>/assignment-fail.spicy:15:9: cannot coerce expression '"string"' of type 'string' to type 'bytes' -[error] <...>/assignment-fail.spicy:20:5: cannot assign to field of constant unit instance -[error] <...>/assignment-fail.spicy:21:5: cannot coerce expression '"string"' of type 'string' to type 'bytes' +[error] <...>/assignment-fail.spicy:8:1-8:14: cannot assign to expression: b"" = b"bytes" +[error] <...>/assignment-fail.spicy:9:1-9:12: cannot coerce expression '"string"' of type 'string' to type 'bytes' +[error] <...>/assignment-fail.spicy:15:9-15:25: cannot coerce expression '"string"' of type 'string' to type 'bytes' +[error] <...>/assignment-fail.spicy:20:5-20:7: cannot assign to field of constant unit instance +[error] <...>/assignment-fail.spicy:21:5-21:18: cannot coerce expression '"string"' of type 'string' to type 'bytes' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.expressions.equal-ops-fail/output b/tests/Baseline/spicy.expressions.equal-ops-fail/output index 48ab9da45..b3c088e3f 100644 --- a/tests/Baseline/spicy.expressions.equal-ops-fail/output +++ b/tests/Baseline/spicy.expressions.equal-ops-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/equal-ops-fail.spicy:11:5: unsupported operator: == -[error] <...>/equal-ops-fail.spicy:12:5: unsupported operator: != +[error] <...>/equal-ops-fail.spicy:11:5-11:10: unsupported operator: == +[error] <...>/equal-ops-fail.spicy:12:5-12:10: unsupported operator: != [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.expressions.local-const-fail/output b/tests/Baseline/spicy.expressions.local-const-fail/output index c50452629..1ce6b7192 100644 --- a/tests/Baseline/spicy.expressions.local-const-fail/output +++ b/tests/Baseline/spicy.expressions.local-const-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/local-const-fail.spicy:10:17-11:20: constant cannot be declared at local scope -[error] <...>/local-const-fail.spicy:12:5: constant cannot be declared at local scope +[error] <...>/local-const-fail.spicy:11:5-11:19: constant cannot be declared at local scope +[error] <...>/local-const-fail.spicy:12:5-12:26: constant cannot be declared at local scope [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.expressions.module-as-expr/output b/tests/Baseline/spicy.expressions.module-as-expr/output index 0dd0e7c37..5171470d0 100644 --- a/tests/Baseline/spicy.expressions.module-as-expr/output +++ b/tests/Baseline/spicy.expressions.module-as-expr/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/module-as-expr.spicy:12:1: cannot use module 'Test' as an ID -[error] <...>/module-as-expr.spicy:14:1: cannot use module 'spicy' as an ID +[error] <...>/module-as-expr.spicy:12:1-12:4: cannot use module 'Test' as an ID +[error] <...>/module-as-expr.spicy:14:1-14:5: cannot use module 'spicy' as an ID [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.optimization.default-parser-functions/noopt.hlt b/tests/Baseline/spicy.optimization.default-parser-functions/noopt.hlt index ba5c702b4..5300b7889 100644 --- a/tests/Baseline/spicy.optimization.default-parser-functions/noopt.hlt +++ b/tests/Baseline/spicy.optimization.default-parser-functions/noopt.hlt @@ -107,7 +107,7 @@ const bool __feat%foo@@P2%supports_sinks = True; const bool __feat%foo@@P2%synchronization = True; method method tuple, int<64>, iterator, optional> foo::P0::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:12:11" + # "<...>/default-parser-functions.spicy:12:11-12:17" local tuple, int<64>, iterator, optional> __result; try { @@ -214,7 +214,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::P0::__parse_foo_P0_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:12:11" + # "<...>/default-parser-functions.spicy:12:11-12:17" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@P0%uses_random_access ) @@ -250,13 +250,13 @@ method method tuple, int<64>, iterator, optional foo::P0::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:12:11" + # "<...>/default-parser-functions.spicy:12:11-12:17" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:12:11" + # "<...>/default-parser-functions.spicy:12:11-12:17" # Begin parsing production: Unit: foo_P0 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -277,14 +277,14 @@ method extern method view foo::P0::parse1(inout value_ref data, } method extern method view foo::P0::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:12:11" + # "<...>/default-parser-functions.spicy:12:11-12:17" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(P0)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:12:11" + # "<...>/default-parser-functions.spicy:12:11-12:17" # Begin parsing production: Unit: foo_P0 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -305,12 +305,12 @@ method extern method view foo::P0::parse3(inout value_ref foo::P0::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:12:11" + # "<...>/default-parser-functions.spicy:12:11-12:17" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:12:11" + # "<...>/default-parser-functions.spicy:12:11-12:17" # Begin parsing production: Unit: foo_P0 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -340,7 +340,7 @@ init function void __register_foo_P0() { } method method tuple, int<64>, iterator, optional> foo::P1::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local tuple, int<64>, iterator, optional> __result; try { @@ -447,7 +447,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::P1::__parse_foo_P1_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@P1%uses_random_access ) @@ -483,13 +483,13 @@ method method tuple, int<64>, iterator, optional foo::P1::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" # Begin parsing production: Unit: foo_P1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -510,14 +510,14 @@ method extern method view foo::P1::parse1(inout value_ref data, } method extern method view foo::P1::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(P1)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" # Begin parsing production: Unit: foo_P1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -538,12 +538,12 @@ method extern method view foo::P1::parse3(inout value_ref foo::P1::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" # Begin parsing production: Unit: foo_P1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -575,7 +575,7 @@ method hook void foo::P2::__on_0x25_error(string __except) { } method method tuple, int<64>, iterator, optional> foo::P2::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local tuple, int<64>, iterator, optional> __result; try { @@ -682,12 +682,12 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::P2::__parse_foo_P2_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local tuple, int<64>, iterator, optional> __result; - # "<...>/default-parser-functions.spicy:17:8" + # "<...>/default-parser-functions.spicy:17:8-17:12" # Begin parsing production: Variable: x -> uint<8> - spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/default-parser-functions.spicy:17:8", __feat%foo@@P2%supports_filters ? (*self).__filters : Null); + spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/default-parser-functions.spicy:17:8-17:12", __feat%foo@@P2%supports_filters ? (*self).__filters : Null); ((*self).x, __cur) = (*unpack>((__cur, hilti::ByteOrder::Network))); if ( __trim ) @@ -719,10 +719,10 @@ method method tuple, int<64>, iterator, optional>(begin(__cur).offset() - __begin.offset()); - # "<...>/default-parser-functions.spicy:18:8" + # "<...>/default-parser-functions.spicy:18:8-18:12" # Begin parsing production: Variable: y -> uint<8> - spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/default-parser-functions.spicy:18:8", __feat%foo@@P2%supports_filters ? (*self).__filters : Null); + spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/default-parser-functions.spicy:18:8-18:12", __feat%foo@@P2%supports_filters ? (*self).__filters : Null); ((*self).y, __cur) = (*unpack>((__cur, hilti::ByteOrder::Network))); if ( __trim ) @@ -788,13 +788,13 @@ method method tuple, int<64>, iterator, optional foo::P2::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" # Begin parsing production: Unit: foo_P2 -> x y (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -815,14 +815,14 @@ method extern method view foo::P2::parse1(inout value_ref data, } method extern method view foo::P2::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(P2)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" # Begin parsing production: Unit: foo_P2 -> x y (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -843,12 +843,12 @@ method extern method view foo::P2::parse3(inout value_ref foo::P2::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" # Begin parsing production: Unit: foo_P2 -> x y (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); diff --git a/tests/Baseline/spicy.optimization.default-parser-functions/opt.hlt b/tests/Baseline/spicy.optimization.default-parser-functions/opt.hlt index 126d39702..42758724c 100644 --- a/tests/Baseline/spicy.optimization.default-parser-functions/opt.hlt +++ b/tests/Baseline/spicy.optimization.default-parser-functions/opt.hlt @@ -50,7 +50,7 @@ init function void __register_foo_P0() { } method method tuple, int<64>, iterator, optional> foo::P1::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -79,7 +79,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::P1::__parse_foo_P1_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -90,13 +90,13 @@ method method tuple, int<64>, iterator, optional foo::P1::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" # Begin parsing production: Unit: foo_P1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -109,14 +109,14 @@ method extern method view foo::P1::parse1(inout value_ref data, } method extern method view foo::P1::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(P1)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" # Begin parsing production: Unit: foo_P1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -129,12 +129,12 @@ method extern method view foo::P1::parse3(inout value_ref foo::P1::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:14:18" + # "<...>/default-parser-functions.spicy:14:18-14:24" # Begin parsing production: Unit: foo_P1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -158,7 +158,7 @@ method hook void foo::P2::__on_0x25_error(string __except) { } method method tuple, int<64>, iterator, optional> foo::P2::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -187,12 +187,12 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::P2::__parse_foo_P2_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local tuple, int<64>, iterator, optional> __result; - # "<...>/default-parser-functions.spicy:17:8" + # "<...>/default-parser-functions.spicy:17:8-17:12" # Begin parsing production: Variable: x -> uint<8> - spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/default-parser-functions.spicy:17:8", Null); + spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/default-parser-functions.spicy:17:8-17:12", Null); ((*self).x, __cur) = (*unpack>((__cur, hilti::ByteOrder::Network))); if ( __trim ) @@ -203,10 +203,10 @@ method method tuple, int<64>, iterator, optional(); __error = (*self).__error; - # "<...>/default-parser-functions.spicy:18:8" + # "<...>/default-parser-functions.spicy:18:8-18:12" # Begin parsing production: Variable: y -> uint<8> - spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/default-parser-functions.spicy:18:8", Null); + spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/default-parser-functions.spicy:18:8-18:12", Null); ((*self).y, __cur) = (*unpack>((__cur, hilti::ByteOrder::Network))); if ( __trim ) @@ -226,13 +226,13 @@ method method tuple, int<64>, iterator, optional foo::P2::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" # Begin parsing production: Unit: foo_P2 -> x y (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -245,14 +245,14 @@ method extern method view foo::P2::parse1(inout value_ref data, } method extern method view foo::P2::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(P2)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" # Begin parsing production: Unit: foo_P2 -> x y (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -265,12 +265,12 @@ method extern method view foo::P2::parse3(inout value_ref foo::P2::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/default-parser-functions.spicy:16:18-21:2" + # "<...>/default-parser-functions.spicy:16:18-21:1" # Begin parsing production: Unit: foo_P2 -> x y (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); diff --git a/tests/Baseline/spicy.optimization.feature_requirements/noopt.hlt b/tests/Baseline/spicy.optimization.feature_requirements/noopt.hlt index fa6eb8274..5f02b79d7 100644 --- a/tests/Baseline/spicy.optimization.feature_requirements/noopt.hlt +++ b/tests/Baseline/spicy.optimization.feature_requirements/noopt.hlt @@ -238,7 +238,7 @@ method hook void foo::X0::__on_0x25_init() { } method method tuple, int<64>, iterator, optional> foo::X0::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:13:11-15:2" + # "<...>/feature_requirements.spicy:13:11-15:1" local tuple, int<64>, iterator, optional> __result; try { @@ -345,7 +345,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X0::__parse_foo_X0_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:13:11-15:2" + # "<...>/feature_requirements.spicy:13:11-15:1" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@X0%uses_random_access ) @@ -381,13 +381,13 @@ method method tuple, int<64>, iterator, optional foo::X0::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:13:11-15:2" + # "<...>/feature_requirements.spicy:13:11-15:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:13:11-15:2" + # "<...>/feature_requirements.spicy:13:11-15:1" # Begin parsing production: Unit: foo_X0 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -408,14 +408,14 @@ method extern method view foo::X0::parse1(inout value_ref data, } method extern method view foo::X0::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:13:11-15:2" + # "<...>/feature_requirements.spicy:13:11-15:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X0)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:13:11-15:2" + # "<...>/feature_requirements.spicy:13:11-15:1" # Begin parsing production: Unit: foo_X0 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -436,12 +436,12 @@ method extern method view foo::X0::parse3(inout value_ref foo::X0::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:13:11-15:2" + # "<...>/feature_requirements.spicy:13:11-15:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:13:11-15:2" + # "<...>/feature_requirements.spicy:13:11-15:1" # Begin parsing production: Unit: foo_X0 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -475,7 +475,7 @@ method hook void foo::X1::__on_0x25_init() { } method method tuple, int<64>, iterator, optional> foo::X1::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:18:11-20:2" + # "<...>/feature_requirements.spicy:18:11-20:1" local tuple, int<64>, iterator, optional> __result; try { @@ -582,7 +582,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X1::__parse_foo_X1_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:18:11-20:2" + # "<...>/feature_requirements.spicy:18:11-20:1" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@X1%uses_random_access ) @@ -618,13 +618,13 @@ method method tuple, int<64>, iterator, optional foo::X1::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:18:11-20:2" + # "<...>/feature_requirements.spicy:18:11-20:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:18:11-20:2" + # "<...>/feature_requirements.spicy:18:11-20:1" # Begin parsing production: Unit: foo_X1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -645,14 +645,14 @@ method extern method view foo::X1::parse1(inout value_ref data, } method extern method view foo::X1::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:18:11-20:2" + # "<...>/feature_requirements.spicy:18:11-20:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X1)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:18:11-20:2" + # "<...>/feature_requirements.spicy:18:11-20:1" # Begin parsing production: Unit: foo_X1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -673,12 +673,12 @@ method extern method view foo::X1::parse3(inout value_ref foo::X1::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:18:11-20:2" + # "<...>/feature_requirements.spicy:18:11-20:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:18:11-20:2" + # "<...>/feature_requirements.spicy:18:11-20:1" # Begin parsing production: Unit: foo_X1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -708,7 +708,7 @@ init function void __register_foo_X1() { } method method tuple, int<64>, iterator, optional> foo::X2::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:23:11" + # "<...>/feature_requirements.spicy:23:11-23:17" local tuple, int<64>, iterator, optional> __result; try { @@ -815,7 +815,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X2::__parse_foo_X2_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:23:11" + # "<...>/feature_requirements.spicy:23:11-23:17" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@X2%uses_random_access ) @@ -851,13 +851,13 @@ method method tuple, int<64>, iterator, optional foo::X2::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:23:11" + # "<...>/feature_requirements.spicy:23:11-23:17" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:23:11" + # "<...>/feature_requirements.spicy:23:11-23:17" # Begin parsing production: Unit: foo_X2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -878,14 +878,14 @@ method extern method view foo::X2::parse1(inout value_ref data, } method extern method view foo::X2::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:23:11" + # "<...>/feature_requirements.spicy:23:11-23:17" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X2)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:23:11" + # "<...>/feature_requirements.spicy:23:11-23:17" # Begin parsing production: Unit: foo_X2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -906,12 +906,12 @@ method extern method view foo::X2::parse3(inout value_ref foo::X2::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:23:11" + # "<...>/feature_requirements.spicy:23:11-23:17" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:23:11" + # "<...>/feature_requirements.spicy:23:11-23:17" # Begin parsing production: Unit: foo_X2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -941,7 +941,7 @@ init function void __register_foo_X2() { } method method tuple, int<64>, iterator, optional> foo::X3::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:26:11-28:2" + # "<...>/feature_requirements.spicy:26:11-28:1" local tuple, int<64>, iterator, optional> __result; try { @@ -1052,7 +1052,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X3::__parse_foo_X3_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:26:11-28:2" + # "<...>/feature_requirements.spicy:26:11-28:1" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@X3%uses_random_access ) @@ -1092,13 +1092,13 @@ method method tuple, int<64>, iterator, optional foo::X3::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:26:11-28:2" + # "<...>/feature_requirements.spicy:26:11-28:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:26:11-28:2" + # "<...>/feature_requirements.spicy:26:11-28:1" # Begin parsing production: Unit: foo_X3 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1119,14 +1119,14 @@ method extern method view foo::X3::parse1(inout value_ref data, } method extern method view foo::X3::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:26:11-28:2" + # "<...>/feature_requirements.spicy:26:11-28:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X3)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:26:11-28:2" + # "<...>/feature_requirements.spicy:26:11-28:1" # Begin parsing production: Unit: foo_X3 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1147,12 +1147,12 @@ method extern method view foo::X3::parse3(inout value_ref foo::X3::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:26:11-28:2" + # "<...>/feature_requirements.spicy:26:11-28:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:26:11-28:2" + # "<...>/feature_requirements.spicy:26:11-28:1" # Begin parsing production: Unit: foo_X3 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1182,7 +1182,7 @@ init function void __register_foo_X3() { } method method tuple, int<64>, iterator, optional> foo::X4::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local tuple, int<64>, iterator, optional> __result; try { @@ -1293,7 +1293,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X4::__parse_foo_X4_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@X4%uses_random_access ) @@ -1333,13 +1333,13 @@ method method tuple, int<64>, iterator, optional foo::X4::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" # Begin parsing production: Unit: foo_X4 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1360,14 +1360,14 @@ method extern method view foo::X4::parse1(inout value_ref data, } method extern method view foo::X4::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X4)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" # Begin parsing production: Unit: foo_X4 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1388,12 +1388,12 @@ method extern method view foo::X4::parse3(inout value_ref foo::X4::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" # Begin parsing production: Unit: foo_X4 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1427,7 +1427,7 @@ method hook void foo::X5::__on_0x25_init() { } method method tuple, int<64>, iterator, optional> foo::X5::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local tuple, int<64>, iterator, optional> __result; try { @@ -1534,7 +1534,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X5::__parse_foo_X5_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@X5%uses_random_access ) @@ -1570,13 +1570,13 @@ method method tuple, int<64>, iterator, optional foo::X5::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" # Begin parsing production: Unit: foo_X5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1597,14 +1597,14 @@ method extern method view foo::X5::parse1(inout value_ref data, } method extern method view foo::X5::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X5)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" # Begin parsing production: Unit: foo_X5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1625,12 +1625,12 @@ method extern method view foo::X5::parse3(inout value_ref foo::X5::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" # Begin parsing production: Unit: foo_X5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1660,7 +1660,7 @@ method hook void foo::X6::__on_0x25_init() { } method method tuple, int<64>, iterator, optional> foo::X6::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local tuple, int<64>, iterator, optional> __result; try { @@ -1768,7 +1768,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X6::__parse_foo_X6_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@X6%uses_random_access ) @@ -1805,13 +1805,13 @@ method method tuple, int<64>, iterator, optional foo::X6::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" # Begin parsing production: Unit: foo_X6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1832,14 +1832,14 @@ method extern method view foo::X6::parse1(inout value_ref data, } method extern method view foo::X6::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X6)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" # Begin parsing production: Unit: foo_X6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1860,12 +1860,12 @@ method extern method view foo::X6::parse3(inout value_ref foo::X6::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" # Begin parsing production: Unit: foo_X6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); diff --git a/tests/Baseline/spicy.optimization.feature_requirements/opt.hlt b/tests/Baseline/spicy.optimization.feature_requirements/opt.hlt index e6da506e2..faacee7fc 100644 --- a/tests/Baseline/spicy.optimization.feature_requirements/opt.hlt +++ b/tests/Baseline/spicy.optimization.feature_requirements/opt.hlt @@ -123,7 +123,7 @@ init function void __register_foo_X3() { } method method tuple, int<64>, iterator, optional> foo::X4::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -155,7 +155,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X4::__parse_foo_X4_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -169,13 +169,13 @@ method method tuple, int<64>, iterator, optional foo::X4::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" # Begin parsing production: Unit: foo_X4 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -188,14 +188,14 @@ method extern method view foo::X4::parse1(inout value_ref data, } method extern method view foo::X4::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X4)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" # Begin parsing production: Unit: foo_X4 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -208,12 +208,12 @@ method extern method view foo::X4::parse3(inout value_ref foo::X4::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:32:11-34:2" + # "<...>/feature_requirements.spicy:32:11-34:1" # Begin parsing production: Unit: foo_X4 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -238,7 +238,7 @@ method hook void foo::X5::__on_0x25_init() { } method method tuple, int<64>, iterator, optional> foo::X5::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -284,7 +284,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X5::__parse_foo_X5_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -298,13 +298,13 @@ method method tuple, int<64>, iterator, optional foo::X5::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" # Begin parsing production: Unit: foo_X5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -317,14 +317,14 @@ method extern method view foo::X5::parse1(inout value_ref data, } method extern method view foo::X5::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X5)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" # Begin parsing production: Unit: foo_X5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -337,12 +337,12 @@ method extern method view foo::X5::parse3(inout value_ref foo::X5::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:36:18-40:2" + # "<...>/feature_requirements.spicy:36:18-40:1" # Begin parsing production: Unit: foo_X5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -364,7 +364,7 @@ method hook void foo::X6::__on_0x25_init() { } method method tuple, int<64>, iterator, optional> foo::X6::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -394,7 +394,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::X6::__parse_foo_X6_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -406,13 +406,13 @@ method method tuple, int<64>, iterator, optional foo::X6::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" # Begin parsing production: Unit: foo_X6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -425,14 +425,14 @@ method extern method view foo::X6::parse1(inout value_ref data, } method extern method view foo::X6::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(X6)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" # Begin parsing production: Unit: foo_X6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -445,12 +445,12 @@ method extern method view foo::X6::parse3(inout value_ref foo::X6::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/feature_requirements.spicy:43:11-46:2" + # "<...>/feature_requirements.spicy:43:11-46:1" # Begin parsing production: Unit: foo_X6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); diff --git a/tests/Baseline/spicy.optimization.unused-functions/noopt.hlt b/tests/Baseline/spicy.optimization.unused-functions/noopt.hlt index efc49a3b3..551cd187d 100644 --- a/tests/Baseline/spicy.optimization.unused-functions/noopt.hlt +++ b/tests/Baseline/spicy.optimization.unused-functions/noopt.hlt @@ -175,7 +175,7 @@ public function void f2() { } method method tuple, int<64>, iterator, optional> foo::A::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:18:10" + # "<...>/unused-functions.spicy:18:10-18:16" local tuple, int<64>, iterator, optional> __result; try { @@ -282,7 +282,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::A::__parse_foo_A_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:18:10" + # "<...>/unused-functions.spicy:18:10-18:16" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@A%uses_random_access ) @@ -318,13 +318,13 @@ method method tuple, int<64>, iterator, optional foo::A::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:18:10" + # "<...>/unused-functions.spicy:18:10-18:16" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:18:10" + # "<...>/unused-functions.spicy:18:10-18:16" # Begin parsing production: Unit: foo_A -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -345,14 +345,14 @@ method extern method view foo::A::parse1(inout value_ref data, o } method extern method view foo::A::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:18:10" + # "<...>/unused-functions.spicy:18:10-18:16" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(A)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:18:10" + # "<...>/unused-functions.spicy:18:10-18:16" # Begin parsing production: Unit: foo_A -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -373,12 +373,12 @@ method extern method view foo::A::parse3(inout value_ref foo::A::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:18:10" + # "<...>/unused-functions.spicy:18:10-18:16" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:18:10" + # "<...>/unused-functions.spicy:18:10-18:16" # Begin parsing production: Unit: foo_A -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -408,7 +408,7 @@ init function void __register_foo_A() { } method method tuple, int<64>, iterator, optional> foo::B::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local tuple, int<64>, iterator, optional> __result; try { @@ -515,7 +515,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::B::__parse_foo_B_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@B%uses_random_access ) @@ -551,13 +551,13 @@ method method tuple, int<64>, iterator, optional foo::B::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" # Begin parsing production: Unit: foo_B -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -578,14 +578,14 @@ method extern method view foo::B::parse1(inout value_ref data, o } method extern method view foo::B::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(B)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" # Begin parsing production: Unit: foo_B -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -606,12 +606,12 @@ method extern method view foo::B::parse3(inout value_ref foo::B::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" # Begin parsing production: Unit: foo_B -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -637,7 +637,7 @@ init function void __register_foo_B() { } method method tuple, int<64>, iterator, optional> foo::C::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" local tuple, int<64>, iterator, optional> __result; try { @@ -744,7 +744,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::C::__parse_foo_C_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@C%uses_random_access ) @@ -780,13 +780,13 @@ method method tuple, int<64>, iterator, optional foo::C::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" # Begin parsing production: Unit: foo_C -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -807,14 +807,14 @@ method extern method view foo::C::parse1(inout value_ref data, o } method extern method view foo::C::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(C)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" # Begin parsing production: Unit: foo_C -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -835,12 +835,12 @@ method extern method view foo::C::parse3(inout value_ref foo::C::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" # Begin parsing production: Unit: foo_C -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -870,7 +870,7 @@ init function void __register_foo_C() { } method method tuple, int<64>, iterator, optional> foo::D::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local tuple, int<64>, iterator, optional> __result; try { @@ -977,10 +977,10 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::D::__parse_foo_D_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local tuple, int<64>, iterator, optional> __result; local value_ref __transient_anon; - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" # Begin parsing production: Unit: foo_C_2 -> __transient_anon = default(); @@ -1028,13 +1028,13 @@ method method tuple, int<64>, iterator, optional foo::D::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" # Begin parsing production: Unit: foo_D -> foo_C_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1055,14 +1055,14 @@ method extern method view foo::D::parse1(inout value_ref data, o } method extern method view foo::D::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(D)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" # Begin parsing production: Unit: foo_D -> foo_C_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1083,12 +1083,12 @@ method extern method view foo::D::parse3(inout value_ref foo::D::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" # Begin parsing production: Unit: foo_D -> foo_C_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1114,7 +1114,7 @@ init function void __register_foo_D() { } method method tuple, int<64>, iterator, optional> foo::F::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:30:10-32:2" + # "<...>/unused-functions.spicy:30:10-32:1" local tuple, int<64>, iterator, optional> __result; try { @@ -1225,7 +1225,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::F::__parse_foo_F_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:30:10-32:2" + # "<...>/unused-functions.spicy:30:10-32:1" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@F%uses_random_access ) @@ -1265,13 +1265,13 @@ method method tuple, int<64>, iterator, optional foo::F::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:30:10-32:2" + # "<...>/unused-functions.spicy:30:10-32:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:30:10-32:2" + # "<...>/unused-functions.spicy:30:10-32:1" # Begin parsing production: Unit: foo_F -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1292,14 +1292,14 @@ method extern method view foo::F::parse1(inout value_ref data, o } method extern method view foo::F::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:30:10-32:2" + # "<...>/unused-functions.spicy:30:10-32:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(F)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:30:10-32:2" + # "<...>/unused-functions.spicy:30:10-32:1" # Begin parsing production: Unit: foo_F -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1320,12 +1320,12 @@ method extern method view foo::F::parse3(inout value_ref foo::F::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:30:10-32:2" + # "<...>/unused-functions.spicy:30:10-32:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:30:10-32:2" + # "<...>/unused-functions.spicy:30:10-32:1" # Begin parsing production: Unit: foo_F -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); diff --git a/tests/Baseline/spicy.optimization.unused-functions/opt.hlt b/tests/Baseline/spicy.optimization.unused-functions/opt.hlt index 5f70b771e..47be051cb 100644 --- a/tests/Baseline/spicy.optimization.unused-functions/opt.hlt +++ b/tests/Baseline/spicy.optimization.unused-functions/opt.hlt @@ -64,7 +64,7 @@ init function void __register_foo_A() { } method method tuple, int<64>, iterator, optional> foo::B::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -93,7 +93,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::B::__parse_foo_B_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -104,13 +104,13 @@ method method tuple, int<64>, iterator, optional foo::B::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" # Begin parsing production: Unit: foo_B -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -123,14 +123,14 @@ method extern method view foo::B::parse1(inout value_ref data, o } method extern method view foo::B::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(B)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" # Begin parsing production: Unit: foo_B -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -143,12 +143,12 @@ method extern method view foo::B::parse3(inout value_ref foo::B::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:21:17" + # "<...>/unused-functions.spicy:21:17-21:23" # Begin parsing production: Unit: foo_B -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -166,7 +166,7 @@ init function void __register_foo_B() { } method method tuple, int<64>, iterator, optional> foo::C::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -195,7 +195,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::C::__parse_foo_C_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -209,7 +209,7 @@ init function void __register_foo_C() { } method method tuple, int<64>, iterator, optional> foo::D::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -238,10 +238,10 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::D::__parse_foo_D_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local tuple, int<64>, iterator, optional> __result; local value_ref __transient_anon; - # "<...>/unused-functions.spicy:24:10" + # "<...>/unused-functions.spicy:24:10-24:16" # Begin parsing production: Unit: foo_C_2 -> __transient_anon = default(); @@ -257,13 +257,13 @@ method method tuple, int<64>, iterator, optional foo::D::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" # Begin parsing production: Unit: foo_D -> foo_C_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -276,14 +276,14 @@ method extern method view foo::D::parse1(inout value_ref data, o } method extern method view foo::D::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(D)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" # Begin parsing production: Unit: foo_D -> foo_C_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -296,12 +296,12 @@ method extern method view foo::D::parse3(inout value_ref foo::D::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-functions.spicy:25:17-27:2" + # "<...>/unused-functions.spicy:25:17-27:1" # Begin parsing production: Unit: foo_D -> foo_C_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); diff --git a/tests/Baseline/spicy.optimization.unused-types/noopt.hlt b/tests/Baseline/spicy.optimization.unused-types/noopt.hlt index 3b0e1a70e..c1df5adb2 100644 --- a/tests/Baseline/spicy.optimization.unused-types/noopt.hlt +++ b/tests/Baseline/spicy.optimization.unused-types/noopt.hlt @@ -312,7 +312,7 @@ global Priv11 en; global Priv12 em = Priv12::A; method method tuple, int<64>, iterator, optional> foo::Priv1::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:13:14" + # "<...>/unused-types.spicy:13:14-13:20" local tuple, int<64>, iterator, optional> __result; try { @@ -419,7 +419,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv1::__parse_foo_Priv1_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:13:14" + # "<...>/unused-types.spicy:13:14-13:20" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@Priv1%uses_random_access ) @@ -455,13 +455,13 @@ method method tuple, int<64>, iterator, optional foo::Priv1::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:13:14" + # "<...>/unused-types.spicy:13:14-13:20" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:13:14" + # "<...>/unused-types.spicy:13:14-13:20" # Begin parsing production: Unit: foo_Priv1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -482,14 +482,14 @@ method extern method view foo::Priv1::parse1(inout value_ref dat } method extern method view foo::Priv1::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:13:14" + # "<...>/unused-types.spicy:13:14-13:20" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Priv1)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:13:14" + # "<...>/unused-types.spicy:13:14-13:20" # Begin parsing production: Unit: foo_Priv1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -510,12 +510,12 @@ method extern method view foo::Priv1::parse3(inout value_ref foo::Priv1::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:13:14" + # "<...>/unused-types.spicy:13:14-13:20" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:13:14" + # "<...>/unused-types.spicy:13:14-13:20" # Begin parsing production: Unit: foo_Priv1 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -545,7 +545,7 @@ init function void __register_foo_Priv1() { } method method tuple, int<64>, iterator, optional> foo::Pub2::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local tuple, int<64>, iterator, optional> __result; try { @@ -652,7 +652,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Pub2::__parse_foo_Pub2_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@Pub2%uses_random_access ) @@ -688,13 +688,13 @@ method method tuple, int<64>, iterator, optional foo::Pub2::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" # Begin parsing production: Unit: foo_Pub2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -715,14 +715,14 @@ method extern method view foo::Pub2::parse1(inout value_ref data } method extern method view foo::Pub2::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Pub2)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" # Begin parsing production: Unit: foo_Pub2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -743,12 +743,12 @@ method extern method view foo::Pub2::parse3(inout value_ref foo::Pub2::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" # Begin parsing production: Unit: foo_Pub2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -774,7 +774,7 @@ init function void __register_foo_Pub2() { } method method tuple, int<64>, iterator, optional> foo::Priv2::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" local tuple, int<64>, iterator, optional> __result; try { @@ -881,7 +881,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv2::__parse_foo_Priv2_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@Priv2%uses_random_access ) @@ -917,13 +917,13 @@ method method tuple, int<64>, iterator, optional foo::Priv2::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" # Begin parsing production: Unit: foo_Priv2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -944,14 +944,14 @@ method extern method view foo::Priv2::parse1(inout value_ref dat } method extern method view foo::Priv2::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Priv2)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" # Begin parsing production: Unit: foo_Priv2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -972,12 +972,12 @@ method extern method view foo::Priv2::parse3(inout value_ref foo::Priv2::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" # Begin parsing production: Unit: foo_Priv2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1007,7 +1007,7 @@ init function void __register_foo_Priv2() { } method method tuple, int<64>, iterator, optional> foo::Priv3::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" local tuple, int<64>, iterator, optional> __result; try { @@ -1114,7 +1114,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv3::__parse_foo_Priv3_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@Priv3%uses_random_access ) @@ -1150,13 +1150,13 @@ method method tuple, int<64>, iterator, optional foo::Priv3::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" # Begin parsing production: Unit: foo_Priv3 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1177,14 +1177,14 @@ method extern method view foo::Priv3::parse1(inout value_ref dat } method extern method view foo::Priv3::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Priv3)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" # Begin parsing production: Unit: foo_Priv3 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1205,12 +1205,12 @@ method extern method view foo::Priv3::parse3(inout value_ref foo::Priv3::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" # Begin parsing production: Unit: foo_Priv3 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1240,7 +1240,7 @@ init function void __register_foo_Priv3() { } method method tuple, int<64>, iterator, optional> foo::Priv4::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:21:14-24:2" + # "<...>/unused-types.spicy:21:14-24:1" local tuple, int<64>, iterator, optional> __result; try { @@ -1347,10 +1347,10 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv4::__parse_foo_Priv4_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:21:14-24:2" + # "<...>/unused-types.spicy:21:14-24:1" local tuple, int<64>, iterator, optional> __result; local value_ref __transient_anon; - # "<...>/unused-types.spicy:19:14" + # "<...>/unused-types.spicy:19:14-19:20" # Begin parsing production: Unit: foo_Priv2_2 -> __transient_anon = default(); @@ -1364,7 +1364,7 @@ method method tuple, int<64>, iterator, optional>(begin(__cur).offset() - __begin.offset()); - # "<...>/unused-types.spicy:20:14" + # "<...>/unused-types.spicy:20:14-20:20" # Begin parsing production: Unit: foo_Priv3_2 -> (*self).x = default(); @@ -1429,13 +1429,13 @@ method method tuple, int<64>, iterator, optional foo::Priv4::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:21:14-24:2" + # "<...>/unused-types.spicy:21:14-24:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:21:14-24:2" + # "<...>/unused-types.spicy:21:14-24:1" # Begin parsing production: Unit: foo_Priv4 -> foo_Priv2_2 foo_Priv3_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1456,14 +1456,14 @@ method extern method view foo::Priv4::parse1(inout value_ref dat } method extern method view foo::Priv4::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:21:14-24:2" + # "<...>/unused-types.spicy:21:14-24:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Priv4)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:21:14-24:2" + # "<...>/unused-types.spicy:21:14-24:1" # Begin parsing production: Unit: foo_Priv4 -> foo_Priv2_2 foo_Priv3_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1484,12 +1484,12 @@ method extern method view foo::Priv4::parse3(inout value_ref foo::Priv4::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:21:14-24:2" + # "<...>/unused-types.spicy:21:14-24:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:21:14-24:2" + # "<...>/unused-types.spicy:21:14-24:1" # Begin parsing production: Unit: foo_Priv4 -> foo_Priv2_2 foo_Priv3_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1519,7 +1519,7 @@ init function void __register_foo_Priv4() { } method method tuple, int<64>, iterator, optional> foo::Priv5::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" local tuple, int<64>, iterator, optional> __result; try { @@ -1626,7 +1626,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv5::__parse_foo_Priv5_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@Priv5%uses_random_access ) @@ -1662,13 +1662,13 @@ method method tuple, int<64>, iterator, optional foo::Priv5::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" # Begin parsing production: Unit: foo_Priv5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1689,14 +1689,14 @@ method extern method view foo::Priv5::parse1(inout value_ref dat } method extern method view foo::Priv5::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Priv5)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" # Begin parsing production: Unit: foo_Priv5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1717,12 +1717,12 @@ method extern method view foo::Priv5::parse3(inout value_ref foo::Priv5::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" # Begin parsing production: Unit: foo_Priv5 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1752,7 +1752,7 @@ init function void __register_foo_Priv5() { } method method tuple, int<64>, iterator, optional> foo::Priv6::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" local tuple, int<64>, iterator, optional> __result; try { @@ -1859,7 +1859,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv6::__parse_foo_Priv6_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@Priv6%uses_random_access ) @@ -1895,13 +1895,13 @@ method method tuple, int<64>, iterator, optional foo::Priv6::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" # Begin parsing production: Unit: foo_Priv6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1922,14 +1922,14 @@ method extern method view foo::Priv6::parse1(inout value_ref dat } method extern method view foo::Priv6::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Priv6)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" # Begin parsing production: Unit: foo_Priv6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1950,12 +1950,12 @@ method extern method view foo::Priv6::parse3(inout value_ref foo::Priv6::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" # Begin parsing production: Unit: foo_Priv6 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -1985,7 +1985,7 @@ init function void __register_foo_Priv6() { } method method tuple, int<64>, iterator, optional> foo::Pub3::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local tuple, int<64>, iterator, optional> __result; try { @@ -2092,10 +2092,10 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Pub3::__parse_foo_Pub3_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local tuple, int<64>, iterator, optional> __result; local value_ref __transient_anon_2; - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" # Begin parsing production: Unit: foo_Priv5_2 -> __transient_anon_2 = default(); @@ -2109,7 +2109,7 @@ method method tuple, int<64>, iterator, optional>(begin(__cur).offset() - __begin.offset()); - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" # Begin parsing production: Unit: foo_Priv6_2 -> (*self).x = default(); @@ -2174,13 +2174,13 @@ method method tuple, int<64>, iterator, optional foo::Pub3::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" # Begin parsing production: Unit: foo_Pub3 -> foo_Priv5_2 foo_Priv6_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -2201,14 +2201,14 @@ method extern method view foo::Pub3::parse1(inout value_ref data } method extern method view foo::Pub3::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Pub3)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" # Begin parsing production: Unit: foo_Pub3 -> foo_Priv5_2 foo_Priv6_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -2229,12 +2229,12 @@ method extern method view foo::Pub3::parse3(inout value_ref foo::Pub3::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" # Begin parsing production: Unit: foo_Pub3 -> foo_Priv5_2 foo_Priv6_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -2260,7 +2260,7 @@ init function void __register_foo_Pub3() { } method method tuple, int<64>, iterator, optional> foo::Priv10::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local tuple, int<64>, iterator, optional> __result; try { @@ -2367,7 +2367,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv10::__parse_foo_Priv10_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local tuple, int<64>, iterator, optional> __result; if ( __feat%foo@@Priv10%uses_random_access ) @@ -2403,13 +2403,13 @@ method method tuple, int<64>, iterator, optional foo::Priv10::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" # Begin parsing production: Unit: foo_Priv10 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -2430,14 +2430,14 @@ method extern method view foo::Priv10::parse1(inout value_ref da } method extern method view foo::Priv10::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Priv10)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" # Begin parsing production: Unit: foo_Priv10 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -2458,12 +2458,12 @@ method extern method view foo::Priv10::parse3(inout value_ref foo::Priv10::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" # Begin parsing production: Unit: foo_Priv10 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); diff --git a/tests/Baseline/spicy.optimization.unused-types/opt.hlt b/tests/Baseline/spicy.optimization.unused-types/opt.hlt index 039f08d01..b666a171a 100644 --- a/tests/Baseline/spicy.optimization.unused-types/opt.hlt +++ b/tests/Baseline/spicy.optimization.unused-types/opt.hlt @@ -113,7 +113,7 @@ init function void __register_foo_Priv1() { } method method tuple, int<64>, iterator, optional> foo::Pub2::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -142,7 +142,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Pub2::__parse_foo_Pub2_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -153,13 +153,13 @@ method method tuple, int<64>, iterator, optional foo::Pub2::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" # Begin parsing production: Unit: foo_Pub2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -172,14 +172,14 @@ method extern method view foo::Pub2::parse1(inout value_ref data } method extern method view foo::Pub2::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Pub2)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" # Begin parsing production: Unit: foo_Pub2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -192,12 +192,12 @@ method extern method view foo::Pub2::parse3(inout value_ref foo::Pub2::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:16:20" + # "<...>/unused-types.spicy:16:20-16:26" # Begin parsing production: Unit: foo_Pub2 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -224,7 +224,7 @@ init function void __register_foo_Priv4() { } method method tuple, int<64>, iterator, optional> foo::Priv5::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -253,7 +253,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv5::__parse_foo_Priv5_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -267,7 +267,7 @@ init function void __register_foo_Priv5() { } method method tuple, int<64>, iterator, optional> foo::Priv6::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -296,7 +296,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv6::__parse_foo_Priv6_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -310,7 +310,7 @@ init function void __register_foo_Priv6() { } method method tuple, int<64>, iterator, optional> foo::Pub3::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -339,17 +339,17 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Pub3::__parse_foo_Pub3_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local tuple, int<64>, iterator, optional> __result; local value_ref __transient_anon_2; - # "<...>/unused-types.spicy:27:14" + # "<...>/unused-types.spicy:27:14-27:20" # Begin parsing production: Unit: foo_Priv5_2 -> __transient_anon_2 = default(); (__cur, __lah, __lahe, __error) = (*__transient_anon_2).__parse_stage1(__data, __begin, __cur, __trim, __lah, __lahe, __error); # End parsing production: Unit: foo_Priv5_2 -> - # "<...>/unused-types.spicy:28:14" + # "<...>/unused-types.spicy:28:14-28:20" # Begin parsing production: Unit: foo_Priv6_2 -> (*self).x = default(); @@ -368,13 +368,13 @@ method method tuple, int<64>, iterator, optional foo::Pub3::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" # Begin parsing production: Unit: foo_Pub3 -> foo_Priv5_2 foo_Priv6_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -387,14 +387,14 @@ method extern method view foo::Pub3::parse1(inout value_ref data } method extern method view foo::Pub3::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Pub3)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" # Begin parsing production: Unit: foo_Pub3 -> foo_Priv5_2 foo_Priv6_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -407,12 +407,12 @@ method extern method view foo::Pub3::parse3(inout value_ref foo::Pub3::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:29:20-32:2" + # "<...>/unused-types.spicy:29:20-32:1" # Begin parsing production: Unit: foo_Pub3 -> foo_Priv5_2 foo_Priv6_2 (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -430,7 +430,7 @@ init function void __register_foo_Pub3() { } method method tuple, int<64>, iterator, optional> foo::Priv10::__parse_stage1(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local tuple, int<64>, iterator, optional> __result; try { hilti::debugIndent("spicy"); @@ -459,7 +459,7 @@ method method tuple, int<64>, iterator, optional, int<64>, iterator, optional> foo::Priv10::__parse_foo_Priv10_stage2(inout value_ref __data, iterator __begin, copy view __cur, copy bool __trim, copy int<64> __lah, copy iterator __lahe, copy optional __error) { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local tuple, int<64>, iterator, optional> __result; (*self).__error = __error; default(); @@ -470,13 +470,13 @@ method method tuple, int<64>, iterator, optional foo::Priv10::parse1(inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local value_ref unit = value_ref(default())value_ref(default()); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" # Begin parsing production: Unit: foo_Priv10 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -489,14 +489,14 @@ method extern method view foo::Priv10::parse1(inout value_ref da } method extern method view foo::Priv10::parse3(inout value_ref gunit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local value_ref unit = value_ref(default())value_ref(default()); spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Priv10)); local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" # Begin parsing production: Unit: foo_Priv10 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); @@ -509,12 +509,12 @@ method extern method view foo::Priv10::parse3(inout value_ref foo::Priv10::parse2(inout value_ref unit, inout value_ref data, optional> cur = Null, optional context) &needed-by-feature="is_filter" &needed-by-feature="supports_sinks" &static { - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" local view ncur = cur ? (*cur) : cast>((*data)); local int<64> lahead = 0; local iterator lahead_end; local optional error = Null; - # "<...>/unused-types.spicy:43:22-46:2" + # "<...>/unused-types.spicy:43:22-46:1" # Begin parsing production: Unit: foo_Priv10 -> (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); diff --git a/tests/Baseline/spicy.rt.debug-trace/.stderr b/tests/Baseline/spicy.rt.debug-trace/.stderr index c2e57efd7..990e8f7ab 100644 --- a/tests/Baseline/spicy.rt.debug-trace/.stderr +++ b/tests/Baseline/spicy.rt.debug-trace/.stderr @@ -1,40 +1,40 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. [hilti-trace] : Mini::Test::__parser = [$name="Mini::Test", $is_public=True, $parse1=Mini::Test::parse1, $parse2=Mini::Test::parse2, $parse3=Mini::Test::parse3, $context_new=Null, $type_info=typeinfo(Mini::Test), $description="", $mime_types=vector(), $ports=vector()]; [hilti-trace] : spicy_rt::registerParser(Mini::Test::__parser, $scope, Null); -[hilti-trace] : # "<...>/debug-trace.spicy:8:20-13:2" +[hilti-trace] : # "<...>/debug-trace.spicy:8:20-13:1" [hilti-trace] : local value_ref unit = value_ref(default())value_ref(default()); [hilti-trace] : spicy_rt::initializeParsedUnit(gunit, unit, typeinfo(Mini::Test)); [hilti-trace] : local view ncur = cur ? (*cur) : cast>((*data)); [hilti-trace] : local int<64> lahead = 0; [hilti-trace] : local iterator lahead_end; [hilti-trace] : local optional error = Null; -[hilti-trace] : # "<...>/debug-trace.spicy:8:20-13:2" +[hilti-trace] : # "<...>/debug-trace.spicy:8:20-13:1" [hilti-trace] : # Begin parsing production: Unit: Mini_Test -> f1 f2 [hilti-trace] : spicy_rt::printParserState("Mini::Test", data, begin(ncur), ncur, lahead, lahead_end, "default", True, error); [hilti-trace] : hilti::debug("spicy-verbose", "- parsing production: Unit: Mini_Test -> f1 f2"); [hilti-trace] : hilti::debugIndent("spicy-verbose"); [hilti-trace] : (ncur, lahead, lahead_end, error) = (*unit).__parse_stage1(data, begin(ncur), ncur, True, lahead, lahead_end, error); -[hilti-trace] : # "<...>/debug-trace.spicy:8:20-13:2" +[hilti-trace] : # "<...>/debug-trace.spicy:8:20-13:1" [hilti-trace] : local tuple, int<64>, iterator, optional> __result; [hilti-trace] : try { hilti::debug("spicy", "Mini::Test"); hilti::debugIndent("spicy"); local iterator __begin = begin(__cur); (*self).__error = __error; (*self).__on_0x25_init(); __error = (*self).__error; local strong_ref filtered = Null; if ( ! filtered ) __result = (*self).__parse_Mini_Test_stage2(__data, __begin, __cur, __trim, __lah, __lahe, __error); } catch ( hilti::SystemException __except ) { default(); (*self).__error = __error; default(); __error = (*self).__error; throw; } [hilti-trace] : hilti::debug("spicy", "Mini::Test"); [hilti-trace] : hilti::debugIndent("spicy"); [hilti-trace] : local iterator __begin = begin(__cur); [hilti-trace] : (*self).__error = __error; -[hilti-trace] <...>/debug-trace.spicy:8:20-13:2: (*self).__on_0x25_init(); -[hilti-trace] <...>/debug-trace.spicy:9:18: hilti::print(self, True); +[hilti-trace] <...>/debug-trace.spicy:8:20-13:1: (*self).__on_0x25_init(); +[hilti-trace] <...>/debug-trace.spicy:9:18-9:28: hilti::print(self, True); [hilti-trace] : __error = (*self).__error; [hilti-trace] : local strong_ref filtered = Null; [hilti-trace] : if ( ! filtered ) { __result = (*self).__parse_Mini_Test_stage2(__data, __begin, __cur, __trim, __lah, __lahe, __error); } [hilti-trace] : __result = (*self).__parse_Mini_Test_stage2(__data, __begin, __cur, __trim, __lah, __lahe, __error); -[hilti-trace] : # "<...>/debug-trace.spicy:8:20-13:2" +[hilti-trace] : # "<...>/debug-trace.spicy:8:20-13:1" [hilti-trace] : local tuple, int<64>, iterator, optional> __result; -[hilti-trace] : # "<...>/debug-trace.spicy:10:9" +[hilti-trace] : # "<...>/debug-trace.spicy:10:9-10:14" [hilti-trace] : # Begin parsing production: Variable: f1 -> uint<32> [hilti-trace] : spicy_rt::printParserState("Mini::Test", __data, __begin, __cur, __lah, __lahe, "default", __trim, __error); [hilti-trace] : hilti::debug("spicy-verbose", "- parsing production: Variable: f1 -> uint<32>"); [hilti-trace] : hilti::debugIndent("spicy-verbose"); -[hilti-trace] : spicy_rt::waitForInput(__data, __cur, 4, "expecting 4 bytes for unpacking value", "<...>/debug-trace.spicy:10:9", Null); +[hilti-trace] : spicy_rt::waitForInput(__data, __cur, 4, "expecting 4 bytes for unpacking value", "<...>/debug-trace.spicy:10:9-10:14", Null); [hilti-trace] : ((*self).f1, __cur) = (*unpack>((__cur, hilti::ByteOrder::Network))); [hilti-trace] : if ( __trim ) { hilti::debug("spicy-verbose", "- trimming input"); (*__data).trim(begin(__cur)); } [hilti-trace] : hilti::debug("spicy-verbose", "- trimming input"); @@ -44,15 +44,15 @@ [hilti-trace] : hilti::debug("spicy", "f1 = %s" % (*self).f1); [hilti-trace] : hilti::debug("spicy-verbose", "- setting field 'f1' to '%s'" % (*self).f1); [hilti-trace] : (*self).__error = __error; -[hilti-trace] <...>/debug-trace.spicy:10:5: (*self).__on_f1((*self).f1); -[hilti-trace] <...>/debug-trace.spicy:10:18: hilti::print((*self).f1, True); +[hilti-trace] <...>/debug-trace.spicy:10:5-10:33: (*self).__on_f1((*self).f1); +[hilti-trace] <...>/debug-trace.spicy:10:18-10:31: hilti::print((*self).f1, True); [hilti-trace] : __error = (*self).__error; -[hilti-trace] : # "<...>/debug-trace.spicy:11:9" +[hilti-trace] : # "<...>/debug-trace.spicy:11:9-11:13" [hilti-trace] : # Begin parsing production: Variable: f2 -> uint<8> [hilti-trace] : spicy_rt::printParserState("Mini::Test", __data, __begin, __cur, __lah, __lahe, "default", __trim, __error); [hilti-trace] : hilti::debug("spicy-verbose", "- parsing production: Variable: f2 -> uint<8>"); [hilti-trace] : hilti::debugIndent("spicy-verbose"); -[hilti-trace] : spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/debug-trace.spicy:11:9", Null); +[hilti-trace] : spicy_rt::waitForInput(__data, __cur, 1, "expecting 1 bytes for unpacking value", "<...>/debug-trace.spicy:11:9-11:13", Null); [hilti-trace] : ((*self).f2, __cur) = (*unpack>((__cur, hilti::ByteOrder::Network))); [hilti-trace] : if ( __trim ) { hilti::debug("spicy-verbose", "- trimming input"); (*__data).trim(begin(__cur)); } [hilti-trace] : hilti::debug("spicy-verbose", "- trimming input"); @@ -62,18 +62,18 @@ [hilti-trace] : hilti::debug("spicy", "f2 = %s" % (*self).f2); [hilti-trace] : hilti::debug("spicy-verbose", "- setting field 'f2' to '%s'" % (*self).f2); [hilti-trace] : (*self).__error = __error; -[hilti-trace] <...>/debug-trace.spicy:11:5: (*self).__on_f2((*self).f2); -[hilti-trace] <...>/debug-trace.spicy:11:18: hilti::print((*self).f2, True); +[hilti-trace] <...>/debug-trace.spicy:11:5-11:33: (*self).__on_f2((*self).f2); +[hilti-trace] <...>/debug-trace.spicy:11:18-11:31: hilti::print((*self).f2, True); [hilti-trace] : __error = (*self).__error; [hilti-trace] : (*self).__error = __error; -[hilti-trace] <...>/debug-trace.spicy:8:20-13:2: (*self).__on_0x25_done(); -[hilti-trace] <...>/debug-trace.spicy:12:18: hilti::print(self, True); +[hilti-trace] <...>/debug-trace.spicy:8:20-13:1: (*self).__on_0x25_done(); +[hilti-trace] <...>/debug-trace.spicy:12:18-12:28: hilti::print(self, True); [hilti-trace] : __error = (*self).__error; [hilti-trace] : hilti::debugDedent("spicy"); [hilti-trace] : __result = (__cur, __lah, __lahe, __error); [hilti-trace] : return __result; [hilti-trace] : (*self).__error = __error; -[hilti-trace] <...>/debug-trace.spicy:8:20-13:2: default(); +[hilti-trace] <...>/debug-trace.spicy:8:20-13:1: default(); [hilti-trace] : __error = (*self).__error; [hilti-trace] : return __result; [hilti-trace] : hilti::debugDedent("spicy-verbose"); diff --git a/tests/Baseline/spicy.rt.stack-check/output b/tests/Baseline/spicy.rt.stack-check/output index 59c54f0e4..b8a8a28ff 100644 --- a/tests/Baseline/spicy.rt.stack-check/output +++ b/tests/Baseline/spicy.rt.stack-check/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type hilti::rt::StackSizeExceeded: not enough stack space remaining (<...>/stack-check.spicy:21:5) +[error] terminating with uncaught exception of type hilti::rt::StackSizeExceeded: not enough stack space remaining (<...>/stack-check.spicy:21:5-21:40) diff --git a/tests/Baseline/spicy.statements.assert/output b/tests/Baseline/spicy.statements.assert/output index 536bb9f74..6726bfeed 100644 --- a/tests/Baseline/spicy.statements.assert/output +++ b/tests/Baseline/spicy.statements.assert/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -uncaught exception hilti::rt::AssertionFailure: failed expression '1 == 0' (fail.spicy:3:1) -uncaught exception hilti::rt::AssertionFailure: my error (fail2.spicy:3:1) +uncaught exception hilti::rt::AssertionFailure: failed expression '1 == 0' (fail.spicy:3:1-3:14) +uncaught exception hilti::rt::AssertionFailure: my error (fail2.spicy:3:1-3:27) diff --git a/tests/Baseline/spicy.statements.confirm-fail/output b/tests/Baseline/spicy.statements.confirm-fail/output index a4191389f..a6727dd04 100644 --- a/tests/Baseline/spicy.statements.confirm-fail/output +++ b/tests/Baseline/spicy.statements.confirm-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/confirm-fail.spicy:6:1: unknown ID 'self' +[error] <...>/confirm-fail.spicy:6:1-6:8: unknown ID 'self' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.statements.reject-fail/output b/tests/Baseline/spicy.statements.reject-fail/output index 41a4599ae..dbb06bf04 100644 --- a/tests/Baseline/spicy.statements.reject-fail/output +++ b/tests/Baseline/spicy.statements.reject-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/reject-fail.spicy:6:1: unknown ID 'self' +[error] <...>/reject-fail.spicy:6:1-6:7: unknown ID 'self' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.statements.switch/output b/tests/Baseline/spicy.statements.switch/output index 6c269b96a..5edbce1a4 100644 --- a/tests/Baseline/spicy.statements.switch/output +++ b/tests/Baseline/spicy.statements.switch/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -uncaught exception hilti::rt::UnhandledSwitchCase: 3 (fail.spicy:5:1-8:2) +uncaught exception hilti::rt::UnhandledSwitchCase: 3 (fail.spicy:5:1-8:1) diff --git a/tests/Baseline/spicy.statements.throw-fail/output b/tests/Baseline/spicy.statements.throw-fail/output index ef2023427..138067633 100644 --- a/tests/Baseline/spicy.statements.throw-fail/output +++ b/tests/Baseline/spicy.statements.throw-fail/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/throw-fail.spicy:8:1: exceptions need to be a string -[error] <...>/throw-fail.spicy:9:1: exceptions need to be a string -[error] <...>/throw-fail.spicy:10:1: exceptions need to be a string +[error] <...>/throw-fail.spicy:8:1-8:8: exceptions need to be a string +[error] <...>/throw-fail.spicy:9:1-9:15: exceptions need to be a string +[error] <...>/throw-fail.spicy:10:1-10:16: exceptions need to be a string [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.statements.throw/output b/tests/Baseline/spicy.statements.throw/output index ce0f69ba6..3d4a1b74b 100644 --- a/tests/Baseline/spicy.statements.throw/output +++ b/tests/Baseline/spicy.statements.throw/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -uncaught exception spicy::rt::ParseError: User-triggered error (throw-1.spicy:2:1) -uncaught exception spicy::rt::ParseError: Runtime error string: 3 (throw-2.spicy:2:1) +uncaught exception spicy::rt::ParseError: User-triggered error (throw-1.spicy:2:1-2:29) +uncaught exception spicy::rt::ParseError: Runtime error string: 3 (throw-2.spicy:2:1-2:43) diff --git a/tests/Baseline/spicy.tools.spicy-driver-batch-gap/output b/tests/Baseline/spicy.tools.spicy-driver-batch-gap/output index a587c4671..4cb8aae12 100644 --- a/tests/Baseline/spicy.tools.spicy-driver-batch-gap/output +++ b/tests/Baseline/spicy.tools.spicy-driver-batch-gap/output @@ -1,9 +1,9 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -error for ID id1: failed to synchronize: data is missing (<...>/spicy-driver-batch-gap.spicy:13:5) +error for ID id1: failed to synchronize: data is missing (<...>/spicy-driver-batch-gap.spicy:13:5-13:58) [$data=[b"A", b"B"]] [$data=[b"a", b"b"]] [$data=[b"C", b"D"]] [$data=[b"c", b"d"]] -error for ID id2: failed to synchronize: data is missing (<...>/spicy-driver-batch-gap.spicy:13:5) +error for ID id2: failed to synchronize: data is missing (<...>/spicy-driver-batch-gap.spicy:13:5-13:58) [$data=[b"E", b"F"]] [$data=[b"e", b"f"]] diff --git a/tests/Baseline/spicy.tools.spicy-driver-library-path/output b/tests/Baseline/spicy.tools.spicy-driver-library-path/output index 7834f02c0..32715c8e1 100644 --- a/tests/Baseline/spicy.tools.spicy-driver-library-path/output +++ b/tests/Baseline/spicy.tools.spicy-driver-library-path/output @@ -2,6 +2,6 @@ [$i=1] [$i=1] [$i=1] -[error] test.spicy:4:1: cannot import module 'Bar': cannot find file +[error] test.spicy:4:1-4:11: cannot import module 'Bar': cannot find file [error] spicy-driver: errors encountered during resolving [$i=1] diff --git a/tests/Baseline/spicy.tools.spicyc-hello-world/test.hlt b/tests/Baseline/spicy.tools.spicyc-hello-world/test.hlt index bccf5cc56..66b8c8292 100644 --- a/tests/Baseline/spicy.tools.spicyc-hello-world/test.hlt +++ b/tests/Baseline/spicy.tools.spicyc-hello-world/test.hlt @@ -17,9 +17,9 @@ namespace __hlt::Foo { HILTI_PRE_INIT(__hlt::Foo::__register_module) extern void __hlt::Foo::__init_module() { - __location__("<...>/spicyc-hello-world.spicy:8:1"); + __location__("<...>/spicyc-hello-world.spicy:8:1-8:22"); ::hilti::rt::print(std::string("Hello, world!"), ::hilti::rt::Bool(true)); - __location__("<...>/spicyc-hello-world.spicy:9:1"); + __location__("<...>/spicyc-hello-world.spicy:9:1-9:24"); ::hilti::rt::printValues(std::make_tuple(std::string("Hello"), std::string("world!")), ::hilti::rt::Bool(true)); } diff --git a/tests/Baseline/spicy.types.bitfield.anonymous-fail-2/output b/tests/Baseline/spicy.types.bitfield.anonymous-fail-2/output index d11863527..7b5c67c7c 100644 --- a/tests/Baseline/spicy.types.bitfield.anonymous-fail-2/output +++ b/tests/Baseline/spicy.types.bitfield.anonymous-fail-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/anonymous-fail.spicy:4:12-13:2: bitfield item name 'x' appears in multiple anonymous bitfields +[error] <...>/anonymous-fail.spicy:4:12-13:1: bitfield item name 'x' appears in multiple anonymous bitfields [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.bitfield.anonymous-fail/output b/tests/Baseline/spicy.types.bitfield.anonymous-fail/output index 8606d939d..72b9fcb11 100644 --- a/tests/Baseline/spicy.types.bitfield.anonymous-fail/output +++ b/tests/Baseline/spicy.types.bitfield.anonymous-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/anonymous-fail.spicy:7:12-12:2: bitfield item 'x' shadows unit field +[error] <...>/anonymous-fail.spicy:7:12-12:1: bitfield item 'x' shadows unit field [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.bitfield.anonymous-field-with-switch-fail/output b/tests/Baseline/spicy.types.bitfield.anonymous-field-with-switch-fail/output index bad921e68..cb3b8c280 100644 --- a/tests/Baseline/spicy.types.bitfield.anonymous-field-with-switch-fail/output +++ b/tests/Baseline/spicy.types.bitfield.anonymous-field-with-switch-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/anonymous-field-with-switch-fail.spicy:6:17-17:2: bitfield item name 'A' appears in multiple anonymous bitfields +[error] <...>/anonymous-field-with-switch-fail.spicy:6:17-17:1: bitfield item name 'A' appears in multiple anonymous bitfields [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.bitfield.ctor-fail/output b/tests/Baseline/spicy.types.bitfield.ctor-fail/output index 15ab54776..d14524c4b 100644 --- a/tests/Baseline/spicy.types.bitfield.ctor-fail/output +++ b/tests/Baseline/spicy.types.bitfield.ctor-fail/output @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:10:5: value is outside of bitfield element's range -[error] <...>/ctor-fail.spicy:11:5: value is outside of bitfield element's range -[error] <...>/ctor-fail.spicy:13:5: cannot coerce expression '-1' of type 'int<64>' to type 'uint<8>' -[error] <...>/ctor-fail.spicy:14:5: cannot coerce expression '"42"' of type 'string' to type 'uint<8>' +[error] <...>/ctor-fail.spicy:10:5-10:18: value is outside of bitfield element's range +[error] <...>/ctor-fail.spicy:11:5-11:16: value is outside of bitfield element's range +[error] <...>/ctor-fail.spicy:13:5-13:17: cannot coerce expression '-1' of type 'int<64>' to type 'uint<8>' +[error] <...>/ctor-fail.spicy:14:5-14:19: cannot coerce expression '"42"' of type 'string' to type 'uint<8>' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.bitfield.ctor/output b/tests/Baseline/spicy.types.bitfield.ctor/output index 078c6b08d..ecccf06e7 100644 --- a/tests/Baseline/spicy.types.bitfield.ctor/output +++ b/tests/Baseline/spicy.types.bitfield.ctor/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. (2, 8, 1) -[error] terminating with uncaught exception of type spicy::rt::ParseError: unexpected value for bitfield element 'a' (<...>/ctor.spicy:10:6-14:4) +[error] terminating with uncaught exception of type spicy::rt::ParseError: unexpected value for bitfield element 'a' (<...>/ctor.spicy:10:6-14:3) diff --git a/tests/Baseline/spicy.types.bitfield.width-fail/output b/tests/Baseline/spicy.types.bitfield.width-fail/output index c1bab6426..d37e39b63 100644 --- a/tests/Baseline/spicy.types.bitfield.width-fail/output +++ b/tests/Baseline/spicy.types.bitfield.width-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/width-fail.spicy:10:9: upper limit is beyond the width of the bitfield -[error] <...>/width-fail.spicy:11:9: lower limit needs to be lower than upper limit +[error] <...>/width-fail.spicy:10:9-10:17: upper limit is beyond the width of the bitfield +[error] <...>/width-fail.spicy:11:9-11:17: lower limit needs to be lower than upper limit [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.bytes.attr-validity/output b/tests/Baseline/spicy.types.bytes.attr-validity/output index cc3fe3980..97f953b15 100644 --- a/tests/Baseline/spicy.types.bytes.attr-validity/output +++ b/tests/Baseline/spicy.types.bytes.attr-validity/output @@ -1,7 +1,7 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[warning] <...>/attr-validity.spicy:13:5: %random-access is no longer needed and deprecated -[error] <...>/attr-validity.spicy:6:23-7:13: bytes field requires one of &eod, &parse_at, &parse_from, &size, &until, &until-including -[error] <...>/attr-validity.spicy:8:13: &until must provide an expression -[error] <...>/attr-validity.spicy:9:25-10:47: attributes cannot be combined: &until, &until-including -[error] <...>/attr-validity.spicy:10:47-11:61: attributes cannot be combined: &parse-from, &parse-at +[warning] <...>/attr-validity.spicy:13:5-13:19: %random-access is no longer needed and deprecated +[error] <...>/attr-validity.spicy:7:5-7:12: bytes field requires one of &eod, &parse_at, &parse_from, &size, &until, &until-including +[error] <...>/attr-validity.spicy:8:13-8:18: &until must provide an expression +[error] <...>/attr-validity.spicy:10:5-10:46: attributes cannot be combined: &until, &until-including +[error] <...>/attr-validity.spicy:11:5-11:60: attributes cannot be combined: &parse-from, &parse-at [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.bytes.parse-chunked-error/output b/tests/Baseline/spicy.types.bytes.parse-chunked-error/output index 7679dd706..ab51209ab 100644 --- a/tests/Baseline/spicy.types.bytes.parse-chunked-error/output +++ b/tests/Baseline/spicy.types.bytes.parse-chunked-error/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. 1234567 890 -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/parse-chunked-error.spicy:9:16) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/parse-chunked-error.spicy:9:16-9:23) diff --git a/tests/Baseline/spicy.types.bytes.parse-ctor-error/output b/tests/Baseline/spicy.types.bytes.parse-ctor-error/output index 1d52f639b..10a8a8159 100644 --- a/tests/Baseline/spicy.types.bytes.parse-ctor-error/output +++ b/tests/Baseline/spicy.types.bytes.parse-ctor-error/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 'def' (<...>/parse-ctor-error.spicy:10:10) -[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 'def' (<...>/parse-ctor-error.spicy:10:10) +[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 'def' (<...>/parse-ctor-error.spicy:10:10-10:15) +[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 'def' (<...>/parse-ctor-error.spicy:10:10-10:15) diff --git a/tests/Baseline/spicy.types.bytes.parse-length-coercion-error/output b/tests/Baseline/spicy.types.bytes.parse-length-coercion-error/output index c8358def3..cf6bb1473 100644 --- a/tests/Baseline/spicy.types.bytes.parse-length-coercion-error/output +++ b/tests/Baseline/spicy.types.bytes.parse-length-coercion-error/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/parse-length-coercion-error.spicy:8:16: cannot coerce attribute's expression from type 'bytes' to 'uint<64>' (&size) +[error] <...>/parse-length-coercion-error.spicy:8:16-8:25: cannot coerce attribute's expression from type 'bytes' to 'uint<64>' (&size) [error] spicy-driver: aborting after errors diff --git a/tests/Baseline/spicy.types.bytes.parse-length-error/output b/tests/Baseline/spicy.types.bytes.parse-length-error/output index 370e9bf8d..88ebccd49 100644 --- a/tests/Baseline/spicy.types.bytes.parse-length-error/output +++ b/tests/Baseline/spicy.types.bytes.parse-length-error/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/parse-length-error.spicy:8:16) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/parse-length-error.spicy:8:16-8:22) diff --git a/tests/Baseline/spicy.types.bytes.parse-length-until-fail/output b/tests/Baseline/spicy.types.bytes.parse-length-until-fail/output index 615ef1180..66c89588d 100644 --- a/tests/Baseline/spicy.types.bytes.parse-length-until-fail/output +++ b/tests/Baseline/spicy.types.bytes.parse-length-until-fail/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until expression found (<...>/parse-length-until-fail.spicy:7:29) +[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until expression found (<...>/parse-length-until-fail.spicy:7:29-7:32) diff --git a/tests/Baseline/spicy.types.bytes.parse-until-error/output b/tests/Baseline/spicy.types.bytes.parse-until-error/output index c1dc0e4ea..f9b9ebdda 100644 --- a/tests/Baseline/spicy.types.bytes.parse-until-error/output +++ b/tests/Baseline/spicy.types.bytes.parse-until-error/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until expression found (<...>/parse-until-error.spicy:8:23) +[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until expression found (<...>/parse-until-error.spicy:8:23-8:28) diff --git a/tests/Baseline/spicy.types.function.cxxname-normalization/output b/tests/Baseline/spicy.types.function.cxxname-normalization/output index 42a0a1edf..a99557152 100644 --- a/tests/Baseline/spicy.types.function.cxxname-normalization/output +++ b/tests/Baseline/spicy.types.function.cxxname-normalization/output @@ -1,57 +1,57 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[debug/normalizer] &cxxname="foo::bar" -> &cxxname="::foo::bar" (<...>/cxxname-normalization.spicy:8:30) -[debug/normalizer] &cxxname="bar" -> &cxxname="::bar" (<...>/cxxname-normalization.spicy:10:30) -[debug/normalizer] [hilti::Module] module foo { declare public function string f1() &cxxname="::foo::bar"; declare public function string f2() &cxxname="::foo::baz"; declare public function string f3() &cxxname="::bar"; declare public function string f4() &cxxname="::baz"; } -> import spicy_rt & hilti (<...>/cxxname-normalization.spicy:6:1-16:12) -[debug/normalizer] &cxxname="spicy::rt::Backtrack" -> &cxxname="::spicy::rt::Backtrack" (<...>/spicy_rt.hlt:7:35) -[debug/normalizer] &cxxname="spicy::rt::MissingData" -> &cxxname="::spicy::rt::MissingData" (<...>/spicy_rt.hlt:8:37) -[debug/normalizer] &cxxname="spicy::rt::ParseError" -> &cxxname="::spicy::rt::ParseError" (<...>/spicy_rt.hlt:9:36) -[debug/normalizer] &cxxname="spicy::rt::UnitAlreadyConnected" -> &cxxname="::spicy::rt::UnitAlreadyConnected" (<...>/spicy_rt.hlt:10:46) -[debug/normalizer] &cxxname="spicy::rt::Sink" -> &cxxname="::spicy::rt::Sink" (<...>/spicy_rt.hlt:36:3) -[debug/normalizer] &cxxname="spicy::rt::filter::init" -> &cxxname="::spicy::rt::filter::init" (<...>/spicy_rt.hlt:43:153) -[debug/normalizer] &cxxname="spicy::rt::filter::connect" -> &cxxname="::spicy::rt::filter::connect" (<...>/spicy_rt.hlt:44:151) -[debug/normalizer] &cxxname="spicy::rt::filter::disconnect" -> &cxxname="::spicy::rt::filter::disconnect" (<...>/spicy_rt.hlt:45:97) -[debug/normalizer] &cxxname="spicy::rt::filter::forward" -> &cxxname="::spicy::rt::filter::forward" (<...>/spicy_rt.hlt:46:98) -[debug/normalizer] &cxxname="spicy::rt::filter::forward_eod" -> &cxxname="::spicy::rt::filter::forward_eod" (<...>/spicy_rt.hlt:47:93) -[debug/normalizer] &cxxname="spicy::rt::confirm" -> &cxxname="::spicy::rt::confirm" (<...>/spicy_rt.hlt:49:86) -[debug/normalizer] &cxxname="spicy::rt::reject" -> &cxxname="::spicy::rt::reject" (<...>/spicy_rt.hlt:50:85) -[debug/normalizer] &cxxname="spicy::rt::detail::createContext" -> &cxxname="::spicy::rt::detail::createContext" (<...>/spicy_rt.hlt:53:64) -[debug/normalizer] &cxxname="spicy::rt::detail::setContext" -> &cxxname="::spicy::rt::detail::setContext" (<...>/spicy_rt.hlt:54:88) -[debug/normalizer] &cxxname="spicy::rt::Parser" -> &cxxname="::spicy::rt::Parser" (<...>/spicy_rt.hlt:69:3) -[debug/normalizer] &cxxname="hilti::rt::integer::BitOrder" -> &cxxname="::hilti::rt::integer::BitOrder" (<...>/spicy_rt.hlt:71:44) -[debug/normalizer] &cxxname="spicy::rt::Direction" -> &cxxname="::spicy::rt::Direction" (<...>/spicy_rt.hlt:72:62) -[debug/normalizer] &cxxname="spicy::rt::detail::registerParser" -> &cxxname="::spicy::rt::detail::registerParser" (<...>/spicy_rt.hlt:77:96) -[debug/normalizer] &cxxname="spicy::rt::detail::printParserState" -> &cxxname="::spicy::rt::detail::printParserState" (<...>/spicy_rt.hlt:78:249) -[debug/normalizer] &cxxname="spicy::rt::detail::waitForInputOrEod" -> &cxxname="::spicy::rt::detail::waitForInputOrEod" (<...>/spicy_rt.hlt:80:122) -[debug/normalizer] &cxxname="spicy::rt::detail::waitForInputOrEod" -> &cxxname="::spicy::rt::detail::waitForInputOrEod" (<...>/spicy_rt.hlt:81:134) -[debug/normalizer] &cxxname="spicy::rt::detail::waitForInput" -> &cxxname="::spicy::rt::detail::waitForInput" (<...>/spicy_rt.hlt:82:152) -[debug/normalizer] &cxxname="spicy::rt::detail::waitForInput" -> &cxxname="::spicy::rt::detail::waitForInput" (<...>/spicy_rt.hlt:83:158) -[debug/normalizer] &cxxname="spicy::rt::detail::waitForEod" -> &cxxname="::spicy::rt::detail::waitForEod" (<...>/spicy_rt.hlt:84:115) -[debug/normalizer] &cxxname="spicy::rt::detail::atEod" -> &cxxname="::spicy::rt::detail::atEod" (<...>/spicy_rt.hlt:85:110) -[debug/normalizer] &cxxname="spicy::rt::detail::unitFind" -> &cxxname="::spicy::rt::detail::unitFind" (<...>/spicy_rt.hlt:87:164) -[debug/normalizer] &cxxname="spicy::rt::detail::backtrack" -> &cxxname="::spicy::rt::detail::backtrack" (<...>/spicy_rt.hlt:89:33) -[debug/normalizer] &cxxname="spicy::rt::ParsedUnit::initialize" -> &cxxname="::spicy::rt::ParsedUnit::initialize" (<...>/spicy_rt.hlt:91:89) -[debug/normalizer] &cxxname="hilti::rt::integer::BitOrder" -> &cxxname="::hilti::rt::integer::BitOrder" (<...>/hilti.hlt:5:44) -[debug/normalizer] &cxxname="hilti::rt::ByteOrder" -> &cxxname="::hilti::rt::ByteOrder" (<...>/hilti.hlt:6:61) -[debug/normalizer] &cxxname="hilti::rt::bytes::Side" -> &cxxname="::hilti::rt::bytes::Side" (<...>/hilti.hlt:7:47) -[debug/normalizer] &cxxname="hilti::rt::AddressFamily" -> &cxxname="::hilti::rt::AddressFamily" (<...>/hilti.hlt:8:49) -[debug/normalizer] &cxxname="hilti::rt::real::Type" -> &cxxname="::hilti::rt::real::Type" (<...>/hilti.hlt:9:64) -[debug/normalizer] &cxxname="hilti::rt::Protocol" -> &cxxname="::hilti::rt::Protocol" (<...>/hilti.hlt:10:48) -[debug/normalizer] &cxxname="hilti::rt::bytes::Charset" -> &cxxname="::hilti::rt::bytes::Charset" (<...>/hilti.hlt:11:44) -[debug/normalizer] &cxxname="hilti::rt::bytes::DecodeErrorStrategy" -> &cxxname="::hilti::rt::bytes::DecodeErrorStrategy" (<...>/hilti.hlt:12:68) -[debug/normalizer] &cxxname="hilti::rt::regexp::MatchState" -> &cxxname="::hilti::rt::regexp::MatchState" (<...>/hilti.hlt:18:3) -[debug/normalizer] &cxxname="hilti::rt::print" -> &cxxname="::hilti::rt::print" (<...>/hilti.hlt:20:57) -[debug/normalizer] &cxxname="hilti::rt::printValues" -> &cxxname="::hilti::rt::printValues" (<...>/hilti.hlt:21:66) -[debug/normalizer] &cxxname="hilti::rt::debug::print" -> &cxxname="::hilti::rt::debug::print" (<...>/hilti.hlt:23:55) -[debug/normalizer] &cxxname="hilti::rt::debug::indent" -> &cxxname="::hilti::rt::debug::indent" (<...>/hilti.hlt:24:52) -[debug/normalizer] &cxxname="hilti::rt::debug::dedent" -> &cxxname="::hilti::rt::debug::dedent" (<...>/hilti.hlt:25:52) -[debug/normalizer] &cxxname="hilti::rt::time::current_time" -> &cxxname="::hilti::rt::time::current_time" (<...>/hilti.hlt:27:36) -[debug/normalizer] &cxxname="hilti::rt::time::mktime" -> &cxxname="::hilti::rt::time::mktime" (<...>/hilti.hlt:28:100) -[debug/normalizer] &cxxname="hilti::rt::abort_with_backtrace" -> &cxxname="::hilti::rt::abort_with_backtrace" (<...>/hilti.hlt:30:29) -[debug/normalizer] &cxxname="hilti::rt::profiler::start" -> &cxxname="::hilti::rt::profiler::start" (<...>/hilti.hlt:32:63) -[debug/normalizer] &cxxname="hilti::rt::profiler::stop" -> &cxxname="::hilti::rt::profiler::stop" (<...>/hilti.hlt:33:57) -[debug/normalizer] &cxxname="hilti::rt::Exception" -> &cxxname="::hilti::rt::Exception" (<...>/hilti.hlt:36:35) -[debug/normalizer] &cxxname="std::exception" -> &cxxname="::std::exception" (<...>/hilti.hlt:39:41) -[debug/normalizer] &cxxname="hilti::rt::RuntimeError" -> &cxxname="::hilti::rt::RuntimeError" (<...>/hilti.hlt:43:38) -[debug/normalizer] &cxxname="hilti::rt::RecoverableFailure" -> &cxxname="::hilti::rt::RecoverableFailure" (<...>/hilti.hlt:46:44) -[debug/normalizer] &cxxname="hilti::rt::MissingData" -> &cxxname="::hilti::rt::MissingData" (<...>/hilti.hlt:49:37) -[debug/normalizer] &cxxname="hilti::rt::exception::what" -> &cxxname="::hilti::rt::exception::what" (<...>/hilti.hlt:52:61) +[debug/normalizer] &cxxname="foo::bar" -> &cxxname="::foo::bar" (<...>/cxxname-normalization.spicy:8:30-8:48) +[debug/normalizer] &cxxname="bar" -> &cxxname="::bar" (<...>/cxxname-normalization.spicy:10:30-10:43) +[debug/normalizer] [hilti::Module] module foo { declare public function string f1() &cxxname="::foo::bar"; declare public function string f2() &cxxname="::foo::baz"; declare public function string f3() &cxxname="::bar"; declare public function string f4() &cxxname="::baz"; } -> import spicy_rt & hilti (<...>/cxxname-normalization.spicy:6:1-16:11) +[debug/normalizer] &cxxname="spicy::rt::Backtrack" -> &cxxname="::spicy::rt::Backtrack" (<...>/spicy_rt.hlt:7:35-7:65) +[debug/normalizer] &cxxname="spicy::rt::MissingData" -> &cxxname="::spicy::rt::MissingData" (<...>/spicy_rt.hlt:8:37-8:69) +[debug/normalizer] &cxxname="spicy::rt::ParseError" -> &cxxname="::spicy::rt::ParseError" (<...>/spicy_rt.hlt:9:36-9:67) +[debug/normalizer] &cxxname="spicy::rt::UnitAlreadyConnected" -> &cxxname="::spicy::rt::UnitAlreadyConnected" (<...>/spicy_rt.hlt:10:46-10:87) +[debug/normalizer] &cxxname="spicy::rt::Sink" -> &cxxname="::spicy::rt::Sink" (<...>/spicy_rt.hlt:36:3-36:28) +[debug/normalizer] &cxxname="spicy::rt::filter::init" -> &cxxname="::spicy::rt::filter::init" (<...>/spicy_rt.hlt:43:153-43:186) +[debug/normalizer] &cxxname="spicy::rt::filter::connect" -> &cxxname="::spicy::rt::filter::connect" (<...>/spicy_rt.hlt:44:151-44:187) +[debug/normalizer] &cxxname="spicy::rt::filter::disconnect" -> &cxxname="::spicy::rt::filter::disconnect" (<...>/spicy_rt.hlt:45:97-45:136) +[debug/normalizer] &cxxname="spicy::rt::filter::forward" -> &cxxname="::spicy::rt::filter::forward" (<...>/spicy_rt.hlt:46:98-46:134) +[debug/normalizer] &cxxname="spicy::rt::filter::forward_eod" -> &cxxname="::spicy::rt::filter::forward_eod" (<...>/spicy_rt.hlt:47:93-47:133) +[debug/normalizer] &cxxname="spicy::rt::confirm" -> &cxxname="::spicy::rt::confirm" (<...>/spicy_rt.hlt:49:86-49:114) +[debug/normalizer] &cxxname="spicy::rt::reject" -> &cxxname="::spicy::rt::reject" (<...>/spicy_rt.hlt:50:85-50:112) +[debug/normalizer] &cxxname="spicy::rt::detail::createContext" -> &cxxname="::spicy::rt::detail::createContext" (<...>/spicy_rt.hlt:53:64-53:106) +[debug/normalizer] &cxxname="spicy::rt::detail::setContext" -> &cxxname="::spicy::rt::detail::setContext" (<...>/spicy_rt.hlt:54:88-54:127) +[debug/normalizer] &cxxname="spicy::rt::Parser" -> &cxxname="::spicy::rt::Parser" (<...>/spicy_rt.hlt:69:3-69:30) +[debug/normalizer] &cxxname="hilti::rt::integer::BitOrder" -> &cxxname="::hilti::rt::integer::BitOrder" (<...>/spicy_rt.hlt:71:44-71:82) +[debug/normalizer] &cxxname="spicy::rt::Direction" -> &cxxname="::spicy::rt::Direction" (<...>/spicy_rt.hlt:72:62-72:92) +[debug/normalizer] &cxxname="spicy::rt::detail::registerParser" -> &cxxname="::spicy::rt::detail::registerParser" (<...>/spicy_rt.hlt:77:96-77:139) +[debug/normalizer] &cxxname="spicy::rt::detail::printParserState" -> &cxxname="::spicy::rt::detail::printParserState" (<...>/spicy_rt.hlt:78:249-78:294) +[debug/normalizer] &cxxname="spicy::rt::detail::waitForInputOrEod" -> &cxxname="::spicy::rt::detail::waitForInputOrEod" (<...>/spicy_rt.hlt:80:122-80:168) +[debug/normalizer] &cxxname="spicy::rt::detail::waitForInputOrEod" -> &cxxname="::spicy::rt::detail::waitForInputOrEod" (<...>/spicy_rt.hlt:81:134-81:180) +[debug/normalizer] &cxxname="spicy::rt::detail::waitForInput" -> &cxxname="::spicy::rt::detail::waitForInput" (<...>/spicy_rt.hlt:82:152-82:193) +[debug/normalizer] &cxxname="spicy::rt::detail::waitForInput" -> &cxxname="::spicy::rt::detail::waitForInput" (<...>/spicy_rt.hlt:83:158-83:199) +[debug/normalizer] &cxxname="spicy::rt::detail::waitForEod" -> &cxxname="::spicy::rt::detail::waitForEod" (<...>/spicy_rt.hlt:84:115-84:154) +[debug/normalizer] &cxxname="spicy::rt::detail::atEod" -> &cxxname="::spicy::rt::detail::atEod" (<...>/spicy_rt.hlt:85:110-85:144) +[debug/normalizer] &cxxname="spicy::rt::detail::unitFind" -> &cxxname="::spicy::rt::detail::unitFind" (<...>/spicy_rt.hlt:87:164-87:201) +[debug/normalizer] &cxxname="spicy::rt::detail::backtrack" -> &cxxname="::spicy::rt::detail::backtrack" (<...>/spicy_rt.hlt:89:33-89:71) +[debug/normalizer] &cxxname="spicy::rt::ParsedUnit::initialize" -> &cxxname="::spicy::rt::ParsedUnit::initialize" (<...>/spicy_rt.hlt:91:89-91:132) +[debug/normalizer] &cxxname="hilti::rt::integer::BitOrder" -> &cxxname="::hilti::rt::integer::BitOrder" (<...>/hilti.hlt:5:44-5:82) +[debug/normalizer] &cxxname="hilti::rt::ByteOrder" -> &cxxname="::hilti::rt::ByteOrder" (<...>/hilti.hlt:6:61-6:91) +[debug/normalizer] &cxxname="hilti::rt::bytes::Side" -> &cxxname="::hilti::rt::bytes::Side" (<...>/hilti.hlt:7:47-7:79) +[debug/normalizer] &cxxname="hilti::rt::AddressFamily" -> &cxxname="::hilti::rt::AddressFamily" (<...>/hilti.hlt:8:49-8:83) +[debug/normalizer] &cxxname="hilti::rt::real::Type" -> &cxxname="::hilti::rt::real::Type" (<...>/hilti.hlt:9:64-9:95) +[debug/normalizer] &cxxname="hilti::rt::Protocol" -> &cxxname="::hilti::rt::Protocol" (<...>/hilti.hlt:10:48-10:77) +[debug/normalizer] &cxxname="hilti::rt::bytes::Charset" -> &cxxname="::hilti::rt::bytes::Charset" (<...>/hilti.hlt:11:44-11:79) +[debug/normalizer] &cxxname="hilti::rt::bytes::DecodeErrorStrategy" -> &cxxname="::hilti::rt::bytes::DecodeErrorStrategy" (<...>/hilti.hlt:12:68-12:115) +[debug/normalizer] &cxxname="hilti::rt::regexp::MatchState" -> &cxxname="::hilti::rt::regexp::MatchState" (<...>/hilti.hlt:18:3-18:42) +[debug/normalizer] &cxxname="hilti::rt::print" -> &cxxname="::hilti::rt::print" (<...>/hilti.hlt:20:57-20:83) +[debug/normalizer] &cxxname="hilti::rt::printValues" -> &cxxname="::hilti::rt::printValues" (<...>/hilti.hlt:21:66-21:98) +[debug/normalizer] &cxxname="hilti::rt::debug::print" -> &cxxname="::hilti::rt::debug::print" (<...>/hilti.hlt:23:55-23:88) +[debug/normalizer] &cxxname="hilti::rt::debug::indent" -> &cxxname="::hilti::rt::debug::indent" (<...>/hilti.hlt:24:52-24:86) +[debug/normalizer] &cxxname="hilti::rt::debug::dedent" -> &cxxname="::hilti::rt::debug::dedent" (<...>/hilti.hlt:25:52-25:86) +[debug/normalizer] &cxxname="hilti::rt::time::current_time" -> &cxxname="::hilti::rt::time::current_time" (<...>/hilti.hlt:27:36-27:75) +[debug/normalizer] &cxxname="hilti::rt::time::mktime" -> &cxxname="::hilti::rt::time::mktime" (<...>/hilti.hlt:28:100-28:133) +[debug/normalizer] &cxxname="hilti::rt::abort_with_backtrace" -> &cxxname="::hilti::rt::abort_with_backtrace" (<...>/hilti.hlt:30:29-30:70) +[debug/normalizer] &cxxname="hilti::rt::profiler::start" -> &cxxname="::hilti::rt::profiler::start" (<...>/hilti.hlt:32:63-32:99) +[debug/normalizer] &cxxname="hilti::rt::profiler::stop" -> &cxxname="::hilti::rt::profiler::stop" (<...>/hilti.hlt:33:57-33:92) +[debug/normalizer] &cxxname="hilti::rt::Exception" -> &cxxname="::hilti::rt::Exception" (<...>/hilti.hlt:36:35-36:65) +[debug/normalizer] &cxxname="std::exception" -> &cxxname="::std::exception" (<...>/hilti.hlt:39:41-39:65) +[debug/normalizer] &cxxname="hilti::rt::RuntimeError" -> &cxxname="::hilti::rt::RuntimeError" (<...>/hilti.hlt:43:38-43:71) +[debug/normalizer] &cxxname="hilti::rt::RecoverableFailure" -> &cxxname="::hilti::rt::RecoverableFailure" (<...>/hilti.hlt:46:44-46:83) +[debug/normalizer] &cxxname="hilti::rt::MissingData" -> &cxxname="::hilti::rt::MissingData" (<...>/hilti.hlt:49:37-49:69) +[debug/normalizer] &cxxname="hilti::rt::exception::what" -> &cxxname="::hilti::rt::exception::what" (<...>/hilti.hlt:52:61-52:97) diff --git a/tests/Baseline/spicy.types.id.validation/output b/tests/Baseline/spicy.types.id.validation/output index 16e1fc830..500fe5186 100644 --- a/tests/Baseline/spicy.types.id.validation/output +++ b/tests/Baseline/spicy.types.id.validation/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/validation.spicy:6:7: Invalid ID '__private_name': cannot start with '__' +[error] <...>/validation.spicy:6:7-6:20: Invalid ID '__private_name': cannot start with '__' [error] spicyc: parse error diff --git a/tests/Baseline/spicy.types.integer.coercion-fail/output b/tests/Baseline/spicy.types.integer.coercion-fail/output index 15c30560e..d43e7a4e9 100644 --- a/tests/Baseline/spicy.types.integer.coercion-fail/output +++ b/tests/Baseline/spicy.types.integer.coercion-fail/output @@ -1,17 +1,17 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/coercion-fail.spicy:7:12-8:26: cannot coerce expression '256' of type 'uint<64>' to type 'uint<8>' -[error] <...>/coercion-fail.spicy:8:26-9:24: cannot coerce expression '-1' of type 'int<64>' to type 'uint<8>' -[error] <...>/coercion-fail.spicy:9:24-11:24: cannot coerce expression '128' of type 'uint<64>' to type 'int<8>' -[error] <...>/coercion-fail.spicy:11:24-12:26: cannot coerce expression '-129' of type 'int<64>' to type 'int<8>' -[error] <...>/coercion-fail.spicy:12:26-14:30: cannot coerce expression '65536' of type 'uint<64>' to type 'uint<16>' -[error] <...>/coercion-fail.spicy:14:30-15:26: cannot coerce expression '-1' of type 'int<64>' to type 'uint<16>' -[error] <...>/coercion-fail.spicy:15:26-17:28: cannot coerce expression '32768' of type 'uint<64>' to type 'int<16>' -[error] <...>/coercion-fail.spicy:17:28-18:30: cannot coerce expression '-32769' of type 'int<64>' to type 'int<16>' -[error] <...>/coercion-fail.spicy:18:30-20:34: cannot coerce expression '4294967296' of type 'uint<64>' to type 'uint<32>' -[error] <...>/coercion-fail.spicy:20:34-21:26: cannot coerce expression '-1' of type 'int<64>' to type 'uint<32>' -[error] <...>/coercion-fail.spicy:21:26-23:32: cannot coerce expression '2147483648' of type 'uint<64>' to type 'int<32>' -[error] <...>/coercion-fail.spicy:23:32-24:34: cannot coerce expression '-2147483649' of type 'int<64>' to type 'int<32>' -[error] <...>/coercion-fail.spicy:24:34-27:25: cannot coerce expression '-1' of type 'int<64>' to type 'uint<64>' -[error] <...>/coercion-fail.spicy:27:25-29:40: cannot coerce expression '9223372036854775808' of type 'uint<64>' to type 'int<64>' -[error] <...>/coercion-fail.spicy:29:40-34:48: cannot coerce expression '-9007199254740993' of type 'int<64>' to type 'real' +[error] <...>/coercion-fail.spicy:8:1-8:25: cannot coerce expression '256' of type 'uint<64>' to type 'uint<8>' +[error] <...>/coercion-fail.spicy:9:1-9:23: cannot coerce expression '-1' of type 'int<64>' to type 'uint<8>' +[error] <...>/coercion-fail.spicy:11:1-11:23: cannot coerce expression '128' of type 'uint<64>' to type 'int<8>' +[error] <...>/coercion-fail.spicy:12:1-12:25: cannot coerce expression '-129' of type 'int<64>' to type 'int<8>' +[error] <...>/coercion-fail.spicy:14:1-14:29: cannot coerce expression '65536' of type 'uint<64>' to type 'uint<16>' +[error] <...>/coercion-fail.spicy:15:1-15:25: cannot coerce expression '-1' of type 'int<64>' to type 'uint<16>' +[error] <...>/coercion-fail.spicy:17:1-17:27: cannot coerce expression '32768' of type 'uint<64>' to type 'int<16>' +[error] <...>/coercion-fail.spicy:18:1-18:29: cannot coerce expression '-32769' of type 'int<64>' to type 'int<16>' +[error] <...>/coercion-fail.spicy:20:1-20:33: cannot coerce expression '4294967296' of type 'uint<64>' to type 'uint<32>' +[error] <...>/coercion-fail.spicy:21:1-21:25: cannot coerce expression '-1' of type 'int<64>' to type 'uint<32>' +[error] <...>/coercion-fail.spicy:23:1-23:31: cannot coerce expression '2147483648' of type 'uint<64>' to type 'int<32>' +[error] <...>/coercion-fail.spicy:24:1-24:33: cannot coerce expression '-2147483649' of type 'int<64>' to type 'int<32>' +[error] <...>/coercion-fail.spicy:27:1-27:24: cannot coerce expression '-1' of type 'int<64>' to type 'uint<64>' +[error] <...>/coercion-fail.spicy:29:1-29:39: cannot coerce expression '9223372036854775808' of type 'uint<64>' to type 'int<64>' +[error] <...>/coercion-fail.spicy:34:1-34:47: cannot coerce expression '-9007199254740993' of type 'int<64>' to type 'real' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-10/output b/tests/Baseline/spicy.types.integer.ctor-fail-10/output index 880fbf4f8..886a626cb 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-10/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-10/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:3:16: integer value out of range for type -[error] <...>/ctor-fail.spicy:4:17: integer value out of range for type -[error] <...>/ctor-fail.spicy:5:17: integer value out of range for type +[error] <...>/ctor-fail.spicy:3:16-3:26: integer value out of range for type +[error] <...>/ctor-fail.spicy:4:17-4:30: integer value out of range for type +[error] <...>/ctor-fail.spicy:5:17-5:34: integer value out of range for type [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-2/output b/tests/Baseline/spicy.types.integer.ctor-fail-2/output index 3a42ba3a4..f013c0893 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-2/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-2/output @@ -1,9 +1,9 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:1:38: invalid character -[error] <...>/ctor-fail.spicy:1:38: invalid character -[error] <...>/ctor-fail.spicy:1:38: invalid character -[error] <...>/ctor-fail.spicy:1:38: invalid character -[error] <...>/ctor-fail.spicy:1:38: invalid character -[error] <...>/ctor-fail.spicy:1:38: invalid character -[error] <...>/ctor-fail.spicy:1:38: syntax error, unexpected ')' +[error] <...>/ctor-fail.spicy:1:38-1:39: invalid character +[error] <...>/ctor-fail.spicy:1:38-1:40: invalid character +[error] <...>/ctor-fail.spicy:1:38-1:41: invalid character +[error] <...>/ctor-fail.spicy:1:38-1:42: invalid character +[error] <...>/ctor-fail.spicy:1:38-1:43: invalid character +[error] <...>/ctor-fail.spicy:1:38-1:44: invalid character +[error] <...>/ctor-fail.spicy:1:38-1:44: syntax error, unexpected ')' [error] spicyc: parse error diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-3/output b/tests/Baseline/spicy.types.integer.ctor-fail-3/output index 12c14cb18..730a17acb 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-3/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-3/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:1:28: integer value out of range +[error] <...>/ctor-fail.spicy:1:28-1:36: integer value out of range [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-4/output b/tests/Baseline/spicy.types.integer.ctor-fail-4/output index 192f0e686..873d7dcfc 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-4/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-4/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:1:29: integer value out of range +[error] <...>/ctor-fail.spicy:1:29-1:38: integer value out of range [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-5/output b/tests/Baseline/spicy.types.integer.ctor-fail-5/output index 2210b8cd4..593f28822 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-5/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-5/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:1:27: integer value out of range +[error] <...>/ctor-fail.spicy:1:27-1:36: integer value out of range [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-6/output b/tests/Baseline/spicy.types.integer.ctor-fail-6/output index 192f0e686..873d7dcfc 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-6/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-6/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:1:29: integer value out of range +[error] <...>/ctor-fail.spicy:1:29-1:38: integer value out of range [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-7/output b/tests/Baseline/spicy.types.integer.ctor-fail-7/output index d0856183c..cc73dbb51 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-7/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-7/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:1:36: integer literal range error +[error] <...>/ctor-fail.spicy:1:36-1:55: integer literal range error [error] spicyc: parse error diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-8/output b/tests/Baseline/spicy.types.integer.ctor-fail-8/output index a02d1221b..8c9f133da 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-8/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-8/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:4:17: integer value out of range +[error] <...>/ctor-fail.spicy:4:17-4:41: integer value out of range [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ctor-fail-9/output b/tests/Baseline/spicy.types.integer.ctor-fail-9/output index e9a2cbe6b..97aefba7f 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail-9/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail-9/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:3:23: integer value out of range +[error] <...>/ctor-fail.spicy:3:23-3:41: integer value out of range [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ctor-fail/output b/tests/Baseline/spicy.types.integer.ctor-fail/output index 0e493c71c..b287821ff 100644 --- a/tests/Baseline/spicy.types.integer.ctor-fail/output +++ b/tests/Baseline/spicy.types.integer.ctor-fail/output @@ -1,8 +1,8 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-fail.spicy:8:16: integer value out of range for type -[error] <...>/ctor-fail.spicy:9:17: integer value out of range for type -[error] <...>/ctor-fail.spicy:10:17: integer value out of range for type -[error] <...>/ctor-fail.spicy:13:16: integer value out of range for type -[error] <...>/ctor-fail.spicy:14:17: integer value out of range for type -[error] <...>/ctor-fail.spicy:15:17: integer value out of range for type +[error] <...>/ctor-fail.spicy:8:16-8:27: integer value out of range for type +[error] <...>/ctor-fail.spicy:9:17-9:31: integer value out of range for type +[error] <...>/ctor-fail.spicy:10:17-10:35: integer value out of range for type +[error] <...>/ctor-fail.spicy:13:16-13:25: integer value out of range for type +[error] <...>/ctor-fail.spicy:14:17-14:29: integer value out of range for type +[error] <...>/ctor-fail.spicy:15:17-15:33: integer value out of range for type [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.ops-fail/output b/tests/Baseline/spicy.types.integer.ops-fail/output index 8938e720c..0156a1bfa 100644 --- a/tests/Baseline/spicy.types.integer.ops-fail/output +++ b/tests/Baseline/spicy.types.integer.ops-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ops-fail.spicy:12:15: unsupported operator: > & > +[error] <...>/ops-fail.spicy:12:15-12:30: unsupported operator: > & > [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.parse-byte-order-from-parameter-fail/output b/tests/Baseline/spicy.types.integer.parse-byte-order-from-parameter-fail/output index b44fcf76b..61b6b2127 100644 --- a/tests/Baseline/spicy.types.integer.parse-byte-order-from-parameter-fail/output +++ b/tests/Baseline/spicy.types.integer.parse-byte-order-from-parameter-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/parse-byte-order-from-parameter-fail.spicy:10:10-12:2: &byte-order expression must be of spicy::ByteOrder, but is of type string +[error] <...>/parse-byte-order-from-parameter-fail.spicy:10:10-12:1: &byte-order expression must be of spicy::ByteOrder, but is of type string [error] spicy-driver: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.parse-size/output b/tests/Baseline/spicy.types.integer.parse-size/output index 6cb8407a3..54f3b81be 100644 --- a/tests/Baseline/spicy.types.integer.parse-size/output +++ b/tests/Baseline/spicy.types.integer.parse-size/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. 1020304 -[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 4 bytes for unpacking value (<...>/parse-size.spicy:15:8) -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/parse-size.spicy:20:14) +[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 4 bytes for unpacking value (<...>/parse-size.spicy:15:8-15:12) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/parse-size.spicy:20:14-20:20) diff --git a/tests/Baseline/spicy.types.integer.wrong-assign/output b/tests/Baseline/spicy.types.integer.wrong-assign/output index 4da003f5a..0f30a9d50 100644 --- a/tests/Baseline/spicy.types.integer.wrong-assign/output +++ b/tests/Baseline/spicy.types.integer.wrong-assign/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/wrong-assign.spicy:9:1: cannot coerce expression 'Test::a' of type 'int<32>' to type 'uint<32>' +[error] <...>/wrong-assign.spicy:9:1-9:5: cannot coerce expression 'Test::a' of type 'int<32>' to type 'uint<32>' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.wrong-cast/output b/tests/Baseline/spicy.types.integer.wrong-cast/output index c9b990c08..d662210bd 100644 --- a/tests/Baseline/spicy.types.integer.wrong-cast/output +++ b/tests/Baseline/spicy.types.integer.wrong-cast/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/wrong-cast.spicy:8:7: unsupported operator: cast<>>(>) +[error] <...>/wrong-cast.spicy:8:7-8:21: unsupported operator: cast<>>(>) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.integer.wrong-int-mix/output b/tests/Baseline/spicy.types.integer.wrong-int-mix/output index f0aa93769..cc1e6278a 100644 --- a/tests/Baseline/spicy.types.integer.wrong-int-mix/output +++ b/tests/Baseline/spicy.types.integer.wrong-int-mix/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/wrong-int-mix.spicy:9:7: unsupported operator: > + > +[error] <...>/wrong-int-mix.spicy:9:7-9:11: unsupported operator: > + > [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.interval.ctor-out-of-range/output b/tests/Baseline/spicy.types.interval.ctor-out-of-range/output index 78c4be0c9..1345efd87 100644 --- a/tests/Baseline/spicy.types.interval.ctor-out-of-range/output +++ b/tests/Baseline/spicy.types.interval.ctor-out-of-range/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/ctor-out-of-range.spicy:7:12: value cannot be represented as an interval -[error] <...>/ctor-out-of-range.spicy:8:12: value cannot be represented as an interval +[error] <...>/ctor-out-of-range.spicy:7:12-7:40: value cannot be represented as an interval +[error] <...>/ctor-out-of-range.spicy:8:12-8:40: value cannot be represented as an interval [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.real.coercion-fail/output b/tests/Baseline/spicy.types.real.coercion-fail/output index b7aa84d60..dc0b8ce50 100644 --- a/tests/Baseline/spicy.types.real.coercion-fail/output +++ b/tests/Baseline/spicy.types.real.coercion-fail/output @@ -1,7 +1,7 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/coercion-fail.spicy:5:12-7:28: cannot coerce expression '0x1.028f5c28f5c29p+0' of type 'real' to type 'bool' -[error] <...>/coercion-fail.spicy:7:28-8:27: cannot coerce expression '0x0p+0' of type 'real' to type 'bool' -[error] <...>/coercion-fail.spicy:8:27-13:42: cannot coerce expression '18446744073709550592' of type 'uint<64>' to type 'real' -[error] <...>/coercion-fail.spicy:13:42-15:42: cannot coerce expression '-9223372036854775296' of type 'int<64>' to type 'real' -[error] <...>/coercion-fail.spicy:15:42-17:35: cannot coerce expression '9007199254740993' of type 'uint<64>' to type 'real' +[error] <...>/coercion-fail.spicy:7:1-7:27: cannot coerce expression '0x1.028f5c28f5c29p+0' of type 'real' to type 'bool' +[error] <...>/coercion-fail.spicy:8:1-8:26: cannot coerce expression '0x0p+0' of type 'real' to type 'bool' +[error] <...>/coercion-fail.spicy:13:1-13:41: cannot coerce expression '18446744073709550592' of type 'uint<64>' to type 'real' +[error] <...>/coercion-fail.spicy:15:1-15:41: cannot coerce expression '-9223372036854775296' of type 'int<64>' to type 'real' +[error] <...>/coercion-fail.spicy:17:1-17:34: cannot coerce expression '9007199254740993' of type 'uint<64>' to type 'real' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.real.parse-fail/output b/tests/Baseline/spicy.types.real.parse-fail/output index 46ff35927..930400b42 100644 --- a/tests/Baseline/spicy.types.real.parse-fail/output +++ b/tests/Baseline/spicy.types.real.parse-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/parse-fail.spicy:9:5: field of type real must be used with a &type attribute -[error] <...>/parse-fail.spicy:10:5: &type attribute must be a spicy::RealType +[error] <...>/parse-fail.spicy:9:5-9:13: field of type real must be used with a &type attribute +[error] <...>/parse-fail.spicy:10:5-10:23: &type attribute must be a spicy::RealType [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.regexp.invalid-field/output b/tests/Baseline/spicy.types.regexp.invalid-field/output index 891bae1b9..03461299c 100644 --- a/tests/Baseline/spicy.types.regexp.invalid-field/output +++ b/tests/Baseline/spicy.types.regexp.invalid-field/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/invalid-field.spicy:7:5: need regexp constant for parsing a field -[error] <...>/invalid-field.spicy:8:15: &eod is only valid for bytes and vector fields +[error] <...>/invalid-field.spicy:7:5-7:15: need regexp constant for parsing a field +[error] <...>/invalid-field.spicy:8:15-8:18: &eod is only valid for bytes and vector fields [error] spicy-driver: aborting after errors diff --git a/tests/Baseline/spicy.types.regexp.parse-ctor-captures-no-sub/output b/tests/Baseline/spicy.types.regexp.parse-ctor-captures-no-sub/output index 07e0e9f5e..b6c294405 100644 --- a/tests/Baseline/spicy.types.regexp.parse-ctor-captures-no-sub/output +++ b/tests/Baseline/spicy.types.regexp.parse-ctor-captures-no-sub/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type hilti::rt::IndexError: vector index 1 out of range (<...>/parse-ctor-captures-no-sub.spicy:13:9) -[error] terminating with uncaught exception of type hilti::rt::IndexError: vector index 1 out of range (<...>/parse-ctor-captures-no-sub.spicy:19:9) -[error] terminating with uncaught exception of type hilti::rt::IndexError: vector index 99 out of range (<...>/parse-ctor-captures-no-sub.spicy:26:9) +[error] terminating with uncaught exception of type hilti::rt::IndexError: vector index 1 out of range (<...>/parse-ctor-captures-no-sub.spicy:13:9-13:17) +[error] terminating with uncaught exception of type hilti::rt::IndexError: vector index 1 out of range (<...>/parse-ctor-captures-no-sub.spicy:19:9-19:17) +[error] terminating with uncaught exception of type hilti::rt::IndexError: vector index 99 out of range (<...>/parse-ctor-captures-no-sub.spicy:26:9-26:18) diff --git a/tests/Baseline/spicy.types.sink.reassembler.wrong-init-seq/output b/tests/Baseline/spicy.types.sink.reassembler.wrong-init-seq/output index 6e78158b3..0259ea0fc 100644 --- a/tests/Baseline/spicy.types.sink.reassembler.wrong-init-seq/output +++ b/tests/Baseline/spicy.types.sink.reassembler.wrong-init-seq/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::SinkError: sink cannot update initial sequence number after activity has already been seen (<...>/wrong-init-seq.spicy:20:19-38:2) +[error] terminating with uncaught exception of type spicy::rt::SinkError: sink cannot update initial sequence number after activity has already been seen (<...>/wrong-init-seq.spicy:20:19-38:1) diff --git a/tests/Baseline/spicy.types.struct.init-fail/output b/tests/Baseline/spicy.types.struct.init-fail/output index c99e0a3ac..03bc78562 100644 --- a/tests/Baseline/spicy.types.struct.init-fail/output +++ b/tests/Baseline/spicy.types.struct.init-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/init-fail.spicy:13:25-14:22: declaration needs a concrete struct type -[error] <...>/init-fail.spicy:18:5: declaration needs a concrete struct type +[error] <...>/init-fail.spicy:14:1-14:21: declaration needs a concrete struct type +[error] <...>/init-fail.spicy:18:5-18:24: declaration needs a concrete struct type [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.struct.parse-fail/output b/tests/Baseline/spicy.types.struct.parse-fail/output index c253443bd..4897b0f96 100644 --- a/tests/Baseline/spicy.types.struct.parse-fail/output +++ b/tests/Baseline/spicy.types.struct.parse-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/parse-fail.spicy:13:5: not a parseable type (test::Foo) +[error] <...>/parse-fail.spicy:13:5-13:13: not a parseable type (test::Foo) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.attr-multiple-fail/output b/tests/Baseline/spicy.types.unit.attr-multiple-fail/output index e4a63068e..5fe4652f1 100644 --- a/tests/Baseline/spicy.types.unit.attr-multiple-fail/output +++ b/tests/Baseline/spicy.types.unit.attr-multiple-fail/output @@ -1,12 +1,12 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/attr-multiple-fail.spicy:11:5: '&convert' can be used at most once -[error] <...>/attr-multiple-fail.spicy:12:5: '&size' can be used at most once -[error] <...>/attr-multiple-fail.spicy:13:5: '&max-size' can be used at most once -[error] <...>/attr-multiple-fail.spicy:15:5: '&parse-at' can be used at most once -[error] <...>/attr-multiple-fail.spicy:18:5: '&parse-from' can be used at most once -[error] <...>/attr-multiple-fail.spicy:20:5: address field cannot have both &ipv4 and &ipv6 attributes -[error] <...>/attr-multiple-fail.spicy:21:5: '&type' can be used at most once -[error] <...>/attr-multiple-fail.spicy:23:5: '&until' can be used at most once -[error] <...>/attr-multiple-fail.spicy:24:5: '&until-including' can be used at most once -[error] <...>/attr-multiple-fail.spicy:25:5: '&while' can be used at most once +[error] <...>/attr-multiple-fail.spicy:11:5-11:47: '&convert' can be used at most once +[error] <...>/attr-multiple-fail.spicy:12:5-12:30: '&size' can be used at most once +[error] <...>/attr-multiple-fail.spicy:13:5-13:43: '&max-size' can be used at most once +[error] <...>/attr-multiple-fail.spicy:15:5-15:64: '&parse-at' can be used at most once +[error] <...>/attr-multiple-fail.spicy:18:5-18:52: '&parse-from' can be used at most once +[error] <...>/attr-multiple-fail.spicy:20:5-20:25: address field cannot have both &ipv4 and &ipv6 attributes +[error] <...>/attr-multiple-fail.spicy:21:5-21:89: '&type' can be used at most once +[error] <...>/attr-multiple-fail.spicy:23:5-23:44: '&until' can be used at most once +[error] <...>/attr-multiple-fail.spicy:24:5-24:64: '&until-including' can be used at most once +[error] <...>/attr-multiple-fail.spicy:25:5-25:44: '&while' can be used at most once [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.attribute-access/output b/tests/Baseline/spicy.types.unit.attribute-access/output index 056bec4b9..af53513dd 100644 --- a/tests/Baseline/spicy.types.unit.attribute-access/output +++ b/tests/Baseline/spicy.types.unit.attribute-access/output @@ -2,4 +2,4 @@ [$f1=(not set), $f2=(not set), $f3=(not set)] [$f1=16, $f2=32, $f3=48] [$f1=(not set), $f2=(not set)] -[error] terminating with uncaught exception of type hilti::rt::AttributeNotSet: struct attribute not set (fail.spicy:6:9) +[error] terminating with uncaught exception of type hilti::rt::AttributeNotSet: struct attribute not set (fail.spicy:6:9-6:23) diff --git a/tests/Baseline/spicy.types.unit.begin-uninit/output b/tests/Baseline/spicy.types.unit.begin-uninit/output index 9dde87b6f..2461fa6f1 100644 --- a/tests/Baseline/spicy.types.unit.begin-uninit/output +++ b/tests/Baseline/spicy.types.unit.begin-uninit/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type hilti::rt::AssertionFailure: failed expression 'self.__offset != 0' (<...>/begin-uninit.spicy:10:16) +[error] terminating with uncaught exception of type hilti::rt::AssertionFailure: failed expression 'self.__offset != 0' (<...>/begin-uninit.spicy:10:16-10:41) diff --git a/tests/Baseline/spicy.types.unit.context-fail/output b/tests/Baseline/spicy.types.unit.context-fail/output index 743f03b4c..e6d6c3271 100644 --- a/tests/Baseline/spicy.types.unit.context-fail/output +++ b/tests/Baseline/spicy.types.unit.context-fail/output @@ -1,10 +1,10 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/context-fail.spicy:9:5: only public units can have %context -[error] <...>/context-fail.spicy:12:17-15:2: unit cannot have more than one %context -[error] <...>/context-fail.spicy:13:5: %context requires an argument -[error] <...>/context-fail.spicy:14:5: %context requires a type -[error] <...>/context-fail.spicy:17:17-20:2: unit cannot have more than one %context -[error] <...>/context-fail.spicy:23:16: context() used with a unit which did not declare %context -[error] <...>/context-fail.spicy:30:3: %context requires a type -[error] <...>/context-fail.spicy:32:14: context() used with a unit which did not declare %context +[error] <...>/context-fail.spicy:9:5-9:22: only public units can have %context +[error] <...>/context-fail.spicy:12:17-15:1: unit cannot have more than one %context +[error] <...>/context-fail.spicy:13:5-13:13: %context requires an argument +[error] <...>/context-fail.spicy:14:5-14:18: %context requires a type +[error] <...>/context-fail.spicy:17:17-20:1: unit cannot have more than one %context +[error] <...>/context-fail.spicy:23:16-23:29: context() used with a unit which did not declare %context +[error] <...>/context-fail.spicy:30:3-30:18: %context requires a type +[error] <...>/context-fail.spicy:32:14-32:27: context() used with a unit which did not declare %context [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.context-mismatch/output b/tests/Baseline/spicy.types.unit.context-mismatch/output index 8ee14c731..3e5071b0c 100644 --- a/tests/Baseline/spicy.types.unit.context-mismatch/output +++ b/tests/Baseline/spicy.types.unit.context-mismatch/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. (b"") -error for ID cid1-resp: context mismatch between related units: expected Test::Context1, but got Test::Context2 (<...>/context-mismatch.spicy:18:23-22:2) +error for ID cid1-resp: context mismatch between related units: expected Test::Context1, but got Test::Context2 (<...>/context-mismatch.spicy:18:23-22:1) diff --git a/tests/Baseline/spicy.types.unit.context-undeclared/output b/tests/Baseline/spicy.types.unit.context-undeclared/output index 269ce337b..ff1c7b7da 100644 --- a/tests/Baseline/spicy.types.unit.context-undeclared/output +++ b/tests/Baseline/spicy.types.unit.context-undeclared/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/context-undeclared.spicy:10:15: context() used with a unit which did not declare %context +[error] <...>/context-undeclared.spicy:10:15-10:28: context() used with a unit which did not declare %context [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.count-fail-2/output b/tests/Baseline/spicy.types.unit.count-fail-2/output index 7d5cab635..eb78639bc 100644 --- a/tests/Baseline/spicy.types.unit.count-fail-2/output +++ b/tests/Baseline/spicy.types.unit.count-fail-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/count-fail.spicy:5:3: cannot coerce expression 'True' of type 'bool' to type 'uint<64>' +[error] <...>/count-fail.spicy:5:3-5:27: cannot coerce expression 'True' of type 'bool' to type 'uint<64>' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.count-fail-3/output b/tests/Baseline/spicy.types.unit.count-fail-3/output index 17001a478..fd18eb884 100644 --- a/tests/Baseline/spicy.types.unit.count-fail-3/output +++ b/tests/Baseline/spicy.types.unit.count-fail-3/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/count-fail.spicy:5:3: cannot coerce expression '0x1p-1' of type 'real' to type 'uint<64>' +[error] <...>/count-fail.spicy:5:3-5:26: cannot coerce expression '0x1p-1' of type 'real' to type 'uint<64>' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.count-fail/output b/tests/Baseline/spicy.types.unit.count-fail/output index ef4bdaea6..1825b8d00 100644 --- a/tests/Baseline/spicy.types.unit.count-fail/output +++ b/tests/Baseline/spicy.types.unit.count-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/count-fail.spicy:10:3: cannot coerce expression '-1' of type 'int<64>' to type 'uint<64>' +[error] <...>/count-fail.spicy:10:3-10:25: cannot coerce expression '-1' of type 'int<64>' to type 'uint<64>' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.dollardollar-fail-2/output b/tests/Baseline/spicy.types.unit.dollardollar-fail-2/output index 37b6d3331..a41c9f0cc 100644 --- a/tests/Baseline/spicy.types.unit.dollardollar-fail-2/output +++ b/tests/Baseline/spicy.types.unit.dollardollar-fail-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/dollardollar-fail.spicy:5:34: $$ is not available in this context +[error] <...>/dollardollar-fail.spicy:5:34-5:35: $$ is not available in this context [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.dollardollar-fail/output b/tests/Baseline/spicy.types.unit.dollardollar-fail/output index 0b31e2ed2..066f6372c 100644 --- a/tests/Baseline/spicy.types.unit.dollardollar-fail/output +++ b/tests/Baseline/spicy.types.unit.dollardollar-fail/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/dollardollar-fail.spicy:8:22: $$ is not available in this context -[error] <...>/dollardollar-fail.spicy:9:20: $$ is not available in this context -[error] <...>/dollardollar-fail.spicy:12:27: $$ is not available in this context +[error] <...>/dollardollar-fail.spicy:8:22-8:23: $$ is not available in this context +[error] <...>/dollardollar-fail.spicy:9:20-9:21: $$ is not available in this context +[error] <...>/dollardollar-fail.spicy:12:27-12:28: $$ is not available in this context [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.error-hook-with-arg/output b/tests/Baseline/spicy.types.unit.error-hook-with-arg/output index ec3d9287e..c36a8d6b1 100644 --- a/tests/Baseline/spicy.types.unit.error-hook-with-arg/output +++ b/tests/Baseline/spicy.types.unit.error-hook-with-arg/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. [$a=b"1234", $b=(not set)] -Error, &size amount not consumed (<...>/error-hook-with-arg.spicy:8:17) -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/error-hook-with-arg.spicy:8:17) +Error, &size amount not consumed (<...>/error-hook-with-arg.spicy:8:17-8:23) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/error-hook-with-arg.spicy:8:17-8:23) diff --git a/tests/Baseline/spicy.types.unit.field-default-value-fail-2/output b/tests/Baseline/spicy.types.unit.field-default-value-fail-2/output index 0326e12c7..9e97682dd 100644 --- a/tests/Baseline/spicy.types.unit.field-default-value-fail-2/output +++ b/tests/Baseline/spicy.types.unit.field-default-value-fail-2/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/field-default-value-fail.spicy:5:3: cannot coerce default expression to type 'bytes' -[error] <...>/field-default-value-fail.spicy:2:12-6:3: type mismatch for &default expression, expecting type bytes, got string +[error] <...>/field-default-value-fail.spicy:5:3-5:29: cannot coerce default expression to type 'bytes' +[error] <...>/field-default-value-fail.spicy:4:1-6:2: type mismatch for &default expression, expecting type bytes, got string [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.field-default-value-fail/output b/tests/Baseline/spicy.types.unit.field-default-value-fail/output index d24033de6..9a5b8d6d6 100644 --- a/tests/Baseline/spicy.types.unit.field-default-value-fail/output +++ b/tests/Baseline/spicy.types.unit.field-default-value-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/field-default-value-fail.spicy:7:12: &default requires an argument +[error] <...>/field-default-value-fail.spicy:7:12-7:19: &default requires an argument [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.field-hook-fail/output b/tests/Baseline/spicy.types.unit.field-hook-fail/output index c7c2ab660..b60b885b0 100644 --- a/tests/Baseline/spicy.types.unit.field-hook-fail/output +++ b/tests/Baseline/spicy.types.unit.field-hook-fail/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/field-hook-fail.spicy:7:12: 'foreach' hook can only be used with containers -[error] <...>/field-hook-fail.spicy:7:12: foreach can only be used with containers -[error] <...>/field-hook-fail.spicy:9:17: foreach can only be used with containers +[error] <...>/field-hook-fail.spicy:7:13-7:23: 'foreach' hook can only be used with containers +[error] <...>/field-hook-fail.spicy:7:13-7:23: foreach can only be used with containers +[error] <...>/field-hook-fail.spicy:9:18-9:28: foreach can only be used with containers [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.field-max-size-fail/output b/tests/Baseline/spicy.types.unit.field-max-size-fail/output index 6551e0e96..8c93c6a28 100644 --- a/tests/Baseline/spicy.types.unit.field-max-size-fail/output +++ b/tests/Baseline/spicy.types.unit.field-max-size-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/field-max-size-fail.spicy:9:5: attributes cannot be combined: &size, &max-size +[error] <...>/field-max-size-fail.spicy:9:5-9:34: attributes cannot be combined: &size, &max-size [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.field-max-size/output b/tests/Baseline/spicy.types.unit.field-max-size/output index 79f5944bf..fd7a8711c 100644 --- a/tests/Baseline/spicy.types.unit.field-max-size/output +++ b/tests/Baseline/spicy.types.unit.field-max-size/output @@ -2,6 +2,6 @@ done, [$xs=b"\x00"] done, [$xs=b"\x01\x00"] error, [$xs=(not set)] -[error] terminating with uncaught exception of type spicy::rt::ParseError: parsing not done within &max-size bytes (<...>/field-max-size.spicy:15:40) +[error] terminating with uncaught exception of type spicy::rt::ParseError: parsing not done within &max-size bytes (<...>/field-max-size.spicy:15:40-15:56) error, [$xs=b"\x01\x01\x01"] -[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until-including expression found (<...>/field-max-size.spicy:15:32) +[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until-including expression found (<...>/field-max-size.spicy:15:32-15:38) diff --git a/tests/Baseline/spicy.types.unit.field-name-clash-fail/output b/tests/Baseline/spicy.types.unit.field-name-clash-fail/output index b5ebb5362..8c75f01c4 100644 --- a/tests/Baseline/spicy.types.unit.field-name-clash-fail/output +++ b/tests/Baseline/spicy.types.unit.field-name-clash-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/field-name-clash-fail.spicy:8:12-10:2: field name 'Foo' cannot have name identical to owning unit 'Test::Foo' +[error] <...>/field-name-clash-fail.spicy:8:12-10:1: field name 'Foo' cannot have name identical to owning unit 'Test::Foo' [error] spicy-driver: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.finally-new-error/output b/tests/Baseline/spicy.types.unit.finally-new-error/output index d6f2d14f3..f2742b47d 100644 --- a/tests/Baseline/spicy.types.unit.finally-new-error/output +++ b/tests/Baseline/spicy.types.unit.finally-new-error/output @@ -3,4 +3,4 @@ Bar init, [$x=(not set)] Bar abc Bar done, [$x=b"abc"] Bar finally - 1, [$x=b"abc"] -[error] terminating with uncaught exception of type hilti::rt::DivisionByZero: integer division by zero (<...>/finally-new-error.spicy:17:49-18:22) +[error] terminating with uncaught exception of type hilti::rt::DivisionByZero: integer division by zero (<...>/finally-new-error.spicy:18:19-18:21) diff --git a/tests/Baseline/spicy.types.unit.finally/output b/tests/Baseline/spicy.types.unit.finally/output index 7613175de..f23d9ee6e 100644 --- a/tests/Baseline/spicy.types.unit.finally/output +++ b/tests/Baseline/spicy.types.unit.finally/output @@ -16,9 +16,9 @@ Foo error, [$y=(not set)] Foo finally, [$y=(not set)] Bar error, [$x=b"abc", $y=[$y=(not set)]] Bar finally, [$x=b"abc", $y=[$y=(not set)]] -[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 'def' (<...>/finally.spicy:28:8) +[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 'def' (<...>/finally.spicy:28:8-28:13) Bar init, [$x=(not set), $y=(not set)] Bar error, [$x=(not set), $y=(not set)] Bar finally, [$x=(not set), $y=(not set)] -[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 'abc' (<...>/finally.spicy:18:8) +[error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 'abc' (<...>/finally.spicy:18:8-18:13) diff --git a/tests/Baseline/spicy.types.unit.hooks-fail/output b/tests/Baseline/spicy.types.unit.hooks-fail/output index 6806cdd9c..6d77e6535 100644 --- a/tests/Baseline/spicy.types.unit.hooks-fail/output +++ b/tests/Baseline/spicy.types.unit.hooks-fail/output @@ -1,25 +1,25 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/hooks-fail.spicy:9:13: hook '%init' does not take any parameters -[error] <...>/hooks-fail.spicy:10:16: hook ID cannot be scoped -[error] <...>/hooks-fail.spicy:10:16: no field 'bar' in unit type -[error] <...>/hooks-fail.spicy:12:13: signature for hook must be: %gap(seq: uint64, len: uint64) -[error] <...>/hooks-fail.spicy:12:13: cannot use hook '%gap', unit type does not support sinks because it is not public -[error] <...>/hooks-fail.spicy:13:17: signature for hook must be: %skipped(seq: uint64) -[error] <...>/hooks-fail.spicy:13:17: cannot use hook '%skipped', unit type does not support sinks because it is not public -[error] <...>/hooks-fail.spicy:14:17: signature for hook must be: %overlap(seq: uint64, old: bytes, new_: bytes) -[error] <...>/hooks-fail.spicy:14:17: cannot use hook '%overlap', unit type does not support sinks because it is not public -[error] <...>/hooks-fail.spicy:15:21: signature for hook must be: %undelivered(seq: uint64, data: bytes) -[error] <...>/hooks-fail.spicy:15:21: cannot use hook '%undelivered', unit type does not support sinks because it is not public -[error] <...>/hooks-fail.spicy:17:10: no field 'x1' in unit type -[error] <...>/hooks-fail.spicy:18:11: unknown hook '%x2' -[error] <...>/hooks-fail.spicy:19:13: cannot use paths in hooks; trigger on the top-level field instead -[error] <...>/hooks-fail.spicy:22:16: cannot use hook '%done' with a unit field -[error] <...>/hooks-fail.spicy:25:15: hook '%init' does not take any parameters -[error] <...>/hooks-fail.spicy:26:15: signature for hook must be: %gap(seq: uint64, len: uint64) -[error] <...>/hooks-fail.spicy:26:15: cannot use hook '%gap', unit type does not support sinks because it is not public -[error] <...>/hooks-fail.spicy:27:12: no field 'y1' in unit type -[error] <...>/hooks-fail.spicy:28:13: unknown hook '%y2' -[error] <...>/hooks-fail.spicy:29:15: cannot use paths in hooks; trigger on the top-level field instead -[error] <...>/hooks-fail.spicy:30:11: unknown ID 'XXXX::x' -[error] <...>/hooks-fail.spicy:31:18: cannot use hook '%done' with a unit field +[error] <...>/hooks-fail.spicy:9:13-9:26: hook '%init' does not take any parameters +[error] <...>/hooks-fail.spicy:10:17-10:18: hook ID cannot be scoped +[error] <...>/hooks-fail.spicy:10:17-10:18: no field 'bar' in unit type +[error] <...>/hooks-fail.spicy:12:13-12:17: signature for hook must be: %gap(seq: uint64, len: uint64) +[error] <...>/hooks-fail.spicy:12:13-12:17: cannot use hook '%gap', unit type does not support sinks because it is not public +[error] <...>/hooks-fail.spicy:13:17-13:21: signature for hook must be: %skipped(seq: uint64) +[error] <...>/hooks-fail.spicy:13:17-13:21: cannot use hook '%skipped', unit type does not support sinks because it is not public +[error] <...>/hooks-fail.spicy:14:17-14:21: signature for hook must be: %overlap(seq: uint64, old: bytes, new_: bytes) +[error] <...>/hooks-fail.spicy:14:17-14:21: cannot use hook '%overlap', unit type does not support sinks because it is not public +[error] <...>/hooks-fail.spicy:15:21-15:25: signature for hook must be: %undelivered(seq: uint64, data: bytes) +[error] <...>/hooks-fail.spicy:15:21-15:25: cannot use hook '%undelivered', unit type does not support sinks because it is not public +[error] <...>/hooks-fail.spicy:17:11-17:12: no field 'x1' in unit type +[error] <...>/hooks-fail.spicy:18:12-18:13: unknown hook '%x2' +[error] <...>/hooks-fail.spicy:19:14-19:15: cannot use paths in hooks; trigger on the top-level field instead +[error] <...>/hooks-fail.spicy:22:17-22:18: cannot use hook '%done' with a unit field +[error] <...>/hooks-fail.spicy:25:15-25:28: hook '%init' does not take any parameters +[error] <...>/hooks-fail.spicy:26:15-26:19: signature for hook must be: %gap(seq: uint64, len: uint64) +[error] <...>/hooks-fail.spicy:26:15-26:19: cannot use hook '%gap', unit type does not support sinks because it is not public +[error] <...>/hooks-fail.spicy:27:13-27:14: no field 'y1' in unit type +[error] <...>/hooks-fail.spicy:28:14-28:15: unknown hook '%y2' +[error] <...>/hooks-fail.spicy:29:16-29:17: cannot use paths in hooks; trigger on the top-level field instead +[error] <...>/hooks-fail.spicy:30:12-30:13: unknown ID 'XXXX::x' +[error] <...>/hooks-fail.spicy:31:19-31:20: cannot use hook '%done' with a unit field [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.offset-early-access-fail/output b/tests/Baseline/spicy.types.unit.offset-early-access-fail/output index f75e09808..5a4f9e7c8 100644 --- a/tests/Baseline/spicy.types.unit.offset-early-access-fail/output +++ b/tests/Baseline/spicy.types.unit.offset-early-access-fail/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type hilti::rt::UnsetOptional: unset optional value (<...>/offset-early-access-fail.spicy:14:18) +[error] terminating with uncaught exception of type hilti::rt::UnsetOptional: unset optional value (<...>/offset-early-access-fail.spicy:14:18-14:39) diff --git a/tests/Baseline/spicy.types.unit.params-fail/output b/tests/Baseline/spicy.types.unit.params-fail/output index ee8ca4f9a..079e32da2 100644 --- a/tests/Baseline/spicy.types.unit.params-fail/output +++ b/tests/Baseline/spicy.types.unit.params-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/params-fail.spicy:15:5: type parameter 1 is missing (b) -[error] <...>/params-fail.spicy:15:5: type parameter 2 is missing (s) +[error] <...>/params-fail.spicy:15:5-15:13: type parameter 1 is missing (b) +[error] <...>/params-fail.spicy:15:5-15:13: type parameter 2 is missing (s) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.params-write-fail/output b/tests/Baseline/spicy.types.unit.params-write-fail/output index 4120b6c15..20fde1bc5 100644 --- a/tests/Baseline/spicy.types.unit.params-write-fail/output +++ b/tests/Baseline/spicy.types.unit.params-write-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/params-write-fail.spicy:16:9: cannot assign to expression: x = False +[error] <...>/params-write-fail.spicy:16:9-16:17: cannot assign to expression: x = False [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.parseable-fail/output b/tests/Baseline/spicy.types.unit.parseable-fail/output index 78d3a5866..62b499460 100644 --- a/tests/Baseline/spicy.types.unit.parseable-fail/output +++ b/tests/Baseline/spicy.types.unit.parseable-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/parseable-fail.spicy:9:5: not a parseable constant ("anything") +[error] <...>/parseable-fail.spicy:9:5-9:18: not a parseable constant ("anything") [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.properties-fail/output b/tests/Baseline/spicy.types.unit.properties-fail/output index 94847e497..659325570 100644 --- a/tests/Baseline/spicy.types.unit.properties-fail/output +++ b/tests/Baseline/spicy.types.unit.properties-fail/output @@ -1,15 +1,15 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[warning] <...>/properties-fail.spicy:13:5: %random-access is no longer needed and deprecated -[error] <...>/properties-fail.spicy:8:19-19:2: attribute '&byte-order' requires an expression -[error] <...>/properties-fail.spicy:19:3: &byte-order requires an expression -[error] <...>/properties-fail.spicy:9:5: %port requires an argument -[error] <...>/properties-fail.spicy:10:5: %port requires a port as its argument -[error] <...>/properties-fail.spicy:11:5: %description requires an argument -[error] <...>/properties-fail.spicy:12:5: %description requires a string argument -[error] <...>/properties-fail.spicy:13:5: %random-access does not accept an argument -[error] <...>/properties-fail.spicy:14:5: %filter does not accept an argument -[error] <...>/properties-fail.spicy:15:5: %mime-type requires an argument -[error] <...>/properties-fail.spicy:16:5: %mime-type requires a string argument -[error] <...>/properties-fail.spicy:17:5: %mime-type argument must follow "main/sub" form -[error] <...>/properties-fail.spicy:18:5: unknown property '%unknown' +[warning] <...>/properties-fail.spicy:13:5-13:26: %random-access is no longer needed and deprecated +[error] <...>/properties-fail.spicy:8:19-19:1: attribute '&byte-order' requires an expression +[error] <...>/properties-fail.spicy:19:3-19:13: &byte-order requires an expression +[error] <...>/properties-fail.spicy:9:5-9:10: %port requires an argument +[error] <...>/properties-fail.spicy:10:5-10:15: %port requires a port as its argument +[error] <...>/properties-fail.spicy:11:5-11:17: %description requires an argument +[error] <...>/properties-fail.spicy:12:5-12:24: %description requires a string argument +[error] <...>/properties-fail.spicy:13:5-13:26: %random-access does not accept an argument +[error] <...>/properties-fail.spicy:14:5-14:23: %filter does not accept an argument +[error] <...>/properties-fail.spicy:15:5-15:15: %mime-type requires an argument +[error] <...>/properties-fail.spicy:16:5-16:20: %mime-type requires a string argument +[error] <...>/properties-fail.spicy:17:5-17:26: %mime-type argument must follow "main/sub" form +[error] <...>/properties-fail.spicy:18:5-18:13: unknown property '%unknown' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.requires-attribute/output b/tests/Baseline/spicy.types.unit.requires-attribute/output index b1c80a70f..b3b338855 100644 --- a/tests/Baseline/spicy.types.unit.requires-attribute/output +++ b/tests/Baseline/spicy.types.unit.requires-attribute/output @@ -1,10 +1,10 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. success, [$x=1, $y=E::X, $z=E::X] error, [$x=2, $y=(not set), $z=(not set)] -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: ($$ == 1) (<...>/requires-attribute.spicy:19:14) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: ($$ == 1) (<...>/requires-attribute.spicy:19:14-19:32) error, [$x=1, $y=E::Y, $z=(not set)] -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: ($$ == 1) (<...>/requires-attribute.spicy:20:29) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: ($$ == 1) (<...>/requires-attribute.spicy:20:29-20:47) error, [$x=1, $y=E::X, $z=E::Y] -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: (self.z == E::X) (<...>/requires-attribute.spicy:21:29) -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: self.x == 1 (<...>/requires-attribute.spicy:30:24) -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: self.y == 2 (<...>/requires-attribute.spicy:30:44) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: (self.z == E::X) (<...>/requires-attribute.spicy:21:29-21:54) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: self.x == 1 (<...>/requires-attribute.spicy:30:24-30:32) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: self.y == 2 (<...>/requires-attribute.spicy:30:44-30:52) diff --git a/tests/Baseline/spicy.types.unit.requires-multiple-fail/output b/tests/Baseline/spicy.types.unit.requires-multiple-fail/output index 7b41b7ed2..00a6541be 100644 --- a/tests/Baseline/spicy.types.unit.requires-multiple-fail/output +++ b/tests/Baseline/spicy.types.unit.requires-multiple-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: ($$ == 2) (<...>/requires-multiple-fail.spicy:11:34) -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: (self.x == 2) (<...>/requires-multiple-fail.spicy:16:27) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: ($$ == 2) (<...>/requires-multiple-fail.spicy:11:34-11:52) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: (self.x == 2) (<...>/requires-multiple-fail.spicy:16:27-16:49) diff --git a/tests/Baseline/spicy.types.unit.requires-property/output b/tests/Baseline/spicy.types.unit.requires-property/output index 031f03f61..8f5bbd4cb 100644 --- a/tests/Baseline/spicy.types.unit.requires-property/output +++ b/tests/Baseline/spicy.types.unit.requires-property/output @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. success, [$x=1, $y=E::X] error, [$x=5, $y=E::X] -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: self.x < 5 (<...>/requires-property.spicy:17:15) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: self.x < 5 (<...>/requires-property.spicy:17:15-17:24) error, [$x=1, $y=E::] -[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: self.y == E::X (<...>/requires-property.spicy:18:15) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: self.y == E::X (<...>/requires-property.spicy:18:15-18:28) diff --git a/tests/Baseline/spicy.types.unit.size-overflow/output b/tests/Baseline/spicy.types.unit.size-overflow/output index d921bf70c..49be4e286 100644 --- a/tests/Baseline/spicy.types.unit.size-overflow/output +++ b/tests/Baseline/spicy.types.unit.size-overflow/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type hilti::rt::Overflow: integer overflow (<...>/size-overflow.spicy:10:11) +[error] terminating with uncaught exception of type hilti::rt::Overflow: integer overflow (<...>/size-overflow.spicy:10:11-10:15) diff --git a/tests/Baseline/spicy.types.unit.size-validation-fail/output b/tests/Baseline/spicy.types.unit.size-validation-fail/output index a9ac2cc8e..b77778a5d 100644 --- a/tests/Baseline/spicy.types.unit.size-validation-fail/output +++ b/tests/Baseline/spicy.types.unit.size-validation-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/size-validation-fail.spicy:9:11-11:2: &size expression cannot use 'self' since it is only available after parsing of unit has started -[error] <...>/size-validation-fail.spicy:13:11-15:2: &max-size expression cannot use 'self' since it is only available after parsing of unit has started +[error] <...>/size-validation-fail.spicy:9:11-11:1: &size expression cannot use 'self' since it is only available after parsing of unit has started +[error] <...>/size-validation-fail.spicy:13:11-15:1: &max-size expression cannot use 'self' since it is only available after parsing of unit has started [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.skip-fail/output b/tests/Baseline/spicy.types.unit.skip-fail/output index 021208b9f..1cf478df7 100644 --- a/tests/Baseline/spicy.types.unit.skip-fail/output +++ b/tests/Baseline/spicy.types.unit.skip-fail/output @@ -1,8 +1,8 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/skip-fail.spicy:8:1: %skip requires an argument -[error] <...>/skip-fail.spicy:9:1: %skip-pre requires a regexp as its argument -[error] <...>/skip-fail.spicy:10:1: %skip-post requires a regexp as its argument -[error] <...>/skip-fail.spicy:13:5: %skip requires an argument -[error] <...>/skip-fail.spicy:14:5: %skip-pre requires a regexp as its argument -[error] <...>/skip-fail.spicy:15:5: %skip-post requires a regexp as its argument +[error] <...>/skip-fail.spicy:8:1-8:6: %skip requires an argument +[error] <...>/skip-fail.spicy:9:1-9:12: %skip-pre requires a regexp as its argument +[error] <...>/skip-fail.spicy:10:1-10:18: %skip-post requires a regexp as its argument +[error] <...>/skip-fail.spicy:13:5-13:10: %skip requires an argument +[error] <...>/skip-fail.spicy:14:5-14:16: %skip-pre requires a regexp as its argument +[error] <...>/skip-fail.spicy:15:5-15:22: %skip-post requires a regexp as its argument [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.skip-field-fail-2/output b/tests/Baseline/spicy.types.unit.skip-field-fail-2/output index ced4a58e3..63a878523 100644 --- a/tests/Baseline/spicy.types.unit.skip-field-fail-2/output +++ b/tests/Baseline/spicy.types.unit.skip-field-fail-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/skip-field-fail.spicy:5:5: skip field cannot have sinks attached +[error] <...>/skip-field-fail.spicy:5:5-5:36: skip field cannot have sinks attached [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.skip-field-fail/output b/tests/Baseline/spicy.types.unit.skip-field-fail/output index a8f98d8f4..f1f13417c 100644 --- a/tests/Baseline/spicy.types.unit.skip-field-fail/output +++ b/tests/Baseline/spicy.types.unit.skip-field-fail/output @@ -1,6 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/skip-field-fail.spicy:15:11: $$ is not available in this context -[error] <...>/skip-field-fail.spicy:9:35: $$ is not available in this context -[error] <...>/skip-field-fail.spicy:10:38: $$ is not available in this context -[error] <...>/skip-field-fail.spicy:11:36: $$ is not available in this context +[error] <...>/skip-field-fail.spicy:15:11-15:12: $$ is not available in this context +[error] <...>/skip-field-fail.spicy:9:35-9:36: $$ is not available in this context +[error] <...>/skip-field-fail.spicy:10:38-10:39: $$ is not available in this context +[error] <...>/skip-field-fail.spicy:11:36-11:37: $$ is not available in this context [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.skip/output b/tests/Baseline/spicy.types.unit.skip/output index 8e6d44195..61c799286 100644 --- a/tests/Baseline/spicy.types.unit.skip/output +++ b/tests/Baseline/spicy.types.unit.skip/output @@ -14,7 +14,7 @@ Parsing Y w/o any skipping since skip-pre and -post in the wrong place X, [$x=b"1"] X, [$x=b"A"] X, [$x=b"B"] -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/skip.spicy:41:14) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/skip.spicy:41:14-41:20) Parsing Y w/ skipping pre and post X, [$x=b"A"] X, [$x=b"B"] diff --git a/tests/Baseline/spicy.types.unit.struct-ctor-init-2/output b/tests/Baseline/spicy.types.unit.struct-ctor-init-2/output index 2ae7d6431..bba031b41 100644 --- a/tests/Baseline/spicy.types.unit.struct-ctor-init-2/output +++ b/tests/Baseline/spicy.types.unit.struct-ctor-init-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/struct-ctor-init-2.spicy:13:11: type cannot be used as key type for maps (because type 'test::Key' is not sortable) +[error] <...>/struct-ctor-init-2.spicy:13:11-13:25: type cannot be used as key type for maps (because type 'test::Key' is not sortable) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.struct-ctor-init-fail/.stderr b/tests/Baseline/spicy.types.unit.struct-ctor-init-fail/.stderr index ec8e81925..f7556fcc7 100644 --- a/tests/Baseline/spicy.types.unit.struct-ctor-init-fail/.stderr +++ b/tests/Baseline/spicy.types.unit.struct-ctor-init-fail/.stderr @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/struct-ctor-init-fail.spicy:14:5: cannot coerce expression '[$a=1, $b=2]' of type 'struct { uint<64> a; uint<64> b; }' to type 'value_ref' +[error] <...>/struct-ctor-init-fail.spicy:14:5-14:35: cannot coerce expression '[$a=1, $b=2]' of type 'struct { uint<64> a; uint<64> b; }' to type 'value_ref' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.sub-unit-fail/output b/tests/Baseline/spicy.types.unit.sub-unit-fail/output index 71a228185..e57e0875c 100644 --- a/tests/Baseline/spicy.types.unit.sub-unit-fail/output +++ b/tests/Baseline/spicy.types.unit.sub-unit-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/sub-unit-fail.spicy:6:23-7:8: unknown ID 'B' +[error] <...>/sub-unit-fail.spicy:7:4-7:7: unknown ID 'B' [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.switch-attributes-fail/output b/tests/Baseline/spicy.types.unit.switch-attributes-fail/output index 71d303ae1..c781aaadb 100644 --- a/tests/Baseline/spicy.types.unit.switch-attributes-fail/output +++ b/tests/Baseline/spicy.types.unit.switch-attributes-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/switch-attributes-fail.spicy:9:5-11:27: attribute '&eod' is not supported here -[error] <...>/switch-attributes-fail.spicy:9:5-11:27: attribute '&until' is not supported here +[error] <...>/switch-attributes-fail.spicy:9:5-11:26: attribute '&eod' is not supported here +[error] <...>/switch-attributes-fail.spicy:9:5-11:26: attribute '&until' is not supported here [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.switch-duplicate-case/output b/tests/Baseline/spicy.types.unit.switch-duplicate-case/output index cdee11149..5ef02e5d2 100644 --- a/tests/Baseline/spicy.types.unit.switch-duplicate-case/output +++ b/tests/Baseline/spicy.types.unit.switch-duplicate-case/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/switch-duplicate-case.spicy:11:8-15:14: duplicate case +[error] <...>/switch-duplicate-case.spicy:11:8-15:13: duplicate case [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.switch-no-default/output b/tests/Baseline/spicy.types.unit.switch-no-default/output index b0a61825a..05d8a8cc5 100644 --- a/tests/Baseline/spicy.types.unit.switch-no-default/output +++ b/tests/Baseline/spicy.types.unit.switch-no-default/output @@ -3,4 +3,4 @@ b1, 2345 b2, b1, b2, 2345 -[error] terminating with uncaught exception of type spicy::rt::ParseError: no matching case in switch statement (<...>/switch-no-default.spicy:13:8-16:14) +[error] terminating with uncaught exception of type spicy::rt::ParseError: no matching case in switch statement (<...>/switch-no-default.spicy:13:8-16:13) diff --git a/tests/Baseline/spicy.types.unit.switch-size-fail/output b/tests/Baseline/spicy.types.unit.switch-size-fail/output index f15f8891a..f3e71e418 100644 --- a/tests/Baseline/spicy.types.unit.switch-size-fail/output +++ b/tests/Baseline/spicy.types.unit.switch-size-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/switch-size-fail.spicy:12:7: cannot coerce attribute's expression from type 'bytes' to 'uint<64>' (&size) +[error] <...>/switch-size-fail.spicy:12:7-12:18: cannot coerce attribute's expression from type 'bytes' to 'uint<64>' (&size) [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.switch-wrong-case/output b/tests/Baseline/spicy.types.unit.switch-wrong-case/output index e9a271ed0..bee2ad48a 100644 --- a/tests/Baseline/spicy.types.unit.switch-wrong-case/output +++ b/tests/Baseline/spicy.types.unit.switch-wrong-case/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/switch-wrong-case.spicy:13:12: unsupported operator: == > +[error] <...>/switch-wrong-case.spicy:13:12-13:12: unsupported operator: == > [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.switch/output b/tests/Baseline/spicy.types.unit.switch/output index 8d0206534..488925b2e 100644 --- a/tests/Baseline/spicy.types.unit.switch/output +++ b/tests/Baseline/spicy.types.unit.switch/output @@ -27,8 +27,8 @@ bar foo foo 2345 -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/switch.spicy:45:8) -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/switch.spicy:45:8) -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/switch.spicy:45:8) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/switch.spicy:45:8-45:14) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/switch.spicy:45:8-45:14) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/switch.spicy:45:8-45:14) [$tag=1, $b1=b"ABC", $b2=(not set)] [$tag=2, $b1=(not set), $b2=b"abc"] diff --git a/tests/Baseline/spicy.types.unit.synchronize-after/output b/tests/Baseline/spicy.types.unit.synchronize-after/output index d4386c0bd..86e374e9f 100644 --- a/tests/Baseline/spicy.types.unit.synchronize-after/output +++ b/tests/Baseline/spicy.types.unit.synchronize-after/output @@ -7,7 +7,7 @@ foo::Test { data: 123 } } -[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize-after.spicy:12:11) +[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize-after.spicy:12:11-12:18) foo::Test { foo: foo::Foo {} bar: foo::Bar { diff --git a/tests/Baseline/spicy.types.unit.synchronize-at-fail/output b/tests/Baseline/spicy.types.unit.synchronize-at-fail/output index 6ba3a9b35..d7b1aaa86 100644 --- a/tests/Baseline/spicy.types.unit.synchronize-at-fail/output +++ b/tests/Baseline/spicy.types.unit.synchronize-at-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/synchronize-at-fail.spicy:8:12-11:2: unit cannot specify both %synchronize-at and %synchronize-after +[error] <...>/synchronize-at-fail.spicy:8:12-11:1: unit cannot specify both %synchronize-at and %synchronize-after [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.synchronize-at/output b/tests/Baseline/spicy.types.unit.synchronize-at/output index 43119bbf1..54f267892 100644 --- a/tests/Baseline/spicy.types.unit.synchronize-at/output +++ b/tests/Baseline/spicy.types.unit.synchronize-at/output @@ -7,7 +7,7 @@ foo::Test1 { data: 123 } } -[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize-at.spicy:17:11) +[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize-at.spicy:17:11-17:18) foo::Test1 { foo: foo::Foo {} bar: foo::Bar { diff --git a/tests/Baseline/spicy.types.unit.synchronize-confirm-elsewhere/output b/tests/Baseline/spicy.types.unit.synchronize-confirm-elsewhere/output index b3300de61..105c4a45e 100644 --- a/tests/Baseline/spicy.types.unit.synchronize-confirm-elsewhere/output +++ b/tests/Baseline/spicy.types.unit.synchronize-confirm-elsewhere/output @@ -25,4 +25,4 @@ test::Z { c: C } } -[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: successful synchronization never confirmed: expecting 'A' (<...>/synchronize-confirm-elsewhere.spicy:28:8) +[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: successful synchronization never confirmed: expecting 'A' (<...>/synchronize-confirm-elsewhere.spicy:28:8-28:11) diff --git a/tests/Baseline/spicy.types.unit.synchronize-fail/output b/tests/Baseline/spicy.types.unit.synchronize-fail/output index cf493ab8a..d1a581413 100644 --- a/tests/Baseline/spicy.types.unit.synchronize-fail/output +++ b/tests/Baseline/spicy.types.unit.synchronize-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/synchronize-fail.spicy:10:5-12:7: unit switch branches cannot be &synchronize +[error] <...>/synchronize-fail.spicy:10:5-12:6: unit switch branches cannot be &synchronize [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.synchronize-literals/output b/tests/Baseline/spicy.types.unit.synchronize-literals/output index 375b4c365..81de81a1a 100644 --- a/tests/Baseline/spicy.types.unit.synchronize-literals/output +++ b/tests/Baseline/spicy.types.unit.synchronize-literals/output @@ -5,5 +5,5 @@ [$a=b"Axy", $b=6, $c=(not set), $d=b"Dxy", $e=(1)] [$a=b"Axy", $b=6, $c=(not set), $d=b"Dxy", $e=(1)] [$a=b"Axy", $b=6, $c=b"Cxy", $d=(not set), $e=(1)] -[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: expecting 'Cxy' (<...>/synchronize-literals.spicy:24:8) -[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize-literals.spicy:25:8) +[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: expecting 'Cxy' (<...>/synchronize-literals.spicy:24:8-24:13) +[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize-literals.spicy:25:8-25:12) diff --git a/tests/Baseline/spicy.types.unit.synchronize-nested/output b/tests/Baseline/spicy.types.unit.synchronize-nested/output index 30263c2fa..1e8c90835 100644 --- a/tests/Baseline/spicy.types.unit.synchronize-nested/output +++ b/tests/Baseline/spicy.types.unit.synchronize-nested/output @@ -9,10 +9,10 @@ [$x=(not set), $a=[$a1=(not set), $a2=b"2", $a3=(not set), $a4=(not set)], $as=[]] [$x=(not set), $a=[$a1=(not set), $a2=(not set), $a3=3, $a4=(not set)], $as=[]] [$x=(not set), $a=[$a1=(not set), $a2=(not set), $a3=(not set), $a4=b"4"], $as=[]] -[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize-nested.spicy:33:8) +[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize-nested.spicy:33:8-33:10) # Synchronize on vector field [$x=b"X", $a=[$a1=(not set), $a2=(not set), $a3=(not set), $a4=(not set)], $as=[[$a1=b"1", $a2=(not set), $a3=(not set), $a4=(not set)]]] [$x=b"X", $a=[$a1=(not set), $a2=(not set), $a3=(not set), $a4=(not set)], $as=[[$a1=(not set), $a2=b"2", $a3=(not set), $a4=(not set)]]] [$x=b"X", $a=[$a1=(not set), $a2=(not set), $a3=(not set), $a4=(not set)], $as=[[$a1=(not set), $a2=(not set), $a3=3, $a4=(not set)]]] [$x=b"X", $a=[$a1=(not set), $a2=(not set), $a3=(not set), $a4=(not set)], $as=[[$a1=(not set), $a2=(not set), $a3=(not set), $a4=b"4"]]] -[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: no expected look-ahead token found (<...>/synchronize-nested.spicy:48:9) +[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: no expected look-ahead token found (<...>/synchronize-nested.spicy:48:9-48:19) diff --git a/tests/Baseline/spicy.types.unit.synchronize/output b/tests/Baseline/spicy.types.unit.synchronize/output index e3f997e26..64942c585 100644 --- a/tests/Baseline/spicy.types.unit.synchronize/output +++ b/tests/Baseline/spicy.types.unit.synchronize/output @@ -192,7 +192,7 @@ Done: [$a=b"A", $b=(not set), $c=(not set), $d=b"D", $e=b"E"] [spicy-verbose] - state: type=test::A input="" stream=0xXXXXXXXX offsets=2/0/2/2 chunks=0 frozen=yes mode=default trim=yes lah=n/a lah_token="n/a" recovering=yes [spicy-verbose] - state: type=test::A input="" stream=0xXXXXXXXX offsets=2/0/2/2 chunks=0 frozen=yes mode=default trim=yes lah=n/a lah_token="n/a" recovering=yes Error: [$a=b"A", $b=(not set), $c=(not set), $d=(not set), $e=(not set)] -[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: expecting 'B' (<...>/synchronize.spicy:35:8) +[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: expecting 'B' (<...>/synchronize.spicy:35:8-35:11) [spicy-verbose] - state: type=test::A input="A" stream=0xXXXXXXXX offsets=0/0/0/1 chunks=1 frozen=yes mode=default trim=yes lah=n/a lah_token="n/a" recovering=no [spicy-verbose] - parsing production: Unit: test_A -> a b c d e [spicy-verbose] - state: type=test::A input="A" stream=0xXXXXXXXX offsets=0/0/0/1 chunks=1 frozen=yes mode=default trim=yes lah=n/a lah_token="n/a" recovering=no @@ -205,7 +205,7 @@ Error: [$a=b"A", $b=(not set), $c=(not set), $d=(not set), $e=(not set)] [spicy-verbose] failed to parse, will try to synchronize at 'd' [spicy-verbose] - state: type=test::A input="" stream=0xXXXXXXXX offsets=1/0/1/1 chunks=0 frozen=yes mode=default trim=yes lah=n/a lah_token="n/a" recovering=yes Error: [$a=b"A", $b=(not set), $c=(not set), $d=(not set), $e=(not set)] -[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: expecting 'B' (<...>/synchronize.spicy:35:8) +[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: expecting 'B' (<...>/synchronize.spicy:35:8-35:11) [spicy-verbose] - state: type=test::A input="1" stream=0xXXXXXXXX offsets=0/0/0/1 chunks=1 frozen=no mode=default trim=yes lah=n/a lah_token="n/a" recovering=no [spicy-verbose] - parsing production: Unit: test_A -> a b c d e [spicy-verbose] - state: type=test::A input="1" stream=0xXXXXXXXX offsets=0/0/0/1 chunks=1 frozen=no mode=default trim=yes lah=n/a lah_token="n/a" recovering=no @@ -220,7 +220,7 @@ Error: [$a=b"A", $b=(not set), $c=(not set), $d=(not set), $e=(not set)] [spicy-verbose] resuming after insufficient input, now have 1 for stream 0xXXXXXXXX [spicy-verbose] - trimming input Error: [$a=(not set), $b=(not set), $c=(not set), $d=(not set), $e=(not set)] -[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize.spicy:34:8) +[error] terminating with uncaught exception of type spicy::rt::ParseError: failed to synchronize: failed to match regular expression (<...>/synchronize.spicy:34:8-34:10) [spicy-verbose] - state: type=test::E input="B" stream=0xXXXXXXXX offsets=0/0/0/1 chunks=1 frozen=no mode=default trim=yes lah=n/a lah_token="n/a" recovering=no [spicy-verbose] - parsing production: Unit: test_E -> anon test_E_A anon_2 [spicy-verbose] - state: type=test::E input="B" stream=0xXXXXXXXX offsets=0/0/0/1 chunks=1 frozen=no mode=default trim=yes lah=n/a lah_token="n/a" recovering=no diff --git a/tests/Baseline/spicy.types.unit.unit-max-size-fail/output b/tests/Baseline/spicy.types.unit.unit-max-size-fail/output index ce3bda0e5..2f4f8a482 100644 --- a/tests/Baseline/spicy.types.unit.unit-max-size-fail/output +++ b/tests/Baseline/spicy.types.unit.unit-max-size-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/unit-max-size-fail.spicy:8:20-10:2: attributes cannot be combined: &size, &max-size +[error] <...>/unit-max-size-fail.spicy:8:20-10:1: attributes cannot be combined: &size, &max-size [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.unit-max-size/output b/tests/Baseline/spicy.types.unit.unit-max-size/output index 608ebd339..ace66dfd2 100644 --- a/tests/Baseline/spicy.types.unit.unit-max-size/output +++ b/tests/Baseline/spicy.types.unit.unit-max-size/output @@ -3,6 +3,6 @@ done, [$xs=b"\x00"] done, [$xs=b"\x01\x00"] done, [$xs=b"\x01\x01\x00"] error, [$xs=b"\x01\x01\x00"] -[error] terminating with uncaught exception of type spicy::rt::ParseError: parsing not done within &max-size bytes (<...>/unit-max-size.spicy:19:3) +[error] terminating with uncaught exception of type spicy::rt::ParseError: parsing not done within &max-size bytes (<...>/unit-max-size.spicy:19:3-19:19) error, [$xs=b"\x01\x01\x01"] -[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until-including expression found (<...>/unit-max-size.spicy:15:32) +[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until-including expression found (<...>/unit-max-size.spicy:15:32-15:38) diff --git a/tests/Baseline/spicy.types.unit.unit-size-fail/output b/tests/Baseline/spicy.types.unit.unit-size-fail/output index f7abdc5bb..7ffe6675f 100644 --- a/tests/Baseline/spicy.types.unit.unit-size-fail/output +++ b/tests/Baseline/spicy.types.unit.unit-size-fail/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/unit-size-fail.spicy:12:3) +[error] terminating with uncaught exception of type spicy::rt::ParseError: &size amount not consumed (<...>/unit-size-fail.spicy:12:3-12:9) diff --git a/tests/Baseline/spicy.types.unit.unsupported-attribute/output b/tests/Baseline/spicy.types.unit.unsupported-attribute/output index cec49028b..86ca7363f 100644 --- a/tests/Baseline/spicy.types.unit.unsupported-attribute/output +++ b/tests/Baseline/spicy.types.unit.unsupported-attribute/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/unsupported-attribute.spicy:8:12-10:2: attribute &no-emit not supported for unit types +[error] <...>/unsupported-attribute.spicy:8:12-10:1: attribute &no-emit not supported for unit types [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.variable-attributes/output b/tests/Baseline/spicy.types.unit.variable-attributes/output index 449328329..38592ca06 100644 --- a/tests/Baseline/spicy.types.unit.variable-attributes/output +++ b/tests/Baseline/spicy.types.unit.variable-attributes/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/variable-attributes.spicy:9:5: attribute '&default' not supported for unit variables +[error] <...>/variable-attributes.spicy:9:5-9:39: attribute '&default' not supported for unit variables [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.void-fail-2/output b/tests/Baseline/spicy.types.unit.void-fail-2/output index 1f37e30a8..a92d4652a 100644 --- a/tests/Baseline/spicy.types.unit.void-fail-2/output +++ b/tests/Baseline/spicy.types.unit.void-fail-2/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/void-fail.spicy:6:22: field 'v' cannot be accessed +[error] <...>/void-fail.spicy:6:22-6:27: field 'v' cannot be accessed [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.void-fail/output b/tests/Baseline/spicy.types.unit.void-fail/output index 6f27d27ea..3dfb0779c 100644 --- a/tests/Baseline/spicy.types.unit.void-fail/output +++ b/tests/Baseline/spicy.types.unit.void-fail/output @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[warning] <...>/void-fail.spicy:6:16-7:20: using `void` fields with attributes is deprecated and support will be removed in a future release; replace 'void ...' with 'skip bytes ...' -[warning] <...>/void-fail.spicy:7:20-8:32: using `void` fields with attributes is deprecated and support will be removed in a future release; replace 'void ...' with 'skip bytes ...' -[error] <...>/void-fail.spicy:7:20-8:32: attributes cannot be combined: &size, &max-size +[warning] <...>/void-fail.spicy:7:5-7:19: using `void` fields with attributes is deprecated and support will be removed in a future release; replace 'void ...' with 'skip bytes ...' +[warning] <...>/void-fail.spicy:8:5-8:31: using `void` fields with attributes is deprecated and support will be removed in a future release; replace 'void ...' with 'skip bytes ...' +[error] <...>/void-fail.spicy:8:5-8:31: attributes cannot be combined: &size, &max-size [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.unit.void-requires/output b/tests/Baseline/spicy.types.unit.void-requires/output index 6d964f704..b7410bf4e 100644 --- a/tests/Baseline/spicy.types.unit.void-requires/output +++ b/tests/Baseline/spicy.types.unit.void-requires/output @@ -3,4 +3,4 @@ Test::X { x: 1 y: 2 } -[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: (self.x == 1) (<...>/void-requires.spicy:12:12) +[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: &requires failed: (self.x == 1) (<...>/void-requires.spicy:12:12-12:34) diff --git a/tests/Baseline/spicy.types.unit.void-until/output b/tests/Baseline/spicy.types.unit.void-until/output index 253efadb7..bb73c7f24 100644 --- a/tests/Baseline/spicy.types.unit.void-until/output +++ b/tests/Baseline/spicy.types.unit.void-until/output @@ -3,5 +3,5 @@ hook! [$x=b"123"] hook! [$x=b"123"] -[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until expression found (<...>/void-until.spicy:15:19) -[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until expression found (<...>/void-until.spicy:15:19) +[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until expression found (<...>/void-until.spicy:15:19-15:23) +[error] terminating with uncaught exception of type spicy::rt::ParseError: end-of-data reached before &until expression found (<...>/void-until.spicy:15:19-15:23) diff --git a/tests/Baseline/spicy.types.unit.void/output b/tests/Baseline/spicy.types.unit.void/output index 8712f7300..13417ab17 100644 --- a/tests/Baseline/spicy.types.unit.void/output +++ b/tests/Baseline/spicy.types.unit.void/output @@ -2,5 +2,5 @@ Test::X { x: 3 } -[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 1 bytes for unpacking value (<...>/void.spicy:14:8) -[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: not enough bytes for skipping (<...>/void.spicy:12:12-13:20) +[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: expecting 1 bytes for unpacking value (<...>/void.spicy:14:8-14:12) +[fatal error] terminating with uncaught exception of type spicy::rt::ParseError: not enough bytes for skipping (<...>/void.spicy:13:5-13:19) diff --git a/tests/Baseline/spicy.types.vector.dollardollar-fail/output b/tests/Baseline/spicy.types.vector.dollardollar-fail/output index 171670434..ac9ae1e17 100644 --- a/tests/Baseline/spicy.types.vector.dollardollar-fail/output +++ b/tests/Baseline/spicy.types.vector.dollardollar-fail/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/dollardollar-fail.spicy:7:24: cannot use $$ with container inside transient field -[error] <...>/dollardollar-fail.spicy:8:25: cannot use $$ with container inside transient field +[error] <...>/dollardollar-fail.spicy:7:24-7:25: cannot use $$ with container inside transient field +[error] <...>/dollardollar-fail.spicy:8:25-8:26: cannot use $$ with container inside transient field [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.vector.infinite-loop-for-each/output b/tests/Baseline/spicy.types.vector.infinite-loop-for-each/output index ebd4b2ed5..155f2c1bc 100644 --- a/tests/Baseline/spicy.types.vector.infinite-loop-for-each/output +++ b/tests/Baseline/spicy.types.vector.infinite-loop-for-each/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::ParseError: loop body did not change input position, possible infinite loop (<...>/infinite-loop-for-each.spicy:16:5) +[error] terminating with uncaught exception of type spicy::rt::ParseError: loop body did not change input position, possible infinite loop (<...>/infinite-loop-for-each.spicy:16:5-16:32) diff --git a/tests/Baseline/spicy.types.vector.infinite-loop-lahead/output b/tests/Baseline/spicy.types.vector.infinite-loop-lahead/output index 36c75877d..8a8fc17c5 100644 --- a/tests/Baseline/spicy.types.vector.infinite-loop-lahead/output +++ b/tests/Baseline/spicy.types.vector.infinite-loop-lahead/output @@ -1,2 +1,2 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] terminating with uncaught exception of type spicy::rt::ParseError: loop body did not change input position, possible infinite loop (<...>/infinite-loop-lahead.spicy:14:5) +[error] terminating with uncaught exception of type spicy::rt::ParseError: loop body did not change input position, possible infinite loop (<...>/infinite-loop-lahead.spicy:14:5-14:17) diff --git a/tests/Baseline/spicy.types.vector.legacy-syntax-fail/output b/tests/Baseline/spicy.types.vector.legacy-syntax-fail/output index d0358c343..2ca4c0442 100644 --- a/tests/Baseline/spicy.types.vector.legacy-syntax-fail/output +++ b/tests/Baseline/spicy.types.vector.legacy-syntax-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/legacy-syntax-fail.spicy:7:5: vector syntax is no longer supported for parsing sequences; use T[] instead. +[error] <...>/legacy-syntax-fail.spicy:7:5-7:31: vector syntax is no longer supported for parsing sequences; use T[] instead. [error] spicyc: parse error diff --git a/tests/Baseline/spicy.types.vector.parse-lahead-int-ambiguous/output b/tests/Baseline/spicy.types.vector.parse-lahead-int-ambiguous/output index d6c802e7d..539f184b3 100644 --- a/tests/Baseline/spicy.types.vector.parse-lahead-int-ambiguous/output +++ b/tests/Baseline/spicy.types.vector.parse-lahead-int-ambiguous/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/parse-lahead-int-ambiguous.spicy:12:1-17:7: grammar HTTP::Test (<...>/parse-lahead-int-ambiguous.spicy:12:1-17:7), production a_l1 (<...>/parse-lahead-int-ambiguous.spicy:13:5) is ambiguous for look-ahead symbol(s) { uint8(1) (uint<8>) } +[error] <...>/parse-lahead-int-ambiguous.spicy:12:1-17:6: grammar HTTP::Test (<...>/parse-lahead-int-ambiguous.spicy:12:1-17:6), production a_l1 (<...>/parse-lahead-int-ambiguous.spicy:13:5-13:14) is ambiguous for look-ahead symbol(s) { uint8(1) (uint<8>) } [error] spicyc: aborting after errors diff --git a/tests/Baseline/spicy.types.vector.parse-lahead-int/output b/tests/Baseline/spicy.types.vector.parse-lahead-int/output index 9d8f83666..d7769b815 100644 --- a/tests/Baseline/spicy.types.vector.parse-lahead-int/output +++ b/tests/Baseline/spicy.types.vector.parse-lahead-int/output @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. [$a=[[$x=1, $y=2571], [$x=1, $y=3085]], $b=2, $c=3599] [$a=[], $b=2, $c=3599] -[error] terminating with uncaught exception of type spicy::rt::ParseError: no expected look-ahead token found (<...>/parse-lahead-int.spicy:15:5) +[error] terminating with uncaught exception of type spicy::rt::ParseError: no expected look-ahead token found (<...>/parse-lahead-int.spicy:15:5-15:14) diff --git a/tests/Baseline/spicy.types.vector.parse-subitem-attrs-fail/output b/tests/Baseline/spicy.types.vector.parse-subitem-attrs-fail/output index 5ff490e0b..e44f4c151 100644 --- a/tests/Baseline/spicy.types.vector.parse-subitem-attrs-fail/output +++ b/tests/Baseline/spicy.types.vector.parse-subitem-attrs-fail/output @@ -1,3 +1,3 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -[error] <...>/parse-subitem-attrs-fail.spicy:7:9: bytes field requires one of &eod, &parse_at, &parse_from, &size, &until, &until-including +[error] <...>/parse-subitem-attrs-fail.spicy:7:9-7:13: bytes field requires one of &eod, &parse_at, &parse_from, &size, &until, &until-including [error] spicyc: aborting after errors