Merge pull request #4191 from erik-krogh/v8Syntax

Approved by esbena

Author: codeql-ci

javascript/extractor/src/com/semmle/jcorn/CustomParser.java

@@ -161,7 +161,8 @@ protected Expression parseExprAtom(DestructuringErrors refDestructuringErrors) {
     } else if (options.v8Extensions() && this.type == TokenType.modulo) {
       // parse V8 native
       this.next();
-      Identifier name = this.parseIdent(true);
+      Identifier buildinName = this.parseIdent(true);
+      Identifier name = this.finishNode(new Identifier(new SourceLocation(startLoc), "%" + buildinName.getName()));
       this.expect(TokenType.parenL);
       List<Expression> args = this.parseExprList(TokenType.parenR, false, false, null);
       CallExpression node =

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

@@ -43,7 +43,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 = "2020-08-24";
+  public static final String EXTRACTOR_VERSION = "2020-09-02";
 
   public static final Pattern NEWLINE = Pattern.compile("\n");
 

javascript/extractor/tests/v8/output/trap/tst.js.trap

@@ -117,80 +117,84 @@ hasLocation(#20040,#20041)
 enclosingStmt(#20040,#20039)
 exprContainers(#20040,#20001)
 #20042=*
-exprs(#20042,79,#20040,-1,"CheckIsBootstrapping")
-hasLocation(#20042,#20009)
+exprs(#20042,79,#20040,-1,"%CheckI ... rapping")
+#20043=@"loc,{#10000},1,1,1,21"
+locations_default(#20043,#10000,1,1,1,21)
+hasLocation(#20042,#20043)
 enclosingStmt(#20042,#20039)
 exprContainers(#20042,#20001)
-literals("CheckIsBootstrapping","CheckIsBootstrapping",#20042)
-#20043=@"var;{CheckIsBootstrapping};{#20000}"
-variables(#20043,"CheckIsBootstrapping",#20000)
-bind(#20042,#20043)
-#20044=*
-stmts(#20044,2,#20001,1,"a%%NumberAdd(1, 2);")
-hasLocation(#20044,#20005)
-stmtContainers(#20044,#20001)
+literals("%CheckIsBootstrapping","%CheckIsBootstrapping",#20042)
+#20044=@"var;{%CheckIsBootstrapping};{#20000}"
+variables(#20044,"%CheckIsBootstrapping",#20000)
+bind(#20042,#20044)
 #20045=*
-exprs(#20045,38,#20044,0,"a%%NumberAdd(1, 2)")
-#20046=@"loc,{#10000},2,1,2,18"
-locations_default(#20046,#10000,2,1,2,18)
-hasLocation(#20045,#20046)
-enclosingStmt(#20045,#20044)
-exprContainers(#20045,#20001)
-#20047=*
-exprs(#20047,79,#20045,0,"a")
-hasLocation(#20047,#20017)
-enclosingStmt(#20047,#20044)
-exprContainers(#20047,#20001)
-literals("a","a",#20047)
-#20048=@"var;{a};{#20000}"
-variables(#20048,"a",#20000)
-bind(#20047,#20048)
-#20049=*
-exprs(#20049,13,#20045,1,"%NumberAdd(1, 2)")
-#20050=@"loc,{#10000},2,3,2,18"
-locations_default(#20050,#10000,2,3,2,18)
-hasLocation(#20049,#20050)
-enclosingStmt(#20049,#20044)
-exprContainers(#20049,#20001)
-#20051=*
-exprs(#20051,79,#20049,-1,"NumberAdd")
-hasLocation(#20051,#20023)
-enclosingStmt(#20051,#20044)
-exprContainers(#20051,#20001)
-literals("NumberAdd","NumberAdd",#20051)
-#20052=@"var;{NumberAdd};{#20000}"
-variables(#20052,"NumberAdd",#20000)
-bind(#20051,#20052)
-#20053=*
-exprs(#20053,3,#20049,0,"1")
-hasLocation(#20053,#20027)
-enclosingStmt(#20053,#20044)
-exprContainers(#20053,#20001)
-literals("1","1",#20053)
-#20054=*
-exprs(#20054,3,#20049,1,"2")
-hasLocation(#20054,#20031)
-enclosingStmt(#20054,#20044)
-exprContainers(#20054,#20001)
-literals("2","2",#20054)
+stmts(#20045,2,#20001,1,"a%%NumberAdd(1, 2);")
+hasLocation(#20045,#20005)
+stmtContainers(#20045,#20001)
+#20046=*
+exprs(#20046,38,#20045,0,"a%%NumberAdd(1, 2)")
+#20047=@"loc,{#10000},2,1,2,18"
+locations_default(#20047,#10000,2,1,2,18)
+hasLocation(#20046,#20047)
+enclosingStmt(#20046,#20045)
+exprContainers(#20046,#20001)
+#20048=*
+exprs(#20048,79,#20046,0,"a")
+hasLocation(#20048,#20017)
+enclosingStmt(#20048,#20045)
+exprContainers(#20048,#20001)
+literals("a","a",#20048)
+#20049=@"var;{a};{#20000}"
+variables(#20049,"a",#20000)
+bind(#20048,#20049)
+#20050=*
+exprs(#20050,13,#20046,1,"%NumberAdd(1, 2)")
+#20051=@"loc,{#10000},2,3,2,18"
+locations_default(#20051,#10000,2,3,2,18)
+hasLocation(#20050,#20051)
+enclosingStmt(#20050,#20045)
+exprContainers(#20050,#20001)
+#20052=*
+exprs(#20052,79,#20050,-1,"%NumberAdd")
+#20053=@"loc,{#10000},2,3,2,12"
+locations_default(#20053,#10000,2,3,2,12)
+hasLocation(#20052,#20053)
+enclosingStmt(#20052,#20045)
+exprContainers(#20052,#20001)
+literals("%NumberAdd","%NumberAdd",#20052)
+#20054=@"var;{%NumberAdd};{#20000}"
+variables(#20054,"%NumberAdd",#20000)
+bind(#20052,#20054)
 #20055=*
-entry_cfg_node(#20055,#20001)
-#20056=@"loc,{#10000},1,1,1,0"
-locations_default(#20056,#10000,1,1,1,0)
-hasLocation(#20055,#20056)
+exprs(#20055,3,#20050,0,"1")
+hasLocation(#20055,#20027)
+enclosingStmt(#20055,#20045)
+exprContainers(#20055,#20001)
+literals("1","1",#20055)
+#20056=*
+exprs(#20056,3,#20050,1,"2")
+hasLocation(#20056,#20031)
+enclosingStmt(#20056,#20045)
+exprContainers(#20056,#20001)
+literals("2","2",#20056)
 #20057=*
-exit_cfg_node(#20057,#20001)
-hasLocation(#20057,#20037)
-successor(#20044,#20047)
-successor(#20054,#20049)
-successor(#20053,#20054)
-successor(#20051,#20053)
-successor(#20049,#20045)
-successor(#20047,#20051)
-successor(#20045,#20057)
+entry_cfg_node(#20057,#20001)
+#20058=@"loc,{#10000},1,1,1,0"
+locations_default(#20058,#10000,1,1,1,0)
+hasLocation(#20057,#20058)
+#20059=*
+exit_cfg_node(#20059,#20001)
+hasLocation(#20059,#20037)
+successor(#20045,#20048)
+successor(#20056,#20050)
+successor(#20055,#20056)
+successor(#20052,#20055)
+successor(#20050,#20046)
+successor(#20048,#20052)
+successor(#20046,#20059)
 successor(#20039,#20042)
 successor(#20042,#20040)
-successor(#20040,#20044)
-successor(#20055,#20039)
+successor(#20040,#20045)
+successor(#20057,#20039)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")