From bf1bcc9ff6110f129f1e1d07b371046433a09935 Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Mon, 24 Jun 2019 20:07:11 +0000 Subject: [PATCH] Augment location information when dumping the AST to JSON. Rather than create JSON objects for source locations and ranges, we instead stream them out directly. This allows us to elide duplicate information (without JSON field reordering causing an issue) like file names and line numbers, similar to the text dump. This also adds token length information when dumping the source location. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@364226 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/JSONNodeDumper.h | 15 +- lib/AST/JSONNodeDumper.cpp | 77 +- test/AST/ast-dump-comment-json.cpp | 589 ++-- test/AST/ast-dump-decl-json.c | 630 ++--- test/AST/ast-dump-decl-json.m | 544 ++-- test/AST/ast-dump-enum-json.cpp | 187 +- test/AST/ast-dump-expr-json.c | 1448 ++++------ test/AST/ast-dump-expr-json.cpp | 2468 ++++++----------- test/AST/ast-dump-expr-json.m | 1369 ++++----- test/AST/ast-dump-funcs-json.cpp | 427 ++- test/AST/ast-dump-if-json.cpp | 300 +- test/AST/ast-dump-macro-json.c | 106 +- test/AST/ast-dump-namespace-json.cpp | 89 +- .../ast-dump-record-definition-data-json.cpp | 1386 ++++----- test/AST/ast-dump-records-json.cpp | 1145 +++----- test/AST/ast-dump-stmt-json.c | 1487 ++++------ test/AST/ast-dump-stmt-json.cpp | 1866 +++++-------- test/AST/ast-dump-stmt-json.m | 246 +- test/AST/ast-dump-template-decls-json.cpp | 724 ++--- test/AST/ast-dump-temporaries-json.cpp | 103 +- test/AST/ast-dump-types-json.cpp | 66 +- test/AST/multistep-explicit-cast-json.c | 144 +- test/AST/multistep-explicit-cast-json.cpp | 360 +-- 23 files changed, 6105 insertions(+), 9671 deletions(-) diff --git a/include/clang/AST/JSONNodeDumper.h b/include/clang/AST/JSONNodeDumper.h index d04499cd44..fe155adda0 100644 --- a/include/clang/AST/JSONNodeDumper.h +++ b/include/clang/AST/JSONNodeDumper.h @@ -124,6 +124,8 @@ class JSONNodeDumper ASTContext& Ctx; PrintingPolicy PrintPolicy; const comments::CommandTraits *Traits; + StringRef LastLocFilename; + unsigned LastLocLine; using InnerAttrVisitor = ConstAttrVisitor; using InnerCommentVisitor = @@ -139,14 +141,15 @@ class JSONNodeDumper JOS.attribute(Key, Value); } - // Creates a single SourceLocation JSON representation of the given location. - llvm::json::Object createBareSourceLocation(SourceLocation Loc); - // Creates a JSON representation of a SourceLocation based on its presumed + // Writes the attributes of a SourceLocation object without. + void writeBareSourceLocation(SourceLocation Loc); + + // Writes the attributes of a SourceLocation to JSON based on its presumed // spelling location. If the given location represents a macro invocation, // this outputs two sub-objects: one for the spelling and one for the // expansion location. - llvm::json::Object createSourceLocation(SourceLocation Loc); - llvm::json::Object createSourceRange(SourceRange R); + void writeSourceLocation(SourceLocation Loc); + void writeSourceRange(SourceRange R); std::string createPointerRepresentation(const void *Ptr); llvm::json::Object createQualType(QualType QT, bool Desugar = true); llvm::json::Object createBareDeclRef(const Decl *D); @@ -178,7 +181,7 @@ public: const PrintingPolicy &PrintPolicy, const comments::CommandTraits *Traits) : NodeStreamer(OS), SM(SrcMgr), Ctx(Ctx), PrintPolicy(PrintPolicy), - Traits(Traits) {} + Traits(Traits), LastLocLine(0) {} void Visit(const Attr *A); void Visit(const Stmt *Node); diff --git a/lib/AST/JSONNodeDumper.cpp b/lib/AST/JSONNodeDumper.cpp index 6092b7b5a3..2bb72f9fe9 100644 --- a/lib/AST/JSONNodeDumper.cpp +++ b/lib/AST/JSONNodeDumper.cpp @@ -1,4 +1,5 @@ #include "clang/AST/JSONNodeDumper.h" +#include "clang/Lex/Lexer.h" #include "llvm/ADT/StringSwitch.h" using namespace clang; @@ -28,7 +29,7 @@ void JSONNodeDumper::Visit(const Attr *A) { } JOS.attribute("id", createPointerRepresentation(A)); JOS.attribute("kind", AttrName); - JOS.attribute("range", createSourceRange(A->getRange())); + JOS.attributeObject("range", [A, this] { writeSourceRange(A->getRange()); }); attributeOnlyIfTrue("inherited", A->isInherited()); attributeOnlyIfTrue("implicit", A->isImplicit()); @@ -47,7 +48,8 @@ void JSONNodeDumper::Visit(const Stmt *S) { JOS.attribute("id", createPointerRepresentation(S)); JOS.attribute("kind", S->getStmtClassName()); - JOS.attribute("range", createSourceRange(S->getSourceRange())); + JOS.attributeObject("range", + [S, this] { writeSourceRange(S->getSourceRange()); }); if (const auto *E = dyn_cast(S)) { JOS.attribute("type", createQualType(E->getType())); @@ -90,8 +92,10 @@ void JSONNodeDumper::Visit(const Decl *D) { return; JOS.attribute("kind", (llvm::Twine(D->getDeclKindName()) + "Decl").str()); - JOS.attribute("loc", createSourceLocation(D->getLocation())); - JOS.attribute("range", createSourceRange(D->getSourceRange())); + JOS.attributeObject("loc", + [D, this] { writeSourceLocation(D->getLocation()); }); + JOS.attributeObject("range", + [D, this] { writeSourceRange(D->getSourceRange()); }); attributeOnlyIfTrue("isImplicit", D->isImplicit()); attributeOnlyIfTrue("isInvalid", D->isInvalidDecl()); @@ -118,8 +122,10 @@ void JSONNodeDumper::Visit(const comments::Comment *C, JOS.attribute("id", createPointerRepresentation(C)); JOS.attribute("kind", C->getCommentKindName()); - JOS.attribute("loc", createSourceLocation(C->getLocation())); - JOS.attribute("range", createSourceRange(C->getSourceRange())); + JOS.attributeObject("loc", + [C, this] { writeSourceLocation(C->getLocation()); }); + JOS.attributeObject("range", + [C, this] { writeSourceRange(C->getSourceRange()); }); InnerCommentVisitor::visit(C, FC); } @@ -128,7 +134,7 @@ void JSONNodeDumper::Visit(const TemplateArgument &TA, SourceRange R, const Decl *From, StringRef Label) { JOS.attribute("kind", "TemplateArgument"); if (R.isValid()) - JOS.attribute("range", createSourceRange(R)); + JOS.attributeObject("range", [R, this] { writeSourceRange(R); }); if (From) JOS.attribute(Label.empty() ? "fromDecl" : Label, createBareDeclRef(From)); @@ -165,43 +171,47 @@ void JSONNodeDumper::Visit(const GenericSelectionExpr::ConstAssociation &A) { attributeOnlyIfTrue("selected", A.isSelected()); } -llvm::json::Object -JSONNodeDumper::createBareSourceLocation(SourceLocation Loc) { +void JSONNodeDumper::writeBareSourceLocation(SourceLocation Loc) { PresumedLoc Presumed = SM.getPresumedLoc(Loc); - if (Presumed.isInvalid()) - return llvm::json::Object{}; - - return llvm::json::Object{{"file", Presumed.getFilename()}, - {"line", Presumed.getLine()}, - {"col", Presumed.getColumn()}}; + if (Presumed.isValid()) { + if (LastLocFilename != Presumed.getFilename()) { + JOS.attribute("file", Presumed.getFilename()); + JOS.attribute("line", Presumed.getLine()); + } else if (LastLocLine != Presumed.getLine()) + JOS.attribute("line", Presumed.getLine()); + JOS.attribute("col", Presumed.getColumn()); + JOS.attribute("tokLen", + Lexer::MeasureTokenLength(Loc, SM, Ctx.getLangOpts())); + LastLocFilename = Presumed.getFilename(); + LastLocLine = Presumed.getLine(); + } } -llvm::json::Object JSONNodeDumper::createSourceLocation(SourceLocation Loc) { +void JSONNodeDumper::writeSourceLocation(SourceLocation Loc) { SourceLocation Spelling = SM.getSpellingLoc(Loc); SourceLocation Expansion = SM.getExpansionLoc(Loc); - llvm::json::Object SLoc = createBareSourceLocation(Spelling); if (Expansion != Spelling) { // If the expansion and the spelling are different, output subobjects // describing both locations. - llvm::json::Object ELoc = createBareSourceLocation(Expansion); - - // If there is a macro expansion, add extra information if the interesting - // bit is the macro arg expansion. - if (SM.isMacroArgExpansion(Loc)) - ELoc["isMacroArgExpansion"] = true; - - return llvm::json::Object{{"spellingLoc", std::move(SLoc)}, - {"expansionLoc", std::move(ELoc)}}; - } - - return SLoc; + JOS.attributeObject( + "spellingLoc", [Spelling, this] { writeBareSourceLocation(Spelling); }); + JOS.attributeObject("expansionLoc", [Expansion, Loc, this] { + writeBareSourceLocation(Expansion); + // If there is a macro expansion, add extra information if the interesting + // bit is the macro arg expansion. + if (SM.isMacroArgExpansion(Loc)) + JOS.attribute("isMacroArgExpansion", true); + }); + } else + writeBareSourceLocation(Spelling); } -llvm::json::Object JSONNodeDumper::createSourceRange(SourceRange R) { - return llvm::json::Object{{"begin", createSourceLocation(R.getBegin())}, - {"end", createSourceLocation(R.getEnd())}}; +void JSONNodeDumper::writeSourceRange(SourceRange R) { + JOS.attributeObject("begin", + [R, this] { writeSourceLocation(R.getBegin()); }); + JOS.attributeObject("end", [R, this] { writeSourceLocation(R.getEnd()); }); } std::string JSONNodeDumper::createPointerRepresentation(const void *Ptr) { @@ -523,7 +533,8 @@ void JSONNodeDumper::VisitConstantArrayType(const ConstantArrayType *CAT) { void JSONNodeDumper::VisitDependentSizedExtVectorType( const DependentSizedExtVectorType *VT) { - JOS.attribute("attrLoc", createSourceLocation(VT->getAttributeLoc())); + JOS.attributeObject( + "attrLoc", [VT, this] { writeSourceLocation(VT->getAttributeLoc()); }); } void JSONNodeDumper::VisitVectorType(const VectorType *VT) { diff --git a/test/AST/ast-dump-comment-json.cpp b/test/AST/ast-dump-comment-json.cpp index aee70ab87d..ee4eec8498 100644 --- a/test/AST/ast-dump-comment-json.cpp +++ b/test/AST/ast-dump-comment-json.cpp @@ -41,20 +41,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 3, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -63,19 +61,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -84,19 +79,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " Aaa" @@ -118,20 +110,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -140,19 +130,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -161,19 +148,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " Aaa" @@ -186,20 +170,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -208,19 +190,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -229,19 +208,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -253,19 +229,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "BlockCommandComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "brief", @@ -275,19 +248,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -296,19 +266,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " Aaa" @@ -323,20 +290,19 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -344,20 +310,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -366,19 +330,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -390,19 +351,17 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParamCommandComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "direction": "in", @@ -413,20 +372,19 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -434,20 +392,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " xxx" @@ -456,20 +412,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -483,19 +437,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParamCommandComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "direction": "in,out", @@ -508,19 +459,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -529,19 +477,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " yyy" @@ -556,20 +501,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -578,19 +521,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -599,19 +539,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -623,19 +560,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TParamCommandComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "param": "Aaa", @@ -645,19 +579,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -666,19 +597,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " xxx" @@ -694,19 +622,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -715,19 +640,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -736,19 +658,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -760,19 +679,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TParamCommandComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "param": "Aaa", @@ -785,19 +701,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -806,19 +719,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " xxx" @@ -833,20 +743,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -855,19 +763,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -876,19 +781,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -898,19 +800,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "InlineCommandComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "c", @@ -927,20 +826,19 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -948,20 +846,19 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -969,20 +866,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -992,19 +887,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "HTMLStartTagComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a" @@ -1014,19 +906,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": "Aaa" @@ -1036,19 +925,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "HTMLEndTagComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a" @@ -1057,20 +943,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -1080,19 +964,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "HTMLStartTagComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "br", @@ -1106,20 +987,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1128,19 +1007,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1149,19 +1025,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -1173,19 +1046,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "VerbatimBlockComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "verbatim", @@ -1195,20 +1065,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "VerbatimBlockLineComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " Aaa" @@ -1221,20 +1089,18 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1243,19 +1109,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1264,19 +1127,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -1288,19 +1148,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParamCommandComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "direction": "in", @@ -1311,19 +1168,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1332,19 +1186,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " More arguments" @@ -1360,19 +1211,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK: "kind": "FullComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1381,19 +1229,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1402,19 +1247,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " " @@ -1426,19 +1268,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParamCommandComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "direction": "in", @@ -1449,19 +1288,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "ParagraphComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1470,19 +1306,16 @@ void Test_TemplatedFunctionVariadic(int arg, ...); // CHECK-NEXT: "kind": "TextComment", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 0 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "text": " More arguments" diff --git a/test/AST/ast-dump-decl-json.c b/test/AST/ast-dump-decl-json.c index c2583fafd2..0321a6650b 100644 --- a/test/AST/ast-dump-decl-json.c +++ b/test/AST/ast-dump-decl-json.c @@ -91,20 +91,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 5, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 5, +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestLocation", @@ -116,20 +115,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "line": 5, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestIndent", @@ -140,20 +139,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 6, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "x", @@ -167,20 +164,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "line": 9, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestChildren", @@ -191,20 +188,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "x", @@ -216,20 +211,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "RecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 11, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "parentDeclContext": "0x{{.*}}", @@ -241,20 +235,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "z", @@ -270,20 +262,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "LabelDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 13, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "line": 17, +// CHECK-NEXT: "col": 13, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -293,20 +284,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "TypedefDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 13, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "line": 21, +// CHECK-NEXT: "col": 13, +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestTypedefDecl", @@ -327,20 +317,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "EnumDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "line": 23, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestEnumDecl", @@ -349,20 +339,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "testEnumDecl", @@ -376,20 +364,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "line": 27, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 31, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestEnumDeclAnon", @@ -400,20 +388,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -421,20 +408,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "testEnumDeclAnon", @@ -448,20 +433,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "e", @@ -476,20 +461,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "EnumDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "line": 33, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestEnumDeclForward" @@ -498,20 +482,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "line": 35, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 37, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestRecordDecl", @@ -522,20 +506,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -549,20 +531,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "line": 39, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestRecordDeclEmpty", @@ -573,20 +555,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "line": 42, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 45, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestRecordDeclAnon1", @@ -597,20 +579,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "RecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "struct", @@ -621,19 +602,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "testRecordDeclAnon1", @@ -648,20 +628,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "line": 47, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestRecordDeclAnon2", @@ -672,20 +652,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "RecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 48, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "struct", @@ -695,20 +674,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 48, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -722,20 +699,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "line": 52, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 21 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 21 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestRecordDeclForward", @@ -745,20 +721,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 3, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "line": 55, +// CHECK-NEXT: "col": 3, +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestEnumConstantDecl", @@ -770,20 +745,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 3, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "line": 56, +// CHECK-NEXT: "col": 3, +// CHECK-NEXT: "tokLen": 24 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 24 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestEnumConstantDeclInit", @@ -797,13 +771,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -817,13 +789,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -840,20 +810,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "RecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "line": 59, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 21 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestIndirectFieldDecl", @@ -864,20 +834,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "RecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 62, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "struct", @@ -887,20 +856,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Field", @@ -914,20 +881,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -939,20 +904,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -964,20 +927,20 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 5, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "line": 66, +// CHECK-NEXT: "col": 5, +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFunctionDecl", @@ -989,20 +952,18 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 66, // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -1016,19 +977,16 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 40, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 40, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "y", @@ -1043,13 +1001,12 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1058,14 +1015,13 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "kind": "ReturnStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 67, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1075,13 +1031,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1096,13 +1050,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1130,20 +1082,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 5, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "line": 71, +// CHECK-NEXT: "col": 5, +// CHECK-NEXT: "tokLen": 17 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 54, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFunctionDecl2", @@ -1156,19 +1107,16 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 39, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 39, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -1184,13 +1132,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 42, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 54, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1200,13 +1146,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 44, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1216,13 +1160,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1237,13 +1179,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1259,13 +1199,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1297,20 +1235,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 5, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "line": 72, +// CHECK-NEXT: "col": 5, +// CHECK-NEXT: "tokLen": 21 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFunctionDeclProto", @@ -1323,19 +1260,16 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "x", @@ -1349,20 +1283,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "line": 73, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 23 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFunctionDeclNoProto", @@ -1374,20 +1307,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 12, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "line": 74, +// CHECK-NEXT: "col": 12, +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFunctionDeclSC", @@ -1400,20 +1332,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 12, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "line": 75, +// CHECK-NEXT: "col": 12, +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFunctionDeclInline", @@ -1426,20 +1357,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "FieldDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 7, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "line": 78, +// CHECK-NEXT: "col": 7, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFieldDecl", @@ -1451,20 +1381,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "FieldDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 7, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "line": 79, +// CHECK-NEXT: "col": 7, +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFieldDeclWidth", @@ -1479,13 +1408,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1499,13 +1426,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1522,20 +1447,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 5, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "line": 82, +// CHECK-NEXT: "col": 5, +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestVarDecl", @@ -1547,20 +1471,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 12, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "line": 83, +// CHECK-NEXT: "col": 12, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestVarDeclSC", @@ -1573,20 +1496,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 14, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "line": 84, +// CHECK-NEXT: "col": 14, +// CHECK-NEXT: "tokLen": 17 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 17 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestVarDeclThread", @@ -1599,20 +1521,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 5, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "line": 85, +// CHECK-NEXT: "col": 5, +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestVarDeclInit", @@ -1627,13 +1548,11 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1648,20 +1567,19 @@ void testParmVarDecl(int TestParmVarDecl); // CHECK: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 26, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "line": 87, +// CHECK-NEXT: "col": 26, +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestParmVarDecl", diff --git a/test/AST/ast-dump-decl-json.m b/test/AST/ast-dump-decl-json.m index 403bc7abbe..5184106dd1 100644 --- a/test/AST/ast-dump-decl-json.m +++ b/test/AST/ast-dump-decl-json.m @@ -88,20 +88,20 @@ void f() { // CHECK: "kind": "ObjCInterfaceDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 12, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "line": 9, +// CHECK-NEXT: "col": 12, +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCIvarDecl", @@ -120,20 +120,20 @@ void f() { // CHECK: "kind": "ObjCImplementationDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 17, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "line": 12, +// CHECK-NEXT: "col": 17, +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCIvarDecl", @@ -150,20 +150,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCIvarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "varDefault", @@ -176,20 +174,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCIvarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "varPrivate", @@ -202,20 +198,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCIvarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "varProtected", @@ -228,20 +222,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCIvarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "varPublic", @@ -254,20 +246,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCIvarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "varPackage", @@ -282,20 +272,19 @@ void f() { // CHECK: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 1, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "line": 23, +// CHECK-NEXT: "col": 1, +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 40, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCMethodDecl:", @@ -310,19 +299,16 @@ void f() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -336,20 +322,20 @@ void f() { // CHECK: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 1, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "line": 27, +// CHECK-NEXT: "col": 1, +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCMethodDecl:", @@ -392,20 +378,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 27, // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -419,13 +403,12 @@ void f() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 41, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -434,14 +417,13 @@ void f() { // CHECK-NEXT: "kind": "ReturnStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -451,13 +433,11 @@ void f() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -476,20 +456,20 @@ void f() { // CHECK: "kind": "ObjCProtocolDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 11, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "line": 32, +// CHECK-NEXT: "col": 11, +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCProtocolDecl", @@ -498,20 +478,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 33, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo", @@ -526,20 +504,20 @@ void f() { // CHECK: "kind": "ObjCInterfaceDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 12, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "line": 36, +// CHECK-NEXT: "col": 12, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 38, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCClass", @@ -565,20 +543,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 37, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo", @@ -593,20 +569,20 @@ void f() { // CHECK: "kind": "ObjCImplementationDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 17, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "line": 40, +// CHECK-NEXT: "col": 17, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 45, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCClass", @@ -625,20 +601,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCIvarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 41, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -651,20 +625,19 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo", @@ -707,14 +680,14 @@ void f() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -726,20 +699,20 @@ void f() { // CHECK: "kind": "ObjCCategoryDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 12, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "line": 47, +// CHECK-NEXT: "col": 12, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCCategoryDecl", @@ -765,20 +738,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 48, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "bar", @@ -793,20 +764,20 @@ void f() { // CHECK: "kind": "ObjCInterfaceDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 12, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "line": 51, +// CHECK-NEXT: "col": 12, +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 53, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestGenericInterface", @@ -830,20 +801,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCTypeParamDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "T", @@ -858,20 +827,20 @@ void f() { // CHECK: "kind": "ObjCCategoryImplDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 17, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "line": 55, +// CHECK-NEXT: "col": 17, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 58, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCCategoryDecl", @@ -890,20 +859,19 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "bar", @@ -946,14 +914,14 @@ void f() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -965,20 +933,19 @@ void f() { // CHECK: "kind": "ObjCCompatibleAliasDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 1, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "line": 60, +// CHECK-NEXT: "col": 1, +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCCompatibleAliasDecl", @@ -992,20 +959,20 @@ void f() { // CHECK: "kind": "ObjCInterfaceDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 12, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "line": 62, +// CHECK-NEXT: "col": 12, +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCProperty", @@ -1024,20 +991,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCPropertyDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo", @@ -1063,20 +1028,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCPropertyDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "bar", @@ -1092,20 +1055,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1120,19 +1081,16 @@ void f() { // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1147,19 +1105,16 @@ void f() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo", @@ -1173,20 +1128,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1201,19 +1154,16 @@ void f() { // CHECK-NEXT: "kind": "ObjCMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1228,19 +1178,16 @@ void f() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "bar", @@ -1256,20 +1203,20 @@ void f() { // CHECK: "kind": "ObjCImplementationDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 17, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "line": 67, +// CHECK-NEXT: "col": 17, +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 72, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCProperty", @@ -1286,20 +1233,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCIvarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -1312,20 +1257,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCPropertyImplDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 70, // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo", @@ -1348,20 +1291,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ObjCIvarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 71, // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "bar", @@ -1376,19 +1317,16 @@ void f() { // CHECK-NEXT: "kind": "ObjCPropertyImplDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "bar", @@ -1413,20 +1351,20 @@ void f() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "line": 74, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 76, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestBlockDecl", @@ -1438,20 +1376,18 @@ void f() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 74, // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -1466,13 +1402,12 @@ void f() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 76, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1481,14 +1416,13 @@ void f() { // CHECK-NEXT: "kind": "ExprWithCleanups", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1509,13 +1443,11 @@ void f() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1528,19 +1460,16 @@ void f() { // CHECK-NEXT: "kind": "BlockDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "variadic": true, @@ -1550,19 +1479,16 @@ void f() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "y", @@ -1587,13 +1513,11 @@ void f() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1603,13 +1527,11 @@ void f() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1624,13 +1546,11 @@ void f() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1655,19 +1575,16 @@ void f() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "y", @@ -1689,20 +1606,19 @@ void f() { // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 21, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "line": 83, +// CHECK-NEXT: "col": 21, +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test", diff --git a/test/AST/ast-dump-enum-json.cpp b/test/AST/ast-dump-enum-json.cpp index 5e564df707..7173daaeaf 100644 --- a/test/AST/ast-dump-enum-json.cpp +++ b/test/AST/ast-dump-enum-json.cpp @@ -36,20 +36,20 @@ enum class I : int { // CHECK: "kind": "EnumDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 1, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 1, +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 6, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -57,20 +57,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "One", @@ -82,20 +80,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 5, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Two", @@ -109,20 +105,19 @@ enum class I : int { // CHECK: "kind": "EnumDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 11, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "E", @@ -131,20 +126,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Three", @@ -156,20 +149,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Four", @@ -183,20 +174,19 @@ enum class I : int { // CHECK: "kind": "EnumDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "F", @@ -208,20 +198,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Five", @@ -233,20 +221,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Six", @@ -260,20 +246,19 @@ enum class I : int { // CHECK: "kind": "EnumDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "G", @@ -286,20 +271,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Seven", @@ -311,20 +294,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Eight", @@ -338,20 +319,19 @@ enum class I : int { // CHECK: "kind": "EnumDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "H", @@ -364,20 +344,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Nine", @@ -389,20 +367,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Ten", @@ -416,20 +392,19 @@ enum class I : int { // CHECK: "kind": "EnumDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 31, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "I", @@ -442,20 +417,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Eleven", @@ -467,20 +440,18 @@ enum class I : int { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "EnumConstantDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Twelve", diff --git a/test/AST/ast-dump-expr-json.c b/test/AST/ast-dump-expr-json.c index a27d615883..9848c23d5d 100644 --- a/test/AST/ast-dump-expr-json.c +++ b/test/AST/ast-dump-expr-json.c @@ -111,20 +111,20 @@ void PrimaryExpressions(int a) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 5, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Comma", @@ -137,14 +137,14 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 3, // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 5, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -153,14 +153,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -175,13 +174,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -196,13 +193,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -217,13 +212,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -240,13 +233,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -265,20 +256,19 @@ void PrimaryExpressions(int a) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Assignment", @@ -290,20 +280,18 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -318,13 +306,12 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -333,14 +320,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -355,13 +341,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -383,13 +367,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -405,14 +387,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "CompoundAssignOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -433,13 +414,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -461,13 +440,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -482,13 +459,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -516,20 +491,19 @@ void PrimaryExpressions(int a) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Conditionals", @@ -541,20 +515,18 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -569,13 +541,12 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -584,14 +555,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ConditionalOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -605,13 +575,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -626,13 +594,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -656,13 +622,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -677,13 +641,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -699,14 +661,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryConditionalOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -720,13 +681,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -741,13 +700,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -771,13 +728,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -791,13 +746,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -812,13 +765,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -844,13 +795,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -864,13 +813,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -885,13 +832,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -917,13 +862,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -942,20 +885,19 @@ void PrimaryExpressions(int a) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "BinaryOperators", @@ -967,20 +909,18 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -994,19 +934,16 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -1021,13 +958,12 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 36, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1036,14 +972,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1058,13 +993,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1079,13 +1012,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1109,13 +1040,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1130,13 +1059,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1161,14 +1088,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1183,13 +1109,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1204,13 +1128,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1234,13 +1156,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1255,13 +1175,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1286,14 +1204,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1308,13 +1225,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1329,13 +1244,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1359,13 +1272,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1380,13 +1291,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1411,14 +1320,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1433,13 +1341,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1454,13 +1360,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1484,13 +1388,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1505,13 +1407,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1536,14 +1436,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1558,13 +1457,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1579,13 +1476,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1609,13 +1504,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1630,13 +1523,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1661,14 +1552,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1683,13 +1573,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1704,13 +1592,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1734,13 +1620,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1755,13 +1639,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1786,14 +1668,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1808,13 +1689,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1829,13 +1708,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1859,13 +1736,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1880,13 +1755,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1911,14 +1784,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 32, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1933,13 +1805,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1954,13 +1824,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1984,13 +1852,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2005,13 +1871,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2036,14 +1900,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 33, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2058,13 +1921,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2079,13 +1940,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2109,13 +1968,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2130,13 +1987,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2161,14 +2016,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2183,13 +2037,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2204,13 +2056,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2234,13 +2084,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2255,13 +2103,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2286,14 +2132,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 35, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2308,13 +2153,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2329,13 +2172,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2359,13 +2200,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2380,13 +2219,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2411,14 +2248,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 38, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2433,13 +2269,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2454,13 +2288,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2484,13 +2316,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2505,13 +2335,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2536,14 +2364,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 39, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2558,13 +2385,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2579,13 +2404,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2609,13 +2432,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2630,13 +2451,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2661,14 +2480,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 42, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2683,13 +2501,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2704,13 +2520,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2734,13 +2548,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2755,13 +2567,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2786,14 +2596,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2808,13 +2617,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2829,13 +2636,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2859,13 +2664,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2880,13 +2683,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2911,14 +2712,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 46, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2933,13 +2733,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2954,13 +2752,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2984,13 +2780,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3005,13 +2799,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3036,14 +2828,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 47, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3058,13 +2849,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3079,13 +2868,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3109,13 +2896,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3130,13 +2915,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3161,14 +2944,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 48, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3183,13 +2965,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3204,13 +2984,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3234,13 +3012,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3255,13 +3031,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3289,20 +3063,19 @@ void PrimaryExpressions(int a) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 66, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -3315,20 +3088,18 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -3342,19 +3113,16 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -3369,13 +3137,12 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 36, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 66, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3384,14 +3151,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "CStyleCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 53, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3406,13 +3172,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3428,13 +3192,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3459,14 +3221,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3482,13 +3243,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3503,13 +3262,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3534,14 +3291,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 58, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3558,13 +3314,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3579,13 +3333,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3610,14 +3362,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 59, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3634,13 +3385,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3663,14 +3412,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3685,13 +3433,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3708,13 +3454,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3729,13 +3473,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3762,14 +3504,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3786,13 +3527,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3807,13 +3546,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3838,14 +3575,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "UnaryExprOrTypeTraitExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3860,13 +3596,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3890,14 +3624,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "UnaryExprOrTypeTraitExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3914,14 +3647,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "UnaryExprOrTypeTraitExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3941,20 +3673,19 @@ void PrimaryExpressions(int a) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 72, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "PostfixOperators", @@ -3966,20 +3697,18 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 72, // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -3993,19 +3722,16 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 40, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 40, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -4020,19 +3746,16 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 53, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 53, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -4047,13 +3770,12 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 56, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4062,14 +3784,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 73, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4084,13 +3805,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4104,13 +3823,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4125,13 +3842,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4155,13 +3870,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4179,14 +3892,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "CallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 74, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4200,13 +3912,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4221,13 +3931,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4251,13 +3959,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4272,13 +3978,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4295,13 +3999,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4316,13 +4018,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4350,13 +4050,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4371,13 +4069,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4402,14 +4098,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 76, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4424,13 +4119,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4447,13 +4140,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4480,14 +4171,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4502,13 +4192,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4525,13 +4213,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4546,13 +4232,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4579,14 +4263,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 81, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4601,13 +4284,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4621,13 +4302,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4641,13 +4320,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4662,13 +4339,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4683,13 +4358,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4704,13 +4377,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4730,14 +4401,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 82, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4753,13 +4423,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4774,13 +4442,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4795,13 +4461,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4824,20 +4488,19 @@ void PrimaryExpressions(int a) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 106, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "PrimaryExpressions", @@ -4849,20 +4512,18 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -4877,13 +4538,12 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 106, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4892,14 +4552,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 88, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4914,13 +4573,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4943,14 +4600,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "CharacterLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 89, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4964,14 +4620,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "CharacterLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4985,14 +4640,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 91, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5007,13 +4661,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5029,14 +4681,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 92, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5051,13 +4702,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5073,14 +4722,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 93, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5095,13 +4743,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5117,14 +4763,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5139,13 +4784,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5161,14 +4804,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5183,13 +4825,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5205,14 +4845,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "IntegerLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 97, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 97 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 97 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5226,14 +4865,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "IntegerLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 98, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5247,14 +4885,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "IntegerLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 99, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5268,14 +4905,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "FloatingLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 100, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 100 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 100 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5289,14 +4925,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "FloatingLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 101, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5310,14 +4945,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "FloatingLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 102, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5331,14 +4965,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "DeclRefExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 103, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5359,14 +4992,13 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 105, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5381,13 +5013,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5401,13 +5031,11 @@ void PrimaryExpressions(int a) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { diff --git a/test/AST/ast-dump-expr-json.cpp b/test/AST/ast-dump-expr-json.cpp index 8a4bfdf777..e629120566 100644 --- a/test/AST/ast-dump-expr-json.cpp +++ b/test/AST/ast-dump-expr-json.cpp @@ -158,20 +158,20 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "line": 41, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestThrow", @@ -184,14 +184,14 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 41, // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -200,14 +200,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXThrowExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 42, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -221,13 +220,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -243,14 +240,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXThrowExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -266,20 +262,20 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "line": 46, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestPointerToMember", @@ -291,20 +287,18 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 46, // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -318,19 +312,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -344,19 +335,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -370,19 +358,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 68, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 58, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 77, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -397,13 +382,12 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 80, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -412,14 +396,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 47, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -434,13 +417,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -462,13 +443,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -483,13 +462,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -514,14 +491,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 48, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -536,13 +512,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -557,13 +531,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -587,13 +559,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -608,13 +578,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -639,14 +607,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -660,13 +627,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -680,13 +645,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -701,13 +664,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -729,13 +690,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -750,13 +709,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -784,13 +741,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -806,14 +761,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -827,13 +781,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -847,13 +799,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -868,13 +818,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -889,13 +837,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -919,13 +865,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -940,13 +884,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -974,13 +916,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -999,20 +939,20 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "line": 53, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 58, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestCasting", @@ -1024,20 +964,18 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 53, // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -1052,13 +990,12 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 58, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1067,14 +1004,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXConstCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 54, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1089,13 +1025,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1111,13 +1045,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1142,14 +1074,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXStaticCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1169,13 +1100,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1191,13 +1120,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1222,14 +1149,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXDynamicCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1244,13 +1170,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1266,13 +1190,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1297,14 +1219,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXReinterpretCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1319,13 +1240,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1341,13 +1260,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1375,20 +1292,21 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "line": 61, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestUnaryExpressions", @@ -1397,20 +1315,18 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -1424,20 +1340,19 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestUnaryExpressions", @@ -1449,20 +1364,18 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -1477,13 +1390,12 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1492,14 +1404,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "SizeOfPackExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 62, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1513,14 +1424,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXNoexceptExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1534,13 +1444,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1555,13 +1463,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1576,13 +1482,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1607,13 +1511,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1628,13 +1530,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1662,14 +1562,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXNewExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1691,14 +1590,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXNewExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 66, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1719,14 +1617,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXNewExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 67, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1749,13 +1646,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1769,13 +1664,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1793,14 +1686,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXNewExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1823,13 +1715,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1844,13 +1734,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1868,14 +1756,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXNewExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 69, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1899,13 +1786,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1920,13 +1805,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1943,13 +1826,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1963,13 +1844,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1984,13 +1863,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2008,14 +1885,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXNewExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 70, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2038,13 +1914,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2059,13 +1933,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2080,13 +1952,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2113,14 +1983,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXNewExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 71, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2144,13 +2013,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2164,13 +2031,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2187,13 +2052,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2208,13 +2071,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2229,13 +2090,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2262,14 +2121,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXDeleteExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 73, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2292,13 +2150,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2313,13 +2169,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2344,14 +2198,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXDeleteExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 74, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2375,13 +2228,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2396,13 +2247,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2432,20 +2281,20 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "line": 77, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestPostfixExpressions", @@ -2457,20 +2306,18 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -2484,19 +2331,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -2510,19 +2354,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 48, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 40, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 48, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -2537,13 +2378,12 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2552,14 +2392,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 78, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2573,13 +2412,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2596,13 +2433,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2626,13 +2461,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2648,14 +2481,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 79, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2669,13 +2501,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2692,13 +2522,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2713,13 +2541,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2745,13 +2571,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2767,14 +2591,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 80, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2789,13 +2612,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2812,13 +2633,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2833,13 +2652,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2866,14 +2683,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 81, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2888,13 +2704,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2911,13 +2725,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2942,14 +2754,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 82, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2963,13 +2774,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2986,13 +2795,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3007,13 +2814,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3040,14 +2845,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3061,13 +2865,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3084,13 +2886,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3115,14 +2915,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 84, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3136,13 +2935,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3159,13 +2956,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3190,14 +2985,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 85, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3211,13 +3005,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3234,13 +3026,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3255,13 +3045,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3288,14 +3076,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMemberCallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 86, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3309,13 +3096,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3332,13 +3117,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3353,13 +3136,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3386,14 +3167,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXTypeidExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3407,13 +3187,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3436,14 +3214,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXTypeidExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 88, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3459,14 +3236,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXTypeidExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 89, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3488,20 +3264,21 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "line": 93, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 92, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 122, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestPrimaryExpressions", @@ -3510,20 +3287,18 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 92, // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -3537,20 +3312,19 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 93, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 122, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestPrimaryExpressions", @@ -3562,20 +3336,18 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 93, // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -3591,13 +3363,12 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 38, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 122, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3606,14 +3377,14 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 101, // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3621,20 +3392,19 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 101, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "V", @@ -3694,20 +3464,18 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3718,20 +3486,19 @@ void TestNonADLCall3() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 100, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 100 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -3744,14 +3511,14 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 100, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 100 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3760,14 +3527,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXThisExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 96, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 96 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 96 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3780,14 +3546,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 98, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3800,19 +3565,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3857,19 +3619,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -3884,13 +3643,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3901,19 +3658,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3929,13 +3683,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3949,13 +3701,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3971,13 +3721,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3988,14 +3736,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 99, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4008,19 +3755,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4067,19 +3811,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -4094,13 +3835,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4111,19 +3850,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4139,13 +3875,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4159,13 +3893,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4182,13 +3914,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4206,13 +3936,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4231,14 +3959,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 103, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4247,19 +3974,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -4273,19 +3997,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -4301,14 +4022,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 105, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4321,19 +4041,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4382,19 +4099,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -4409,13 +4123,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4426,19 +4138,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXConversionDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4454,19 +4163,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4485,13 +4191,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4502,14 +4206,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 106, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4522,19 +4225,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4583,19 +4283,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -4610,19 +4307,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -4636,13 +4330,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4653,19 +4345,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXConversionDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4681,19 +4370,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4710,19 +4396,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -4740,13 +4423,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4757,14 +4438,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 107, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4777,19 +4457,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4834,19 +4511,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -4861,13 +4535,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4878,19 +4550,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4906,13 +4575,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4926,13 +4593,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4956,13 +4621,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4973,14 +4636,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 108, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4993,19 +4655,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5054,19 +4713,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -5081,13 +4737,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -5101,13 +4755,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -5118,14 +4770,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 109, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5138,19 +4789,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5199,19 +4847,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -5226,13 +4871,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5242,13 +4885,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5258,13 +4899,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5294,13 +4933,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5310,13 +4947,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5326,13 +4961,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5359,14 +4992,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 110, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5379,19 +5011,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5440,19 +5069,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -5467,13 +5093,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -5487,13 +5111,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -5504,14 +5126,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 111, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5524,19 +5145,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5585,19 +5203,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -5612,13 +5227,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5628,13 +5241,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5644,13 +5255,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5680,13 +5289,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5696,13 +5303,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5712,13 +5317,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5745,14 +5348,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 112, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5765,19 +5367,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5822,19 +5421,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -5849,13 +5445,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5865,13 +5459,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5881,13 +5473,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5902,13 +5492,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5923,13 +5511,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5953,13 +5539,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5974,13 +5558,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6011,19 +5593,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6036,19 +5615,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6064,13 +5640,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6085,13 +5659,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6115,13 +5687,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6143,13 +5713,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -6159,13 +5727,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -6175,13 +5741,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6196,13 +5760,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6217,13 +5779,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6247,13 +5807,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6268,13 +5826,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6305,14 +5861,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 113, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6325,19 +5880,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6382,19 +5934,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -6409,13 +5958,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -6426,19 +5973,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6451,19 +5995,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6480,13 +6021,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6500,13 +6039,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6530,13 +6067,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6551,13 +6086,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -6568,14 +6101,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 114, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6588,19 +6120,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6649,19 +6178,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -6677,13 +6203,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -6694,19 +6218,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXConversionDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6722,19 +6243,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6753,13 +6271,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -6770,14 +6286,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 115, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6790,19 +6305,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6851,19 +6363,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -6878,13 +6387,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -6895,19 +6402,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXConversionDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6923,19 +6427,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -6954,13 +6455,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -6971,14 +6470,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 116, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6991,19 +6489,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -7052,19 +6547,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -7079,13 +6571,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -7096,19 +6586,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXConversionDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -7124,19 +6611,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -7155,13 +6639,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -7172,14 +6654,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "LambdaExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 117, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7192,19 +6673,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -7253,19 +6731,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -7280,13 +6755,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -7296,13 +6769,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -7312,13 +6783,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7338,19 +6807,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXConversionDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -7366,19 +6832,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -7397,13 +6860,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -7413,13 +6874,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -7429,13 +6888,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7455,14 +6912,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXFoldExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 119, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7476,13 +6932,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7506,14 +6960,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXFoldExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 120, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7528,13 +6981,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7557,14 +7008,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CXXFoldExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 121, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7578,13 +7028,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7606,13 +7054,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7640,20 +7086,20 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 130 +// CHECK-NEXT: "line": 130, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 130 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 134, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 134 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestADLCall", @@ -7666,14 +7112,14 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 130, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 130 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 134, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 134 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -7682,14 +7128,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 131, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 131 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 131 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -7698,19 +7143,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 131 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 131 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 131 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -7727,13 +7169,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 131 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 131 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7756,14 +7196,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 132, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7778,13 +7217,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7799,13 +7236,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7829,13 +7264,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7854,13 +7287,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7876,13 +7307,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7911,14 +7340,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 133, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7933,13 +7361,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7954,13 +7380,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -7984,13 +7408,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8010,13 +7432,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8032,13 +7452,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8070,20 +7488,20 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 136 +// CHECK-NEXT: "line": 136, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 136 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 139, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 139 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestNonADLCall", @@ -8096,14 +7514,14 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 136, // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 136 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 139, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 139 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -8112,14 +7530,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 137, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 137 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 137 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -8128,19 +7545,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 137 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 137 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 137 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -8157,13 +7571,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 137 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 137 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8186,14 +7598,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 138, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8207,13 +7618,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8228,13 +7637,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8258,13 +7665,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8283,13 +7688,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8305,13 +7708,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 138 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8343,20 +7744,20 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 141 +// CHECK-NEXT: "line": 141, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 141 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 146, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 146 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestNonADLCall2", @@ -8369,14 +7770,14 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 141, // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 141 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 146, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 146 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -8385,14 +7786,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 142, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 142 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 142 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -8401,19 +7801,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 142 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 142 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 142 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -8430,13 +7827,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 142 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 142 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8459,14 +7854,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 143, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 143 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 143 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -8475,19 +7869,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "UsingDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 143 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 143 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 143 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "NS::f" @@ -8499,14 +7890,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 144, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8520,13 +7910,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8541,13 +7929,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8576,13 +7962,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8601,13 +7985,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8623,13 +8005,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 144 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8658,14 +8038,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 145, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8680,13 +8059,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8701,13 +8078,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8731,13 +8106,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8757,13 +8130,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8779,13 +8150,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 145 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8817,20 +8186,20 @@ void TestNonADLCall3() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 150 +// CHECK-NEXT: "line": 150, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 150 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 153, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 153 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestNonADLCall3", @@ -8843,14 +8212,14 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 150, // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 150 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 153, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 153 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -8859,14 +8228,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 151, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 151 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 151 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -8875,19 +8243,16 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 151 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 151 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 151 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -8903,13 +8268,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 151 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 151 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8931,14 +8294,13 @@ void TestNonADLCall3() { // CHECK-NEXT: "kind": "CallExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 152, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8952,13 +8314,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -8973,13 +8333,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -9003,13 +8361,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -9028,13 +8384,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -9049,13 +8403,11 @@ void TestNonADLCall3() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 152 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { diff --git a/test/AST/ast-dump-expr-json.m b/test/AST/ast-dump-expr-json.m index 9f6dac78ba..91a98f5e02 100644 --- a/test/AST/ast-dump-expr-json.m +++ b/test/AST/ast-dump-expr-json.m @@ -100,20 +100,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "line": 54, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCEncode", @@ -126,14 +126,14 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 54, // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -142,14 +142,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -164,13 +163,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -188,14 +185,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -210,13 +206,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -238,20 +232,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "line": 59, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 62, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCMessage", @@ -263,20 +257,18 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 59, // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -291,13 +283,12 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 62, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -306,14 +297,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ObjCMessageExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -329,13 +319,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -350,13 +338,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -381,14 +367,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ObjCMessageExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -409,20 +394,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "line": 64, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 66, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCBoxed", @@ -435,14 +420,14 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 66, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -451,14 +436,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ObjCBoxedExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -473,13 +457,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -493,13 +475,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -514,13 +494,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -535,13 +513,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -564,20 +540,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "line": 68, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 70, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCSelector", @@ -590,14 +566,14 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 70, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -606,14 +582,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 69, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -622,19 +597,16 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "s", @@ -650,13 +622,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -678,20 +648,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "line": 72, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 74, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCProtocol", @@ -703,20 +673,18 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 72, // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -732,13 +700,12 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 74, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -747,14 +714,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ObjCMessageExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 73, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -770,13 +736,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -792,13 +756,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -824,13 +786,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 42, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -853,20 +813,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "line": 76, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 79, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCPropertyRef", @@ -878,20 +838,18 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 76, // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -906,13 +864,12 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 79, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -921,14 +878,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "PseudoObjectExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -942,13 +898,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -963,13 +917,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -990,13 +942,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1010,13 +960,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1031,13 +979,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1065,13 +1011,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1085,13 +1029,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1110,13 +1052,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1130,13 +1070,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1151,13 +1089,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1183,13 +1119,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1203,13 +1137,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1226,13 +1158,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1246,13 +1176,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1267,13 +1195,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1287,13 +1213,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1314,13 +1238,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1336,13 +1258,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1356,13 +1276,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1377,13 +1295,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1409,13 +1325,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1429,13 +1343,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1450,13 +1362,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1470,13 +1380,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1500,14 +1408,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 78, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1516,19 +1423,16 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -1543,13 +1447,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1564,13 +1466,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1584,13 +1484,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1611,13 +1509,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1631,13 +1527,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1652,13 +1546,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1686,13 +1578,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1706,13 +1596,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1727,13 +1615,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1759,13 +1645,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1781,13 +1665,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1801,13 +1683,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1822,13 +1702,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1866,20 +1744,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "line": 81, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCSubscriptRef", @@ -1891,20 +1769,18 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 81, // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -1918,19 +1794,16 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 71, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 50, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 71, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -1945,13 +1818,12 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 77, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1960,14 +1832,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "PseudoObjectExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 82, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1982,13 +1853,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2003,13 +1872,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2024,13 +1891,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2044,13 +1909,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2065,13 +1928,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2097,13 +1958,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2117,13 +1976,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2142,13 +1999,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2162,13 +2017,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2183,13 +2036,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2210,13 +2061,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2230,13 +2079,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2251,13 +2098,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2283,13 +2128,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2303,13 +2146,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2326,13 +2167,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2346,13 +2185,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2367,13 +2204,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2392,13 +2227,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2413,13 +2246,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2435,13 +2266,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2455,13 +2284,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2476,13 +2303,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2505,13 +2330,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2527,13 +2350,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2547,13 +2368,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2568,13 +2387,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2600,13 +2417,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2621,13 +2436,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2643,13 +2456,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2663,13 +2474,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2684,13 +2493,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2713,13 +2520,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2733,13 +2538,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2759,14 +2562,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2775,19 +2577,16 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -2804,13 +2603,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2825,13 +2622,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2846,13 +2641,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2866,13 +2659,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2887,13 +2678,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2919,13 +2708,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2939,13 +2726,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2964,13 +2749,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2984,13 +2767,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3005,13 +2786,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3037,13 +2816,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3057,13 +2834,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3080,13 +2855,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3103,13 +2876,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3123,13 +2894,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3144,13 +2913,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3176,13 +2943,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3196,13 +2961,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3226,14 +2989,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "PseudoObjectExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 85, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3248,13 +3010,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3269,13 +3029,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3290,13 +3048,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3310,13 +3066,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3331,13 +3085,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3363,13 +3115,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3383,13 +3133,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3403,13 +3151,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3430,13 +3176,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3450,13 +3194,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3471,13 +3213,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3498,13 +3238,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3518,13 +3256,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3539,13 +3275,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3571,13 +3305,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3591,13 +3323,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3611,13 +3341,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3636,13 +3364,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3656,13 +3382,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3677,13 +3401,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3702,13 +3424,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3723,13 +3443,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3745,13 +3463,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3765,13 +3481,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3786,13 +3500,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3815,13 +3527,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3837,13 +3547,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3857,13 +3565,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3878,13 +3584,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3910,13 +3614,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3931,13 +3633,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3953,13 +3653,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3973,13 +3671,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3994,13 +3690,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4023,13 +3717,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4045,13 +3737,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4065,13 +3755,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4085,13 +3773,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4115,14 +3801,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 86, // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4138,13 +3823,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 2, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4168,13 +3851,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4189,13 +3870,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4210,13 +3889,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4230,13 +3907,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4251,13 +3926,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4283,13 +3956,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4303,13 +3974,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4323,13 +3992,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4350,13 +4017,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4370,13 +4035,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4391,13 +4054,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4423,13 +4084,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4443,13 +4102,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4463,13 +4120,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4488,13 +4143,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4511,13 +4164,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4531,13 +4182,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4552,13 +4201,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4584,13 +4231,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4606,13 +4251,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4626,13 +4269,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4646,13 +4287,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4681,20 +4320,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "line": 89, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 15 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 91, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCIVarRef", @@ -4706,20 +4345,18 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 89, // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -4734,13 +4371,12 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 91, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4749,14 +4385,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4771,13 +4406,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4800,13 +4433,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4821,13 +4452,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4853,13 +4482,11 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4878,20 +4505,20 @@ void TestObjCBoolLiteral() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "line": 93, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 96, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 96 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCBoolLiteral", @@ -4904,14 +4531,14 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 93, // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 96, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 96 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4920,14 +4547,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ObjCBoolLiteralExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4942,14 +4568,13 @@ void TestObjCBoolLiteral() { // CHECK-NEXT: "kind": "ObjCBoolLiteralExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { diff --git a/test/AST/ast-dump-funcs-json.cpp b/test/AST/ast-dump-funcs-json.cpp index ef3215d182..b42be3b1af 100644 --- a/test/AST/ast-dump-funcs-json.cpp +++ b/test/AST/ast-dump-funcs-json.cpp @@ -46,20 +46,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "line": 4, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test1", @@ -71,20 +70,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "line": 5, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test2", @@ -96,20 +94,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "line": 6, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test3", @@ -121,20 +118,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "line": 7, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test4", @@ -146,20 +142,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "line": 8, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test5", @@ -171,20 +166,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 16, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "line": 9, +// CHECK-NEXT: "col": 16, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test6", @@ -198,19 +192,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -222,19 +213,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -248,13 +236,11 @@ int main() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -271,20 +257,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 16, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "line": 10, +// CHECK-NEXT: "col": 16, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test7", @@ -298,20 +283,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "line": 14, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test6", @@ -324,19 +308,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -348,19 +329,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -374,13 +352,11 @@ int main() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -397,13 +373,11 @@ int main() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -413,20 +387,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "line": 18, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test1", @@ -438,20 +411,19 @@ int main() { // CHECK: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 9, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "line": 20, +// CHECK-NEXT: "col": 9, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "parentDeclContext": "0x{{.*}}", @@ -467,13 +439,11 @@ int main() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -483,20 +453,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "line": 22, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -509,20 +478,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "line": 23, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test2", @@ -534,20 +502,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "line": 24, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test3", @@ -560,19 +527,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -585,19 +549,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -611,20 +572,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "line": 25, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test4", @@ -637,19 +597,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -662,19 +619,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -689,13 +643,11 @@ int main() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -712,20 +664,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 16, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "line": 26, +// CHECK-NEXT: "col": 16, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test5", @@ -738,20 +689,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 13, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "line": 27, +// CHECK-NEXT: "col": 13, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test6", @@ -764,20 +714,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 13, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "line": 28, +// CHECK-NEXT: "col": 13, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test7", @@ -790,20 +739,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 13, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "line": 29, +// CHECK-NEXT: "col": 13, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test8", @@ -816,20 +764,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "line": 30, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test9", @@ -841,20 +788,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "line": 31, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test10", @@ -866,20 +812,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "line": 32, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test11", @@ -891,20 +836,21 @@ int main() { // CHECK: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 3, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "line": 35, +// CHECK-NEXT: "col": 3, +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 35, // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test12", @@ -913,20 +859,18 @@ int main() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -939,20 +883,18 @@ int main() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 35, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test12", @@ -965,19 +907,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -992,20 +931,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "line": 37, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test13", @@ -1018,19 +956,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1043,13 +978,11 @@ int main() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -1059,20 +992,19 @@ int main() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "line": 38, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Test14", @@ -1086,19 +1018,16 @@ int main() { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1111,13 +1040,11 @@ int main() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } diff --git a/test/AST/ast-dump-if-json.cpp b/test/AST/ast-dump-if-json.cpp index 49d711ab88..5cd0d6040c 100644 --- a/test/AST/ast-dump-if-json.cpp +++ b/test/AST/ast-dump-if-json.cpp @@ -33,14 +33,14 @@ void func(int val) { // CHECK: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 5, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -49,14 +49,13 @@ void func(int val) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -71,13 +70,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -92,13 +89,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -123,14 +118,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 5, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -141,14 +135,14 @@ void func(int val) { // CHECK: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -158,14 +152,13 @@ void func(int val) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -180,13 +173,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -201,13 +192,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -232,14 +221,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -248,14 +236,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -266,14 +253,14 @@ void func(int val) { // CHECK: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -283,14 +270,13 @@ void func(int val) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -305,13 +291,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -326,13 +310,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -357,14 +339,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -373,14 +354,14 @@ void func(int val) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -390,14 +371,13 @@ void func(int val) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -412,13 +392,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -433,13 +411,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -464,14 +440,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -480,14 +455,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -500,14 +474,14 @@ void func(int val) { // CHECK: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isConstexpr": true, @@ -517,14 +491,13 @@ void func(int val) { // CHECK-NEXT: "kind": "ConstantExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -539,13 +512,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -560,13 +531,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -581,13 +550,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -605,14 +572,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -623,14 +589,14 @@ void func(int val) { // CHECK: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasVar": true, @@ -640,14 +606,13 @@ void func(int val) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -656,19 +621,16 @@ void func(int val) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -684,13 +646,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -709,13 +669,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -730,13 +688,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -751,13 +707,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -782,14 +736,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -800,14 +753,14 @@ void func(int val) { // CHECK: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasInit": true, @@ -817,14 +770,13 @@ void func(int val) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -833,19 +785,16 @@ void func(int val) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -861,13 +810,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -886,13 +833,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -907,13 +852,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -928,13 +871,11 @@ void func(int val) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -959,14 +900,13 @@ void func(int val) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } diff --git a/test/AST/ast-dump-macro-json.c b/test/AST/ast-dump-macro-json.c index 43a9df0fd6..e1746ab933 100644 --- a/test/AST/ast-dump-macro-json.c +++ b/test/AST/ast-dump-macro-json.c @@ -22,27 +22,26 @@ void BLAP(foo, __COUNTER__)(void); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "expansionLoc": { -// CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 -// CHECK-NEXT: }, // CHECK-NEXT: "spellingLoc": { -// CHECK-NEXT: "col": 13, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 13, +// CHECK-NEXT: "tokLen": 7 +// CHECK-NEXT: }, +// CHECK-NEXT: "expansionLoc": { +// CHECK-NEXT: "line": 6, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "frobble", @@ -54,27 +53,25 @@ void BLAP(foo, __COUNTER__)(void); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "expansionLoc": { -// CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 -// CHECK-NEXT: }, // CHECK-NEXT: "spellingLoc": { +// CHECK-NEXT: "line": 3, // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 7 +// CHECK-NEXT: }, +// CHECK-NEXT: "expansionLoc": { +// CHECK-NEXT: "line": 7, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "previousDecl": "0x{{.*}}", @@ -87,28 +84,25 @@ void BLAP(foo, __COUNTER__)(void); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "expansionLoc": { -// CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "isMacroArgExpansion": true, -// CHECK-NEXT: "line": 11 -// CHECK-NEXT: }, // CHECK-NEXT: "spellingLoc": { +// CHECK-NEXT: "line": 11, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 4 +// CHECK-NEXT: }, +// CHECK-NEXT: "expansionLoc": { +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 4, +// CHECK-NEXT: "isMacroArgExpansion": true // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "quux", @@ -120,27 +114,27 @@ void BLAP(foo, __COUNTER__)(void); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "expansionLoc": { -// CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 -// CHECK-NEXT: }, // CHECK-NEXT: "spellingLoc": { -// CHECK-NEXT: "col": 1, // CHECK-NEXT: "file": "", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 1, +// CHECK-NEXT: "tokLen": 4 +// CHECK-NEXT: }, +// CHECK-NEXT: "expansionLoc": { +// CHECK-NEXT: "file": "{{.*}}", +// CHECK-NEXT: "line": 16, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo0", @@ -152,27 +146,27 @@ void BLAP(foo, __COUNTER__)(void); // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "expansionLoc": { -// CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 -// CHECK-NEXT: }, // CHECK-NEXT: "spellingLoc": { -// CHECK-NEXT: "col": 1, // CHECK-NEXT: "file": "", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "line": 5, +// CHECK-NEXT: "col": 1, +// CHECK-NEXT: "tokLen": 4 +// CHECK-NEXT: }, +// CHECK-NEXT: "expansionLoc": { +// CHECK-NEXT: "file": "{{.*}}", +// CHECK-NEXT: "line": 17, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo1", diff --git a/test/AST/ast-dump-namespace-json.cpp b/test/AST/ast-dump-namespace-json.cpp index 3162fb8cd6..c97beeb33c 100644 --- a/test/AST/ast-dump-namespace-json.cpp +++ b/test/AST/ast-dump-namespace-json.cpp @@ -23,20 +23,20 @@ namespace quux::inline frobble { // CHECK: "kind": "NamespaceDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 11, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 11, +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "foo" @@ -45,20 +45,19 @@ namespace quux::inline frobble { // CHECK: "kind": "NamespaceDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 6, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -71,20 +70,19 @@ namespace quux::inline frobble { // CHECK: "kind": "NamespaceDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "bar", @@ -93,20 +91,19 @@ namespace quux::inline frobble { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "NamespaceDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 11, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "__1", @@ -118,20 +115,19 @@ namespace quux::inline frobble { // CHECK: "kind": "NamespaceDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "baz", @@ -140,20 +136,19 @@ namespace quux::inline frobble { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "NamespaceDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "quux" @@ -164,20 +159,19 @@ namespace quux::inline frobble { // CHECK: "kind": "NamespaceDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "quux", @@ -186,20 +180,19 @@ namespace quux::inline frobble { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "NamespaceDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "frobble", diff --git a/test/AST/ast-dump-record-definition-data-json.cpp b/test/AST/ast-dump-record-definition-data-json.cpp index de2fb86e70..b6d657c784 100644 --- a/test/AST/ast-dump-record-definition-data-json.cpp +++ b/test/AST/ast-dump-record-definition-data-json.cpp @@ -141,19 +141,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -202,19 +199,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -230,13 +224,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -247,19 +239,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXConversionDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -275,19 +264,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -303,19 +289,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -334,19 +317,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -396,15 +376,13 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": {}, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -414,19 +392,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -439,19 +414,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "operator()", @@ -466,19 +438,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -491,13 +460,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -510,15 +477,13 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": {}, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -529,19 +494,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -554,19 +516,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXConversionDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -584,15 +543,13 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": {}, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -603,19 +560,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -628,19 +582,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -656,19 +607,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -684,19 +632,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -714,20 +659,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "CanPassInRegisters", @@ -771,20 +715,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -796,20 +738,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 57, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "CanPassInRegisters", @@ -824,19 +764,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 47, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 46, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -851,20 +788,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "CantPassInRegisters", @@ -907,20 +843,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -932,20 +866,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 58, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "CantPassInRegisters", @@ -959,19 +891,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 49, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 48, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -986,20 +915,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsEmpty", @@ -1060,20 +988,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1086,20 +1012,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotEmpty", @@ -1155,20 +1080,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1179,20 +1102,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -1206,20 +1127,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsAggregate", @@ -1275,20 +1195,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1299,20 +1217,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -1326,20 +1242,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 27, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotAggregate", @@ -1393,20 +1308,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 27, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 14 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1417,20 +1330,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "AccessSpecDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "access": "private" @@ -1439,20 +1350,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -1466,20 +1375,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 32, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsStandardLayout", @@ -1540,20 +1448,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 32, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1564,20 +1470,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 33, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -1591,20 +1495,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 38, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotStandardLayout", @@ -1656,20 +1559,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1680,20 +1581,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 37, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -1706,20 +1605,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1736,19 +1633,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1762,19 +1656,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1791,19 +1682,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1817,19 +1705,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1846,20 +1731,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 41, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsTriviallyCopyable", @@ -1920,20 +1804,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1946,20 +1828,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 45, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotTriviallyCopyable", @@ -1999,20 +1880,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2024,20 +1903,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 58, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotTriviallyCopyable", @@ -2050,19 +1927,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 55, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 54, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2075,13 +1949,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 57, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 58, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2093,20 +1965,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 47, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsPOD", @@ -2162,20 +2033,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 47, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2186,20 +2055,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 48, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -2213,20 +2080,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 53, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotPOD", @@ -2279,20 +2145,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2303,20 +2167,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 52, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -2330,20 +2192,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsTrivial", @@ -2403,20 +2264,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2428,20 +2287,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsTrivial", @@ -2457,20 +2314,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 59, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotTrivial", @@ -2526,20 +2382,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 59, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2551,20 +2405,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotTrivial", @@ -2578,13 +2430,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2596,20 +2446,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsPolymorphic", @@ -2661,20 +2510,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2685,20 +2532,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -2711,20 +2556,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2741,19 +2584,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2767,19 +2607,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2796,19 +2633,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2822,19 +2656,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2851,20 +2682,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 67, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 69, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotPolymorphic", @@ -2925,20 +2755,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 67, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2949,20 +2777,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -2976,20 +2802,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 71, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 73, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsAbstract", @@ -3042,20 +2867,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 71, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3066,20 +2889,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 72, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -3093,20 +2914,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 71, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3123,19 +2942,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3149,19 +2965,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3178,19 +2991,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3204,19 +3014,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3233,20 +3040,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotAbstract", @@ -3298,20 +3104,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3322,20 +3126,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 76, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -3348,20 +3150,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3378,19 +3178,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3404,19 +3201,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3433,19 +3227,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3459,19 +3250,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3488,20 +3276,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 79, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 81, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsLiteral", @@ -3550,20 +3337,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 79, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 79 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3575,20 +3360,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 80, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "~IsLiteral", @@ -3603,20 +3386,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 85, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "IsNotLiteral", @@ -3660,20 +3442,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3685,20 +3465,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 84, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "~IsNotLiteral", @@ -3712,13 +3490,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3730,20 +3506,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 26 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 89, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasUserDeclaredConstructor", @@ -3799,20 +3574,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 26 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 26 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3824,20 +3597,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 88, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 26 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 26 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasUserDeclaredConstructor", @@ -3851,13 +3622,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3869,20 +3638,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 91, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 28 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 92, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasNoUserDeclaredConstructor", @@ -3943,20 +3711,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 91, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 28 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 28 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3969,20 +3735,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 34 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 96, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 96 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasConstexprNonCopyMoveConstructor", @@ -4041,20 +3806,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 34 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 34 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4066,20 +3829,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 34 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasConstexprNonCopyMoveConstructor", @@ -4094,13 +3855,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 50, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4112,20 +3871,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 98, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 100, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 100 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasNoConstexprNonCopyMoveConstructor", @@ -4181,20 +3939,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 98, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4206,20 +3962,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 99, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasNoConstexprNonCopyMoveConstructor", @@ -4233,13 +3987,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 42, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4251,20 +4003,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 102, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 104, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasMutableFields", @@ -4322,20 +4073,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 102, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4346,20 +4095,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 103, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -4372,20 +4119,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXConstructorDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 102, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4402,19 +4147,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4428,19 +4170,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4457,19 +4196,16 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 16 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4484,20 +4220,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 106, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 108, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasNoMutableFields", @@ -4553,20 +4288,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 106, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 106 +// CHECK-NEXT: "tokLen": 18 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4577,20 +4310,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 107, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -4604,20 +4335,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 110, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 17 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 114, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasVariantMembers", @@ -4674,20 +4404,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 110, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 17 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 17 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4698,20 +4426,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 111, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 113, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "union", @@ -4767,20 +4494,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 112, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -4794,20 +4519,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 111, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4819,20 +4542,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 112, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4844,20 +4565,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 116, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 117, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "HasNoVariantMembers", @@ -4918,20 +4638,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 116, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4944,20 +4662,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 119, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 121, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "AllowsConstDefaultInit", @@ -5015,20 +4732,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 119, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5039,20 +4754,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 120, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -5067,13 +4780,11 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5090,20 +4801,19 @@ struct DoesNotAllowConstDefaultInit { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 123, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 28 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 125, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 125 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "DoesNotAllowConstDefaultInit", @@ -5159,20 +4869,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 123, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 28 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 28 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5183,20 +4891,18 @@ struct DoesNotAllowConstDefaultInit { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 124, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 124 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 124 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 124 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", diff --git a/test/AST/ast-dump-records-json.cpp b/test/AST/ast-dump-records-json.cpp index 3b33d38366..7a4912be6b 100644 --- a/test/AST/ast-dump-records-json.cpp +++ b/test/AST/ast-dump-records-json.cpp @@ -100,20 +100,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 8, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 8, +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "A", @@ -123,20 +122,18 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -147,20 +144,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 6, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "previousDecl": "0x{{.*}}", @@ -217,20 +213,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 6, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -241,20 +235,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -266,20 +258,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -292,19 +282,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "c", @@ -316,20 +303,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "d", @@ -344,13 +329,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -365,13 +348,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -388,20 +369,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -415,13 +394,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -436,13 +413,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -459,20 +434,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 11, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "e", @@ -487,13 +460,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -508,13 +479,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -531,20 +500,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -558,20 +525,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "C", @@ -628,20 +594,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -652,20 +616,19 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "struct", @@ -720,20 +683,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -747,20 +708,20 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -773,20 +734,19 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "union", @@ -842,20 +802,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "c", @@ -867,20 +825,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "d", @@ -894,20 +850,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -919,20 +873,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -942,20 +894,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -965,20 +915,19 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 27, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "struct", @@ -1033,20 +982,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "e", @@ -1059,19 +1006,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -1085,20 +1029,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1110,20 +1052,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1134,19 +1074,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1158,20 +1095,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "D", @@ -1227,20 +1163,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1251,20 +1185,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 31, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -1276,20 +1208,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 32, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -1301,20 +1231,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 33, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "c", @@ -1328,20 +1256,18 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "E", @@ -1351,20 +1277,18 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 38, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 38 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "F", @@ -1374,20 +1298,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 47, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "previousDecl": "0x{{.*}}", @@ -1445,20 +1368,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1469,20 +1390,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 41, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -1494,20 +1413,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 42, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -1520,19 +1437,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "c", @@ -1544,20 +1458,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "d", @@ -1572,13 +1484,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1593,13 +1503,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1616,20 +1524,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1643,13 +1549,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1664,13 +1568,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1687,20 +1589,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 45, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "e", @@ -1715,13 +1615,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1736,13 +1634,11 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1759,20 +1655,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 46, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -1786,20 +1680,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 62, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "G", @@ -1856,20 +1749,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1880,20 +1771,19 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 52, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "struct", @@ -1948,20 +1838,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -1975,20 +1863,20 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 52, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 52, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -2001,20 +1889,19 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 54, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "union", @@ -2070,20 +1957,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "c", @@ -2095,20 +1980,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "d", @@ -2122,20 +2005,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 54, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2147,20 +2028,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2170,20 +2049,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2193,20 +2070,19 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 59, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "struct", @@ -2261,20 +2137,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "e", @@ -2287,19 +2161,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -2313,20 +2184,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 59, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2338,20 +2207,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2362,19 +2229,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "IndirectFieldDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2386,20 +2250,18 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -2459,19 +2321,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2483,19 +2342,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2512,19 +2368,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2538,19 +2391,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2567,19 +2417,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2593,19 +2440,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2622,20 +2466,18 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -2695,19 +2537,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2719,19 +2558,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2748,19 +2584,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2774,19 +2607,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2803,19 +2633,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2829,19 +2656,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2858,20 +2682,18 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 66, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -2931,19 +2753,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2955,19 +2774,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2984,19 +2800,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3010,19 +2823,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3039,19 +2849,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3065,19 +2872,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3094,20 +2898,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 69, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 69 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Derived1", @@ -3176,20 +2979,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3202,20 +3003,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 71, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 72, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Derived2", @@ -3283,20 +3083,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 71, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3309,20 +3107,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 74, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Derived3", @@ -3379,20 +3176,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 74, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3404,19 +3199,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3432,19 +3224,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3458,19 +3247,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3486,19 +3272,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3512,19 +3295,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 74 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3541,20 +3321,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 78, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Derived4", @@ -3625,20 +3404,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3650,19 +3427,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3678,19 +3452,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3704,19 +3475,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3732,19 +3500,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3758,19 +3523,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3787,20 +3549,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 80, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 81, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Derived5", @@ -3857,20 +3618,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 80, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3882,19 +3641,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3910,19 +3666,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3936,19 +3689,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -3964,19 +3714,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3990,19 +3737,16 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "kind": "CXXDestructorDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4019,20 +3763,19 @@ struct Derived6 : virtual public Bases... { // CHECK: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 84, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 85, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Derived6", @@ -4102,20 +3845,18 @@ struct Derived6 : virtual public Bases... { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 84, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 84 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, diff --git a/test/AST/ast-dump-stmt-json.c b/test/AST/ast-dump-stmt-json.c index f86743a84a..ed1ccc9be0 100644 --- a/test/AST/ast-dump-stmt-json.c +++ b/test/AST/ast-dump-stmt-json.c @@ -139,20 +139,19 @@ void TestMiscStmts(void) { // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 5, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 5, +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestLocation", @@ -167,13 +166,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -188,20 +185,18 @@ void TestMiscStmts(void) { // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestIndent", @@ -216,13 +211,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -237,13 +230,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -258,13 +249,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -278,13 +267,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -304,14 +291,14 @@ void TestMiscStmts(void) { // CHECK: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 6, // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -320,14 +307,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -336,19 +322,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "x", @@ -363,13 +346,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -387,14 +368,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -403,19 +383,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "y", @@ -428,19 +405,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "z", @@ -456,20 +430,18 @@ void TestMiscStmts(void) { // CHECK: "kind": "VarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 11, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestOpaqueValueExpr", @@ -484,13 +456,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -504,13 +474,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -525,13 +493,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -545,13 +511,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -568,13 +532,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -588,13 +550,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -611,13 +571,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -635,14 +593,14 @@ void TestMiscStmts(void) { // CHECK: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -651,14 +609,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -667,19 +624,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -695,13 +649,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -716,13 +668,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -742,14 +692,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -758,19 +707,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -786,13 +732,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -810,14 +754,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -834,13 +777,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -863,14 +804,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -886,13 +826,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -915,14 +853,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -939,13 +876,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -960,13 +895,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -981,13 +914,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1014,14 +945,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1037,13 +967,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1058,13 +986,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1089,14 +1015,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1113,13 +1038,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1134,13 +1057,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1155,13 +1076,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1188,14 +1107,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "UnaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1212,13 +1130,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1233,13 +1149,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1267,13 +1181,12 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 45, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1282,14 +1195,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "GenericSelectionExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1303,13 +1215,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1324,13 +1234,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1373,13 +1281,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1397,14 +1303,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "GenericSelectionExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 36, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1418,13 +1323,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1439,13 +1342,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1488,13 +1389,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1514,13 +1413,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1538,14 +1435,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "GenericSelectionExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 36, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1559,13 +1455,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1580,13 +1474,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1621,13 +1513,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1655,13 +1545,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1679,14 +1567,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "GenericSelectionExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 31, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 50, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1700,13 +1587,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1721,13 +1606,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1770,13 +1653,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1803,13 +1684,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1829,13 +1708,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 47, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 47, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1853,14 +1730,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 33, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1869,19 +1745,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "j", @@ -1896,13 +1769,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 31, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1916,13 +1787,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1937,13 +1806,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1986,13 +1853,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2016,14 +1881,14 @@ void TestMiscStmts(void) { // CHECK: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2032,14 +1897,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "LabelStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 39, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "label1", @@ -2051,13 +1916,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2068,14 +1931,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "GotoStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 42, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "targetLabelDeclId": "0x{{.*}}" @@ -2085,14 +1947,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "LabelStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 44, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 45, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "label2", @@ -2104,13 +1966,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2126,14 +1986,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 47, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2142,19 +2001,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -2170,13 +2026,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 47 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2195,14 +2049,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IndirectGotoStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2212,13 +2065,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2233,13 +2084,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2254,13 +2103,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2290,13 +2137,12 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2305,14 +2151,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "SwitchStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 53, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2321,14 +2167,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 53, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2343,13 +2188,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2373,13 +2216,12 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 63, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2388,14 +2230,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "CaseStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 54, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2404,14 +2246,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ConstantExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 54, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2425,13 +2266,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2447,14 +2286,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "BreakStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2465,14 +2303,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "CaseStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 58, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2481,14 +2319,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ConstantExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2502,13 +2339,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2524,14 +2359,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "CaseStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 58, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2540,14 +2375,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ConstantExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 57, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2561,13 +2395,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 57 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2583,14 +2415,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "BreakStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 58, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 58 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2603,14 +2434,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DefaultStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 59, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 59 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 60, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2620,13 +2451,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 60 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2637,14 +2466,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "CaseStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 62, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isGNURange": true, @@ -2654,14 +2483,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ConstantExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 61, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2675,13 +2503,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2698,13 +2524,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2718,13 +2542,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 61 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2740,14 +2562,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "BreakStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 62, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 62 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2765,13 +2586,12 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 91, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 91 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2780,14 +2600,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 67, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2796,14 +2616,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 67, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2818,13 +2637,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2847,14 +2664,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2865,14 +2681,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 70, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2882,13 +2697,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2903,13 +2716,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2933,13 +2744,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 70 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -2950,14 +2759,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 72, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -2967,14 +2776,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 72, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2989,13 +2797,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 72 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3018,14 +2824,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 73, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 73 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -3034,14 +2839,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3052,14 +2856,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 78, // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -3069,14 +2873,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3091,13 +2894,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3121,13 +2922,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -3136,14 +2935,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 78, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3154,14 +2952,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 80, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -3171,14 +2969,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 80, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3193,13 +2990,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3222,14 +3017,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 81, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -3238,14 +3032,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 82, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3254,14 +3048,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 82, // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3276,13 +3069,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3305,14 +3096,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3325,14 +3115,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 85, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -3342,14 +3132,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 85, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3364,13 +3153,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3393,14 +3180,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 86, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -3409,14 +3195,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -3426,14 +3212,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3448,13 +3233,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3477,14 +3260,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 88, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 88 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -3493,14 +3275,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3516,13 +3297,12 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 118, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 118 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3531,14 +3311,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "WhileStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3547,14 +3327,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 94, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3569,13 +3348,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 94 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3598,14 +3375,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3616,14 +3392,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DoStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 97, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 97 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 99, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3632,14 +3408,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 98, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 98 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -3648,14 +3423,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 99, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3670,13 +3444,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 99 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3701,14 +3473,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ForStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 101, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 102, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3717,14 +3489,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 101, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3733,19 +3504,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -3761,13 +3529,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3787,13 +3553,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3808,13 +3572,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3829,13 +3591,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3859,13 +3619,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3882,13 +3640,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3904,13 +3660,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 29, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 101 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3933,14 +3687,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 102, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 102 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3951,14 +3704,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ForStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 104, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 105, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3967,14 +3720,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 104, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3989,13 +3741,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4020,13 +3770,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4041,13 +3789,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4071,13 +3817,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4092,13 +3836,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4121,14 +3863,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 105, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4139,14 +3880,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ForStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 107, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 108, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4157,14 +3898,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 107, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4179,13 +3919,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4209,13 +3947,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4230,13 +3966,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4258,13 +3992,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4279,13 +4011,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4302,13 +4032,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4323,13 +4051,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4358,14 +4084,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 108, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4376,14 +4101,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ForStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 110, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 111, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4394,14 +4119,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ImplicitCastExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 110, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4416,13 +4140,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 110 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4446,14 +4168,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 111, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4464,14 +4185,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ForStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 113, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 114, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4483,14 +4204,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 113, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4505,13 +4225,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4533,13 +4251,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4554,13 +4270,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4577,13 +4291,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4598,13 +4310,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4633,14 +4343,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 114, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 114 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4651,14 +4360,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ForStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 116, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 117, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4672,13 +4381,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4691,14 +4398,14 @@ void TestMiscStmts(void) { // CHECK: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 120, // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 130, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 130 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4707,14 +4414,14 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "WhileStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 123, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 126, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 126 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4723,14 +4430,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "IntegerLiteral", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 123, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4745,13 +4451,12 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 126, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 126 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4760,14 +4465,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ContinueStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 124, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 124 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 124 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -4776,14 +4480,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "BreakStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 125, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 125 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 125 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4796,14 +4499,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ReturnStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 127, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 127 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 127 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -4812,14 +4514,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "ReturnStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 129, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4829,13 +4530,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4849,13 +4548,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4870,13 +4567,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4900,13 +4595,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 129 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4926,14 +4619,14 @@ void TestMiscStmts(void) { // CHECK: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 132, // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 132 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 134, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 134 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4942,14 +4635,13 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "StmtExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 133, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4963,13 +4655,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4979,13 +4669,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4994,19 +4682,16 @@ void TestMiscStmts(void) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -5022,13 +4707,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5047,13 +4730,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5068,13 +4749,11 @@ void TestMiscStmts(void) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 133 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { diff --git a/test/AST/ast-dump-stmt-json.cpp b/test/AST/ast-dump-stmt-json.cpp index 576c333175..4b0959adcb 100644 --- a/test/AST/ast-dump-stmt-json.cpp +++ b/test/AST/ast-dump-stmt-json.cpp @@ -128,20 +128,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -156,13 +154,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -172,20 +168,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "UsingDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "n::function" @@ -195,19 +189,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "UsingShadowDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -224,20 +215,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "UsingDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "n::Variable" @@ -247,19 +236,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "UsingShadowDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -276,20 +262,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestFunction", @@ -302,14 +287,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -318,14 +303,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -334,19 +318,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -361,13 +342,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -384,13 +363,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -422,14 +399,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 11, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -444,13 +420,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -477,13 +451,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -502,20 +474,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestCatch1", @@ -528,14 +499,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -544,14 +515,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXTryStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -560,14 +531,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -576,14 +547,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXCatchStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -591,20 +562,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "x", @@ -618,13 +587,12 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -640,20 +608,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestCatch2", @@ -666,14 +633,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 26, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -682,14 +649,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXTryStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -698,14 +665,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 23, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 23 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -714,14 +681,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXCatchStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -733,14 +700,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -756,20 +723,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestAllocationExprs", @@ -782,14 +748,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -798,14 +764,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 29, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -814,19 +779,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 29 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -842,14 +804,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -864,13 +825,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -892,13 +851,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -921,14 +878,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXDeleteExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 31, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -950,13 +906,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -971,13 +925,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1002,14 +954,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 32, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1024,13 +975,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1052,13 +1001,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1081,13 +1028,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1102,13 +1047,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 32 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1128,14 +1071,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXDeleteExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 33, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1159,13 +1101,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1180,13 +1120,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1211,14 +1149,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1233,13 +1170,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1261,13 +1196,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1291,14 +1224,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXDeleteExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 35, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1321,13 +1253,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1342,13 +1272,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 35 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1736,20 +1664,20 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 27 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 39, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestDependentAllocationExpr", @@ -1758,20 +1686,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 39, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -1784,20 +1710,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 27 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestDependentAllocationExpr", @@ -1810,14 +1735,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 36, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1826,14 +1751,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 41, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -1842,19 +1766,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -1870,13 +1791,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 41 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1893,14 +1812,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXDeleteExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 42, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1914,13 +1832,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1948,20 +1864,20 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 28 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestDependentScopeMemberExpr", @@ -1970,20 +1886,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -1996,20 +1910,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 28 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestDependentScopeMemberExpr", @@ -2022,14 +1935,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2038,14 +1951,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 52, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 31 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 41, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2054,19 +1966,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 38, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 31 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 38, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -2082,14 +1991,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 53, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2104,13 +2012,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2126,13 +2032,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2156,13 +2060,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 53 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2177,14 +2079,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 54, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2199,13 +2100,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2221,13 +2120,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2251,13 +2148,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2272,13 +2167,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2295,14 +2188,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2317,13 +2209,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2339,13 +2229,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2359,13 +2247,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2382,13 +2268,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2416,13 +2300,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2442,20 +2324,20 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestDependentScopeTemplateMemberExpr", @@ -2464,20 +2346,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 64, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 64 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -2490,20 +2370,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestDependentScopeTemplateMemberExpr", @@ -2516,14 +2395,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 65, // CHECK-NEXT: "col": 45, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 65 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 68, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 68 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2532,14 +2411,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 66, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 46, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2548,19 +2426,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 36 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 66 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -2576,14 +2451,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "BinaryOperator", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 67, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2598,13 +2472,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2621,13 +2493,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2642,13 +2512,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2672,13 +2540,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2698,20 +2564,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 75, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 17 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 78, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestUnionInitList", @@ -2724,14 +2589,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 76, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 76 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 78, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 78 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2740,14 +2605,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 77, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2756,19 +2620,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "us", @@ -2783,13 +2644,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2803,13 +2662,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2831,13 +2688,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2859,13 +2714,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 77 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -2890,20 +2743,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 80, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestSwitch", @@ -2915,20 +2767,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 80, // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -2943,13 +2793,12 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 80 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 83, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 83 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2958,14 +2807,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "SwitchStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 81, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 82, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasInit": true, @@ -2975,14 +2824,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 81, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -2991,19 +2839,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -3019,13 +2864,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3040,13 +2883,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 81 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3069,14 +2910,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 82, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 82 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3090,20 +2930,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 85, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 96, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 96 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestIf", @@ -3115,20 +2954,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 85, // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -3143,13 +2980,12 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 85 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 96, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 96 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3158,14 +2994,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 86, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasInit": true, @@ -3175,14 +3011,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 86, // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3191,19 +3026,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -3219,13 +3051,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3244,13 +3074,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3265,13 +3093,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3286,13 +3112,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 86 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3318,14 +3142,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 87, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 87 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3336,14 +3159,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 89, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isConstexpr": true, @@ -3353,14 +3176,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "ConstantExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 89, // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3375,13 +3197,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3396,13 +3216,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3417,13 +3235,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3437,13 +3253,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3470,13 +3284,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3491,13 +3303,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 89 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3517,14 +3327,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 90, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 90 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3535,14 +3344,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "IfStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 92, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "hasElse": true, @@ -3553,14 +3362,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "ConstantExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 92, // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3575,13 +3383,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3596,13 +3402,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3617,13 +3421,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3637,13 +3439,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3670,13 +3470,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3691,13 +3489,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 92 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3717,14 +3513,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 93, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 93 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -3733,14 +3528,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 95, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 95 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -3754,20 +3548,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 103, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 117, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestIteration", @@ -3780,14 +3573,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 103, // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 103 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 117, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 117 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3796,14 +3589,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "ForStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 104, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 105, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3812,14 +3605,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 104, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3828,19 +3620,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -3856,13 +3645,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3881,13 +3668,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -3896,19 +3681,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -3924,13 +3706,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3945,13 +3725,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -3979,13 +3757,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4000,13 +3776,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4021,13 +3795,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4053,13 +3825,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4075,13 +3845,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 32, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 104 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4104,14 +3872,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 105, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 105 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4122,14 +3889,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 107, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4138,19 +3904,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 7, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 107 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -4166,14 +3929,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXForRangeStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 108, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 109, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4183,14 +3946,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 108, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4199,19 +3961,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4228,13 +3987,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4260,13 +4017,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4275,19 +4030,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4305,13 +4057,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4326,13 +4076,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4360,13 +4108,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4375,19 +4121,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4405,13 +4148,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4426,13 +4167,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4447,13 +4186,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4477,13 +4214,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4504,13 +4239,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4525,13 +4258,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4547,13 +4278,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4579,13 +4308,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4601,13 +4328,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4635,13 +4360,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4658,13 +4381,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4690,13 +4411,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4705,19 +4424,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "v", @@ -4732,13 +4448,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4753,13 +4467,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4776,13 +4488,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4798,13 +4508,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 108 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4837,14 +4545,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 109, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 109 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -4855,14 +4562,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 111, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4871,19 +4577,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 9 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -4899,13 +4602,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 111 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -4927,14 +4628,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXForRangeStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 112, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 113, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4944,14 +4645,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 112, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -4960,19 +4660,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -4989,13 +4686,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5021,13 +4716,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5036,19 +4729,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5066,13 +4756,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5086,13 +4774,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5109,13 +4795,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5130,13 +4814,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5168,13 +4850,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5183,19 +4863,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5213,13 +4890,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5233,13 +4908,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5256,13 +4929,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5277,13 +4948,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5315,13 +4984,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5336,13 +5003,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5358,13 +5023,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5390,13 +5053,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5412,13 +5073,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5446,13 +5105,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5469,13 +5126,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5501,13 +5156,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5516,19 +5169,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "v", @@ -5543,13 +5193,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5564,13 +5212,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5587,13 +5233,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5609,13 +5253,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 112 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5648,14 +5290,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 113, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 113 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -5666,14 +5307,14 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "CXXForRangeStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 115, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 116, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5682,14 +5323,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "DeclStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 115, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5698,19 +5338,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -5726,13 +5363,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5741,19 +5376,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5770,13 +5402,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5802,13 +5432,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5817,19 +5445,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5847,13 +5472,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5868,13 +5491,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5902,13 +5523,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -5917,19 +5536,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -5947,13 +5563,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5968,13 +5582,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -5989,13 +5601,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6019,13 +5629,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6046,13 +5654,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6067,13 +5673,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6089,13 +5693,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6121,13 +5723,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6143,13 +5743,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6177,13 +5775,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6200,13 +5796,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6232,13 +5826,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -6247,19 +5839,16 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 19, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "v", @@ -6274,13 +5863,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6295,13 +5882,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6318,13 +5903,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6340,13 +5923,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 115 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6379,14 +5960,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "NullStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 116, // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 116 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -6400,20 +5980,20 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 120, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 33 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 119, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 123, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestDependentGenericSelectionExpr", @@ -6422,20 +6002,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 119, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 119 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -6448,20 +6026,19 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 120, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 33 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 123, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestDependentGenericSelectionExpr", @@ -6473,20 +6050,18 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 120, // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 40, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 43, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -6501,13 +6076,12 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 46, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 120 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 123, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 123 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -6516,14 +6090,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "GenericSelectionExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 121, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6538,13 +6111,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6593,13 +6164,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6619,13 +6188,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 34, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 121 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6643,14 +6210,13 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "kind": "GenericSelectionExpr", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 122, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6665,13 +6231,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -6713,13 +6277,11 @@ void TestDependentGenericSelectionExpr(Ty T) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 122 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { diff --git a/test/AST/ast-dump-stmt-json.m b/test/AST/ast-dump-stmt-json.m index be9a6b60ec..c419708277 100644 --- a/test/AST/ast-dump-stmt-json.m +++ b/test/AST/ast-dump-stmt-json.m @@ -24,20 +24,20 @@ void TestObjCAtCatchStmt() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "line": 3, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 13 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 5, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestBlockExpr", @@ -49,20 +49,18 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 3, // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -77,13 +75,12 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 27, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 5, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 5 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -92,14 +89,13 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "ExprWithCleanups", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -120,13 +116,11 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -139,19 +133,16 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "BlockDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -172,13 +163,11 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -188,13 +177,11 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -209,13 +196,11 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -249,20 +234,20 @@ void TestObjCAtCatchStmt() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "line": 7, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestExprWithCleanup", @@ -274,20 +259,18 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 26, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isUsed": true, @@ -302,13 +285,12 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -317,14 +299,13 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "ExprWithCleanups", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 8, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -345,13 +326,11 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -364,19 +343,16 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "BlockDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -397,13 +373,11 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 4, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -413,13 +387,11 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -434,13 +406,11 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -474,20 +444,20 @@ void TestObjCAtCatchStmt() { // CHECK: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "line": 14, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestObjCAtCatchStmt", @@ -500,14 +470,14 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 14, // CHECK-NEXT: "col": 28, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 14 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 20, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 20 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -516,14 +486,14 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "ObjCAtTryStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -532,14 +502,14 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -549,13 +519,12 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -563,20 +532,18 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "VarDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -590,13 +557,12 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -608,13 +574,12 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isCatchAll": true, @@ -624,14 +589,14 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 17, // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 17 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } @@ -643,13 +608,12 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 5, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -658,14 +622,14 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "CapturedStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "inner": [ @@ -683,14 +647,14 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "kind": "CompoundStmt", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: }, @@ -698,20 +662,18 @@ void TestObjCAtCatchStmt() { // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ImplicitParamDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 14, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, diff --git a/test/AST/ast-dump-template-decls-json.cpp b/test/AST/ast-dump-template-decls-json.cpp index cce9ef7216..a6825c0d06 100644 --- a/test/AST/ast-dump-template-decls-json.cpp +++ b/test/AST/ast-dump-template-decls-json.cpp @@ -213,20 +213,21 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 6, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "line": 4, +// CHECK-NEXT: "col": 6, +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 3, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -235,20 +236,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 3, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 3 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -261,20 +260,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 4, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "a", @@ -287,19 +284,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -314,20 +308,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 6, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -336,20 +330,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 6, // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 6 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -363,20 +355,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 7, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "b", @@ -389,19 +379,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 7 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -417,20 +404,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "c", @@ -439,20 +426,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 9, // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -466,19 +451,16 @@ void V::f() {} // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 9 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Uy", @@ -490,20 +472,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 10, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "c", @@ -516,19 +496,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 10 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -551,20 +528,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 12, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 13, // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "previousDecl": "0x{{.*}}", @@ -590,19 +567,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -615,20 +589,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "d", @@ -637,20 +611,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 15, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -664,19 +636,16 @@ void V::f() {} // CHECK-NEXT: "kind": "TemplateTemplateParmDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 52, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Uy", @@ -688,19 +657,16 @@ void V::f() {} // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 33, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "typename", @@ -713,20 +679,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 16, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "d", @@ -739,19 +703,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -763,19 +724,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -790,20 +748,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "e", @@ -812,20 +770,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -838,20 +794,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 19, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "e", @@ -864,19 +818,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -891,20 +842,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -913,20 +864,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "NonTypeTemplateParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 21, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -941,20 +890,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 22, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -967,19 +914,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 12, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "i", @@ -994,13 +938,11 @@ void V::f() {} // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1026,20 +968,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "g", @@ -1048,20 +990,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 24, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 24 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -1088,20 +1028,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 25, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "g", @@ -1114,19 +1052,16 @@ void V::f() {} // CHECK-NEXT: "kind": "ParmVarDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 25 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1141,20 +1076,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 27, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "h", @@ -1163,20 +1098,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 27, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 27 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "tagUsed": "typename", @@ -1201,20 +1134,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 28, // CHECK-NEXT: "col": 6, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 28 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "h", @@ -1228,20 +1159,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ClassTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 31, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 31, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "R", @@ -1250,20 +1181,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 30, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Ty", @@ -1275,20 +1204,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 31, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "R", @@ -1349,19 +1276,16 @@ void V::f() {} // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 31 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1381,20 +1305,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ClassTemplateSpecializationDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 33, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 33 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 34, // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "R", @@ -1462,19 +1386,16 @@ void V::f() {} // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1487,20 +1408,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ClassTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 37, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 37, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "S", @@ -1509,20 +1430,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 36, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Ty", @@ -1535,19 +1454,16 @@ void V::f() {} // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 5 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 30, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 36 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Uy", @@ -1559,20 +1475,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 37, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "S", @@ -1633,19 +1547,16 @@ void V::f() {} // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 37 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1660,20 +1571,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ClassTemplatePartialSpecializationDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 39, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "S", @@ -1745,20 +1656,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 39, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 39 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isReferenced": true, @@ -1771,20 +1680,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 40, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1797,20 +1704,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ClassTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 42, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "T", @@ -1819,20 +1726,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "NonTypeTemplateParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 42, // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 42 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1845,20 +1750,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 43, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "T", @@ -1919,19 +1822,16 @@ void V::f() {} // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 43 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -1946,20 +1846,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ClassTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 46, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 45, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 46, // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "U", @@ -1968,20 +1868,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "NonTypeTemplateParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 45, // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 45 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1994,20 +1892,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 46, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "U", @@ -2068,19 +1964,16 @@ void V::f() {} // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 46 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2095,20 +1988,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "ClassTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 48, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 52, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "V", @@ -2117,20 +2010,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 48, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Ty", @@ -2142,20 +2033,19 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 52, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "V", @@ -2215,20 +2105,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXRecordDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 49, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 49 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "isImplicit": true, @@ -2239,20 +2127,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -2261,20 +2149,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 50, // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 50 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Uy", @@ -2286,20 +2172,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 51, // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 51 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "f", @@ -2317,20 +2201,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "FunctionTemplateDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "parentDeclContext": "0x{{.*}}", @@ -2341,20 +2225,18 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 55, // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 11, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 20, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 55 +// CHECK-NEXT: "tokLen": 2 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "Uy", @@ -2366,20 +2248,20 @@ void V::f() {} // CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "kind": "CXXMethodDecl", // CHECK-NEXT: "loc": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 13, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 54, // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 54 +// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: }, // CHECK-NEXT: "end": { +// CHECK-NEXT: "line": 56, // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "parentDeclContext": "0x{{.*}}", @@ -2395,13 +2277,11 @@ void V::f() {} // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 56 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: } // CHECK-NEXT: } diff --git a/test/AST/ast-dump-temporaries-json.cpp b/test/AST/ast-dump-temporaries-json.cpp index 15fd491124..d9a6d95e8f 100644 --- a/test/AST/ast-dump-temporaries-json.cpp +++ b/test/AST/ast-dump-temporaries-json.cpp @@ -26,13 +26,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -47,13 +45,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -77,13 +73,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -98,13 +92,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -127,13 +119,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 16, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 11 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -160,13 +150,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -180,13 +168,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -210,13 +196,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -231,13 +215,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 15 +// CHECK-NEXT: "tokLen": 3 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -257,14 +239,13 @@ void MaterializeTemp() { // CHECK: "kind": "ExprWithCleanups", // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { +// CHECK-NEXT: "line": 18, // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -278,13 +259,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 9, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -298,13 +277,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -319,13 +296,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 3, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -349,13 +324,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -371,13 +344,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -392,13 +363,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -413,13 +382,11 @@ void MaterializeTemp() { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 8, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { diff --git a/test/AST/ast-dump-types-json.cpp b/test/AST/ast-dump-types-json.cpp index b34a8b28d4..8b9bdd5fe6 100644 --- a/test/AST/ast-dump-types-json.cpp +++ b/test/AST/ast-dump-types-json.cpp @@ -25,20 +25,19 @@ typedef int TestQualTypePrinting(const char* c); // CHECK: "kind": "TypedefDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 18, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "line": 12, +// CHECK-NEXT: "col": 18, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 18, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestElaboratedType1", @@ -74,20 +73,19 @@ typedef int TestQualTypePrinting(const char* c); // CHECK: "kind": "TypedefDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 15, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "line": 13, +// CHECK-NEXT: "col": 15, +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 15, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 13 +// CHECK-NEXT: "tokLen": 19 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestElaboratedType2", @@ -124,20 +122,19 @@ typedef int TestQualTypePrinting(const char* c); // CHECK: "kind": "TypedefDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 22, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "line": 16, +// CHECK-NEXT: "col": 22, +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 22 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestMacroQualifiedType", @@ -231,20 +228,19 @@ typedef int TestQualTypePrinting(const char* c); // CHECK: "kind": "TypedefDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 20, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "line": 18, +// CHECK-NEXT: "col": 20, +// CHECK-NEXT: "tokLen": 29 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 51, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 18 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestMemberFunctionPointerType", @@ -306,20 +302,19 @@ typedef int TestQualTypePrinting(const char* c); // CHECK: "kind": "TypedefDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 17, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "line": 19, +// CHECK-NEXT: "col": 17, +// CHECK-NEXT: "tokLen": 25 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 17, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 19 +// CHECK-NEXT: "tokLen": 25 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestMemberDataPointerType", @@ -362,20 +357,19 @@ typedef int TestQualTypePrinting(const char* c); // CHECK: "kind": "TypedefDecl", // CHECK-NEXT: "loc": { -// CHECK-NEXT: "col": 13, // CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "line": 21, +// CHECK-NEXT: "col": 13, +// CHECK-NEXT: "tokLen": 20 // CHECK-NEXT: }, // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 1, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 7 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 47, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 21 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "name": "TestQualTypePrinting", diff --git a/test/AST/multistep-explicit-cast-json.c b/test/AST/multistep-explicit-cast-json.c index f13f49c9f3..bfdcf247f7 100644 --- a/test/AST/multistep-explicit-cast-json.c +++ b/test/AST/multistep-explicit-cast-json.c @@ -42,13 +42,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -63,13 +61,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -84,13 +80,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -116,13 +110,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -137,13 +129,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -158,13 +148,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -190,13 +178,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -211,13 +197,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -232,13 +216,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -264,13 +246,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -285,13 +265,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -306,13 +284,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -338,13 +314,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -359,13 +333,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -381,13 +353,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -413,13 +383,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -434,13 +402,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -456,13 +422,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -488,13 +452,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -509,13 +471,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -531,13 +491,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -563,13 +521,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -584,13 +540,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -606,13 +560,11 @@ signed char cstylecast_3(signed int x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { diff --git a/test/AST/multistep-explicit-cast-json.cpp b/test/AST/multistep-explicit-cast-json.cpp index 70ba2f2cd9..76123c206b 100644 --- a/test/AST/multistep-explicit-cast-json.cpp +++ b/test/AST/multistep-explicit-cast-json.cpp @@ -83,13 +83,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -104,13 +102,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -125,13 +121,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 4 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -157,13 +151,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -178,13 +170,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -199,13 +189,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 8 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -231,13 +219,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -252,13 +238,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -273,13 +257,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 12 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -305,13 +287,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -326,13 +306,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -347,13 +325,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 16 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -379,13 +355,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -400,13 +374,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -422,13 +394,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -444,13 +414,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 22 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -478,13 +446,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -499,13 +465,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -521,13 +485,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -543,13 +505,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 26 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -577,13 +537,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -598,13 +556,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -620,13 +576,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -642,13 +596,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 25, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 30 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -676,13 +628,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -697,13 +647,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -719,13 +667,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -741,13 +687,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 34 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -775,13 +719,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 38, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -796,13 +738,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -818,13 +758,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -840,13 +778,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 40 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -874,13 +810,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 36, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -895,13 +829,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -917,13 +849,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -939,13 +869,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 44 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -973,13 +901,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 38, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -994,13 +920,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1016,13 +940,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1038,13 +960,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 37, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 48 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1072,13 +992,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 11 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 36, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1093,13 +1011,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1115,13 +1031,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1137,13 +1051,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 35, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 52 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1171,13 +1083,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1193,13 +1103,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1216,13 +1124,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1239,13 +1145,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 63 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1275,13 +1179,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1297,13 +1199,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1320,13 +1220,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1343,13 +1241,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 67 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1379,13 +1275,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 12 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 24, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1401,13 +1295,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1424,13 +1316,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1447,13 +1337,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 23, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 71 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1483,13 +1371,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 10, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 10 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 22, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1505,13 +1391,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1528,13 +1412,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { @@ -1551,13 +1433,11 @@ SignedChar cxxfunctionalcast_3(SignedInt x) { // CHECK-NEXT: "range": { // CHECK-NEXT: "begin": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: }, // CHECK-NEXT: "end": { // CHECK-NEXT: "col": 21, -// CHECK-NEXT: "file": "{{.*}}", -// CHECK-NEXT: "line": 75 +// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: } // CHECK-NEXT: }, // CHECK-NEXT: "type": { -- 2.40.0