ByteDecoder
diff --git a/‎javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java‎
Lines changed: 1 addition & 1 deletion b/‎javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap‎
Lines changed: 4 additions & 4 deletions b/‎javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap‎
Lines changed: 5 additions & 5 deletions b/‎javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap‎
Lines changed: 10 additions & 10 deletions b/‎javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap‎
Lines changed: 10 additions & 10 deletions
diff --git a/‎javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap‎
Lines changed: 11 additions & 11 deletions b/‎javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap‎
Lines changed: 11 additions & 11 deletions
@@ -405,7 +405,7 @@ protected Label visit(SourceElement nd, int kind, String tostring, Context c) {
       Statement enclosingStmt = contextManager.getCurrentStatement();
       if (enclosingStmt != null)
         trapwriter.addTuple("enclosing_stmt", lbl, trapwriter.localID(enclosingStmt));
-      trapwriter.addTuple("exprContainers", lbl, contextManager.getCurrentContainerKey());
+      trapwriter.addTuple("expr_containers", lbl, contextManager.getCurrentContainerKey());
       return lbl;
     }
 
 
@@ -57,14 +57,14 @@ exprs(#20017,18,#20016,0,"!class {}")
 locations_default(#20018,#10000,1,1,1,9)
 hasLocation(#20017,#20018)
 enclosing_stmt(#20017,#20016)
-exprContainers(#20017,#20001)
+expr_containers(#20017,#20001)
 #20019=*
 exprs(#20019,80,#20017,0,"class {}")
 #20020=@"loc,{#10000},1,2,1,9"
 locations_default(#20020,#10000,1,2,1,9)
 hasLocation(#20019,#20020)
 enclosing_stmt(#20019,#20016)
-exprContainers(#20019,#20001)
+expr_containers(#20019,#20001)
 #20021=*
 properties(#20021,#20019,2,0,"constructor() {}")
 #20022=@"loc,{#10000},1,8,1,7"
@@ -74,13 +74,13 @@ hasLocation(#20021,#20022)
 exprs(#20023,0,#20021,0,"constructor")
 hasLocation(#20023,#20022)
 enclosing_stmt(#20023,#20016)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 literals("constructor","constructor",#20023)
 #20024=*
 exprs(#20024,9,#20021,1,"() {}")
 hasLocation(#20024,#20022)
 enclosing_stmt(#20024,#20016)
-exprContainers(#20024,#20001)
+expr_containers(#20024,#20001)
 #20025=*
 scopes(#20025,1)
 scopenodes(#20024,#20025)
 
@@ -62,14 +62,14 @@ exprs(#20019,18,#20018,0,"!class A {}")
 locations_default(#20020,#10000,1,1,1,11)
 hasLocation(#20019,#20020)
 enclosing_stmt(#20019,#20018)
-exprContainers(#20019,#20001)
+expr_containers(#20019,#20001)
 #20021=*
 exprs(#20021,80,#20019,0,"class A {}")
 #20022=@"loc,{#10000},1,2,1,11"
 locations_default(#20022,#10000,1,2,1,11)
 hasLocation(#20021,#20022)
 enclosing_stmt(#20021,#20018)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 #20023=*
 scopes(#20023,8)
 scopenodes(#20021,#20023)
@@ -82,7 +82,7 @@ local_type_names(#20025,"A",#20023)
 exprs(#20026,78,#20021,0,"A")
 hasLocation(#20026,#20009)
 enclosing_stmt(#20026,#20018)
-exprContainers(#20026,#20001)
+expr_containers(#20026,#20001)
 literals("A","A",#20026)
 decl(#20026,#20024)
 typedecl(#20026,#20025)
@@ -95,13 +95,13 @@ hasLocation(#20027,#20028)
 exprs(#20029,0,#20027,0,"constructor")
 hasLocation(#20029,#20028)
 enclosing_stmt(#20029,#20018)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 literals("constructor","constructor",#20029)
 #20030=*
 exprs(#20030,9,#20027,1,"() {}")
 hasLocation(#20030,#20028)
 enclosing_stmt(#20030,#20018)
-exprContainers(#20030,#20001)
+expr_containers(#20030,#20001)
 #20031=*
 scopes(#20031,1)
 scopenodes(#20030,#20031)
 
@@ -67,19 +67,19 @@ exprs(#20021,18,#20020,0,"!class extends B {}")
 locations_default(#20022,#10000,1,1,1,19)
 hasLocation(#20021,#20022)
 enclosing_stmt(#20021,#20020)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 #20023=*
 exprs(#20023,80,#20021,0,"class extends B {}")
 #20024=@"loc,{#10000},1,2,1,19"
 locations_default(#20024,#10000,1,2,1,19)
 hasLocation(#20023,#20024)
 enclosing_stmt(#20023,#20020)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 #20025=*
 exprs(#20025,79,#20023,1,"B")
 hasLocation(#20025,#20011)
 enclosing_stmt(#20025,#20020)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 literals("B","B",#20025)
 #20026=@"var;{B};{#20000}"
 variables(#20026,"B",#20000)
@@ -93,13 +93,13 @@ hasLocation(#20027,#20028)
 exprs(#20029,0,#20027,0,"constructor")
 hasLocation(#20029,#20028)
 enclosing_stmt(#20029,#20020)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 literals("constructor","constructor",#20029)
 #20030=*
 exprs(#20030,9,#20027,1,"(...arg ... rgs); }")
 hasLocation(#20030,#20028)
 enclosing_stmt(#20030,#20020)
-exprContainers(#20030,#20001)
+expr_containers(#20030,#20001)
 #20031=*
 scopes(#20031,1)
 scopenodes(#20030,#20031)
@@ -109,7 +109,7 @@ variables(#20032,"args",#20031)
 #20033=*
 exprs(#20033,78,#20030,0,"args")
 hasLocation(#20033,#20028)
-exprContainers(#20033,#20030)
+expr_containers(#20033,#20030)
 literals("args","args",#20033)
 decl(#20033,#20032)
 #20034=@"var;{arguments};{#20031}"
@@ -128,22 +128,22 @@ stmt_containers(#20036,#20030)
 exprs(#20037,13,#20036,0,"super(...args)")
 hasLocation(#20037,#20028)
 enclosing_stmt(#20037,#20036)
-exprContainers(#20037,#20030)
+expr_containers(#20037,#20030)
 #20038=*
 exprs(#20038,81,#20037,-1,"super")
 hasLocation(#20038,#20028)
 enclosing_stmt(#20038,#20036)
-exprContainers(#20038,#20030)
+expr_containers(#20038,#20030)
 #20039=*
 exprs(#20039,66,#20037,0,"...args")
 hasLocation(#20039,#20028)
 enclosing_stmt(#20039,#20036)
-exprContainers(#20039,#20030)
+expr_containers(#20039,#20030)
 #20040=*
 exprs(#20040,79,#20039,0,"args")
 hasLocation(#20040,#20028)
 enclosing_stmt(#20040,#20036)
-exprContainers(#20040,#20030)
+expr_containers(#20040,#20030)
 literals("args","args",#20040)
 bind(#20040,#20032)
 isMethod(#20027)
 
@@ -72,14 +72,14 @@ exprs(#20023,18,#20022,0,"!class  ... ds B {}")
 locations_default(#20024,#10000,1,1,1,21)
 hasLocation(#20023,#20024)
 enclosing_stmt(#20023,#20022)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 #20025=*
 exprs(#20025,80,#20023,0,"class A extends B {}")
 #20026=@"loc,{#10000},1,2,1,21"
 locations_default(#20026,#10000,1,2,1,21)
 hasLocation(#20025,#20026)
 enclosing_stmt(#20025,#20022)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 #20027=*
 scopes(#20027,8)
 scopenodes(#20025,#20027)
@@ -92,15 +92,15 @@ local_type_names(#20029,"A",#20027)
 exprs(#20030,78,#20025,0,"A")
 hasLocation(#20030,#20009)
 enclosing_stmt(#20030,#20022)
-exprContainers(#20030,#20001)
+expr_containers(#20030,#20001)
 literals("A","A",#20030)
 decl(#20030,#20028)
 typedecl(#20030,#20029)
 #20031=*
 exprs(#20031,79,#20025,1,"B")
 hasLocation(#20031,#20013)
 enclosing_stmt(#20031,#20022)
-exprContainers(#20031,#20001)
+expr_containers(#20031,#20001)
 literals("B","B",#20031)
 #20032=@"var;{B};{#20000}"
 variables(#20032,"B",#20000)
@@ -114,13 +114,13 @@ hasLocation(#20033,#20034)
 exprs(#20035,0,#20033,0,"constructor")
 hasLocation(#20035,#20034)
 enclosing_stmt(#20035,#20022)
-exprContainers(#20035,#20001)
+expr_containers(#20035,#20001)
 literals("constructor","constructor",#20035)
 #20036=*
 exprs(#20036,9,#20033,1,"(...arg ... rgs); }")
 hasLocation(#20036,#20034)
 enclosing_stmt(#20036,#20022)
-exprContainers(#20036,#20001)
+expr_containers(#20036,#20001)
 #20037=*
 scopes(#20037,1)
 scopenodes(#20036,#20037)
@@ -130,7 +130,7 @@ variables(#20038,"args",#20037)
 #20039=*
 exprs(#20039,78,#20036,0,"args")
 hasLocation(#20039,#20034)
-exprContainers(#20039,#20036)
+expr_containers(#20039,#20036)
 literals("args","args",#20039)
 decl(#20039,#20038)
 #20040=@"var;{arguments};{#20037}"
@@ -149,22 +149,22 @@ stmt_containers(#20042,#20036)
 exprs(#20043,13,#20042,0,"super(...args)")
 hasLocation(#20043,#20034)
 enclosing_stmt(#20043,#20042)
-exprContainers(#20043,#20036)
+expr_containers(#20043,#20036)
 #20044=*
 exprs(#20044,81,#20043,-1,"super")
 hasLocation(#20044,#20034)
 enclosing_stmt(#20044,#20042)
-exprContainers(#20044,#20036)
+expr_containers(#20044,#20036)
 #20045=*
 exprs(#20045,66,#20043,0,"...args")
 hasLocation(#20045,#20034)
 enclosing_stmt(#20045,#20042)
-exprContainers(#20045,#20036)
+expr_containers(#20045,#20036)
 #20046=*
 exprs(#20046,79,#20045,0,"args")
 hasLocation(#20046,#20034)
 enclosing_stmt(#20046,#20042)
-exprContainers(#20046,#20036)
+expr_containers(#20046,#20036)
 literals("args","args",#20046)
 bind(#20046,#20038)
 isMethod(#20033)
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ protected Label visit(SourceElement nd, int kind, String tostring, Context c) {`
`405`	`405`	`Statement enclosingStmt = contextManager.getCurrentStatement();`
`406`	`406`	`if (enclosingStmt != null)`
`407`	`407`	`trapwriter.addTuple("enclosing_stmt", lbl, trapwriter.localID(enclosingStmt));`
`408`		`- trapwriter.addTuple("exprContainers", lbl, contextManager.getCurrentContainerKey());`
	`408`	`+ trapwriter.addTuple("expr_containers", lbl, contextManager.getCurrentContainerKey());`
`409`	`409`	`return lbl;`
`410`	`410`	`}`
`411`	`411`