JavaScript: Update TRAP test outputs.

javascript/extractor/tests/errors/output/trap/json.js.trap

@@ -12,12 +12,12 @@ scopes(#20000,0)
 json(#20001,5,#10000,0,"{\n  ""a"": 42\n}")
 #20002=@"loc,{#10000},1,1,3,1"
 locations_default(#20002,#10000,1,1,3,1)
-hasLocation(#20001,#20002)
+json_locations(#20001,#20002)
 #20003=*
 json(#20003,2,#20001,0,"42")
 #20004=@"loc,{#10000},2,8,2,9"
 locations_default(#20004,#10000,2,8,2,9)
-hasLocation(#20003,#20004)
+json_locations(#20003,#20004)
 json_literals("42","42",#20003)
 json_properties(#20001,"a",#20003)
 numlines(#10000,3,0,0)

javascript/extractor/tests/excludes/output/trap/empty.json.trap

@@ -13,6 +13,6 @@ hasLocation(#10000,#10003)
 json(#20000,5,#10000,0,"{}")
 #20001=@"loc,{#10000},1,1,1,2"
 locations_default(#20001,#10000,1,1,1,2)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 numlines(#10000,1,0,0)
 filetype(#10000,"json")

javascript/extractor/tests/json/output/trap/array.json.trap

@@ -10,6 +10,6 @@ hasLocation(#10000,#10002)
 json(#20000,4,#10000,0,"[]")
 #20001=@"loc,{#10000},1,1,1,2"
 locations_default(#20001,#10000,1,1,1,2)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 numlines(#10000,1,0,0)
 filetype(#10000,"json")

javascript/extractor/tests/json/output/trap/comments.json.trap

@@ -10,23 +10,23 @@ hasLocation(#10000,#10002)
 json(#20000,5,#10000,0,"{\n  //  ... ts */\n}")
 #20001=@"loc,{#10000},1,1,5,1"
 locations_default(#20001,#10000,1,1,5,1)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 #20002=*
 json(#20002,3,#20000,0,"""world""")
 #20003=@"loc,{#10000},3,12,3,18"
 locations_default(#20003,#10000,3,12,3,18)
-hasLocation(#20002,#20003)
+json_locations(#20002,#20003)
 json_literals("world","""world""",#20002)
 json_properties(#20000,"hello",#20002)
 #20004=*
 json_errors(#20004,"Error: Comments are not legal in JSON.")
 #20005=@"loc,{#10000},2,3,2,3"
 locations_default(#20005,#10000,2,3,2,3)
-hasLocation(#20004,#20005)
+json_locations(#20004,#20005)
 #20006=*
 json_errors(#20006,"Error: Comments are not legal in JSON.")
 #20007=@"loc,{#10000},4,3,4,3"
 locations_default(#20007,#10000,4,3,4,3)
-hasLocation(#20006,#20007)
+json_locations(#20006,#20007)
 numlines(#10000,5,0,0)
 filetype(#10000,"json")

javascript/extractor/tests/json/output/trap/duplicate-keys.json.trap

@@ -10,19 +10,19 @@ hasLocation(#10000,#10002)
 json(#20000,5,#10000,0,"{\n    "" ... "": 42\n}")
 #20001=@"loc,{#10000},1,1,4,1"
 locations_default(#20001,#10000,1,1,4,1)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 #20002=*
 json(#20002,2,#20000,0,"23")
 #20003=@"loc,{#10000},2,10,2,11"
 locations_default(#20003,#10000,2,10,2,11)
-hasLocation(#20002,#20003)
+json_locations(#20002,#20003)
 json_literals("23","23",#20002)
 json_properties(#20000,"x",#20002)
 #20004=*
 json(#20004,2,#20000,1,"42")
 #20005=@"loc,{#10000},3,10,3,11"
 locations_default(#20005,#10000,3,10,3,11)
-hasLocation(#20004,#20005)
+json_locations(#20004,#20005)
 json_literals("42","42",#20004)
 json_properties(#20000,"x",#20004)
 numlines(#10000,4,0,0)

javascript/extractor/tests/json/output/trap/neg.json.trap

@@ -10,7 +10,7 @@ hasLocation(#10000,#10002)
 json(#20000,2,#10000,0,"-1")
 #20001=@"loc,{#10000},1,1,1,2"
 locations_default(#20001,#10000,1,1,1,2)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 json_literals("-1","-1",#20000)
 numlines(#10000,1,0,0)
 filetype(#10000,"json")

javascript/extractor/tests/json/output/trap/neg2.json.trap

@@ -10,18 +10,18 @@ hasLocation(#10000,#10002)
 json(#20000,4,#10000,0,"[1, -2]")
 #20001=@"loc,{#10000},1,1,1,7"
 locations_default(#20001,#10000,1,1,1,7)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 #20002=*
 json(#20002,2,#20000,0,"1")
 #20003=@"loc,{#10000},1,2,1,2"
 locations_default(#20003,#10000,1,2,1,2)
-hasLocation(#20002,#20003)
+json_locations(#20002,#20003)
 json_literals("1","1",#20002)
 #20004=*
 json(#20004,2,#20000,1,"-2")
 #20005=@"loc,{#10000},1,5,1,6"
 locations_default(#20005,#10000,1,5,1,6)
-hasLocation(#20004,#20005)
+json_locations(#20004,#20005)
 json_literals("-2","-2",#20004)
 numlines(#10000,1,0,0)
 filetype(#10000,"json")

javascript/extractor/tests/json/output/trap/null.json.trap

@@ -10,7 +10,7 @@ hasLocation(#10000,#10002)
 json(#20000,0,#10000,0,"null")
 #20001=@"loc,{#10000},1,1,1,4"
 locations_default(#20001,#10000,1,1,1,4)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 json_literals("null","null",#20000)
 numlines(#10000,1,0,0)
 filetype(#10000,"json")

javascript/extractor/tests/json/output/trap/tst.json.trap

@@ -10,31 +10,31 @@ hasLocation(#10000,#10002)
 json(#20000,5,#10000,0,"{\n    "" ...     }\n}")
 #20001=@"loc,{#10000},1,1,7,1"
 locations_default(#20001,#10000,1,1,7,1)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 #20002=*
 json(#20002,3,#20000,0,"""world""")
 #20003=@"loc,{#10000},2,14,2,20"
 locations_default(#20003,#10000,2,14,2,20)
-hasLocation(#20002,#20003)
+json_locations(#20002,#20003)
 json_literals("world","""world""",#20002)
 json_properties(#20000,"hello",#20002)
 #20004=*
 json(#20004,5,#20000,1,"{\n      ... 2\n    }")
 #20005=@"loc,{#10000},3,10,6,5"
 locations_default(#20005,#10000,3,10,6,5)
-hasLocation(#20004,#20005)
+json_locations(#20004,#20005)
 #20006=*
 json(#20006,2,#20004,0,"23")
 #20007=@"loc,{#10000},4,14,4,15"
 locations_default(#20007,#10000,4,14,4,15)
-hasLocation(#20006,#20007)
+json_locations(#20006,#20007)
 json_literals("23","23",#20006)
 json_properties(#20004,"x",#20006)
 #20008=*
 json(#20008,2,#20004,1,"42")
 #20009=@"loc,{#10000},5,14,5,15"
 locations_default(#20009,#10000,5,14,5,15)
-hasLocation(#20008,#20009)
+json_locations(#20008,#20009)
 json_literals("42","42",#20008)
 json_properties(#20004,"y",#20008)
 json_properties(#20000,"o",#20004)

javascript/extractor/tests/node/output/trap/package.json.trap

@@ -13,7 +13,7 @@ hasLocation(#10000,#10003)
 json(#20000,3,#10000,0,"""i get extracted""")
 #20001=@"loc,{#10000},1,1,1,17"
 locations_default(#20001,#10000,1,1,1,17)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 json_literals("i get extracted","""i get extracted""",#20000)
 numlines(#10000,1,0,0)
 filetype(#10000,"json")

javascript/extractor/tests/rcfiles/output/trap/.babelrc.trap

@@ -10,12 +10,12 @@ hasLocation(#10000,#10002)
 json(#20000,5,#10000,0,"{\n  ""so ... dule""\n}")
 #20001=@"loc,{#10000},1,1,3,1"
 locations_default(#20001,#10000,1,1,3,1)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 #20002=*
 json(#20002,3,#20000,0,"""module""")
 #20003=@"loc,{#10000},2,17,2,24"
 locations_default(#20003,#10000,2,17,2,24)
-hasLocation(#20002,#20003)
+json_locations(#20002,#20003)
 json_literals("module","""module""",#20002)
 json_properties(#20000,"sourceType",#20002)
 numlines(#10000,3,0,0)

javascript/extractor/tests/rcfiles/output/trap/.eslintrc.trap

@@ -10,12 +10,12 @@ hasLocation(#10000,#10002)
 json(#20000,5,#10000,0,"{\n  ""pa ... lint""\n}")
 #20001=@"loc,{#10000},1,1,3,1"
 locations_default(#20001,#10000,1,1,3,1)
-hasLocation(#20000,#20001)
+json_locations(#20000,#20001)
 #20002=*
 json(#20002,3,#20000,0,"""babel-eslint""")
 #20003=@"loc,{#10000},2,13,2,26"
 locations_default(#20003,#10000,2,13,2,26)
-hasLocation(#20002,#20003)
+json_locations(#20002,#20003)
 json_literals("babel-eslint","""babel-eslint""",#20002)
 json_properties(#20000,"parser",#20002)
 numlines(#10000,3,0,0)