JS: Update TRAP files

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

@@ -17,12 +17,14 @@ locations_default(#20003,#10000,1,1,1,0)
 hasLocation(#20002,#20003)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20004=*
-entry_cfg_node(#20004,#20001)
-hasLocation(#20004,#20003)
+#20004=@"var;{this};{#20000}"
+variables(#20004,"this",#20000)
 #20005=*
-exit_cfg_node(#20005,#20001)
+entry_cfg_node(#20005,#20001)
 hasLocation(#20005,#20003)
-successor(#20004,#20005)
+#20006=*
+exit_cfg_node(#20006,#20001)
+hasLocation(#20006,#20003)
+successor(#20005,#20006)
 numlines(#10000,0,0,0)
 filetype(#10000,"javascript")

javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap

@@ -60,58 +60,60 @@ toplevels(#20001,0)
 #20020=@"loc,{#10000},1,1,2,0"
 locations_default(#20020,#10000,1,1,2,0)
 hasLocation(#20001,#20020)
-#20021=*
-stmts(#20021,2,#20001,0,"(x = 0) = y")
-hasLocation(#20021,#20003)
-stmt_containers(#20021,#20001)
+#20021=@"var;{this};{#20000}"
+variables(#20021,"this",#20000)
 #20022=*
-exprs(#20022,47,#20021,0,"(x = 0) = y")
+stmts(#20022,2,#20001,0,"(x = 0) = y")
 hasLocation(#20022,#20003)
-enclosing_stmt(#20022,#20021)
-expr_containers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
-exprs(#20023,63,#20022,0,"(x = 0)")
-#20024=@"loc,{#10000},1,1,1,7"
-locations_default(#20024,#10000,1,1,1,7)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20021)
+exprs(#20023,47,#20022,0,"(x = 0) = y")
+hasLocation(#20023,#20003)
+enclosing_stmt(#20023,#20022)
 expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,79,#20023,0,"x")
-hasLocation(#20025,#20007)
-enclosing_stmt(#20025,#20021)
-expr_containers(#20025,#20001)
+#20024=*
+exprs(#20024,63,#20023,0,"(x = 0)")
+#20025=@"loc,{#10000},1,1,1,7"
+locations_default(#20025,#10000,1,1,1,7)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20022)
+expr_containers(#20024,#20001)
 #20026=*
-exprs(#20026,79,#20022,1,"y")
-hasLocation(#20026,#20017)
-enclosing_stmt(#20026,#20021)
+exprs(#20026,79,#20024,0,"x")
+hasLocation(#20026,#20007)
+enclosing_stmt(#20026,#20022)
 expr_containers(#20026,#20001)
-literals("y","y",#20026)
-#20027=@"var;{y};{#20000}"
-variables(#20027,"y",#20000)
-bind(#20026,#20027)
-#20028=*
-entry_cfg_node(#20028,#20001)
-#20029=@"loc,{#10000},1,1,1,0"
-locations_default(#20029,#10000,1,1,1,0)
-hasLocation(#20028,#20029)
-#20030=*
-exit_cfg_node(#20030,#20001)
-hasLocation(#20030,#20019)
-successor(#20021,#20023)
-successor(#20026,#20022)
-successor(#20023,#20025)
-successor(#20025,#20026)
-successor(#20022,#20030)
-successor(#20028,#20021)
+#20027=*
+exprs(#20027,79,#20023,1,"y")
+hasLocation(#20027,#20017)
+enclosing_stmt(#20027,#20022)
+expr_containers(#20027,#20001)
+literals("y","y",#20027)
+#20028=@"var;{y};{#20000}"
+variables(#20028,"y",#20000)
+bind(#20027,#20028)
+#20029=*
+entry_cfg_node(#20029,#20001)
+#20030=@"loc,{#10000},1,1,1,0"
+locations_default(#20030,#10000,1,1,1,0)
+hasLocation(#20029,#20030)
 #20031=*
-js_parse_errors(#20031,#20001,"Error: Unexpected assignment pattern.","(x = 0) = y
-")
-hasLocation(#20031,#20007)
+exit_cfg_node(#20031,#20001)
+hasLocation(#20031,#20019)
+successor(#20022,#20024)
+successor(#20027,#20023)
+successor(#20024,#20026)
+successor(#20026,#20027)
+successor(#20023,#20031)
+successor(#20029,#20022)
 #20032=*
-lines(#20032,#20001,"(x = 0) = y","
+js_parse_errors(#20032,#20001,"Error: Unexpected assignment pattern.","(x = 0) = y
 ")
-hasLocation(#20032,#20003)
+hasLocation(#20032,#20007)
+#20033=*
+lines(#20033,#20001,"(x = 0) = y","
+")
+hasLocation(#20033,#20003)
 numlines(#20001,1,0,0)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")

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

@@ -52,53 +52,55 @@ locations_default(#20016,#10000,1,1,2,0)
 hasLocation(#20001,#20016)
 #20017=@"var;{class};{#20000}"
 variables(#20017,"class",#20000)
-#20018=*
-stmts(#20018,18,#20001,0,"var class = 23;")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,64,#20018,0,"class = 23")
-#20020=@"loc,{#10000},1,5,1,14"
-locations_default(#20020,#10000,1,5,1,14)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,78,#20019,0,"class")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("class","class",#20021)
-decl(#20021,#20017)
+stmts(#20019,18,#20001,0,"var class = 23;")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,64,#20019,0,"class = 23")
+#20021=@"loc,{#10000},1,5,1,14"
+locations_default(#20021,#10000,1,5,1,14)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
 #20022=*
-exprs(#20022,3,#20019,1,"23")
-hasLocation(#20022,#20011)
-enclosing_stmt(#20022,#20018)
+exprs(#20022,78,#20020,0,"class")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20019)
 expr_containers(#20022,#20001)
-literals("23","23",#20022)
+literals("class","class",#20022)
+decl(#20022,#20017)
 #20023=*
-entry_cfg_node(#20023,#20001)
-#20024=@"loc,{#10000},1,1,1,0"
-locations_default(#20024,#10000,1,1,1,0)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20001)
-hasLocation(#20025,#20015)
-successor(#20018,#20021)
-successor(#20022,#20019)
-successor(#20021,#20022)
-successor(#20019,#20025)
-successor(#20023,#20018)
+exprs(#20023,3,#20020,1,"23")
+hasLocation(#20023,#20011)
+enclosing_stmt(#20023,#20019)
+expr_containers(#20023,#20001)
+literals("23","23",#20023)
+#20024=*
+entry_cfg_node(#20024,#20001)
+#20025=@"loc,{#10000},1,1,1,0"
+locations_default(#20025,#10000,1,1,1,0)
+hasLocation(#20024,#20025)
 #20026=*
-js_parse_errors(#20026,#20001,"Error: Cannot use keyword 'class' as an identifier.","var class = 23;
+exit_cfg_node(#20026,#20001)
+hasLocation(#20026,#20015)
+successor(#20019,#20022)
+successor(#20023,#20020)
+successor(#20022,#20023)
+successor(#20020,#20026)
+successor(#20024,#20019)
+#20027=*
+js_parse_errors(#20027,#20001,"Error: Cannot use keyword 'class' as an identifier.","var class = 23;
 ")
-#20027=@"loc,{#10000},1,5,1,5"
-locations_default(#20027,#10000,1,5,1,5)
-hasLocation(#20026,#20027)
-#20028=*
-lines(#20028,#20001,"var class = 23;","
+#20028=@"loc,{#10000},1,5,1,5"
+locations_default(#20028,#10000,1,5,1,5)
+hasLocation(#20027,#20028)
+#20029=*
+lines(#20029,#20001,"var class = 23;","
 ")
-hasLocation(#20028,#20003)
+hasLocation(#20029,#20003)
 numlines(#20001,1,0,0)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")