Add more information to JSON AST dumping of source locations.

This adds information about the offset within the source file to the given source location as well as information about the include file a location is from. These pieces of information allow for more efficient post-processing of JSON AST dumps.

llvm-svn: 374921

1 files changed, 20 insertions, 0 deletions

diff --git a/clang/test/AST/ast-dump-macro-json.c b/clang/test/AST/ast-dump-macro-json.c
index e1746ab9336..0334a4ba36a 100644
--- a/clang/test/AST/ast-dump-macro-json.c
+++ b/clang/test/AST/ast-dump-macro-json.c
@@ -23,12 +23,14 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK:  "kind": "FunctionDecl",
 // CHECK-NEXT:  "loc": {
 // CHECK-NEXT:   "spellingLoc": {
+// CHECK-NEXT:    "offset": 96,
 // CHECK-NEXT:    "file": "{{.*}}",
 // CHECK-NEXT:    "line": 3,
 // CHECK-NEXT:    "col": 13,
 // CHECK-NEXT:    "tokLen": 7
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "expansionLoc": {
+// CHECK-NEXT:    "offset": 126,
 // CHECK-NEXT:    "line": 6,
 // CHECK-NEXT:    "col": 6,
 // CHECK-NEXT:    "tokLen": 3
@@ -36,10 +38,12 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK-NEXT:  },
 // CHECK-NEXT:  "range": {
 // CHECK-NEXT:   "begin": {
+// CHECK-NEXT:    "offset": 121,
 // CHECK-NEXT:    "col": 1,
 // CHECK-NEXT:    "tokLen": 4
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "end": {
+// CHECK-NEXT:    "offset": 134,
 // CHECK-NEXT:    "col": 14,
 // CHECK-NEXT:    "tokLen": 1
 // CHECK-NEXT:   }
@@ -54,11 +58,13 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK:  "kind": "FunctionDecl",
 // CHECK-NEXT:  "loc": {
 // CHECK-NEXT:   "spellingLoc": {
+// CHECK-NEXT:    "offset": 96,
 // CHECK-NEXT:    "line": 3,
 // CHECK-NEXT:    "col": 13,
 // CHECK-NEXT:    "tokLen": 7
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "expansionLoc": {
+// CHECK-NEXT:    "offset": 142,
 // CHECK-NEXT:    "line": 7,
 // CHECK-NEXT:    "col": 6,
 // CHECK-NEXT:    "tokLen": 3
@@ -66,10 +72,12 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK-NEXT:  },
 // CHECK-NEXT:  "range": {
 // CHECK-NEXT:   "begin": {
+// CHECK-NEXT:    "offset": 137,
 // CHECK-NEXT:    "col": 1,
 // CHECK-NEXT:    "tokLen": 4
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "end": {
+// CHECK-NEXT:    "offset": 150,
 // CHECK-NEXT:    "col": 14,
 // CHECK-NEXT:    "tokLen": 1
 // CHECK-NEXT:   }
@@ -85,11 +93,13 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK:  "kind": "FunctionDecl",
 // CHECK-NEXT:  "loc": {
 // CHECK-NEXT:   "spellingLoc": {
+// CHECK-NEXT:    "offset": 183,
 // CHECK-NEXT:    "line": 11,
 // CHECK-NEXT:    "col": 11,
 // CHECK-NEXT:    "tokLen": 4
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "expansionLoc": {
+// CHECK-NEXT:    "offset": 178,
 // CHECK-NEXT:    "col": 6,
 // CHECK-NEXT:    "tokLen": 4,
 // CHECK-NEXT:    "isMacroArgExpansion": true
@@ -97,10 +107,12 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK-NEXT:  },
 // CHECK-NEXT:  "range": {
 // CHECK-NEXT:   "begin": {
+// CHECK-NEXT:    "offset": 173,
 // CHECK-NEXT:    "col": 1,
 // CHECK-NEXT:    "tokLen": 4
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "end": {
+// CHECK-NEXT:    "offset": 193,
 // CHECK-NEXT:    "col": 21,
 // CHECK-NEXT:    "tokLen": 1
 // CHECK-NEXT:   }
@@ -115,12 +127,14 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK:  "kind": "FunctionDecl",
 // CHECK-NEXT:  "loc": {
 // CHECK-NEXT:   "spellingLoc": {
+// CHECK-NEXT:    "offset": 4,
 // CHECK-NEXT:    "file": "<scratch space>",
 // CHECK-NEXT:    "line": 3,
 // CHECK-NEXT:    "col": 1,
 // CHECK-NEXT:    "tokLen": 4
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "expansionLoc": {
+// CHECK-NEXT:    "offset": 259,
 // CHECK-NEXT:    "file": "{{.*}}",
 // CHECK-NEXT:    "line": 16,
 // CHECK-NEXT:    "col": 6,
@@ -129,10 +143,12 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK-NEXT:  },
 // CHECK-NEXT:  "range": {
 // CHECK-NEXT:   "begin": {
+// CHECK-NEXT:    "offset": 254,
 // CHECK-NEXT:    "col": 1,
 // CHECK-NEXT:    "tokLen": 4
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "end": {
+// CHECK-NEXT:    "offset": 286,
 // CHECK-NEXT:    "col": 33,
 // CHECK-NEXT:    "tokLen": 1
 // CHECK-NEXT:   }
@@ -147,12 +163,14 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK:  "kind": "FunctionDecl",
 // CHECK-NEXT:  "loc": {
 // CHECK-NEXT:   "spellingLoc": {
+// CHECK-NEXT:    "offset": 13,
 // CHECK-NEXT:    "file": "<scratch space>",
 // CHECK-NEXT:    "line": 5,
 // CHECK-NEXT:    "col": 1,
 // CHECK-NEXT:    "tokLen": 4
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "expansionLoc": {
+// CHECK-NEXT:    "offset": 294,
 // CHECK-NEXT:    "file": "{{.*}}",
 // CHECK-NEXT:    "line": 17,
 // CHECK-NEXT:    "col": 6,
@@ -161,10 +179,12 @@ void BLAP(foo, __COUNTER__)(void);
 // CHECK-NEXT:  },
 // CHECK-NEXT:  "range": {
 // CHECK-NEXT:   "begin": {
+// CHECK-NEXT:    "offset": 289,
 // CHECK-NEXT:    "col": 1,
 // CHECK-NEXT:    "tokLen": 4
 // CHECK-NEXT:   },
 // CHECK-NEXT:   "end": {
+// CHECK-NEXT:    "offset": 321,
 // CHECK-NEXT:    "col": 33,
 // CHECK-NEXT:    "tokLen": 1
 // CHECK-NEXT:   }