Merge pull request github#1642 from xiemaisi/json_locations

Approved by asger-semmle

Author: semmle-qlci

javascript/extractor/src/com/semmle/js/extractor/JSONExtractor.java

@@ -43,6 +43,7 @@ public LoCInfo extract(final TextualExtractor textualExtractor) {
         throw recoverableErrors.get(0).asUserError();
 
       Label fileLabel = locationManager.getFileLabel();
+      locationManager.setHasLocationTable("json_locations");
       v.accept(
           new Visitor<Context, Label>() {
             private Label emit(JSONValue nd, int kind, Context c) {

javascript/extractor/src/com/semmle/js/extractor/LocationManager.java

@@ -20,6 +20,7 @@ public class LocationManager {
   private int startColumn;
   private int startLine;
   private final Set<String> locationDefaultEmitted = new LinkedHashSet<String>();
+  private String hasLocation = "hasLocation";
 
   public LocationManager(File sourceFile, TrapWriter trapWriter, Label fileLabel) {
     this.sourceFile = sourceFile;
@@ -58,6 +59,10 @@ public void setStart(int line, int column) {
     startColumn = column;
   }
 
+  public void setHasLocationTable(String hasLocation) {
+    this.hasLocation = hasLocation;
+  }
+
   /**
    * Emit ___location information for an AST node. The node's ___location is translated from the parser's
    * 0-based column numbering scheme into our 1-based scheme and then emitted as a snippet ___location.
@@ -91,7 +96,7 @@ public void emitSnippetLocation(Label lbl, int sl, int sc, int el, int ec) {
   /** Emit an absolute ___location in the current file. No line or column adjustment is performed. */
   public void emitFileLocation(Label lbl, int sl, int sc, int el, int ec) {
     Label locLabel = emitLocationsDefault(sl, sc, el, ec);
-    trapWriter.addTuple("hasLocation", lbl, locLabel);
+    trapWriter.addTuple(hasLocation, lbl, locLabel);
   }
 
   /**

javascript/extractor/src/com/semmle/js/extractor/Main.java

@@ -37,7 +37,7 @@ public class Main {
    * A version identifier that should be updated every time the extractor changes in such a way that
    * it may produce different tuples for the same file under the same {@link ExtractorConfig}.
    */
-  public static final String EXTRACTOR_VERSION = "2019-04-17";
+  public static final String EXTRACTOR_VERSION = "2019-07-25";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 

javascript/extractor/src/com/semmle/js/extractor/YAMLExtractor.java

@@ -99,6 +99,7 @@ public LoCInfo extract(TextualExtractor textualExtractor) {
     trapWriter = textualExtractor.getTrapwriter();
 
     Label fileLabel = locationManager.getFileLabel();
+    locationManager.setHasLocationTable("yaml_locations");
     try {
       parser = new ParserImpl(new StreamReader(textualExtractor.getSource()));
       resolver = new Resolver();

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")