Merge pull request #461 from xiemaisi/js/bye-bye-rhino

Approved by esben-semmle

Author: semmle-qlci

javascript/extractor/src/com/semmle/js/ast/SourceLocation.java

@@ -21,6 +21,10 @@ public SourceLocation(String source, Position start) {
 		this(source, start, null);
 	}
 
+	public SourceLocation(SourceLocation that) {
+		this(that.source, that.start, that.end);
+	}
+
 	/**
 	 * The source code contained in this location.
 	 */

javascript/extractor/src/com/semmle/js/ast/regexp/Error.java

@@ -7,6 +7,20 @@
  * An error encountered while parsing a regular expression.
  */
 public class Error extends SourceElement {
+	public static final int UNEXPECTED_EOS = 0;
+	public static final int UNEXPECTED_CHARACTER = 1;
+	public static final int EXPECTED_DIGIT = 2;
+	public static final int EXPECTED_HEX_DIGIT = 3;
+	public static final int EXPECTED_CONTROL_LETTER = 4;
+	public static final int EXPECTED_CLOSING_PAREN = 5;
+	public static final int EXPECTED_CLOSING_BRACE = 6;
+	public static final int EXPECTED_EOS = 7;
+	public static final int OCTAL_ESCAPE = 8;
+	public static final int INVALID_BACKREF = 9;
+	public static final int EXPECTED_RBRACKET = 10;
+	public static final int EXPECTED_IDENTIFIER = 11;
+	public static final int EXPECTED_CLOSING_ANGLE = 12;
+
 	private final int code;
 
 	public Error(SourceLocation loc, Number code) {

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

@@ -39,7 +39,7 @@ public class Main {
 	 * such a way that it may produce different tuples for the same file under the same
 	 * {@link ExtractorConfig}.
 	 */
-	public static final String EXTRACTOR_VERSION = "2018-10-16";
+	public static final String EXTRACTOR_VERSION = "2018-11-12";
 
 	public static final Pattern NEWLINE = Pattern.compile("\n");