diff options
| -rw-r--r-- | src/parser/contexts.h | 29 | ||||
| -rw-r--r-- | test/lit/source-map.wast | 26 |
2 files changed, 38 insertions, 17 deletions
diff --git a/src/parser/contexts.h b/src/parser/contexts.h index 2243c6065..5ad0c16de 100644 --- a/src/parser/contexts.h +++ b/src/parser/contexts.h @@ -1719,30 +1719,29 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> { return; } - auto contents = lexer.takeKeyword(); - if (!contents || !lexer.empty()) { - return; - } + auto contents = lexer.next(); - auto fileSize = contents->find(':'); - if (fileSize == contents->npos) { + auto fileSize = contents.find(':'); + if (fileSize == 0 || fileSize == contents.npos) { return; } - auto file = contents->substr(0, fileSize); - contents = contents->substr(fileSize + 1); + auto file = contents.substr(0, fileSize); + contents = contents.substr(fileSize + 1); - auto lineSize = contents->find(':'); - if (fileSize == contents->npos) { + auto lineSize = contents.find(':'); + if (lineSize == contents.npos) { return; } - auto line = Lexer(contents->substr(0, lineSize)).takeU32(); - if (!line) { + lexer = Lexer(contents.substr(0, lineSize)); + auto line = lexer.takeU32(); + if (!line || !lexer.empty()) { return; } - contents = contents->substr(lineSize + 1); + contents = contents.substr(lineSize + 1); - auto col = Lexer(*contents).takeU32(); - if (!col) { + lexer = Lexer(contents); + auto col = lexer.takeU32(); + if (!col || !lexer.empty()) { return; } diff --git a/test/lit/source-map.wast b/test/lit/source-map.wast index c00374d67..f8ef07c65 100644 --- a/test/lit/source-map.wast +++ b/test/lit/source-map.wast @@ -10,9 +10,9 @@ (module ;;@ src.cpp:0:1 - ;; CHECK: (type $0 (func (param i32 i32))) + ;; CHECK: (type $0 (func)) - ;; CHECK: (type $1 (func)) + ;; CHECK: (type $1 (func (param i32 i32))) ;; CHECK: (func $foo (param $x i32) (param $y i32) ;; CHECK-NEXT: ;;@ src.cpp:10:1 @@ -88,4 +88,26 @@ ;;@ src.cpp:3:1 (return) ) + + ;; CHECK: (func $paths + ;; CHECK-NEXT: ;;@ /tmp/src.cpp:1:1 + ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: ;;@ ../src.cpp:2:2 + ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: ;;@ café.cpp:2:2 + ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: ;;@ café.cpp:2:2 + ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: ) + (func $paths + ;;@ /tmp/src.cpp:1:1 + (nop) + ;;@ ../src.cpp:2:2 + (nop) + ;;@ café.cpp:2:2 + (nop) + ;; This annotation is invalid (missing column) + ;;@ src.cpp:3 + (nop) + ) ) |