JavaScript: store YAML locations in yaml_locations table instead of hasLocation.

Author: Max Schaefer

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-07-24";
+  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/ql/src/semmle/javascript/YAML.qll

@@ -13,7 +13,7 @@ import javascript
  * referring to some other YAML value.
  */
 class YAMLNode extends @yaml_node, Locatable {
-  override Location getLocation() { hasLocation(this, result) }
+  override Location getLocation() { yaml_locations(this, result) }
 
   /**
    * Gets the parent node of this node, which is always a collection.
@@ -300,6 +300,8 @@ class YAMLDocument extends YAMLNode {
  * An error message produced by the YAML parser while processing a YAML file.
  */
 class YAMLParseError extends @yaml_error, Error {
+  override Location getLocation() { yaml_locations(this, result) }
+
   override string getMessage() { yaml_errors(this, result) }
 
   override string toString() { result = getMessage() }

javascript/ql/src/semmlecode.javascript.dbscheme

@@ -933,7 +933,7 @@ case @json_value.kind of
     | @token
     | @cfg_node
     | @jsdoc | @jsdoc_type_expr | @jsdoc_tag
-    | @yaml_node | @yaml_error
+    | @yaml_locatable
     | @xmllocatable;
 
 hasLocation (unique int locatable: @locatable ref,
@@ -1027,6 +1027,11 @@ yaml_scalars (unique int scalar: @yaml_scalar_node ref,
 yaml_errors (unique int id: @yaml_error,
              varchar(900) message: string ref);
 
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int ___location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
 /* XML Files */
 
 xmlEncoding(