renamed "exprContainers" to "expr_containers"

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

@@ -405,7 +405,7 @@ public class ASTExtractor {
       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;
     }
 

javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap

@@ -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)

javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap

@@ -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)

javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap

@@ -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)

javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap

@@ -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,7 +92,7 @@ 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)
@@ -100,7 +100,7 @@ typedecl(#20030,#20029)
 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)

javascript/extractor/tests/cfg/output/trap/fields.js.trap

@@ -394,7 +394,7 @@ stmt_containers(#20139,#20001)
 exprs(#20141,78,#20139,0,"A")
 hasLocation(#20141,#20041)
 enclosing_stmt(#20141,#20139)
-exprContainers(#20141,#20001)
+expr_containers(#20141,#20001)
 literals("A","A",#20141)
 decl(#20141,#20135)
 typedecl(#20141,#20137)
@@ -411,7 +411,7 @@ hasLocation(#20143,#20144)
 exprs(#20145,0,#20143,0,"constructor")
 hasLocation(#20145,#20045)
 enclosing_stmt(#20145,#20139)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 literals("constructor","constructor",#20145)
 #20146=*
 exprs(#20146,9,#20143,1,"() {\n    ctor;\n  }")
@@ -419,7 +419,7 @@ exprs(#20146,9,#20143,1,"() {\n    ctor;\n  }")
 locations_default(#20147,#10000,2,14,4,3)
 hasLocation(#20146,#20147)
 enclosing_stmt(#20146,#20139)
-exprContainers(#20146,#20001)
+expr_containers(#20146,#20001)
 #20148=*
 scopes(#20148,1)
 scopenodes(#20146,#20148)
@@ -443,7 +443,7 @@ stmt_containers(#20152,#20146)
 exprs(#20154,79,#20152,0,"ctor")
 hasLocation(#20154,#20053)
 enclosing_stmt(#20154,#20152)
-exprContainers(#20154,#20146)
+expr_containers(#20154,#20146)
 literals("ctor","ctor",#20154)
 #20155=@"var;{ctor};{#20000}"
 variables(#20155,"ctor",#20000)
@@ -457,7 +457,7 @@ hasLocation(#20156,#20157)
 #20158=*
 exprs(#20158,0,#20156,0,"x")
 hasLocation(#20158,#20059)
-exprContainers(#20158,#20146)
+expr_containers(#20158,#20146)
 literals("x","x",#20158)
 #20159=*
 properties(#20159,#20139,4,8,"static y;")
@@ -468,7 +468,7 @@ hasLocation(#20159,#20160)
 exprs(#20161,0,#20159,0,"y")
 hasLocation(#20161,#20065)
 enclosing_stmt(#20161,#20139)
-exprContainers(#20161,#20001)
+expr_containers(#20161,#20001)
 literals("y","y",#20161)
 isStatic(#20159)
 #20162=*
@@ -480,7 +480,7 @@ hasLocation(#20162,#20163)
 exprs(#20164,0,#20162,0,"f")
 hasLocation(#20164,#20069)
 enclosing_stmt(#20164,#20139)
-exprContainers(#20164,#20001)
+expr_containers(#20164,#20001)
 literals("f","f",#20164)
 #20165=*
 exprs(#20165,9,#20162,1,"() {}")
@@ -488,7 +488,7 @@ exprs(#20165,9,#20162,1,"() {}")
 locations_default(#20166,#10000,7,4,7,8)
 hasLocation(#20165,#20166)
 enclosing_stmt(#20165,#20139)
-exprContainers(#20165,#20001)
+expr_containers(#20165,#20001)
 #20167=*
 scopes(#20167,1)
 scopenodes(#20165,#20167)
@@ -512,7 +512,7 @@ hasLocation(#20171,#20172)
 exprs(#20173,0,#20171,0,"g")
 hasLocation(#20173,#20081)
 enclosing_stmt(#20173,#20139)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 literals("g","g",#20173)
 #20174=*
 exprs(#20174,9,#20171,1,"() {}")
@@ -520,7 +520,7 @@ exprs(#20174,9,#20171,1,"() {}")
 locations_default(#20175,#10000,8,11,8,15)
 hasLocation(#20174,#20175)
 enclosing_stmt(#20174,#20139)
-exprContainers(#20174,#20001)
+expr_containers(#20174,#20001)
 #20176=*
 scopes(#20176,1)
 scopenodes(#20174,#20176)
@@ -546,7 +546,7 @@ stmt_containers(#20180,#20001)
 exprs(#20182,78,#20180,0,"B")
 hasLocation(#20182,#20094)
 enclosing_stmt(#20182,#20180)
-exprContainers(#20182,#20001)
+expr_containers(#20182,#20001)
 literals("B","B",#20182)
 decl(#20182,#20136)
 typedecl(#20182,#20138)
@@ -558,7 +558,7 @@ scopenesting(#20183,#20000)
 exprs(#20184,79,#20180,1,"A")
 hasLocation(#20184,#20098)
 enclosing_stmt(#20184,#20180)
-exprContainers(#20184,#20001)
+expr_containers(#20184,#20001)
 literals("A","A",#20184)
 bind(#20184,#20135)
 #20185=*
@@ -570,7 +570,7 @@ hasLocation(#20185,#20186)
 exprs(#20187,0,#20185,0,"constructor")
 hasLocation(#20187,#20102)
 enclosing_stmt(#20187,#20180)
-exprContainers(#20187,#20001)
+expr_containers(#20187,#20001)
 literals("constructor","constructor",#20187)
 #20188=*
 exprs(#20188,9,#20185,1,"() {\n   ... er;\n  }")
@@ -578,7 +578,7 @@ exprs(#20188,9,#20185,1,"() {\n   ... er;\n  }")
 locations_default(#20189,#10000,12,14,16,3)
 hasLocation(#20188,#20189)
 enclosing_stmt(#20188,#20180)
-exprContainers(#20188,#20001)
+expr_containers(#20188,#20001)
 #20190=*
 scopes(#20190,1)
 scopenodes(#20188,#20190)
@@ -602,7 +602,7 @@ stmt_containers(#20194,#20188)
 exprs(#20196,79,#20194,0,"before")
 hasLocation(#20196,#20110)
 enclosing_stmt(#20196,#20194)
-exprContainers(#20196,#20188)
+expr_containers(#20196,#20188)
 literals("before","before",#20196)
 #20197=@"var;{before};{#20000}"
 variables(#20197,"before",#20000)
@@ -619,12 +619,12 @@ exprs(#20200,13,#20198,0,"super()")
 locations_default(#20201,#10000,14,5,14,11)
 hasLocation(#20200,#20201)
 enclosing_stmt(#20200,#20198)
-exprContainers(#20200,#20188)
+expr_containers(#20200,#20188)
 #20202=*
 exprs(#20202,81,#20200,-1,"super")
 hasLocation(#20202,#20114)
 enclosing_stmt(#20202,#20198)
-exprContainers(#20202,#20188)
+expr_containers(#20202,#20188)
 #20203=*
 stmts(#20203,2,#20192,2,"after;")
 #20204=@"loc,{#10000},15,5,15,10"
@@ -635,7 +635,7 @@ stmt_containers(#20203,#20188)
 exprs(#20205,79,#20203,0,"after")
 hasLocation(#20205,#20122)
 enclosing_stmt(#20205,#20203)
-exprContainers(#20205,#20188)
+expr_containers(#20205,#20188)
 literals("after","after",#20205)
 #20206=@"var;{after};{#20000}"
 variables(#20206,"after",#20000)
@@ -649,7 +649,7 @@ hasLocation(#20207,#20208)
 #20209=*
 exprs(#20209,0,#20207,0,"z")
 hasLocation(#20209,#20128)
-exprContainers(#20209,#20188)
+expr_containers(#20209,#20188)
 literals("z","z",#20209)
 #20210=*
 entry_cfg_node(#20210,#20001)

javascript/extractor/tests/cfg/output/trap/seq.js.trap

@@ -97,12 +97,12 @@ exprs(#20033,10,#20032,0,"x,1+2,y||z")
 locations_default(#20034,#10000,1,4,1,13)
 hasLocation(#20033,#20034)
 enclosing_stmt(#20033,#20032)
-exprContainers(#20033,#20001)
+expr_containers(#20033,#20001)
 #20035=*
 exprs(#20035,79,#20033,0,"x")
 hasLocation(#20035,#20009)
 enclosing_stmt(#20035,#20032)
-exprContainers(#20035,#20001)
+expr_containers(#20035,#20001)
 literals("x","x",#20035)
 #20036=@"var;{x};{#20000}"
 variables(#20036,"x",#20000)
@@ -113,18 +113,18 @@ exprs(#20037,34,#20033,1,"1+2")
 locations_default(#20038,#10000,1,6,1,8)
 hasLocation(#20037,#20038)
 enclosing_stmt(#20037,#20032)
-exprContainers(#20037,#20001)
+expr_containers(#20037,#20001)
 #20039=*
 exprs(#20039,3,#20037,0,"1")
 hasLocation(#20039,#20013)
 enclosing_stmt(#20039,#20032)
-exprContainers(#20039,#20001)
+expr_containers(#20039,#20001)
 literals("1","1",#20039)
 #20040=*
 exprs(#20040,3,#20037,1,"2")
 hasLocation(#20040,#20017)
 enclosing_stmt(#20040,#20032)
-exprContainers(#20040,#20001)
+expr_containers(#20040,#20001)
 literals("2","2",#20040)
 #20041=*
 exprs(#20041,45,#20033,2,"y||z")
@@ -132,12 +132,12 @@ exprs(#20041,45,#20033,2,"y||z")
 locations_default(#20042,#10000,1,10,1,13)
 hasLocation(#20041,#20042)
 enclosing_stmt(#20041,#20032)
-exprContainers(#20041,#20001)
+expr_containers(#20041,#20001)
 #20043=*
 exprs(#20043,79,#20041,0,"y")
 hasLocation(#20043,#20021)
 enclosing_stmt(#20043,#20032)
-exprContainers(#20043,#20001)
+expr_containers(#20043,#20001)
 literals("y","y",#20043)
 #20044=@"var;{y};{#20000}"
 variables(#20044,"y",#20000)
@@ -146,7 +146,7 @@ bind(#20043,#20044)
 exprs(#20045,79,#20041,1,"z")
 hasLocation(#20045,#20025)
 enclosing_stmt(#20045,#20032)
-exprContainers(#20045,#20001)
+expr_containers(#20045,#20001)
 literals("z","z",#20045)
 #20046=@"var;{z};{#20000}"
 variables(#20046,"z",#20000)

javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap

@@ -100,19 +100,19 @@ exprs(#20034,44,#20033,0,"a && b && c")
 locations_default(#20035,#10000,1,1,1,11)
 hasLocation(#20034,#20035)
 enclosing_stmt(#20034,#20033)
-exprContainers(#20034,#20001)
+expr_containers(#20034,#20001)
 #20036=*
 exprs(#20036,44,#20034,0,"a && b")
 #20037=@"loc,{#10000},1,1,1,6"
 locations_default(#20037,#10000,1,1,1,6)
 hasLocation(#20036,#20037)
 enclosing_stmt(#20036,#20033)
-exprContainers(#20036,#20001)
+expr_containers(#20036,#20001)
 #20038=*
 exprs(#20038,79,#20036,0,"a")
 hasLocation(#20038,#20007)
 enclosing_stmt(#20038,#20033)
-exprContainers(#20038,#20001)
+expr_containers(#20038,#20001)
 literals("a","a",#20038)
 #20039=@"var;{a};{#20000}"
 variables(#20039,"a",#20000)
@@ -121,7 +121,7 @@ bind(#20038,#20039)
 exprs(#20040,79,#20036,1,"b")
 hasLocation(#20040,#20011)
 enclosing_stmt(#20040,#20033)
-exprContainers(#20040,#20001)
+expr_containers(#20040,#20001)
 literals("b","b",#20040)
 #20041=@"var;{b};{#20000}"
 variables(#20041,"b",#20000)
@@ -130,7 +130,7 @@ bind(#20040,#20041)
 exprs(#20042,79,#20034,1,"c")
 hasLocation(#20042,#20015)
 enclosing_stmt(#20042,#20033)
-exprContainers(#20042,#20001)
+expr_containers(#20042,#20001)
 literals("c","c",#20042)
 #20043=@"var;{c};{#20000}"
 variables(#20043,"c",#20000)
@@ -145,19 +145,19 @@ exprs(#20045,45,#20044,0,"x || y || z")
 locations_default(#20046,#10000,2,1,2,11)
 hasLocation(#20045,#20046)
 enclosing_stmt(#20045,#20044)
-exprContainers(#20045,#20001)
+expr_containers(#20045,#20001)
 #20047=*
 exprs(#20047,45,#20045,0,"x || y")
 #20048=@"loc,{#10000},2,1,2,6"
 locations_default(#20048,#10000,2,1,2,6)
 hasLocation(#20047,#20048)
 enclosing_stmt(#20047,#20044)
-exprContainers(#20047,#20001)
+expr_containers(#20047,#20001)
 #20049=*
 exprs(#20049,79,#20047,0,"x")
 hasLocation(#20049,#20019)
 enclosing_stmt(#20049,#20044)
-exprContainers(#20049,#20001)
+expr_containers(#20049,#20001)
 literals("x","x",#20049)
 #20050=@"var;{x};{#20000}"
 variables(#20050,"x",#20000)
@@ -166,7 +166,7 @@ bind(#20049,#20050)
 exprs(#20051,79,#20047,1,"y")
 hasLocation(#20051,#20023)
 enclosing_stmt(#20051,#20044)
-exprContainers(#20051,#20001)
+expr_containers(#20051,#20001)
 literals("y","y",#20051)
 #20052=@"var;{y};{#20000}"
 variables(#20052,"y",#20000)
@@ -175,7 +175,7 @@ bind(#20051,#20052)
 exprs(#20053,79,#20045,1,"z")
 hasLocation(#20053,#20027)
 enclosing_stmt(#20053,#20044)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 literals("z","z",#20053)
 #20054=@"var;{z};{#20000}"
 variables(#20054,"z",#20000)

javascript/extractor/tests/cfg/output/trap/ternary.js.trap

@@ -92,26 +92,26 @@ exprs(#20031,45,#20030,0,"(a ? b  ... d) || e")
 locations_default(#20032,#10000,1,1,1,21)
 hasLocation(#20031,#20032)
 enclosing_stmt(#20031,#20030)
-exprContainers(#20031,#20001)
+expr_containers(#20031,#20001)
 #20033=*
 exprs(#20033,63,#20031,0,"(a ? b || c : d)")
 #20034=@"loc,{#10000},1,1,1,16"
 locations_default(#20034,#10000,1,1,1,16)
 hasLocation(#20033,#20034)
 enclosing_stmt(#20033,#20030)
-exprContainers(#20033,#20001)
+expr_containers(#20033,#20001)
 #20035=*
 exprs(#20035,11,#20033,0,"a ? b || c : d")
 #20036=@"loc,{#10000},1,2,1,15"
 locations_default(#20036,#10000,1,2,1,15)
 hasLocation(#20035,#20036)
 enclosing_stmt(#20035,#20030)
-exprContainers(#20035,#20001)
+expr_containers(#20035,#20001)
 #20037=*
 exprs(#20037,79,#20035,0,"a")
 hasLocation(#20037,#20007)
 enclosing_stmt(#20037,#20030)
-exprContainers(#20037,#20001)
+expr_containers(#20037,#20001)
 literals("a","a",#20037)
 #20038=@"var;{a};{#20000}"
 variables(#20038,"a",#20000)
@@ -122,12 +122,12 @@ exprs(#20039,45,#20035,1,"b || c")
 locations_default(#20040,#10000,1,6,1,11)
 hasLocation(#20039,#20040)
 enclosing_stmt(#20039,#20030)
-exprContainers(#20039,#20001)
+expr_containers(#20039,#20001)
 #20041=*
 exprs(#20041,79,#20039,0,"b")
 hasLocation(#20041,#20011)
 enclosing_stmt(#20041,#20030)
-exprContainers(#20041,#20001)
+expr_containers(#20041,#20001)
 literals("b","b",#20041)
 #20042=@"var;{b};{#20000}"
 variables(#20042,"b",#20000)
@@ -136,7 +136,7 @@ bind(#20041,#20042)
 exprs(#20043,79,#20039,1,"c")
 hasLocation(#20043,#20015)
 enclosing_stmt(#20043,#20030)
-exprContainers(#20043,#20001)
+expr_containers(#20043,#20001)
 literals("c","c",#20043)
 #20044=@"var;{c};{#20000}"
 variables(#20044,"c",#20000)
@@ -145,7 +145,7 @@ bind(#20043,#20044)
 exprs(#20045,79,#20035,2,"d")
 hasLocation(#20045,#20019)
 enclosing_stmt(#20045,#20030)
-exprContainers(#20045,#20001)
+expr_containers(#20045,#20001)
 literals("d","d",#20045)
 #20046=@"var;{d};{#20000}"
 variables(#20046,"d",#20000)
@@ -154,7 +154,7 @@ bind(#20045,#20046)
 exprs(#20047,79,#20031,1,"e")
 hasLocation(#20047,#20025)
 enclosing_stmt(#20047,#20030)
-exprContainers(#20047,#20001)
+expr_containers(#20047,#20001)
 literals("e","e",#20047)
 #20048=@"var;{e};{#20000}"
 variables(#20048,"e",#20000)

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

@@ -872,7 +872,7 @@ stmt_containers(#20322,#20001)
 #20324=*
 exprs(#20324,78,#20322,-1,"outer")
 hasLocation(#20324,#20077)
-exprContainers(#20324,#20322)
+expr_containers(#20324,#20322)
 literals("outer","outer",#20324)
 decl(#20324,#20320)
 #20325=*
@@ -902,19 +902,19 @@ exprs(#20332,64,#20330,0,"i = 0")
 locations_default(#20333,#10000,3,9,3,13)
 hasLocation(#20332,#20333)
 enclosing_stmt(#20332,#20330)
-exprContainers(#20332,#20322)
+expr_containers(#20332,#20322)
 #20334=*
 exprs(#20334,78,#20332,0,"i")
 hasLocation(#20334,#20086)
 enclosing_stmt(#20334,#20330)
-exprContainers(#20334,#20322)
+expr_containers(#20334,#20322)
 literals("i","i",#20334)
 decl(#20334,#20326)
 #20335=*
 exprs(#20335,3,#20332,1,"0")
 hasLocation(#20335,#20090)
 enclosing_stmt(#20335,#20330)
-exprContainers(#20335,#20322)
+expr_containers(#20335,#20322)
 literals("0","0",#20335)
 #20336=*
 stmts(#20336,18,#20328,1,"var i = 1;")
@@ -928,19 +928,19 @@ exprs(#20338,64,#20336,0,"i = 1")
 locations_default(#20339,#10000,4,9,4,13)
 hasLocation(#20338,#20339)
 enclosing_stmt(#20338,#20336)
-exprContainers(#20338,#20322)
+expr_containers(#20338,#20322)
 #20340=*
 exprs(#20340,78,#20338,0,"i")
 hasLocation(#20340,#20096)
 enclosing_stmt(#20340,#20336)
-exprContainers(#20340,#20322)
+expr_containers(#20340,#20322)
 literals("i","i",#20340)
 decl(#20340,#20326)
 #20341=*
 exprs(#20341,3,#20338,1,"1")
 hasLocation(#20341,#20100)
 enclosing_stmt(#20341,#20336)
-exprContainers(#20341,#20322)
+expr_containers(#20341,#20322)
 literals("1","1",#20341)
 #20342=*
 stmts(#20342,14,#20328,2,"for ( i ...  ++i );")
@@ -954,19 +954,19 @@ exprs(#20344,27,#20342,1,"i < 32")
 locations_default(#20345,#10000,5,19,5,24)
 hasLocation(#20344,#20345)
 enclosing_stmt(#20344,#20342)
-exprContainers(#20344,#20322)
+expr_containers(#20344,#20322)
 #20346=*
 exprs(#20346,79,#20344,0,"i")
 hasLocation(#20346,#20116)
 enclosing_stmt(#20346,#20342)
-exprContainers(#20346,#20322)
+expr_containers(#20346,#20322)
 literals("i","i",#20346)
 bind(#20346,#20326)
 #20347=*
 exprs(#20347,3,#20344,1,"32")
 hasLocation(#20347,#20120)
 enclosing_stmt(#20347,#20342)
-exprContainers(#20347,#20322)
+expr_containers(#20347,#20322)
 literals("32","32",#20347)
 #20348=*
 exprs(#20348,59,#20342,2,"++i")
@@ -974,12 +974,12 @@ exprs(#20348,59,#20342,2,"++i")
 locations_default(#20349,#10000,5,28,5,30)
 hasLocation(#20348,#20349)
 enclosing_stmt(#20348,#20342)
-exprContainers(#20348,#20322)
+expr_containers(#20348,#20322)
 #20350=*
 exprs(#20350,79,#20348,0,"i")
 hasLocation(#20350,#20126)
 enclosing_stmt(#20350,#20342)
-exprContainers(#20350,#20322)
+expr_containers(#20350,#20322)
 literals("i","i",#20350)
 bind(#20350,#20326)
 #20351=*
@@ -988,19 +988,19 @@ exprs(#20351,47,#20342,0,"i = 0")
 locations_default(#20352,#10000,5,11,5,15)
 hasLocation(#20351,#20352)
 enclosing_stmt(#20351,#20342)
-exprContainers(#20351,#20322)
+expr_containers(#20351,#20322)
 #20353=*
 exprs(#20353,79,#20351,0,"i")
 hasLocation(#20353,#20108)
 enclosing_stmt(#20353,#20342)
-exprContainers(#20353,#20322)
+expr_containers(#20353,#20322)
 literals("i","i",#20353)
 bind(#20353,#20326)
 #20354=*
 exprs(#20354,3,#20351,1,"0")
 hasLocation(#20354,#20112)
 enclosing_stmt(#20354,#20342)
-exprContainers(#20354,#20322)
+expr_containers(#20354,#20322)
 literals("0","0",#20354)
 #20355=*
 stmts(#20355,0,#20342,3,";")
@@ -1016,7 +1016,7 @@ stmt_containers(#20356,#20322)
 exprs(#20358,79,#20356,-1,"i")
 hasLocation(#20358,#20136)
 enclosing_stmt(#20358,#20356)
-exprContainers(#20358,#20322)
+expr_containers(#20358,#20322)
 literals("i","i",#20358)
 bind(#20358,#20326)
 #20359=*
@@ -1029,7 +1029,7 @@ stmt_containers(#20359,#20322)
 exprs(#20361,3,#20359,-1,"32")
 hasLocation(#20361,#20144)
 enclosing_stmt(#20361,#20359)
-exprContainers(#20361,#20322)
+expr_containers(#20361,#20322)
 literals("32","32",#20361)
 #20362=*
 stmts(#20362,9,#20359,0,"return true;")
@@ -1041,7 +1041,7 @@ stmt_containers(#20362,#20322)
 exprs(#20364,2,#20362,0,"true")
 hasLocation(#20364,#20150)
 enclosing_stmt(#20364,#20362)
-exprContainers(#20364,#20322)
+expr_containers(#20364,#20322)
 literals("true","true",#20364)
 #20365=*
 stmts(#20365,14,#20001,1,"for (;a ... ntinue;")
@@ -1053,7 +1053,7 @@ stmt_containers(#20365,#20001)
 exprs(#20367,79,#20365,1,"a")
 hasLocation(#20367,#20163)
 enclosing_stmt(#20367,#20365)
-exprContainers(#20367,#20001)
+expr_containers(#20367,#20001)
 literals("a","a",#20367)
 #20368=@"var;{a};{#20000}"
 variables(#20368,"a",#20000)
@@ -1074,7 +1074,7 @@ stmt_containers(#20371,#20001)
 #20373=*
 exprs(#20373,78,#20371,-1,"f")
 hasLocation(#20373,#20175)
-exprContainers(#20373,#20371)
+expr_containers(#20373,#20371)
 literals("f","f",#20373)
 decl(#20373,#20321)
 #20374=*
@@ -1088,7 +1088,7 @@ variables(#20376,"o",#20374)
 #20377=*
 exprs(#20377,78,#20371,0,"o")
 hasLocation(#20377,#20179)
-exprContainers(#20377,#20371)
+expr_containers(#20377,#20371)
 literals("o","o",#20377)
 decl(#20377,#20376)
 #20378=@"var;{arguments};{#20374}"
@@ -1110,7 +1110,7 @@ stmt_containers(#20381,#20371)
 exprs(#20383,79,#20381,1,"o")
 hasLocation(#20383,#20195)
 enclosing_stmt(#20383,#20381)
-exprContainers(#20383,#20371)
+expr_containers(#20383,#20371)
 literals("o","o",#20383)
 bind(#20383,#20376)
 #20384=*
@@ -1123,12 +1123,12 @@ stmt_containers(#20384,#20371)
 exprs(#20386,64,#20384,0,"p")
 hasLocation(#20386,#20191)
 enclosing_stmt(#20386,#20384)
-exprContainers(#20386,#20371)
+expr_containers(#20386,#20371)
 #20387=*
 exprs(#20387,78,#20386,0,"p")
 hasLocation(#20387,#20191)
 enclosing_stmt(#20387,#20384)
-exprContainers(#20387,#20371)
+expr_containers(#20387,#20371)
 literals("p","p",#20387)
 decl(#20387,#20375)
 #20388=*
@@ -1141,7 +1141,7 @@ stmt_containers(#20388,#20371)
 exprs(#20390,79,#20388,0,"p")
 hasLocation(#20390,#20203)
 enclosing_stmt(#20390,#20388)
-exprContainers(#20390,#20371)
+expr_containers(#20390,#20371)
 literals("p","p",#20390)
 bind(#20390,#20375)
 #20391=*
@@ -1176,7 +1176,7 @@ variables(#20399,"e",#20398)
 exprs(#20400,78,#20396,0,"e")
 hasLocation(#20400,#20220)
 enclosing_stmt(#20400,#20396)
-exprContainers(#20400,#20001)
+expr_containers(#20400,#20001)
 literals("e","e",#20400)
 decl(#20400,#20399)
 #20401=*
@@ -1197,19 +1197,19 @@ exprs(#20405,13,#20403,0,"o.m()")
 locations_default(#20406,#10000,22,5,22,9)
 hasLocation(#20405,#20406)
 enclosing_stmt(#20405,#20403)
-exprContainers(#20405,#20001)
+expr_containers(#20405,#20001)
 #20407=*
 exprs(#20407,14,#20405,-1,"o.m")
 #20408=@"loc,{#10000},22,5,22,7"
 locations_default(#20408,#10000,22,5,22,7)
 hasLocation(#20407,#20408)
 enclosing_stmt(#20407,#20403)
-exprContainers(#20407,#20001)
+expr_containers(#20407,#20001)
 #20409=*
 exprs(#20409,79,#20407,0,"o")
 hasLocation(#20409,#20226)
 enclosing_stmt(#20409,#20403)
-exprContainers(#20409,#20001)
+expr_containers(#20409,#20001)
 literals("o","o",#20409)
 #20410=@"var;{o};{#20000}"
 variables(#20410,"o",#20000)
@@ -1218,7 +1218,7 @@ bind(#20409,#20410)
 exprs(#20411,0,#20407,1,"m")
 hasLocation(#20411,#20230)
 enclosing_stmt(#20411,#20403)
-exprContainers(#20411,#20001)
+expr_containers(#20411,#20001)
 literals("m","m",#20411)
 #20412=*
 stmts(#20412,1,#20392,-1,"{\n}")
@@ -1248,7 +1248,7 @@ stmt_containers(#20418,#20001)
 exprs(#20420,79,#20418,1,"headers")
 hasLocation(#20420,#20257)
 enclosing_stmt(#20420,#20418)
-exprContainers(#20420,#20001)
+expr_containers(#20420,#20001)
 literals("headers","headers",#20420)
 #20421=@"var;{headers};{#20000}"
 variables(#20421,"headers",#20000)
@@ -1257,7 +1257,7 @@ bind(#20420,#20421)
 exprs(#20422,79,#20418,0,"i")
 hasLocation(#20422,#20253)
 enclosing_stmt(#20422,#20418)
-exprContainers(#20422,#20001)
+expr_containers(#20422,#20001)
 literals("i","i",#20422)
 #20423=@"var;{i};{#20000}"
 variables(#20423,"i",#20000)
@@ -1282,7 +1282,7 @@ variables(#20428,"_",#20427)
 exprs(#20429,78,#20425,0,"_")
 hasLocation(#20429,#20269)
 enclosing_stmt(#20429,#20425)
-exprContainers(#20429,#20001)
+expr_containers(#20429,#20001)
 literals("_","_",#20429)
 decl(#20429,#20428)
 #20430=*
@@ -1321,12 +1321,12 @@ exprs(#20440,13,#20438,0,"f()")
 locations_default(#20441,#10000,32,5,32,7)
 hasLocation(#20440,#20441)
 enclosing_stmt(#20440,#20438)
-exprContainers(#20440,#20001)
+expr_containers(#20440,#20001)
 #20442=*
 exprs(#20442,79,#20440,-1,"f")
 hasLocation(#20442,#20287)
 enclosing_stmt(#20442,#20438)
-exprContainers(#20442,#20001)
+expr_containers(#20442,#20001)
 literals("f","f",#20442)
 bind(#20442,#20321)
 #20443=*
@@ -1341,26 +1341,26 @@ exprs(#20445,18,#20443,0,"!(x || y)")
 locations_default(#20446,#10000,35,5,35,13)
 hasLocation(#20445,#20446)
 enclosing_stmt(#20445,#20443)
-exprContainers(#20445,#20001)
+expr_containers(#20445,#20001)
 #20447=*
 exprs(#20447,63,#20445,0,"(x || y)")
 #20448=@"loc,{#10000},35,6,35,13"
 locations_default(#20448,#10000,35,6,35,13)
 hasLocation(#20447,#20448)
 enclosing_stmt(#20447,#20443)
-exprContainers(#20447,#20001)
+expr_containers(#20447,#20001)
 #20449=*
 exprs(#20449,45,#20447,0,"x || y")
 #20450=@"loc,{#10000},35,7,35,12"
 locations_default(#20450,#10000,35,7,35,12)
 hasLocation(#20449,#20450)
 enclosing_stmt(#20449,#20443)
-exprContainers(#20449,#20001)
+expr_containers(#20449,#20001)
 #20451=*
 exprs(#20451,79,#20449,0,"x")
 hasLocation(#20451,#20304)
 enclosing_stmt(#20451,#20443)
-exprContainers(#20451,#20001)
+expr_containers(#20451,#20001)
 literals("x","x",#20451)
 #20452=@"var;{x};{#20000}"
 variables(#20452,"x",#20000)
@@ -1369,7 +1369,7 @@ bind(#20451,#20452)
 exprs(#20453,79,#20449,1,"y")
 hasLocation(#20453,#20308)
 enclosing_stmt(#20453,#20443)
-exprContainers(#20453,#20001)
+expr_containers(#20453,#20001)
 literals("y","y",#20453)
 #20454=@"var;{y};{#20000}"
 variables(#20454,"y",#20000)
@@ -1384,7 +1384,7 @@ stmt_containers(#20455,#20001)
 exprs(#20457,79,#20455,0,"z")
 hasLocation(#20457,#20314)
 enclosing_stmt(#20457,#20455)
-exprContainers(#20457,#20001)
+expr_containers(#20457,#20001)
 literals("z","z",#20457)
 #20458=@"var;{z};{#20000}"
 variables(#20458,"z",#20000)

javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap

@@ -120,19 +120,19 @@ exprs(#20040,13,#20039,0,"goog.de ... 'test')")
 locations_default(#20041,#10000,1,1,1,28)
 hasLocation(#20040,#20041)
 enclosing_stmt(#20040,#20039)
-exprContainers(#20040,#20001)
+expr_containers(#20040,#20001)
 #20042=*
 exprs(#20042,14,#20040,-1,"goog.declareModuleId")
 #20043=@"loc,{#10000},1,1,1,20"
 locations_default(#20043,#10000,1,1,1,20)
 hasLocation(#20042,#20043)
 enclosing_stmt(#20042,#20039)
-exprContainers(#20042,#20001)
+expr_containers(#20042,#20001)
 #20044=*
 exprs(#20044,79,#20042,0,"goog")
 hasLocation(#20044,#20009)
 enclosing_stmt(#20044,#20039)
-exprContainers(#20044,#20001)
+expr_containers(#20044,#20001)
 literals("goog","goog",#20044)
 #20045=@"var;{goog};{#20000}"
 variables(#20045,"goog",#20000)
@@ -141,13 +141,13 @@ bind(#20044,#20045)
 exprs(#20046,0,#20042,1,"declareModuleId")
 hasLocation(#20046,#20013)
 enclosing_stmt(#20046,#20039)
-exprContainers(#20046,#20001)
+expr_containers(#20046,#20001)
 literals("declareModuleId","declareModuleId",#20046)
 #20047=*
 exprs(#20047,4,#20040,0,"'test'")
 hasLocation(#20047,#20017)
 enclosing_stmt(#20047,#20039)
-exprContainers(#20047,#20001)
+expr_containers(#20047,#20001)
 literals("test","'test'",#20047)
 #20048=*
 regexpterm(#20048,14,#20047,0,"test")
@@ -171,19 +171,19 @@ exprs(#20053,64,#20051,0,"x = 5")
 locations_default(#20054,#10000,3,12,3,16)
 hasLocation(#20053,#20054)
 enclosing_stmt(#20053,#20051)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 #20055=*
 exprs(#20055,78,#20053,0,"x")
 hasLocation(#20055,#20027)
 enclosing_stmt(#20055,#20051)
-exprContainers(#20055,#20001)
+expr_containers(#20055,#20001)
 literals("x","x",#20055)
 decl(#20055,#20038)
 #20056=*
 exprs(#20056,3,#20053,1,"5")
 hasLocation(#20056,#20031)
 enclosing_stmt(#20056,#20051)
-exprContainers(#20056,#20001)
+expr_containers(#20056,#20001)
 literals("5","5",#20056)
 #20057=*
 entry_cfg_node(#20057,#20001)

javascript/extractor/tests/closure/output/trap/googDotModule.js.trap

@@ -157,19 +157,19 @@ exprs(#20055,13,#20054,0,"goog.module('test')")
 locations_default(#20056,#10000,1,1,1,19)
 hasLocation(#20055,#20056)
 enclosing_stmt(#20055,#20054)
-exprContainers(#20055,#20001)
+expr_containers(#20055,#20001)
 #20057=*
 exprs(#20057,14,#20055,-1,"goog.module")
 #20058=@"loc,{#10000},1,1,1,11"
 locations_default(#20058,#10000,1,1,1,11)
 hasLocation(#20057,#20058)
 enclosing_stmt(#20057,#20054)
-exprContainers(#20057,#20001)
+expr_containers(#20057,#20001)
 #20059=*
 exprs(#20059,79,#20057,0,"goog")
 hasLocation(#20059,#20009)
 enclosing_stmt(#20059,#20054)
-exprContainers(#20059,#20001)
+expr_containers(#20059,#20001)
 literals("goog","goog",#20059)
 #20060=@"var;{goog};{#20000}"
 variables(#20060,"goog",#20000)
@@ -178,13 +178,13 @@ bind(#20059,#20060)
 exprs(#20061,0,#20057,1,"module")
 hasLocation(#20061,#20013)
 enclosing_stmt(#20061,#20054)
-exprContainers(#20061,#20001)
+expr_containers(#20061,#20001)
 literals("module","module",#20061)
 #20062=*
 exprs(#20062,4,#20055,0,"'test'")
 hasLocation(#20062,#20017)
 enclosing_stmt(#20062,#20054)
-exprContainers(#20062,#20001)
+expr_containers(#20062,#20001)
 literals("test","'test'",#20062)
 #20063=*
 regexpterm(#20063,14,#20062,0,"test")
@@ -202,19 +202,19 @@ exprs(#20066,64,#20065,0,"x = 5")
 locations_default(#20067,#10000,2,5,2,9)
 hasLocation(#20066,#20067)
 enclosing_stmt(#20066,#20065)
-exprContainers(#20066,#20001)
+expr_containers(#20066,#20001)
 #20068=*
 exprs(#20068,78,#20066,0,"x")
 hasLocation(#20068,#20025)
 enclosing_stmt(#20068,#20065)
-exprContainers(#20068,#20001)
+expr_containers(#20068,#20001)
 literals("x","x",#20068)
 decl(#20068,#20053)
 #20069=*
 exprs(#20069,3,#20066,1,"5")
 hasLocation(#20069,#20029)
 enclosing_stmt(#20069,#20065)
-exprContainers(#20069,#20001)
+expr_containers(#20069,#20001)
 literals("5","5",#20069)
 #20070=*
 stmts(#20070,2,#20001,2,"exports = { x: x };")
@@ -226,12 +226,12 @@ exprs(#20071,47,#20070,0,"exports = { x: x }")
 locations_default(#20072,#10000,3,1,3,18)
 hasLocation(#20071,#20072)
 enclosing_stmt(#20071,#20070)
-exprContainers(#20071,#20001)
+expr_containers(#20071,#20001)
 #20073=*
 exprs(#20073,79,#20071,0,"exports")
 hasLocation(#20073,#20033)
 enclosing_stmt(#20073,#20070)
-exprContainers(#20073,#20001)
+expr_containers(#20073,#20001)
 literals("exports","exports",#20073)
 bind(#20073,#20052)
 #20074=*
@@ -240,7 +240,7 @@ exprs(#20074,8,#20071,1,"{ x: x }")
 locations_default(#20075,#10000,3,11,3,18)
 hasLocation(#20074,#20075)
 enclosing_stmt(#20074,#20070)
-exprContainers(#20074,#20001)
+expr_containers(#20074,#20001)
 #20076=*
 properties(#20076,#20074,0,0,"x: x")
 #20077=@"loc,{#10000},3,13,3,16"
@@ -250,13 +250,13 @@ hasLocation(#20076,#20077)
 exprs(#20078,0,#20076,0,"x")
 hasLocation(#20078,#20039)
 enclosing_stmt(#20078,#20070)
-exprContainers(#20078,#20001)
+expr_containers(#20078,#20001)
 literals("x","x",#20078)
 #20079=*
 exprs(#20079,79,#20076,1,"x")
 hasLocation(#20079,#20043)
 enclosing_stmt(#20079,#20070)
-exprContainers(#20079,#20001)
+expr_containers(#20079,#20001)
 literals("x","x",#20079)
 bind(#20079,#20053)
 #20080=*

javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap

@@ -112,19 +112,19 @@ exprs(#20038,13,#20037,0,"goog.pr ... est.x')")
 locations_default(#20039,#10000,1,1,1,22)
 hasLocation(#20038,#20039)
 enclosing_stmt(#20038,#20037)
-exprContainers(#20038,#20001)
+expr_containers(#20038,#20001)
 #20040=*
 exprs(#20040,14,#20038,-1,"goog.provide")
 #20041=@"loc,{#10000},1,1,1,12"
 locations_default(#20041,#10000,1,1,1,12)
 hasLocation(#20040,#20041)
 enclosing_stmt(#20040,#20037)
-exprContainers(#20040,#20001)
+expr_containers(#20040,#20001)
 #20042=*
 exprs(#20042,79,#20040,0,"goog")
 hasLocation(#20042,#20009)
 enclosing_stmt(#20042,#20037)
-exprContainers(#20042,#20001)
+expr_containers(#20042,#20001)
 literals("goog","goog",#20042)
 #20043=@"var;{goog};{#20000}"
 variables(#20043,"goog",#20000)
@@ -133,13 +133,13 @@ bind(#20042,#20043)
 exprs(#20044,0,#20040,1,"provide")
 hasLocation(#20044,#20013)
 enclosing_stmt(#20044,#20037)
-exprContainers(#20044,#20001)
+expr_containers(#20044,#20001)
 literals("provide","provide",#20044)
 #20045=*
 exprs(#20045,4,#20038,0,"'test.x'")
 hasLocation(#20045,#20017)
 enclosing_stmt(#20045,#20037)
-exprContainers(#20045,#20001)
+expr_containers(#20045,#20001)
 literals("test.x","'test.x'",#20045)
 #20046=*
 regexpterm(#20046,1,#20045,0,"test.x")
@@ -173,19 +173,19 @@ exprs(#20055,47,#20054,0,"test.x = 5")
 locations_default(#20056,#10000,3,1,3,10)
 hasLocation(#20055,#20056)
 enclosing_stmt(#20055,#20054)
-exprContainers(#20055,#20001)
+expr_containers(#20055,#20001)
 #20057=*
 exprs(#20057,14,#20055,0,"test.x")
 #20058=@"loc,{#10000},3,1,3,6"
 locations_default(#20058,#10000,3,1,3,6)
 hasLocation(#20057,#20058)
 enclosing_stmt(#20057,#20054)
-exprContainers(#20057,#20001)
+expr_containers(#20057,#20001)
 #20059=*
 exprs(#20059,79,#20057,0,"test")
 hasLocation(#20059,#20023)
 enclosing_stmt(#20059,#20054)
-exprContainers(#20059,#20001)
+expr_containers(#20059,#20001)
 literals("test","test",#20059)
 #20060=@"var;{test};{#20000}"
 variables(#20060,"test",#20000)
@@ -194,13 +194,13 @@ bind(#20059,#20060)
 exprs(#20061,0,#20057,1,"x")
 hasLocation(#20061,#20027)
 enclosing_stmt(#20061,#20054)
-exprContainers(#20061,#20001)
+expr_containers(#20061,#20001)
 literals("x","x",#20061)
 #20062=*
 exprs(#20062,3,#20055,1,"5")
 hasLocation(#20062,#20031)
 enclosing_stmt(#20062,#20054)
-exprContainers(#20062,#20001)
+expr_containers(#20062,#20001)
 literals("5","5",#20062)
 #20063=*
 entry_cfg_node(#20063,#20001)

javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap

@@ -79,7 +79,7 @@ stmt_containers(#20026,#20001)
 #20027=*
 exprs(#20027,78,#20026,-1,"f")
 hasLocation(#20027,#20007)
-exprContainers(#20027,#20026)
+expr_containers(#20027,#20026)
 literals("f","f",#20027)
 decl(#20027,#20025)
 #20028=*
@@ -91,7 +91,7 @@ variables(#20029,"ä",#20028)
 #20030=*
 exprs(#20030,78,#20026,0,"\u00e4")
 hasLocation(#20030,#20011)
-exprContainers(#20030,#20026)
+expr_containers(#20030,#20026)
 literals("ä","ä",#20030)
 decl(#20030,#20029)
 #20031=@"var;{ö};{#20028}"
@@ -99,7 +99,7 @@ variables(#20031,"ö",#20028)
 #20032=*
 exprs(#20032,78,#20026,1,"\u00f6")
 hasLocation(#20032,#20015)
-exprContainers(#20032,#20026)
+expr_containers(#20032,#20026)
 literals("ö","ö",#20032)
 decl(#20032,#20031)
 #20033=@"var;{arguments};{#20028}"

javascript/extractor/tests/e4x/output/trap/regress.js.trap

@@ -58,19 +58,19 @@ stmt_containers(#20017,#20001)
 exprs(#20018,7,#20017,0,"[ x in y ]")
 hasLocation(#20018,#20003)
 enclosing_stmt(#20018,#20017)
-exprContainers(#20018,#20001)
+expr_containers(#20018,#20001)
 #20019=*
 exprs(#20019,42,#20018,0,"x in y")
 #20020=@"loc,{#10000},1,3,1,8"
 locations_default(#20020,#10000,1,3,1,8)
 hasLocation(#20019,#20020)
 enclosing_stmt(#20019,#20017)
-exprContainers(#20019,#20001)
+expr_containers(#20019,#20001)
 #20021=*
 exprs(#20021,79,#20019,0,"x")
 hasLocation(#20021,#20007)
 enclosing_stmt(#20021,#20017)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 literals("x","x",#20021)
 #20022=@"var;{x};{#20000}"
 variables(#20022,"x",#20000)
@@ -79,7 +79,7 @@ bind(#20021,#20022)
 exprs(#20023,79,#20019,1,"y")
 hasLocation(#20023,#20011)
 enclosing_stmt(#20023,#20017)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 literals("y","y",#20023)
 #20024=@"var;{y};{#20000}"
 variables(#20024,"y",#20000)

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

@@ -500,12 +500,12 @@ exprs(#20187,14,#20186,0,"items.@id")
 locations_default(#20188,#10000,1,1,1,9)
 hasLocation(#20187,#20188)
 enclosing_stmt(#20187,#20186)
-exprContainers(#20187,#20001)
+expr_containers(#20187,#20001)
 #20189=*
 exprs(#20189,79,#20187,0,"items")
 hasLocation(#20189,#20029)
 enclosing_stmt(#20189,#20186)
-exprContainers(#20189,#20001)
+expr_containers(#20189,#20001)
 literals("items","items",#20189)
 #20190=@"var;{items};{#20000}"
 variables(#20190,"items",#20000)
@@ -516,12 +516,12 @@ exprs(#20191,109,#20187,1,"@id")
 locations_default(#20192,#10000,1,7,1,9)
 hasLocation(#20191,#20192)
 enclosing_stmt(#20191,#20186)
-exprContainers(#20191,#20001)
+expr_containers(#20191,#20001)
 #20193=*
 exprs(#20193,0,#20191,0,"id")
 hasLocation(#20193,#20035)
 enclosing_stmt(#20193,#20186)
-exprContainers(#20193,#20001)
+expr_containers(#20193,#20001)
 literals("id","id",#20193)
 #20194=*
 stmts(#20194,2,#20001,1,"items.*[1];")
@@ -533,31 +533,31 @@ exprs(#20195,15,#20194,0,"items.*[1]")
 locations_default(#20196,#10000,2,1,2,10)
 hasLocation(#20195,#20196)
 enclosing_stmt(#20195,#20194)
-exprContainers(#20195,#20001)
+expr_containers(#20195,#20001)
 #20197=*
 exprs(#20197,14,#20195,0,"items.*")
 #20198=@"loc,{#10000},2,1,2,7"
 locations_default(#20198,#10000,2,1,2,7)
 hasLocation(#20197,#20198)
 enclosing_stmt(#20197,#20194)
-exprContainers(#20197,#20001)
+expr_containers(#20197,#20001)
 #20199=*
 exprs(#20199,79,#20197,0,"items")
 hasLocation(#20199,#20039)
 enclosing_stmt(#20199,#20194)
-exprContainers(#20199,#20001)
+expr_containers(#20199,#20001)
 literals("items","items",#20199)
 bind(#20199,#20190)
 #20200=*
 exprs(#20200,108,#20197,1,"*")
 hasLocation(#20200,#20043)
 enclosing_stmt(#20200,#20194)
-exprContainers(#20200,#20001)
+expr_containers(#20200,#20001)
 #20201=*
 exprs(#20201,3,#20195,1,"1")
 hasLocation(#20201,#20047)
 enclosing_stmt(#20201,#20194)
-exprContainers(#20201,#20001)
+expr_containers(#20201,#20001)
 literals("1","1",#20201)
 #20202=*
 stmts(#20202,2,#20001,2,"order.@*;")
@@ -569,12 +569,12 @@ exprs(#20203,14,#20202,0,"order.@*")
 locations_default(#20204,#10000,3,1,3,8)
 hasLocation(#20203,#20204)
 enclosing_stmt(#20203,#20202)
-exprContainers(#20203,#20001)
+expr_containers(#20203,#20001)
 #20205=*
 exprs(#20205,79,#20203,0,"order")
 hasLocation(#20205,#20053)
 enclosing_stmt(#20205,#20202)
-exprContainers(#20205,#20001)
+expr_containers(#20205,#20001)
 literals("order","order",#20205)
 #20206=@"var;{order};{#20000}"
 variables(#20206,"order",#20000)
@@ -585,12 +585,12 @@ exprs(#20207,109,#20203,1,"@*")
 locations_default(#20208,#10000,3,7,3,8)
 hasLocation(#20207,#20208)
 enclosing_stmt(#20207,#20202)
-exprContainers(#20207,#20001)
+expr_containers(#20207,#20001)
 #20209=*
 exprs(#20209,108,#20207,0,"*")
 hasLocation(#20209,#20059)
 enclosing_stmt(#20209,#20202)
-exprContainers(#20209,#20001)
+expr_containers(#20209,#20001)
 #20210=*
 stmts(#20210,2,#20001,3,"e..empl ...  == 1);")
 hasLocation(#20210,#20009)
@@ -601,26 +601,26 @@ exprs(#20211,111,#20210,0,"e..empl ... d == 1)")
 locations_default(#20212,#10000,4,1,4,34)
 hasLocation(#20211,#20212)
 enclosing_stmt(#20211,#20210)
-exprContainers(#20211,#20001)
+expr_containers(#20211,#20001)
 #20213=*
 exprs(#20213,114,#20211,0,"e..employee")
 #20214=@"loc,{#10000},4,1,4,11"
 locations_default(#20214,#10000,4,1,4,11)
 hasLocation(#20213,#20214)
 enclosing_stmt(#20213,#20210)
-exprContainers(#20213,#20001)
+expr_containers(#20213,#20001)
 #20215=*
 exprs(#20215,79,#20213,0,"e")
 hasLocation(#20215,#20063)
 enclosing_stmt(#20215,#20210)
-exprContainers(#20215,#20001)
+expr_containers(#20215,#20001)
 literals("e","e",#20215)
 bind(#20215,#20185)
 #20216=*
 exprs(#20216,0,#20213,1,"employee")
 hasLocation(#20216,#20067)
 enclosing_stmt(#20216,#20210)
-exprContainers(#20216,#20001)
+expr_containers(#20216,#20001)
 literals("employee","employee",#20216)
 #20217=*
 exprs(#20217,45,#20211,1,"@id == 0 || @id == 1")
@@ -628,32 +628,32 @@ exprs(#20217,45,#20211,1,"@id == 0 || @id == 1")
 locations_default(#20218,#10000,4,14,4,33)
 hasLocation(#20217,#20218)
 enclosing_stmt(#20217,#20210)
-exprContainers(#20217,#20001)
+expr_containers(#20217,#20001)
 #20219=*
 exprs(#20219,23,#20217,0,"@id == 0")
 #20220=@"loc,{#10000},4,14,4,21"
 locations_default(#20220,#10000,4,14,4,21)
 hasLocation(#20219,#20220)
 enclosing_stmt(#20219,#20210)
-exprContainers(#20219,#20001)
+expr_containers(#20219,#20001)
 #20221=*
 exprs(#20221,109,#20219,0,"@id")
 #20222=@"loc,{#10000},4,14,4,16"
 locations_default(#20222,#10000,4,14,4,16)
 hasLocation(#20221,#20222)
 enclosing_stmt(#20221,#20210)
-exprContainers(#20221,#20001)
+expr_containers(#20221,#20001)
 #20223=*
 exprs(#20223,0,#20221,0,"id")
 hasLocation(#20223,#20075)
 enclosing_stmt(#20223,#20210)
-exprContainers(#20223,#20001)
+expr_containers(#20223,#20001)
 literals("id","id",#20223)
 #20224=*
 exprs(#20224,3,#20219,1,"0")
 hasLocation(#20224,#20079)
 enclosing_stmt(#20224,#20210)
-exprContainers(#20224,#20001)
+expr_containers(#20224,#20001)
 literals("0","0",#20224)
 #20225=*
 exprs(#20225,23,#20217,1,"@id == 1")
@@ -661,25 +661,25 @@ exprs(#20225,23,#20217,1,"@id == 1")
 locations_default(#20226,#10000,4,26,4,33)
 hasLocation(#20225,#20226)
 enclosing_stmt(#20225,#20210)
-exprContainers(#20225,#20001)
+expr_containers(#20225,#20001)
 #20227=*
 exprs(#20227,109,#20225,0,"@id")
 #20228=@"loc,{#10000},4,26,4,28"
 locations_default(#20228,#10000,4,26,4,28)
 hasLocation(#20227,#20228)
 enclosing_stmt(#20227,#20210)
-exprContainers(#20227,#20001)
+expr_containers(#20227,#20001)
 #20229=*
 exprs(#20229,0,#20227,0,"id")
 hasLocation(#20229,#20085)
 enclosing_stmt(#20229,#20210)
-exprContainers(#20229,#20001)
+expr_containers(#20229,#20001)
 literals("id","id",#20229)
 #20230=*
 exprs(#20230,3,#20225,1,"1")
 hasLocation(#20230,#20089)
 enclosing_stmt(#20230,#20210)
-exprContainers(#20230,#20001)
+expr_containers(#20230,#20001)
 literals("1","1",#20230)
 #20231=*
 stmts(#20231,2,#20001,4,"message ... gStyle;")
@@ -691,19 +691,19 @@ exprs(#20232,97,#20231,0,"message ... ngStyle")
 locations_default(#20233,#10000,5,1,5,28)
 hasLocation(#20232,#20233)
 enclosing_stmt(#20232,#20231)
-exprContainers(#20232,#20001)
+expr_containers(#20232,#20001)
 #20234=*
 exprs(#20234,14,#20232,0,"message.@soap")
 #20235=@"loc,{#10000},5,1,5,13"
 locations_default(#20235,#10000,5,1,5,13)
 hasLocation(#20234,#20235)
 enclosing_stmt(#20234,#20231)
-exprContainers(#20234,#20001)
+expr_containers(#20234,#20001)
 #20236=*
 exprs(#20236,79,#20234,0,"message")
 hasLocation(#20236,#20095)
 enclosing_stmt(#20236,#20231)
-exprContainers(#20236,#20001)
+expr_containers(#20236,#20001)
 literals("message","message",#20236)
 #20237=@"var;{message};{#20000}"
 variables(#20237,"message",#20000)
@@ -714,18 +714,18 @@ exprs(#20238,109,#20234,1,"@soap")
 locations_default(#20239,#10000,5,9,5,13)
 hasLocation(#20238,#20239)
 enclosing_stmt(#20238,#20231)
-exprContainers(#20238,#20001)
+expr_containers(#20238,#20001)
 #20240=*
 exprs(#20240,0,#20238,0,"soap")
 hasLocation(#20240,#20101)
 enclosing_stmt(#20240,#20231)
-exprContainers(#20240,#20001)
+expr_containers(#20240,#20001)
 literals("soap","soap",#20240)
 #20241=*
 exprs(#20241,79,#20232,1,"encodingStyle")
 hasLocation(#20241,#20105)
 enclosing_stmt(#20241,#20231)
-exprContainers(#20241,#20001)
+expr_containers(#20241,#20001)
 literals("encodingStyle","encodingStyle",#20241)
 #20242=@"var;{encodingStyle};{#20000}"
 variables(#20242,"encodingStyle",#20000)
@@ -740,32 +740,32 @@ exprs(#20244,97,#20243,0,"message.soap::Body")
 locations_default(#20245,#10000,6,1,6,18)
 hasLocation(#20244,#20245)
 enclosing_stmt(#20244,#20243)
-exprContainers(#20244,#20001)
+expr_containers(#20244,#20001)
 #20246=*
 exprs(#20246,14,#20244,0,"message.soap")
 #20247=@"loc,{#10000},6,1,6,12"
 locations_default(#20247,#10000,6,1,6,12)
 hasLocation(#20246,#20247)
 enclosing_stmt(#20246,#20243)
-exprContainers(#20246,#20001)
+expr_containers(#20246,#20001)
 #20248=*
 exprs(#20248,79,#20246,0,"message")
 hasLocation(#20248,#20109)
 enclosing_stmt(#20248,#20243)
-exprContainers(#20248,#20001)
+expr_containers(#20248,#20001)
 literals("message","message",#20248)
 bind(#20248,#20237)
 #20249=*
 exprs(#20249,0,#20246,1,"soap")
 hasLocation(#20249,#20113)
 enclosing_stmt(#20249,#20243)
-exprContainers(#20249,#20001)
+expr_containers(#20249,#20001)
 literals("soap","soap",#20249)
 #20250=*
 exprs(#20250,79,#20244,1,"Body")
 hasLocation(#20250,#20117)
 enclosing_stmt(#20250,#20243)
-exprContainers(#20250,#20001)
+expr_containers(#20250,#20001)
 literals("Body","Body",#20250)
 #20251=@"var;{Body};{#20000}"
 variables(#20251,"Body",#20000)
@@ -780,12 +780,12 @@ exprs(#20253,14,#20252,0,"items.@[f()]")
 locations_default(#20254,#10000,7,1,7,12)
 hasLocation(#20253,#20254)
 enclosing_stmt(#20253,#20252)
-exprContainers(#20253,#20001)
+expr_containers(#20253,#20001)
 #20255=*
 exprs(#20255,79,#20253,0,"items")
 hasLocation(#20255,#20121)
 enclosing_stmt(#20255,#20252)
-exprContainers(#20255,#20001)
+expr_containers(#20255,#20001)
 literals("items","items",#20255)
 bind(#20255,#20190)
 #20256=*
@@ -794,19 +794,19 @@ exprs(#20256,110,#20253,1,"@[f()]")
 locations_default(#20257,#10000,7,7,7,12)
 hasLocation(#20256,#20257)
 enclosing_stmt(#20256,#20252)
-exprContainers(#20256,#20001)
+expr_containers(#20256,#20001)
 #20258=*
 exprs(#20258,13,#20256,0,"f()")
 #20259=@"loc,{#10000},7,9,7,11"
 locations_default(#20259,#10000,7,9,7,11)
 hasLocation(#20258,#20259)
 enclosing_stmt(#20258,#20252)
-exprContainers(#20258,#20001)
+expr_containers(#20258,#20001)
 #20260=*
 exprs(#20260,79,#20258,-1,"f")
 hasLocation(#20260,#20129)
 enclosing_stmt(#20260,#20252)
-exprContainers(#20260,#20001)
+expr_containers(#20260,#20001)
 literals("f","f",#20260)
 #20261=@"var;{f};{#20000}"
 variables(#20261,"f",#20000)
@@ -821,26 +821,26 @@ exprs(#20263,97,#20262,0,"message.soap::[g()]")
 locations_default(#20264,#10000,8,1,8,19)
 hasLocation(#20263,#20264)
 enclosing_stmt(#20263,#20262)
-exprContainers(#20263,#20001)
+expr_containers(#20263,#20001)
 #20265=*
 exprs(#20265,14,#20263,0,"message.soap")
 #20266=@"loc,{#10000},8,1,8,12"
 locations_default(#20266,#10000,8,1,8,12)
 hasLocation(#20265,#20266)
 enclosing_stmt(#20265,#20262)
-exprContainers(#20265,#20001)
+expr_containers(#20265,#20001)
 #20267=*
 exprs(#20267,79,#20265,0,"message")
 hasLocation(#20267,#20139)
 enclosing_stmt(#20267,#20262)
-exprContainers(#20267,#20001)
+expr_containers(#20267,#20001)
 literals("message","message",#20267)
 bind(#20267,#20237)
 #20268=*
 exprs(#20268,0,#20265,1,"soap")
 hasLocation(#20268,#20143)
 enclosing_stmt(#20268,#20262)
-exprContainers(#20268,#20001)
+expr_containers(#20268,#20001)
 literals("soap","soap",#20268)
 #20269=*
 exprs(#20269,7,#20263,1,"[g()]")
@@ -848,19 +848,19 @@ exprs(#20269,7,#20263,1,"[g()]")
 locations_default(#20270,#10000,8,15,8,19)
 hasLocation(#20269,#20270)
 enclosing_stmt(#20269,#20262)
-exprContainers(#20269,#20001)
+expr_containers(#20269,#20001)
 #20271=*
 exprs(#20271,13,#20269,0,"g()")
 #20272=@"loc,{#10000},8,16,8,18"
 locations_default(#20272,#10000,8,16,8,18)
 hasLocation(#20271,#20272)
 enclosing_stmt(#20271,#20262)
-exprContainers(#20271,#20001)
+expr_containers(#20271,#20001)
 #20273=*
 exprs(#20273,79,#20271,-1,"g")
 hasLocation(#20273,#20149)
 enclosing_stmt(#20273,#20262)
-exprContainers(#20273,#20001)
+expr_containers(#20273,#20001)
 literals("g","g",#20273)
 #20274=@"var;{g};{#20000}"
 variables(#20274,"g",#20000)
@@ -878,12 +878,12 @@ exprs(#20277,64,#20275,0,"e = <?x ...  </elt>")
 locations_default(#20278,#10000,10,5,13,8)
 hasLocation(#20277,#20278)
 enclosing_stmt(#20277,#20275)
-exprContainers(#20277,#20001)
+expr_containers(#20277,#20001)
 #20279=*
 exprs(#20279,78,#20277,0,"e")
 hasLocation(#20279,#20161)
 enclosing_stmt(#20279,#20275)
-exprContainers(#20279,#20001)
+expr_containers(#20279,#20001)
 literals("e","e",#20279)
 decl(#20279,#20185)
 #20280=*
@@ -892,18 +892,18 @@ exprs(#20280,89,#20277,1,"<?xml v ...  </elt>")
 locations_default(#20281,#10000,10,9,13,8)
 hasLocation(#20280,#20281)
 enclosing_stmt(#20280,#20275)
-exprContainers(#20280,#20001)
+expr_containers(#20280,#20001)
 #20282=*
 exprs(#20282,0,#20280,-1,"elt")
 hasLocation(#20282,#20167)
 enclosing_stmt(#20282,#20275)
-exprContainers(#20282,#20001)
+expr_containers(#20282,#20001)
 literals("elt","elt",#20282)
 #20283=*
 exprs(#20283,4,#20280,-2,"\n  <!-- ...  ]]>\n  ")
 hasLocation(#20283,#20171)
 enclosing_stmt(#20283,#20275)
-exprContainers(#20283,#20001)
+expr_containers(#20283,#20001)
 literals("
   
    some <cdata> 

javascript/extractor/tests/encoding/output/trap/surrogates.js.trap

@@ -217,7 +217,7 @@ stmt_containers(#20074,#20001)
 exprs(#20075,4,#20074,0,"'\ud800'")
 hasLocation(#20075,#20032)
 enclosing_stmt(#20075,#20074)
-exprContainers(#20075,#20001)
+expr_containers(#20075,#20001)
 literals("?","'\ud800'",#20075)
 #20076=*
 regexpterm(#20076,14,#20075,0,"?")
@@ -233,7 +233,7 @@ stmt_containers(#20078,#20001)
 exprs(#20079,4,#20078,0,"'foo\ud800'")
 hasLocation(#20079,#20036)
 enclosing_stmt(#20079,#20078)
-exprContainers(#20079,#20001)
+expr_containers(#20079,#20001)
 literals("foo?","'foo\ud800'",#20079)
 #20080=*
 regexpterm(#20080,14,#20079,0,"foo?")
@@ -249,7 +249,7 @@ stmt_containers(#20082,#20001)
 exprs(#20083,4,#20082,0,"'\ud800bar'")
 hasLocation(#20083,#20040)
 enclosing_stmt(#20083,#20082)
-exprContainers(#20083,#20001)
+expr_containers(#20083,#20001)
 literals("?bar","'\ud800bar'",#20083)
 #20084=*
 regexpterm(#20084,14,#20083,0,"?bar")
@@ -265,7 +265,7 @@ stmt_containers(#20086,#20001)
 exprs(#20087,4,#20086,0,"'foo\ud800bar'")
 hasLocation(#20087,#20044)
 enclosing_stmt(#20087,#20086)
-exprContainers(#20087,#20001)
+expr_containers(#20087,#20001)
 literals("foo?bar","'foo\ud800bar'",#20087)
 #20088=*
 regexpterm(#20088,14,#20087,0,"foo?bar")
@@ -281,7 +281,7 @@ stmt_containers(#20090,#20001)
 exprs(#20091,5,#20090,0,"/\uD800/")
 hasLocation(#20091,#20048)
 enclosing_stmt(#20091,#20090)
-exprContainers(#20091,#20001)
+expr_containers(#20091,#20001)
 literals("/\uD800/","/\uD800/",#20091)
 #20092=*
 regexpterm(#20092,16,#20091,0,"\uD800")
@@ -297,7 +297,7 @@ stmt_containers(#20094,#20001)
 exprs(#20095,5,#20094,0,"/foo\ud800/")
 hasLocation(#20095,#20052)
 enclosing_stmt(#20095,#20094)
-exprContainers(#20095,#20001)
+expr_containers(#20095,#20001)
 literals("/foo\ud800/","/foo\ud800/",#20095)
 #20096=*
 regexpterm(#20096,1,#20095,0,"foo\ud800")
@@ -324,7 +324,7 @@ stmt_containers(#20102,#20001)
 exprs(#20103,5,#20102,0,"/\ud800bar/")
 hasLocation(#20103,#20056)
 enclosing_stmt(#20103,#20102)
-exprContainers(#20103,#20001)
+expr_containers(#20103,#20001)
 literals("/\ud800bar/","/\ud800bar/",#20103)
 #20104=*
 regexpterm(#20104,1,#20103,0,"\ud800bar")
@@ -351,7 +351,7 @@ stmt_containers(#20110,#20001)
 exprs(#20111,5,#20110,0,"/foo\ud800bar/")
 hasLocation(#20111,#20060)
 enclosing_stmt(#20111,#20110)
-exprContainers(#20111,#20001)
+expr_containers(#20111,#20001)
 literals("/foo\ud800bar/","/foo\ud800bar/",#20111)
 #20112=*
 regexpterm(#20112,1,#20111,0,"foo\ud800bar")
@@ -384,7 +384,7 @@ stmt_containers(#20120,#20001)
 exprs(#20121,4,#20120,0,"'\udc00\ud800'")
 hasLocation(#20121,#20064)
 enclosing_stmt(#20121,#20120)
-exprContainers(#20121,#20001)
+expr_containers(#20121,#20001)
 literals("??","'\udc00\ud800'",#20121)
 #20122=*
 regexpterm(#20122,14,#20121,0,"??")
@@ -400,7 +400,7 @@ stmt_containers(#20124,#20001)
 exprs(#20125,4,#20124,0,"'\uD834\uDF06'")
 hasLocation(#20125,#20068)
 enclosing_stmt(#20125,#20124)
-exprContainers(#20125,#20001)
+expr_containers(#20125,#20001)
 literals("𝌆","'\uD834\uDF06'",#20125)
 #20126=*
 regexpterm(#20126,14,#20125,0,"𝌆")

javascript/extractor/tests/encoding/output/trap/unicode.js.trap

@@ -33,7 +33,7 @@ stmt_containers(#20007,#20001)
 exprs(#20008,4,#20007,0,"""Semml\u00e9""")
 hasLocation(#20008,#20003)
 enclosing_stmt(#20008,#20007)
-exprContainers(#20008,#20001)
+expr_containers(#20008,#20001)
 literals("Semmlé","""Semmlé""",#20008)
 #20009=*
 regexpterm(#20009,14,#20008,0,"Semmlé")

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

@@ -68,24 +68,24 @@ stmt_containers(#20021,#20001)
 exprs(#20022,47,#20021,0,"(x = 0) = y")
 hasLocation(#20022,#20003)
 enclosing_stmt(#20022,#20021)
-exprContainers(#20022,#20001)
+expr_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)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 #20025=*
 exprs(#20025,79,#20023,0,"x")
 hasLocation(#20025,#20007)
 enclosing_stmt(#20025,#20021)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 #20026=*
 exprs(#20026,79,#20022,1,"y")
 hasLocation(#20026,#20017)
 enclosing_stmt(#20026,#20021)
-exprContainers(#20026,#20001)
+expr_containers(#20026,#20001)
 literals("y","y",#20026)
 #20027=@"var;{y};{#20000}"
 variables(#20027,"y",#20000)

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

@@ -62,19 +62,19 @@ exprs(#20019,64,#20018,0,"class = 23")
 locations_default(#20020,#10000,1,5,1,14)
 hasLocation(#20019,#20020)
 enclosing_stmt(#20019,#20018)
-exprContainers(#20019,#20001)
+expr_containers(#20019,#20001)
 #20021=*
 exprs(#20021,78,#20019,0,"class")
 hasLocation(#20021,#20007)
 enclosing_stmt(#20021,#20018)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 literals("class","class",#20021)
 decl(#20021,#20017)
 #20022=*
 exprs(#20022,3,#20019,1,"23")
 hasLocation(#20022,#20011)
 enclosing_stmt(#20022,#20018)
-exprContainers(#20022,#20001)
+expr_containers(#20022,#20001)
 literals("23","23",#20022)
 #20023=*
 entry_cfg_node(#20023,#20001)

javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap

@@ -77,19 +77,19 @@ exprs(#20025,47,#20024,0,"[x=42] = []")
 locations_default(#20026,#10000,1,1,1,11)
 hasLocation(#20025,#20026)
 enclosing_stmt(#20025,#20024)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 #20027=*
 exprs(#20027,67,#20025,0,"[x=42]")
 #20028=@"loc,{#10000},1,1,1,6"
 locations_default(#20028,#10000,1,1,1,6)
 hasLocation(#20027,#20028)
 enclosing_stmt(#20027,#20024)
-exprContainers(#20027,#20001)
+expr_containers(#20027,#20001)
 #20029=*
 exprs(#20029,79,#20027,0,"x")
 hasLocation(#20029,#20007)
 enclosing_stmt(#20029,#20024)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 literals("x","x",#20029)
 #20030=@"var;{x};{#20000}"
 variables(#20030,"x",#20000)
@@ -98,7 +98,7 @@ bind(#20029,#20030)
 exprs(#20031,3,#20027,-2,"42")
 hasLocation(#20031,#20011)
 enclosing_stmt(#20031,#20024)
-exprContainers(#20031,#20001)
+expr_containers(#20031,#20001)
 literals("42","42",#20031)
 arraySize(#20027,1)
 #20032=*
@@ -107,7 +107,7 @@ exprs(#20032,7,#20025,1,"[]")
 locations_default(#20033,#10000,1,10,1,11)
 hasLocation(#20032,#20033)
 enclosing_stmt(#20032,#20024)
-exprContainers(#20032,#20001)
+expr_containers(#20032,#20001)
 arraySize(#20032,0)
 #20034=*
 entry_cfg_node(#20034,#20001)

javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap

@@ -146,7 +146,7 @@ stmt_containers(#20051,#20001)
 #20052=*
 exprs(#20052,78,#20051,-1,"cdr")
 hasLocation(#20052,#20013)
-exprContainers(#20052,#20051)
+expr_containers(#20052,#20051)
 literals("cdr","cdr",#20052)
 decl(#20052,#20050)
 #20053=*
@@ -160,7 +160,7 @@ variables(#20055,"o",#20053)
 #20056=*
 exprs(#20056,78,#20051,0,"o")
 hasLocation(#20056,#20017)
-exprContainers(#20056,#20051)
+expr_containers(#20056,#20051)
 literals("o","o",#20056)
 decl(#20056,#20055)
 #20057=@"var;{arguments};{#20053}"
@@ -184,19 +184,19 @@ exprs(#20062,64,#20060,0,"[, ...ys] = o")
 locations_default(#20063,#10000,2,7,2,19)
 hasLocation(#20062,#20063)
 enclosing_stmt(#20062,#20060)
-exprContainers(#20062,#20051)
+expr_containers(#20062,#20051)
 #20064=*
 exprs(#20064,67,#20062,0,"[, ...ys]")
 #20065=@"loc,{#10000},2,7,2,15"
 locations_default(#20065,#10000,2,7,2,15)
 hasLocation(#20064,#20065)
 enclosing_stmt(#20064,#20060)
-exprContainers(#20064,#20051)
+expr_containers(#20064,#20051)
 #20066=*
 exprs(#20066,78,#20064,-1,"ys")
 hasLocation(#20066,#20031)
 enclosing_stmt(#20066,#20060)
-exprContainers(#20066,#20051)
+expr_containers(#20066,#20051)
 literals("ys","ys",#20066)
 decl(#20066,#20054)
 arraySize(#20064,1)
@@ -204,7 +204,7 @@ arraySize(#20064,1)
 exprs(#20067,79,#20062,1,"o")
 hasLocation(#20067,#20037)
 enclosing_stmt(#20067,#20060)
-exprContainers(#20067,#20051)
+expr_containers(#20067,#20051)
 literals("o","o",#20067)
 bind(#20067,#20055)
 #20068=*
@@ -217,7 +217,7 @@ stmt_containers(#20068,#20051)
 exprs(#20070,79,#20068,0,"ys")
 hasLocation(#20070,#20043)
 enclosing_stmt(#20070,#20068)
-exprContainers(#20070,#20051)
+expr_containers(#20070,#20051)
 literals("ys","ys",#20070)
 bind(#20070,#20054)
 #20071=*

javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap

@@ -266,26 +266,26 @@ exprs(#20100,13,#20099,0,"[""a"", "" ... length)")
 locations_default(#20101,#10000,1,1,1,37)
 hasLocation(#20100,#20101)
 enclosing_stmt(#20100,#20099)
-exprContainers(#20100,#20001)
+expr_containers(#20100,#20001)
 #20102=*
 exprs(#20102,14,#20100,-1,"[""a"", "" ... c""].map")
 #20103=@"loc,{#10000},1,1,1,22"
 locations_default(#20103,#10000,1,1,1,22)
 hasLocation(#20102,#20103)
 enclosing_stmt(#20102,#20099)
-exprContainers(#20102,#20001)
+expr_containers(#20102,#20001)
 #20104=*
 exprs(#20104,7,#20102,0,"[""a"", ""ab"", ""abc""]")
 #20105=@"loc,{#10000},1,1,1,18"
 locations_default(#20105,#10000,1,1,1,18)
 hasLocation(#20104,#20105)
 enclosing_stmt(#20104,#20099)
-exprContainers(#20104,#20001)
+expr_containers(#20104,#20001)
 #20106=*
 exprs(#20106,4,#20104,0,"""a""")
 hasLocation(#20106,#20011)
 enclosing_stmt(#20106,#20099)
-exprContainers(#20106,#20001)
+expr_containers(#20106,#20001)
 literals("a","""a""",#20106)
 #20107=*
 regexpterm(#20107,14,#20106,0,"a")
@@ -297,7 +297,7 @@ regexpConstValue(#20107,"a")
 exprs(#20109,4,#20104,1,"""ab""")
 hasLocation(#20109,#20015)
 enclosing_stmt(#20109,#20099)
-exprContainers(#20109,#20001)
+expr_containers(#20109,#20001)
 literals("ab","""ab""",#20109)
 #20110=*
 regexpterm(#20110,14,#20109,0,"ab")
@@ -309,7 +309,7 @@ regexpConstValue(#20110,"ab")
 exprs(#20112,4,#20104,2,"""abc""")
 hasLocation(#20112,#20019)
 enclosing_stmt(#20112,#20099)
-exprContainers(#20112,#20001)
+expr_containers(#20112,#20001)
 literals("abc","""abc""",#20112)
 #20113=*
 regexpterm(#20113,14,#20112,0,"abc")
@@ -322,7 +322,7 @@ arraySize(#20104,3)
 exprs(#20115,0,#20102,1,"map")
 hasLocation(#20115,#20025)
 enclosing_stmt(#20115,#20099)
-exprContainers(#20115,#20001)
+expr_containers(#20115,#20001)
 literals("map","map",#20115)
 #20116=*
 exprs(#20116,65,#20100,0,"s => s.length")
@@ -330,7 +330,7 @@ exprs(#20116,65,#20100,0,"s => s.length")
 locations_default(#20117,#10000,1,24,1,36)
 hasLocation(#20116,#20117)
 enclosing_stmt(#20116,#20099)
-exprContainers(#20116,#20001)
+expr_containers(#20116,#20001)
 #20118=*
 scopes(#20118,1)
 scopenodes(#20116,#20118)
@@ -340,7 +340,7 @@ variables(#20119,"s",#20118)
 #20120=*
 exprs(#20120,78,#20116,0,"s")
 hasLocation(#20120,#20029)
-exprContainers(#20120,#20116)
+expr_containers(#20120,#20116)
 literals("s","s",#20120)
 decl(#20120,#20119)
 #20121=*
@@ -348,17 +348,17 @@ exprs(#20121,14,#20116,-2,"s.length")
 #20122=@"loc,{#10000},1,29,1,36"
 locations_default(#20122,#10000,1,29,1,36)
 hasLocation(#20121,#20122)
-exprContainers(#20121,#20116)
+expr_containers(#20121,#20116)
 #20123=*
 exprs(#20123,79,#20121,0,"s")
 hasLocation(#20123,#20033)
-exprContainers(#20123,#20116)
+expr_containers(#20123,#20116)
 literals("s","s",#20123)
 bind(#20123,#20119)
 #20124=*
 exprs(#20124,0,#20121,1,"length")
 hasLocation(#20124,#20037)
-exprContainers(#20124,#20116)
+expr_containers(#20124,#20116)
 literals("length","length",#20124)
 #20125=*
 stmts(#20125,2,#20001,1,"setInte ...  1000);")
@@ -370,12 +370,12 @@ exprs(#20126,13,#20125,0,"setInte ... , 1000)")
 locations_default(#20127,#10000,2,1,2,30)
 hasLocation(#20126,#20127)
 enclosing_stmt(#20126,#20125)
-exprContainers(#20126,#20001)
+expr_containers(#20126,#20001)
 #20128=*
 exprs(#20128,79,#20126,-1,"setInterval")
 hasLocation(#20128,#20043)
 enclosing_stmt(#20128,#20125)
-exprContainers(#20128,#20001)
+expr_containers(#20128,#20001)
 literals("setInterval","setInterval",#20128)
 #20129=@"var;{setInterval};{#20000}"
 variables(#20129,"setInterval",#20000)
@@ -386,7 +386,7 @@ exprs(#20130,65,#20126,0,"() => ++cnt")
 locations_default(#20131,#10000,2,13,2,23)
 hasLocation(#20130,#20131)
 enclosing_stmt(#20130,#20125)
-exprContainers(#20130,#20001)
+expr_containers(#20130,#20001)
 #20132=*
 scopes(#20132,1)
 scopenodes(#20130,#20132)
@@ -396,11 +396,11 @@ exprs(#20133,59,#20130,-2,"++cnt")
 #20134=@"loc,{#10000},2,19,2,23"
 locations_default(#20134,#10000,2,19,2,23)
 hasLocation(#20133,#20134)
-exprContainers(#20133,#20130)
+expr_containers(#20133,#20130)
 #20135=*
 exprs(#20135,79,#20133,0,"cnt")
 hasLocation(#20135,#20055)
-exprContainers(#20135,#20130)
+expr_containers(#20135,#20130)
 literals("cnt","cnt",#20135)
 #20136=@"var;{cnt};{#20000}"
 variables(#20136,"cnt",#20000)
@@ -409,7 +409,7 @@ bind(#20135,#20136)
 exprs(#20137,3,#20126,1,"1000")
 hasLocation(#20137,#20059)
 enclosing_stmt(#20137,#20125)
-exprContainers(#20137,#20001)
+expr_containers(#20137,#20001)
 literals("1000","1000",#20137)
 #20138=*
 stmts(#20138,2,#20001,2,"setTime ... 60000);")
@@ -421,12 +421,12 @@ exprs(#20139,13,#20138,0,"setTime ...  60000)")
 locations_default(#20140,#10000,3,1,3,47)
 hasLocation(#20139,#20140)
 enclosing_stmt(#20139,#20138)
-exprContainers(#20139,#20001)
+expr_containers(#20139,#20001)
 #20141=*
 exprs(#20141,79,#20139,-1,"setTimeout")
 hasLocation(#20141,#20065)
 enclosing_stmt(#20141,#20138)
-exprContainers(#20141,#20001)
+expr_containers(#20141,#20001)
 literals("setTimeout","setTimeout",#20141)
 #20142=@"var;{setTimeout};{#20000}"
 variables(#20142,"setTimeout",#20000)
@@ -437,7 +437,7 @@ exprs(#20143,65,#20139,0,"() => { ... p!""); }")
 locations_default(#20144,#10000,3,12,3,39)
 hasLocation(#20143,#20144)
 enclosing_stmt(#20143,#20138)
-exprContainers(#20143,#20001)
+expr_containers(#20143,#20001)
 #20145=*
 scopes(#20145,1)
 scopenodes(#20143,#20145)
@@ -460,12 +460,12 @@ exprs(#20150,13,#20148,0,"alert(""Wake up!"")")
 locations_default(#20151,#10000,3,20,3,36)
 hasLocation(#20150,#20151)
 enclosing_stmt(#20150,#20148)
-exprContainers(#20150,#20143)
+expr_containers(#20150,#20143)
 #20152=*
 exprs(#20152,79,#20150,-1,"alert")
 hasLocation(#20152,#20077)
 enclosing_stmt(#20152,#20148)
-exprContainers(#20152,#20143)
+expr_containers(#20152,#20143)
 literals("alert","alert",#20152)
 #20153=@"var;{alert};{#20000}"
 variables(#20153,"alert",#20000)
@@ -474,7 +474,7 @@ bind(#20152,#20153)
 exprs(#20154,4,#20150,0,"""Wake up!""")
 hasLocation(#20154,#20081)
 enclosing_stmt(#20154,#20148)
-exprContainers(#20154,#20143)
+expr_containers(#20154,#20143)
 literals("Wake up!","""Wake up!""",#20154)
 #20155=*
 regexpterm(#20155,14,#20154,0,"Wake up!")
@@ -486,7 +486,7 @@ regexpConstValue(#20155,"Wake up!")
 exprs(#20157,3,#20139,1,"60000")
 hasLocation(#20157,#20091)
 enclosing_stmt(#20157,#20138)
-exprContainers(#20157,#20001)
+expr_containers(#20157,#20001)
 literals("60000","60000",#20157)
 #20158=*
 entry_cfg_node(#20158,#20001)

javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap

@@ -227,7 +227,7 @@ stmt_containers(#20080,#20001)
 exprs(#20081,78,#20080,0,"A")
 hasLocation(#20081,#20021)
 enclosing_stmt(#20081,#20080)
-exprContainers(#20081,#20001)
+expr_containers(#20081,#20001)
 literals("A","A",#20081)
 decl(#20081,#20078)
 typedecl(#20081,#20079)
@@ -244,7 +244,7 @@ hasLocation(#20083,#20084)
 exprs(#20085,0,#20083,0,"x")
 hasLocation(#20085,#20027)
 enclosing_stmt(#20085,#20080)
-exprContainers(#20085,#20001)
+expr_containers(#20085,#20001)
 literals("x","x",#20085)
 #20086=*
 exprs(#20086,9,#20083,1,"() {\n   ... _x;\n  }")
@@ -252,7 +252,7 @@ exprs(#20086,9,#20083,1,"() {\n   ... _x;\n  }")
 locations_default(#20087,#10000,2,8,4,3)
 hasLocation(#20086,#20087)
 enclosing_stmt(#20086,#20080)
-exprContainers(#20086,#20001)
+expr_containers(#20086,#20001)
 #20088=*
 scopes(#20088,1)
 scopenodes(#20086,#20088)
@@ -278,17 +278,17 @@ exprs(#20094,14,#20092,0,"this._x")
 locations_default(#20095,#10000,3,12,3,18)
 hasLocation(#20094,#20095)
 enclosing_stmt(#20094,#20092)
-exprContainers(#20094,#20086)
+expr_containers(#20094,#20086)
 #20096=*
 exprs(#20096,6,#20094,0,"this")
 hasLocation(#20096,#20037)
 enclosing_stmt(#20096,#20092)
-exprContainers(#20096,#20086)
+expr_containers(#20096,#20086)
 #20097=*
 exprs(#20097,0,#20094,1,"_x")
 hasLocation(#20097,#20041)
 enclosing_stmt(#20097,#20092)
-exprContainers(#20097,#20086)
+expr_containers(#20097,#20086)
 literals("_x","_x",#20097)
 isMethod(#20083)
 #20098=*
@@ -300,7 +300,7 @@ hasLocation(#20098,#20099)
 exprs(#20100,0,#20098,0,"x")
 hasLocation(#20100,#20049)
 enclosing_stmt(#20100,#20080)
-exprContainers(#20100,#20001)
+expr_containers(#20100,#20001)
 literals("x","x",#20100)
 #20101=*
 exprs(#20101,9,#20098,1,"(v) {\n  ... +v;\n  }")
@@ -308,7 +308,7 @@ exprs(#20101,9,#20098,1,"(v) {\n  ... +v;\n  }")
 locations_default(#20102,#10000,5,8,7,3)
 hasLocation(#20101,#20102)
 enclosing_stmt(#20101,#20080)
-exprContainers(#20101,#20001)
+expr_containers(#20101,#20001)
 #20103=*
 scopes(#20103,1)
 scopenodes(#20101,#20103)
@@ -318,7 +318,7 @@ variables(#20104,"v",#20103)
 #20105=*
 exprs(#20105,78,#20101,0,"v")
 hasLocation(#20105,#20053)
-exprContainers(#20105,#20101)
+expr_containers(#20105,#20101)
 literals("v","v",#20105)
 decl(#20105,#20104)
 #20106=@"var;{arguments};{#20103}"
@@ -342,24 +342,24 @@ exprs(#20111,47,#20109,0,"this._x = +v")
 locations_default(#20112,#10000,6,5,6,16)
 hasLocation(#20111,#20112)
 enclosing_stmt(#20111,#20109)
-exprContainers(#20111,#20101)
+expr_containers(#20111,#20101)
 #20113=*
 exprs(#20113,14,#20111,0,"this._x")
 #20114=@"loc,{#10000},6,5,6,11"
 locations_default(#20114,#10000,6,5,6,11)
 hasLocation(#20113,#20114)
 enclosing_stmt(#20113,#20109)
-exprContainers(#20113,#20101)
+expr_containers(#20113,#20101)
 #20115=*
 exprs(#20115,6,#20113,0,"this")
 hasLocation(#20115,#20059)
 enclosing_stmt(#20115,#20109)
-exprContainers(#20115,#20101)
+expr_containers(#20115,#20101)
 #20116=*
 exprs(#20116,0,#20113,1,"_x")
 hasLocation(#20116,#20063)
 enclosing_stmt(#20116,#20109)
-exprContainers(#20116,#20101)
+expr_containers(#20116,#20101)
 literals("_x","_x",#20116)
 #20117=*
 exprs(#20117,17,#20111,1,"+v")
@@ -367,12 +367,12 @@ exprs(#20117,17,#20111,1,"+v")
 locations_default(#20118,#10000,6,15,6,16)
 hasLocation(#20117,#20118)
 enclosing_stmt(#20117,#20109)
-exprContainers(#20117,#20101)
+expr_containers(#20117,#20101)
 #20119=*
 exprs(#20119,79,#20117,0,"v")
 hasLocation(#20119,#20069)
 enclosing_stmt(#20119,#20109)
-exprContainers(#20119,#20101)
+expr_containers(#20119,#20101)
 literals("v","v",#20119)
 bind(#20119,#20104)
 isMethod(#20098)
@@ -385,13 +385,13 @@ hasLocation(#20120,#20121)
 exprs(#20122,0,#20120,0,"constructor")
 hasLocation(#20122,#20121)
 enclosing_stmt(#20122,#20080)
-exprContainers(#20122,#20001)
+expr_containers(#20122,#20001)
 literals("constructor","constructor",#20122)
 #20123=*
 exprs(#20123,9,#20120,1,"() {}")
 hasLocation(#20123,#20121)
 enclosing_stmt(#20123,#20080)
-exprContainers(#20123,#20001)
+expr_containers(#20123,#20001)
 #20124=*
 scopes(#20124,1)
 scopenodes(#20123,#20124)

javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap

@@ -141,7 +141,7 @@ stmt_containers(#20048,#20001)
 exprs(#20049,78,#20048,0,"A")
 hasLocation(#20049,#20015)
 enclosing_stmt(#20049,#20048)
-exprContainers(#20049,#20001)
+expr_containers(#20049,#20001)
 literals("A","A",#20049)
 decl(#20049,#20046)
 typedecl(#20049,#20047)
@@ -158,7 +158,7 @@ hasLocation(#20051,#20052)
 exprs(#20053,0,#20051,0,"constructor")
 hasLocation(#20053,#20019)
 enclosing_stmt(#20053,#20048)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 literals("constructor","constructor",#20053)
 #20054=*
 exprs(#20054,9,#20051,1,"(x) {\n  ...  x;\n  }")
@@ -166,7 +166,7 @@ exprs(#20054,9,#20051,1,"(x) {\n  ...  x;\n  }")
 locations_default(#20055,#10000,2,14,4,3)
 hasLocation(#20054,#20055)
 enclosing_stmt(#20054,#20048)
-exprContainers(#20054,#20001)
+expr_containers(#20054,#20001)
 #20056=*
 scopes(#20056,1)
 scopenodes(#20054,#20056)
@@ -176,7 +176,7 @@ variables(#20057,"x",#20056)
 #20058=*
 exprs(#20058,78,#20054,0,"x")
 hasLocation(#20058,#20023)
-exprContainers(#20058,#20054)
+expr_containers(#20058,#20054)
 literals("x","x",#20058)
 decl(#20058,#20057)
 #20059=@"var;{arguments};{#20056}"
@@ -200,30 +200,30 @@ exprs(#20064,47,#20062,0,"this.x = x")
 locations_default(#20065,#10000,3,5,3,14)
 hasLocation(#20064,#20065)
 enclosing_stmt(#20064,#20062)
-exprContainers(#20064,#20054)
+expr_containers(#20064,#20054)
 #20066=*
 exprs(#20066,14,#20064,0,"this.x")
 #20067=@"loc,{#10000},3,5,3,10"
 locations_default(#20067,#10000,3,5,3,10)
 hasLocation(#20066,#20067)
 enclosing_stmt(#20066,#20062)
-exprContainers(#20066,#20054)
+expr_containers(#20066,#20054)
 #20068=*
 exprs(#20068,6,#20066,0,"this")
 hasLocation(#20068,#20029)
 enclosing_stmt(#20068,#20062)
-exprContainers(#20068,#20054)
+expr_containers(#20068,#20054)
 #20069=*
 exprs(#20069,0,#20066,1,"x")
 hasLocation(#20069,#20033)
 enclosing_stmt(#20069,#20062)
-exprContainers(#20069,#20054)
+expr_containers(#20069,#20054)
 literals("x","x",#20069)
 #20070=*
 exprs(#20070,79,#20064,1,"x")
 hasLocation(#20070,#20037)
 enclosing_stmt(#20070,#20062)
-exprContainers(#20070,#20054)
+expr_containers(#20070,#20054)
 literals("x","x",#20070)
 bind(#20070,#20057)
 isMethod(#20051)

javascript/extractor/tests/es2015/output/trap/class_extends.js.trap

@@ -64,7 +64,7 @@ stmt_containers(#20020,#20001)
 exprs(#20021,78,#20020,0,"Point")
 hasLocation(#20021,#20007)
 enclosing_stmt(#20021,#20020)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 literals("Point","Point",#20021)
 decl(#20021,#20018)
 typedecl(#20021,#20019)
@@ -76,7 +76,7 @@ scopenesting(#20022,#20000)
 exprs(#20023,79,#20020,1,"Object")
 hasLocation(#20023,#20011)
 enclosing_stmt(#20023,#20020)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 literals("Object","Object",#20023)
 #20024=@"var;{Object};{#20000}"
 variables(#20024,"Object",#20000)
@@ -90,13 +90,13 @@ hasLocation(#20025,#20026)
 exprs(#20027,0,#20025,0,"constructor")
 hasLocation(#20027,#20026)
 enclosing_stmt(#20027,#20020)
-exprContainers(#20027,#20001)
+expr_containers(#20027,#20001)
 literals("constructor","constructor",#20027)
 #20028=*
 exprs(#20028,9,#20025,1,"(...arg ... rgs); }")
 hasLocation(#20028,#20026)
 enclosing_stmt(#20028,#20020)
-exprContainers(#20028,#20001)
+expr_containers(#20028,#20001)
 #20029=*
 scopes(#20029,1)
 scopenodes(#20028,#20029)
@@ -106,7 +106,7 @@ variables(#20030,"args",#20029)
 #20031=*
 exprs(#20031,78,#20028,0,"args")
 hasLocation(#20031,#20026)
-exprContainers(#20031,#20028)
+expr_containers(#20031,#20028)
 literals("args","args",#20031)
 decl(#20031,#20030)
 #20032=@"var;{arguments};{#20029}"
@@ -125,22 +125,22 @@ stmt_containers(#20034,#20028)
 exprs(#20035,13,#20034,0,"super(...args)")
 hasLocation(#20035,#20026)
 enclosing_stmt(#20035,#20034)
-exprContainers(#20035,#20028)
+expr_containers(#20035,#20028)
 #20036=*
 exprs(#20036,81,#20035,-1,"super")
 hasLocation(#20036,#20026)
 enclosing_stmt(#20036,#20034)
-exprContainers(#20036,#20028)
+expr_containers(#20036,#20028)
 #20037=*
 exprs(#20037,66,#20035,0,"...args")
 hasLocation(#20037,#20026)
 enclosing_stmt(#20037,#20034)
-exprContainers(#20037,#20028)
+expr_containers(#20037,#20028)
 #20038=*
 exprs(#20038,79,#20037,0,"args")
 hasLocation(#20038,#20026)
 enclosing_stmt(#20038,#20034)
-exprContainers(#20038,#20028)
+expr_containers(#20038,#20028)
 literals("args","args",#20038)
 bind(#20038,#20030)
 isMethod(#20025)

javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap

@@ -114,7 +114,7 @@ stmt_containers(#20040,#20001)
 exprs(#20041,78,#20040,0,"Point")
 hasLocation(#20041,#20007)
 enclosing_stmt(#20041,#20040)
-exprContainers(#20041,#20001)
+expr_containers(#20041,#20001)
 literals("Point","Point",#20041)
 decl(#20041,#20038)
 typedecl(#20041,#20039)
@@ -128,33 +128,33 @@ exprs(#20043,63,#20040,1,"(Math.r ...  Array)")
 locations_default(#20044,#10000,1,21,1,52)
 hasLocation(#20043,#20044)
 enclosing_stmt(#20043,#20040)
-exprContainers(#20043,#20001)
+expr_containers(#20043,#20001)
 #20045=*
 exprs(#20045,11,#20043,0,"Math.ra ... : Array")
 #20046=@"loc,{#10000},1,22,1,51"
 locations_default(#20046,#10000,1,22,1,51)
 hasLocation(#20045,#20046)
 enclosing_stmt(#20045,#20040)
-exprContainers(#20045,#20001)
+expr_containers(#20045,#20001)
 #20047=*
 exprs(#20047,13,#20045,0,"Math.random()")
 #20048=@"loc,{#10000},1,22,1,34"
 locations_default(#20048,#10000,1,22,1,34)
 hasLocation(#20047,#20048)
 enclosing_stmt(#20047,#20040)
-exprContainers(#20047,#20001)
+expr_containers(#20047,#20001)
 #20049=*
 exprs(#20049,14,#20047,-1,"Math.random")
 #20050=@"loc,{#10000},1,22,1,32"
 locations_default(#20050,#10000,1,22,1,32)
 hasLocation(#20049,#20050)
 enclosing_stmt(#20049,#20040)
-exprContainers(#20049,#20001)
+expr_containers(#20049,#20001)
 #20051=*
 exprs(#20051,79,#20049,0,"Math")
 hasLocation(#20051,#20013)
 enclosing_stmt(#20051,#20040)
-exprContainers(#20051,#20001)
+expr_containers(#20051,#20001)
 literals("Math","Math",#20051)
 #20052=@"var;{Math};{#20000}"
 variables(#20052,"Math",#20000)
@@ -163,13 +163,13 @@ bind(#20051,#20052)
 exprs(#20053,0,#20049,1,"random")
 hasLocation(#20053,#20017)
 enclosing_stmt(#20053,#20040)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 literals("random","random",#20053)
 #20054=*
 exprs(#20054,79,#20045,1,"Object")
 hasLocation(#20054,#20025)
 enclosing_stmt(#20054,#20040)
-exprContainers(#20054,#20001)
+expr_containers(#20054,#20001)
 literals("Object","Object",#20054)
 #20055=@"var;{Object};{#20000}"
 variables(#20055,"Object",#20000)
@@ -178,7 +178,7 @@ bind(#20054,#20055)
 exprs(#20056,79,#20045,2,"Array")
 hasLocation(#20056,#20029)
 enclosing_stmt(#20056,#20040)
-exprContainers(#20056,#20001)
+expr_containers(#20056,#20001)
 literals("Array","Array",#20056)
 #20057=@"var;{Array};{#20000}"
 variables(#20057,"Array",#20000)
@@ -192,13 +192,13 @@ hasLocation(#20058,#20059)
 exprs(#20060,0,#20058,0,"constructor")
 hasLocation(#20060,#20059)
 enclosing_stmt(#20060,#20040)
-exprContainers(#20060,#20001)
+expr_containers(#20060,#20001)
 literals("constructor","constructor",#20060)
 #20061=*
 exprs(#20061,9,#20058,1,"(...arg ... rgs); }")
 hasLocation(#20061,#20059)
 enclosing_stmt(#20061,#20040)
-exprContainers(#20061,#20001)
+expr_containers(#20061,#20001)
 #20062=*
 scopes(#20062,1)
 scopenodes(#20061,#20062)
@@ -208,7 +208,7 @@ variables(#20063,"args",#20062)
 #20064=*
 exprs(#20064,78,#20061,0,"args")
 hasLocation(#20064,#20059)
-exprContainers(#20064,#20061)
+expr_containers(#20064,#20061)
 literals("args","args",#20064)
 decl(#20064,#20063)
 #20065=@"var;{arguments};{#20062}"
@@ -227,22 +227,22 @@ stmt_containers(#20067,#20061)
 exprs(#20068,13,#20067,0,"super(...args)")
 hasLocation(#20068,#20059)
 enclosing_stmt(#20068,#20067)
-exprContainers(#20068,#20061)
+expr_containers(#20068,#20061)
 #20069=*
 exprs(#20069,81,#20068,-1,"super")
 hasLocation(#20069,#20059)
 enclosing_stmt(#20069,#20067)
-exprContainers(#20069,#20061)
+expr_containers(#20069,#20061)
 #20070=*
 exprs(#20070,66,#20068,0,"...args")
 hasLocation(#20070,#20059)
 enclosing_stmt(#20070,#20067)
-exprContainers(#20070,#20061)
+expr_containers(#20070,#20061)
 #20071=*
 exprs(#20071,79,#20070,0,"args")
 hasLocation(#20071,#20059)
 enclosing_stmt(#20071,#20067)
-exprContainers(#20071,#20061)
+expr_containers(#20071,#20061)
 literals("args","args",#20071)
 bind(#20071,#20063)
 isMethod(#20058)

javascript/extractor/tests/es2015/output/trap/class_method.js.trap

@@ -131,7 +131,7 @@ stmt_containers(#20044,#20001)
 exprs(#20045,78,#20044,0,"A")
 hasLocation(#20045,#20015)
 enclosing_stmt(#20045,#20044)
-exprContainers(#20045,#20001)
+expr_containers(#20045,#20001)
 literals("A","A",#20045)
 decl(#20045,#20042)
 typedecl(#20045,#20043)
@@ -148,7 +148,7 @@ hasLocation(#20047,#20048)
 exprs(#20049,0,#20047,0,"getX")
 hasLocation(#20049,#20019)
 enclosing_stmt(#20049,#20044)
-exprContainers(#20049,#20001)
+expr_containers(#20049,#20001)
 literals("getX","getX",#20049)
 #20050=*
 exprs(#20050,9,#20047,1,"() {\n   ... .x;\n  }")
@@ -156,7 +156,7 @@ exprs(#20050,9,#20047,1,"() {\n   ... .x;\n  }")
 locations_default(#20051,#10000,2,7,4,3)
 hasLocation(#20050,#20051)
 enclosing_stmt(#20050,#20044)
-exprContainers(#20050,#20001)
+expr_containers(#20050,#20001)
 #20052=*
 scopes(#20052,1)
 scopenodes(#20050,#20052)
@@ -182,17 +182,17 @@ exprs(#20058,14,#20056,0,"this.x")
 locations_default(#20059,#10000,3,12,3,17)
 hasLocation(#20058,#20059)
 enclosing_stmt(#20058,#20056)
-exprContainers(#20058,#20050)
+expr_containers(#20058,#20050)
 #20060=*
 exprs(#20060,6,#20058,0,"this")
 hasLocation(#20060,#20029)
 enclosing_stmt(#20060,#20056)
-exprContainers(#20060,#20050)
+expr_containers(#20060,#20050)
 #20061=*
 exprs(#20061,0,#20058,1,"x")
 hasLocation(#20061,#20033)
 enclosing_stmt(#20061,#20056)
-exprContainers(#20061,#20050)
+expr_containers(#20061,#20050)
 literals("x","x",#20061)
 isMethod(#20047)
 #20062=*
@@ -204,13 +204,13 @@ hasLocation(#20062,#20063)
 exprs(#20064,0,#20062,0,"constructor")
 hasLocation(#20064,#20063)
 enclosing_stmt(#20064,#20044)
-exprContainers(#20064,#20001)
+expr_containers(#20064,#20001)
 literals("constructor","constructor",#20064)
 #20065=*
 exprs(#20065,9,#20062,1,"() {}")
 hasLocation(#20065,#20063)
 enclosing_stmt(#20065,#20044)
-exprContainers(#20065,#20001)
+expr_containers(#20065,#20001)
 #20066=*
 scopes(#20066,1)
 scopenodes(#20065,#20066)

javascript/extractor/tests/es2015/output/trap/class_static.js.trap

@@ -126,7 +126,7 @@ stmt_containers(#20042,#20001)
 exprs(#20043,78,#20042,0,"A")
 hasLocation(#20043,#20015)
 enclosing_stmt(#20043,#20042)
-exprContainers(#20043,#20001)
+expr_containers(#20043,#20001)
 literals("A","A",#20043)
 decl(#20043,#20040)
 typedecl(#20043,#20041)
@@ -143,7 +143,7 @@ hasLocation(#20045,#20046)
 exprs(#20047,0,#20045,0,"className")
 hasLocation(#20047,#20021)
 enclosing_stmt(#20047,#20042)
-exprContainers(#20047,#20001)
+expr_containers(#20047,#20001)
 literals("className","className",#20047)
 #20048=*
 exprs(#20048,9,#20045,1,"() {\n   ... A"";\n  }")
@@ -151,7 +151,7 @@ exprs(#20048,9,#20045,1,"() {\n   ... A"";\n  }")
 locations_default(#20049,#10000,2,19,4,3)
 hasLocation(#20048,#20049)
 enclosing_stmt(#20048,#20042)
-exprContainers(#20048,#20001)
+expr_containers(#20048,#20001)
 #20050=*
 scopes(#20050,1)
 scopenodes(#20048,#20050)
@@ -175,7 +175,7 @@ stmt_containers(#20054,#20048)
 exprs(#20056,4,#20054,0,"""A""")
 hasLocation(#20056,#20031)
 enclosing_stmt(#20056,#20054)
-exprContainers(#20056,#20048)
+expr_containers(#20056,#20048)
 literals("A","""A""",#20056)
 #20057=*
 regexpterm(#20057,14,#20056,0,"A")
@@ -194,13 +194,13 @@ hasLocation(#20059,#20060)
 exprs(#20061,0,#20059,0,"constructor")
 hasLocation(#20061,#20060)
 enclosing_stmt(#20061,#20042)
-exprContainers(#20061,#20001)
+expr_containers(#20061,#20001)
 literals("constructor","constructor",#20061)
 #20062=*
 exprs(#20062,9,#20059,1,"() {}")
 hasLocation(#20062,#20060)
 enclosing_stmt(#20062,#20042)
-exprContainers(#20062,#20001)
+expr_containers(#20062,#20001)
 #20063=*
 scopes(#20063,1)
 scopenodes(#20062,#20063)

javascript/extractor/tests/es2015/output/trap/classdecl.js.trap

@@ -54,7 +54,7 @@ stmt_containers(#20016,#20001)
 exprs(#20017,78,#20016,0,"Point")
 hasLocation(#20017,#20007)
 enclosing_stmt(#20017,#20016)
-exprContainers(#20017,#20001)
+expr_containers(#20017,#20001)
 literals("Point","Point",#20017)
 decl(#20017,#20014)
 typedecl(#20017,#20015)
@@ -71,13 +71,13 @@ hasLocation(#20019,#20020)
 exprs(#20021,0,#20019,0,"constructor")
 hasLocation(#20021,#20020)
 enclosing_stmt(#20021,#20016)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 literals("constructor","constructor",#20021)
 #20022=*
 exprs(#20022,9,#20019,1,"() {}")
 hasLocation(#20022,#20020)
 enclosing_stmt(#20022,#20016)
-exprContainers(#20022,#20001)
+expr_containers(#20022,#20001)
 #20023=*
 scopes(#20023,1)
 scopenodes(#20022,#20023)

javascript/extractor/tests/es2015/output/trap/classexpr.js.trap

@@ -60,14 +60,14 @@ stmt_containers(#20018,#20001)
 exprs(#20019,63,#20018,0,"(class Point {})")
 hasLocation(#20019,#20003)
 enclosing_stmt(#20019,#20018)
-exprContainers(#20019,#20001)
+expr_containers(#20019,#20001)
 #20020=*
 exprs(#20020,80,#20019,0,"class Point {}")
 #20021=@"loc,{#10000},1,2,1,15"
 locations_default(#20021,#10000,1,2,1,15)
 hasLocation(#20020,#20021)
 enclosing_stmt(#20020,#20018)
-exprContainers(#20020,#20001)
+expr_containers(#20020,#20001)
 #20022=*
 scopes(#20022,8)
 scopenodes(#20020,#20022)
@@ -80,7 +80,7 @@ local_type_names(#20024,"Point",#20022)
 exprs(#20025,78,#20020,0,"Point")
 hasLocation(#20025,#20009)
 enclosing_stmt(#20025,#20018)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 literals("Point","Point",#20025)
 decl(#20025,#20023)
 typedecl(#20025,#20024)
@@ -93,13 +93,13 @@ hasLocation(#20026,#20027)
 exprs(#20028,0,#20026,0,"constructor")
 hasLocation(#20028,#20027)
 enclosing_stmt(#20028,#20018)
-exprContainers(#20028,#20001)
+expr_containers(#20028,#20001)
 literals("constructor","constructor",#20028)
 #20029=*
 exprs(#20029,9,#20026,1,"() {}")
 hasLocation(#20029,#20027)
 enclosing_stmt(#20029,#20018)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 #20030=*
 scopes(#20030,1)
 scopenodes(#20029,#20030)

javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap

@@ -55,14 +55,14 @@ stmt_containers(#20016,#20001)
 exprs(#20017,63,#20016,0,"(class       {})")
 hasLocation(#20017,#20003)
 enclosing_stmt(#20017,#20016)
-exprContainers(#20017,#20001)
+expr_containers(#20017,#20001)
 #20018=*
 exprs(#20018,80,#20017,0,"class       {}")
 #20019=@"loc,{#10000},1,2,1,15"
 locations_default(#20019,#10000,1,2,1,15)
 hasLocation(#20018,#20019)
 enclosing_stmt(#20018,#20016)
-exprContainers(#20018,#20001)
+expr_containers(#20018,#20001)
 #20020=*
 properties(#20020,#20018,2,0,"constructor() {}")
 #20021=@"loc,{#10000},1,14,1,13"
@@ -72,13 +72,13 @@ hasLocation(#20020,#20021)
 exprs(#20022,0,#20020,0,"constructor")
 hasLocation(#20022,#20021)
 enclosing_stmt(#20022,#20016)
-exprContainers(#20022,#20001)
+expr_containers(#20022,#20001)
 literals("constructor","constructor",#20022)
 #20023=*
 exprs(#20023,9,#20020,1,"() {}")
 hasLocation(#20023,#20021)
 enclosing_stmt(#20023,#20016)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 #20024=*
 scopes(#20024,1)
 scopenodes(#20023,#20024)

javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap

@@ -82,26 +82,26 @@ exprs(#20027,47,#20026,0,"[o.x] = [42]")
 locations_default(#20028,#10000,1,1,1,12)
 hasLocation(#20027,#20028)
 enclosing_stmt(#20027,#20026)
-exprContainers(#20027,#20001)
+expr_containers(#20027,#20001)
 #20029=*
 exprs(#20029,67,#20027,0,"[o.x]")
 #20030=@"loc,{#10000},1,1,1,5"
 locations_default(#20030,#10000,1,1,1,5)
 hasLocation(#20029,#20030)
 enclosing_stmt(#20029,#20026)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 #20031=*
 exprs(#20031,14,#20029,0,"o.x")
 #20032=@"loc,{#10000},1,2,1,4"
 locations_default(#20032,#10000,1,2,1,4)
 hasLocation(#20031,#20032)
 enclosing_stmt(#20031,#20026)
-exprContainers(#20031,#20001)
+expr_containers(#20031,#20001)
 #20033=*
 exprs(#20033,79,#20031,0,"o")
 hasLocation(#20033,#20007)
 enclosing_stmt(#20033,#20026)
-exprContainers(#20033,#20001)
+expr_containers(#20033,#20001)
 literals("o","o",#20033)
 #20034=@"var;{o};{#20000}"
 variables(#20034,"o",#20000)
@@ -110,7 +110,7 @@ bind(#20033,#20034)
 exprs(#20035,0,#20031,1,"x")
 hasLocation(#20035,#20011)
 enclosing_stmt(#20035,#20026)
-exprContainers(#20035,#20001)
+expr_containers(#20035,#20001)
 literals("x","x",#20035)
 arraySize(#20029,1)
 #20036=*
@@ -119,12 +119,12 @@ exprs(#20036,7,#20027,1,"[42]")
 locations_default(#20037,#10000,1,9,1,12)
 hasLocation(#20036,#20037)
 enclosing_stmt(#20036,#20026)
-exprContainers(#20036,#20001)
+expr_containers(#20036,#20001)
 #20038=*
 exprs(#20038,3,#20036,0,"42")
 hasLocation(#20038,#20019)
 enclosing_stmt(#20038,#20026)
-exprContainers(#20038,#20001)
+expr_containers(#20038,#20001)
 literals("42","42",#20038)
 arraySize(#20036,1)
 #20039=*

javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap

@@ -92,21 +92,21 @@ exprs(#20031,63,#20030,0,"({ x: o.x } = q)")
 locations_default(#20032,#10000,1,1,1,16)
 hasLocation(#20031,#20032)
 enclosing_stmt(#20031,#20030)
-exprContainers(#20031,#20001)
+expr_containers(#20031,#20001)
 #20033=*
 exprs(#20033,47,#20031,0,"{ x: o.x } = q")
 #20034=@"loc,{#10000},1,2,1,15"
 locations_default(#20034,#10000,1,2,1,15)
 hasLocation(#20033,#20034)
 enclosing_stmt(#20033,#20030)
-exprContainers(#20033,#20001)
+expr_containers(#20033,#20001)
 #20035=*
 exprs(#20035,68,#20033,0,"{ x: o.x }")
 #20036=@"loc,{#10000},1,2,1,11"
 locations_default(#20036,#10000,1,2,1,11)
 hasLocation(#20035,#20036)
 enclosing_stmt(#20035,#20030)
-exprContainers(#20035,#20001)
+expr_containers(#20035,#20001)
 #20037=*
 properties(#20037,#20035,0,0,"x: o.x")
 #20038=@"loc,{#10000},1,4,1,9"
@@ -116,7 +116,7 @@ hasLocation(#20037,#20038)
 exprs(#20039,0,#20037,0,"x")
 hasLocation(#20039,#20009)
 enclosing_stmt(#20039,#20030)
-exprContainers(#20039,#20001)
+expr_containers(#20039,#20001)
 literals("x","x",#20039)
 #20040=*
 exprs(#20040,14,#20037,1,"o.x")
@@ -124,12 +124,12 @@ exprs(#20040,14,#20037,1,"o.x")
 locations_default(#20041,#10000,1,7,1,9)
 hasLocation(#20040,#20041)
 enclosing_stmt(#20040,#20030)
-exprContainers(#20040,#20001)
+expr_containers(#20040,#20001)
 #20042=*
 exprs(#20042,79,#20040,0,"o")
 hasLocation(#20042,#20013)
 enclosing_stmt(#20042,#20030)
-exprContainers(#20042,#20001)
+expr_containers(#20042,#20001)
 literals("o","o",#20042)
 #20043=@"var;{o};{#20000}"
 variables(#20043,"o",#20000)
@@ -138,13 +138,13 @@ bind(#20042,#20043)
 exprs(#20044,0,#20040,1,"x")
 hasLocation(#20044,#20017)
 enclosing_stmt(#20044,#20030)
-exprContainers(#20044,#20001)
+expr_containers(#20044,#20001)
 literals("x","x",#20044)
 #20045=*
 exprs(#20045,79,#20033,1,"q")
 hasLocation(#20045,#20023)
 enclosing_stmt(#20045,#20030)
-exprContainers(#20045,#20001)
+expr_containers(#20045,#20001)
 literals("q","q",#20045)
 #20046=@"var;{q};{#20000}"
 variables(#20046,"q",#20000)

javascript/extractor/tests/es2015/output/trap/const.js.trap

@@ -62,19 +62,19 @@ exprs(#20019,64,#20018,0,"x = 23")
 locations_default(#20020,#10000,1,7,1,12)
 hasLocation(#20019,#20020)
 enclosing_stmt(#20019,#20018)
-exprContainers(#20019,#20001)
+expr_containers(#20019,#20001)
 #20021=*
 exprs(#20021,78,#20019,0,"x")
 hasLocation(#20021,#20007)
 enclosing_stmt(#20021,#20018)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 literals("x","x",#20021)
 decl(#20021,#20017)
 #20022=*
 exprs(#20022,3,#20019,1,"23")
 hasLocation(#20022,#20011)
 enclosing_stmt(#20022,#20018)
-exprContainers(#20022,#20001)
+expr_containers(#20022,#20001)
 literals("23","23",#20022)
 #20023=*
 entry_cfg_node(#20023,#20001)

javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap

@@ -96,7 +96,7 @@ stmt_containers(#20033,#20001)
 #20034=*
 exprs(#20034,78,#20033,-1,"f")
 hasLocation(#20034,#20007)
-exprContainers(#20034,#20033)
+expr_containers(#20034,#20033)
 literals("f","f",#20034)
 decl(#20034,#20032)
 #20035=*
@@ -108,7 +108,7 @@ variables(#20036,"x",#20035)
 #20037=*
 exprs(#20037,78,#20033,0,"x")
 hasLocation(#20037,#20011)
-exprContainers(#20037,#20033)
+expr_containers(#20037,#20033)
 literals("x","x",#20037)
 decl(#20037,#20036)
 #20038=@"var;{y};{#20035}"
@@ -116,7 +116,7 @@ variables(#20038,"y",#20035)
 #20039=*
 exprs(#20039,78,#20033,1,"y")
 hasLocation(#20039,#20015)
-exprContainers(#20039,#20033)
+expr_containers(#20039,#20033)
 literals("y","y",#20039)
 decl(#20039,#20038)
 #20040=@"var;{arguments};{#20035}"
@@ -127,17 +127,17 @@ exprs(#20041,34,#20033,-9,"x+19")
 #20042=@"loc,{#10000},1,17,1,20"
 locations_default(#20042,#10000,1,17,1,20)
 hasLocation(#20041,#20042)
-exprContainers(#20041,#20033)
+expr_containers(#20041,#20033)
 #20043=*
 exprs(#20043,79,#20041,0,"x")
 hasLocation(#20043,#20019)
-exprContainers(#20043,#20033)
+expr_containers(#20043,#20033)
 literals("x","x",#20043)
 bind(#20043,#20036)
 #20044=*
 exprs(#20044,3,#20041,1,"19")
 hasLocation(#20044,#20023)
-exprContainers(#20044,#20033)
+expr_containers(#20044,#20033)
 literals("19","19",#20044)
 #20045=*
 stmts(#20045,1,#20033,-2,"{}")

javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap

@@ -109,7 +109,7 @@ stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,78,#20037,-1,"f")
 hasLocation(#20038,#20013)
-exprContainers(#20038,#20037)
+expr_containers(#20038,#20037)
 literals("f","f",#20038)
 decl(#20038,#20036)
 #20039=*
@@ -138,19 +138,19 @@ exprs(#20045,69,#20043,0,"yield* g()")
 locations_default(#20046,#10000,2,5,2,14)
 hasLocation(#20045,#20046)
 enclosing_stmt(#20045,#20043)
-exprContainers(#20045,#20037)
+expr_containers(#20045,#20037)
 #20047=*
 exprs(#20047,13,#20045,0,"g()")
 #20048=@"loc,{#10000},2,12,2,14"
 locations_default(#20048,#10000,2,12,2,14)
 hasLocation(#20047,#20048)
 enclosing_stmt(#20047,#20043)
-exprContainers(#20047,#20037)
+expr_containers(#20047,#20037)
 #20049=*
 exprs(#20049,79,#20047,-1,"g")
 hasLocation(#20049,#20025)
 enclosing_stmt(#20049,#20043)
-exprContainers(#20049,#20037)
+expr_containers(#20049,#20037)
 literals("g","g",#20049)
 #20050=@"var;{g};{#20000}"
 variables(#20050,"g",#20000)

javascript/extractor/tests/es2015/output/trap/destructuring.js.trap

@@ -478,7 +478,7 @@ stmt_containers(#20177,#20001)
 #20179=*
 exprs(#20179,78,#20177,-1,"f")
 hasLocation(#20179,#20031)
-exprContainers(#20179,#20177)
+expr_containers(#20179,#20177)
 literals("f","f",#20179)
 decl(#20179,#20175)
 #20180=*
@@ -498,17 +498,17 @@ exprs(#20185,67,#20177,0,"[x, y]")
 #20186=@"loc,{#10000},1,12,1,17"
 locations_default(#20186,#10000,1,12,1,17)
 hasLocation(#20185,#20186)
-exprContainers(#20185,#20177)
+expr_containers(#20185,#20177)
 #20187=*
 exprs(#20187,78,#20185,0,"x")
 hasLocation(#20187,#20037)
-exprContainers(#20187,#20177)
+expr_containers(#20187,#20177)
 literals("x","x",#20187)
 decl(#20187,#20183)
 #20188=*
 exprs(#20188,78,#20185,1,"y")
 hasLocation(#20188,#20041)
-exprContainers(#20188,#20177)
+expr_containers(#20188,#20177)
 literals("y","y",#20188)
 decl(#20188,#20184)
 arraySize(#20185,2)
@@ -533,19 +533,19 @@ exprs(#20194,64,#20192,0,"[a, [, c]] = x")
 locations_default(#20195,#10000,2,6,2,19)
 hasLocation(#20194,#20195)
 enclosing_stmt(#20194,#20192)
-exprContainers(#20194,#20177)
+expr_containers(#20194,#20177)
 #20196=*
 exprs(#20196,67,#20194,0,"[a, [, c]]")
 #20197=@"loc,{#10000},2,6,2,15"
 locations_default(#20197,#10000,2,6,2,15)
 hasLocation(#20196,#20197)
 enclosing_stmt(#20196,#20192)
-exprContainers(#20196,#20177)
+expr_containers(#20196,#20177)
 #20198=*
 exprs(#20198,78,#20196,0,"a")
 hasLocation(#20198,#20053)
 enclosing_stmt(#20198,#20192)
-exprContainers(#20198,#20177)
+expr_containers(#20198,#20177)
 literals("a","a",#20198)
 decl(#20198,#20181)
 #20199=*
@@ -554,12 +554,12 @@ exprs(#20199,67,#20196,1,"[, c]")
 locations_default(#20200,#10000,2,10,2,14)
 hasLocation(#20199,#20200)
 enclosing_stmt(#20199,#20192)
-exprContainers(#20199,#20177)
+expr_containers(#20199,#20177)
 #20201=*
 exprs(#20201,78,#20199,1,"c")
 hasLocation(#20201,#20061)
 enclosing_stmt(#20201,#20192)
-exprContainers(#20201,#20177)
+expr_containers(#20201,#20177)
 literals("c","c",#20201)
 decl(#20201,#20182)
 arraySize(#20199,2)
@@ -568,7 +568,7 @@ arraySize(#20196,2)
 exprs(#20202,79,#20194,1,"x")
 hasLocation(#20202,#20069)
 enclosing_stmt(#20202,#20192)
-exprContainers(#20202,#20177)
+expr_containers(#20202,#20177)
 literals("x","x",#20202)
 bind(#20202,#20183)
 #20203=*
@@ -595,19 +595,19 @@ exprs(#20209,7,#20207,0,"[a, c]")
 locations_default(#20210,#10000,4,9,4,14)
 hasLocation(#20209,#20210)
 enclosing_stmt(#20209,#20207)
-exprContainers(#20209,#20177)
+expr_containers(#20209,#20177)
 #20211=*
 exprs(#20211,79,#20209,0,"a")
 hasLocation(#20211,#20081)
 enclosing_stmt(#20211,#20207)
-exprContainers(#20211,#20177)
+expr_containers(#20211,#20177)
 literals("a","a",#20211)
 bind(#20211,#20181)
 #20212=*
 exprs(#20212,79,#20209,1,"c")
 hasLocation(#20212,#20085)
 enclosing_stmt(#20212,#20207)
-exprContainers(#20212,#20177)
+expr_containers(#20212,#20177)
 literals("c","c",#20212)
 bind(#20212,#20182)
 arraySize(#20209,2)
@@ -627,7 +627,7 @@ variables(#20216,"d",#20215)
 exprs(#20217,78,#20213,0,"d")
 hasLocation(#20217,#20097)
 enclosing_stmt(#20217,#20213)
-exprContainers(#20217,#20177)
+expr_containers(#20217,#20177)
 literals("d","d",#20217)
 decl(#20217,#20216)
 #20218=*
@@ -648,19 +648,19 @@ exprs(#20222,13,#20220,0,"console.log(d)")
 locations_default(#20223,#10000,6,3,6,16)
 hasLocation(#20222,#20223)
 enclosing_stmt(#20222,#20220)
-exprContainers(#20222,#20177)
+expr_containers(#20222,#20177)
 #20224=*
 exprs(#20224,14,#20222,-1,"console.log")
 #20225=@"loc,{#10000},6,3,6,13"
 locations_default(#20225,#10000,6,3,6,13)
 hasLocation(#20224,#20225)
 enclosing_stmt(#20224,#20220)
-exprContainers(#20224,#20177)
+expr_containers(#20224,#20177)
 #20226=*
 exprs(#20226,79,#20224,0,"console")
 hasLocation(#20226,#20103)
 enclosing_stmt(#20226,#20220)
-exprContainers(#20226,#20177)
+expr_containers(#20226,#20177)
 literals("console","console",#20226)
 #20227=@"var;{console};{#20000}"
 variables(#20227,"console",#20000)
@@ -669,13 +669,13 @@ bind(#20226,#20227)
 exprs(#20228,0,#20224,1,"log")
 hasLocation(#20228,#20107)
 enclosing_stmt(#20228,#20220)
-exprContainers(#20228,#20177)
+expr_containers(#20228,#20177)
 literals("log","log",#20228)
 #20229=*
 exprs(#20229,79,#20222,0,"d")
 hasLocation(#20229,#20111)
 enclosing_stmt(#20229,#20220)
-exprContainers(#20229,#20177)
+expr_containers(#20229,#20177)
 literals("d","d",#20229)
 bind(#20229,#20216)
 #20230=*
@@ -687,7 +687,7 @@ stmt_containers(#20230,#20001)
 #20232=*
 exprs(#20232,78,#20230,-1,"g")
 hasLocation(#20232,#20122)
-exprContainers(#20232,#20230)
+expr_containers(#20232,#20230)
 literals("g","g",#20232)
 decl(#20232,#20176)
 #20233=*
@@ -705,19 +705,19 @@ exprs(#20237,68,#20230,0,"{ x, y: z }")
 #20238=@"loc,{#10000},10,12,10,22"
 locations_default(#20238,#10000,10,12,10,22)
 hasLocation(#20237,#20238)
-exprContainers(#20237,#20230)
+expr_containers(#20237,#20230)
 #20239=*
 properties(#20239,#20237,0,0,"x")
 hasLocation(#20239,#20128)
 #20240=*
 exprs(#20240,0,#20239,0,"x")
 hasLocation(#20240,#20128)
-exprContainers(#20240,#20230)
+expr_containers(#20240,#20230)
 literals("x","x",#20240)
 #20241=*
 exprs(#20241,78,#20239,1,"x")
 hasLocation(#20241,#20128)
-exprContainers(#20241,#20230)
+expr_containers(#20241,#20230)
 literals("x","x",#20241)
 decl(#20241,#20235)
 #20242=*
@@ -728,12 +728,12 @@ hasLocation(#20242,#20243)
 #20244=*
 exprs(#20244,0,#20242,0,"y")
 hasLocation(#20244,#20132)
-exprContainers(#20244,#20230)
+expr_containers(#20244,#20230)
 literals("y","y",#20244)
 #20245=*
 exprs(#20245,78,#20242,1,"z")
 hasLocation(#20245,#20136)
-exprContainers(#20245,#20230)
+expr_containers(#20245,#20230)
 literals("z","z",#20245)
 decl(#20245,#20236)
 #20246=@"var;{arguments};{#20233}"
@@ -757,14 +757,14 @@ exprs(#20251,64,#20249,0,"{ [x]: w } = z")
 locations_default(#20252,#10000,11,6,11,19)
 hasLocation(#20251,#20252)
 enclosing_stmt(#20251,#20249)
-exprContainers(#20251,#20230)
+expr_containers(#20251,#20230)
 #20253=*
 exprs(#20253,68,#20251,0,"{ [x]: w }")
 #20254=@"loc,{#10000},11,6,11,15"
 locations_default(#20254,#10000,11,6,11,15)
 hasLocation(#20253,#20254)
 enclosing_stmt(#20253,#20249)
-exprContainers(#20253,#20230)
+expr_containers(#20253,#20230)
 #20255=*
 properties(#20255,#20253,0,0,"[x]: w")
 #20256=@"loc,{#10000},11,8,11,13"
@@ -774,14 +774,14 @@ hasLocation(#20255,#20256)
 exprs(#20257,79,#20255,0,"x")
 hasLocation(#20257,#20150)
 enclosing_stmt(#20257,#20249)
-exprContainers(#20257,#20230)
+expr_containers(#20257,#20230)
 literals("x","x",#20257)
 bind(#20257,#20235)
 #20258=*
 exprs(#20258,78,#20255,1,"w")
 hasLocation(#20258,#20156)
 enclosing_stmt(#20258,#20249)
-exprContainers(#20258,#20230)
+expr_containers(#20258,#20230)
 literals("w","w",#20258)
 decl(#20258,#20234)
 isComputed(#20255)
@@ -789,7 +789,7 @@ isComputed(#20255)
 exprs(#20259,79,#20251,1,"z")
 hasLocation(#20259,#20162)
 enclosing_stmt(#20259,#20249)
-exprContainers(#20259,#20230)
+expr_containers(#20259,#20230)
 literals("z","z",#20259)
 bind(#20259,#20236)
 #20260=*
@@ -802,7 +802,7 @@ stmt_containers(#20260,#20230)
 exprs(#20262,79,#20260,0,"w")
 hasLocation(#20262,#20168)
 enclosing_stmt(#20262,#20260)
-exprContainers(#20262,#20230)
+expr_containers(#20262,#20230)
 literals("w","w",#20262)
 bind(#20262,#20234)
 #20263=*

javascript/extractor/tests/es2015/output/trap/export1.js.trap

@@ -76,19 +76,19 @@ exprs(#20023,64,#20021,0,"x = 23")
 locations_default(#20024,#10000,1,12,1,17)
 hasLocation(#20023,#20024)
 enclosing_stmt(#20023,#20021)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 #20025=*
 exprs(#20025,78,#20023,0,"x")
 hasLocation(#20025,#20009)
 enclosing_stmt(#20025,#20021)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 literals("x","x",#20025)
 decl(#20025,#20019)
 #20026=*
 exprs(#20026,3,#20023,1,"23")
 hasLocation(#20026,#20013)
 enclosing_stmt(#20026,#20021)
-exprContainers(#20026,#20001)
+expr_containers(#20026,#20001)
 literals("23","23",#20026)
 #20027=*
 entry_cfg_node(#20027,#20001)

javascript/extractor/tests/es2015/output/trap/export10.js.trap

@@ -103,7 +103,7 @@ stmt_containers(#20033,#20001)
 #20035=*
 exprs(#20035,78,#20033,-1,"f")
 hasLocation(#20035,#20011)
-exprContainers(#20035,#20033)
+expr_containers(#20035,#20033)
 literals("f","f",#20035)
 decl(#20035,#20030)
 #20036=*
@@ -129,7 +129,7 @@ stmt_containers(#20040,#20001)
 exprs(#20042,7,#20040,0,"[,]")
 hasLocation(#20042,#20041)
 enclosing_stmt(#20042,#20040)
-exprContainers(#20042,#20001)
+expr_containers(#20042,#20001)
 arraySize(#20042,1)
 #20043=*
 entry_cfg_node(#20043,#20001)

javascript/extractor/tests/es2015/output/trap/export11.js.trap

@@ -66,7 +66,7 @@ exprs(#20019,80,#20018,0,"class {}")
 locations_default(#20020,#10000,1,16,1,23)
 hasLocation(#20019,#20020)
 enclosing_stmt(#20019,#20018)
-exprContainers(#20019,#20001)
+expr_containers(#20019,#20001)
 #20021=*
 properties(#20021,#20019,2,0,"constructor() {}")
 #20022=@"loc,{#10000},1,22,1,21"
@@ -76,13 +76,13 @@ hasLocation(#20021,#20022)
 exprs(#20023,0,#20021,0,"constructor")
 hasLocation(#20023,#20022)
 enclosing_stmt(#20023,#20018)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 literals("constructor","constructor",#20023)
 #20024=*
 exprs(#20024,9,#20021,1,"() {}")
 hasLocation(#20024,#20022)
 enclosing_stmt(#20024,#20018)
-exprContainers(#20024,#20001)
+expr_containers(#20024,#20001)
 #20025=*
 scopes(#20025,1)
 scopenodes(#20024,#20025)

javascript/extractor/tests/es2015/output/trap/export2.js.trap

@@ -85,7 +85,7 @@ stmt_containers(#20026,#20001)
 #20028=*
 exprs(#20028,78,#20026,-1,"f")
 hasLocation(#20028,#20009)
-exprContainers(#20028,#20026)
+expr_containers(#20028,#20026)
 literals("f","f",#20028)
 decl(#20028,#20023)
 #20029=*

javascript/extractor/tests/es2015/output/trap/export3.js.trap

@@ -90,7 +90,7 @@ stmt_containers(#20028,#20001)
 #20030=*
 exprs(#20030,78,#20028,-1,"f")
 hasLocation(#20030,#20011)
-exprContainers(#20030,#20028)
+expr_containers(#20030,#20028)
 literals("f","f",#20030)
 decl(#20030,#20025)
 #20031=*

javascript/extractor/tests/es2015/output/trap/export4.js.trap

@@ -80,7 +80,7 @@ exprs(#20025,9,#20023,0,"function () {}")
 locations_default(#20026,#10000,1,16,1,29)
 hasLocation(#20025,#20026)
 enclosing_stmt(#20025,#20023)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 #20027=*
 scopes(#20027,1)
 scopenodes(#20025,#20027)

javascript/extractor/tests/es2015/output/trap/export5.js.trap

@@ -140,19 +140,19 @@ exprs(#20049,64,#20048,0,"x = 23")
 locations_default(#20050,#10000,1,5,1,10)
 hasLocation(#20049,#20050)
 enclosing_stmt(#20049,#20048)
-exprContainers(#20049,#20001)
+expr_containers(#20049,#20001)
 #20051=*
 exprs(#20051,78,#20049,0,"x")
 hasLocation(#20051,#20009)
 enclosing_stmt(#20051,#20048)
-exprContainers(#20051,#20001)
+expr_containers(#20051,#20001)
 literals("x","x",#20051)
 decl(#20051,#20046)
 #20052=*
 exprs(#20052,3,#20049,1,"23")
 hasLocation(#20052,#20013)
 enclosing_stmt(#20052,#20048)
-exprContainers(#20052,#20001)
+expr_containers(#20052,#20001)
 literals("23","23",#20052)
 #20053=*
 exprs(#20053,64,#20048,1,"y = 42")
@@ -160,19 +160,19 @@ exprs(#20053,64,#20048,1,"y = 42")
 locations_default(#20054,#10000,1,13,1,18)
 hasLocation(#20053,#20054)
 enclosing_stmt(#20053,#20048)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 #20055=*
 exprs(#20055,78,#20053,0,"y")
 hasLocation(#20055,#20017)
 enclosing_stmt(#20055,#20048)
-exprContainers(#20055,#20001)
+expr_containers(#20055,#20001)
 literals("y","y",#20055)
 decl(#20055,#20047)
 #20056=*
 exprs(#20056,3,#20053,1,"42")
 hasLocation(#20056,#20021)
 enclosing_stmt(#20056,#20048)
-exprContainers(#20056,#20001)
+expr_containers(#20056,#20001)
 literals("42","42",#20056)
 #20057=*
 stmts(#20057,30,#20001,1,"export  ... as z };")
@@ -182,19 +182,19 @@ stmt_containers(#20057,#20001)
 exprs(#20058,86,#20057,0,"x")
 hasLocation(#20058,#20029)
 enclosing_stmt(#20058,#20057)
-exprContainers(#20058,#20001)
+expr_containers(#20058,#20001)
 #20059=*
 exprs(#20059,103,#20058,0,"x")
 hasLocation(#20059,#20029)
 enclosing_stmt(#20059,#20057)
-exprContainers(#20059,#20001)
+expr_containers(#20059,#20001)
 literals("x","x",#20059)
 bind(#20059,#20046)
 #20060=*
 exprs(#20060,0,#20058,1,"x")
 hasLocation(#20060,#20029)
 enclosing_stmt(#20060,#20057)
-exprContainers(#20060,#20001)
+expr_containers(#20060,#20001)
 literals("x","x",#20060)
 #20061=*
 exprs(#20061,86,#20057,1,"y as z")
@@ -202,19 +202,19 @@ exprs(#20061,86,#20057,1,"y as z")
 locations_default(#20062,#10000,2,13,2,18)
 hasLocation(#20061,#20062)
 enclosing_stmt(#20061,#20057)
-exprContainers(#20061,#20001)
+expr_containers(#20061,#20001)
 #20063=*
 exprs(#20063,103,#20061,0,"y")
 hasLocation(#20063,#20033)
 enclosing_stmt(#20063,#20057)
-exprContainers(#20063,#20001)
+expr_containers(#20063,#20001)
 literals("y","y",#20063)
 bind(#20063,#20047)
 #20064=*
 exprs(#20064,0,#20061,1,"z")
 hasLocation(#20064,#20037)
 enclosing_stmt(#20064,#20057)
-exprContainers(#20064,#20001)
+expr_containers(#20064,#20001)
 literals("z","z",#20064)
 #20065=*
 entry_cfg_node(#20065,#20001)

javascript/extractor/tests/es2015/output/trap/export6.js.trap

@@ -61,7 +61,7 @@ stmt_containers(#20017,#20001)
 exprs(#20018,4,#20017,0,"'foo'")
 hasLocation(#20018,#20011)
 enclosing_stmt(#20018,#20017)
-exprContainers(#20018,#20001)
+expr_containers(#20018,#20001)
 literals("foo","'foo'",#20018)
 #20019=*
 regexpterm(#20019,14,#20018,0,"foo")

javascript/extractor/tests/es2015/output/trap/export7.js.trap

@@ -91,7 +91,7 @@ stmt_containers(#20029,#20001)
 exprs(#20030,4,#20029,-2,"'foo'")
 hasLocation(#20030,#20023)
 enclosing_stmt(#20030,#20029)
-exprContainers(#20030,#20001)
+expr_containers(#20030,#20001)
 literals("foo","'foo'",#20030)
 #20031=*
 regexpterm(#20031,14,#20030,0,"foo")
@@ -103,18 +103,18 @@ regexpConstValue(#20031,"foo")
 exprs(#20033,86,#20029,0,"x")
 hasLocation(#20033,#20009)
 enclosing_stmt(#20033,#20029)
-exprContainers(#20033,#20001)
+expr_containers(#20033,#20001)
 #20034=*
 exprs(#20034,0,#20033,0,"x")
 hasLocation(#20034,#20009)
 enclosing_stmt(#20034,#20029)
-exprContainers(#20034,#20001)
+expr_containers(#20034,#20001)
 literals("x","x",#20034)
 #20035=*
 exprs(#20035,0,#20033,1,"x")
 hasLocation(#20035,#20009)
 enclosing_stmt(#20035,#20029)
-exprContainers(#20035,#20001)
+expr_containers(#20035,#20001)
 literals("x","x",#20035)
 #20036=*
 exprs(#20036,86,#20029,1,"y as z")
@@ -122,18 +122,18 @@ exprs(#20036,86,#20029,1,"y as z")
 locations_default(#20037,#10000,1,13,1,18)
 hasLocation(#20036,#20037)
 enclosing_stmt(#20036,#20029)
-exprContainers(#20036,#20001)
+expr_containers(#20036,#20001)
 #20038=*
 exprs(#20038,0,#20036,0,"y")
 hasLocation(#20038,#20013)
 enclosing_stmt(#20038,#20029)
-exprContainers(#20038,#20001)
+expr_containers(#20038,#20001)
 literals("y","y",#20038)
 #20039=*
 exprs(#20039,0,#20036,1,"z")
 hasLocation(#20039,#20017)
 enclosing_stmt(#20039,#20029)
-exprContainers(#20039,#20001)
+expr_containers(#20039,#20001)
 literals("z","z",#20039)
 #20040=*
 entry_cfg_node(#20040,#20001)

javascript/extractor/tests/es2015/output/trap/export8.js.trap

@@ -86,12 +86,12 @@ exprs(#20027,47,#20026,0,"foo = 42")
 locations_default(#20028,#10000,1,1,1,8)
 hasLocation(#20027,#20028)
 enclosing_stmt(#20027,#20026)
-exprContainers(#20027,#20001)
+expr_containers(#20027,#20001)
 #20029=*
 exprs(#20029,79,#20027,0,"foo")
 hasLocation(#20029,#20007)
 enclosing_stmt(#20029,#20026)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 literals("foo","foo",#20029)
 #20030=@"var;{foo};{#20000}"
 variables(#20030,"foo",#20000)
@@ -100,7 +100,7 @@ bind(#20029,#20030)
 exprs(#20031,3,#20027,1,"42")
 hasLocation(#20031,#20011)
 enclosing_stmt(#20031,#20026)
-exprContainers(#20031,#20001)
+expr_containers(#20031,#20001)
 literals("42","42",#20031)
 #20032=*
 stmts(#20032,29,#20001,1,"export default foo;")
@@ -110,7 +110,7 @@ stmt_containers(#20032,#20001)
 exprs(#20033,103,#20032,0,"foo")
 hasLocation(#20033,#20019)
 enclosing_stmt(#20033,#20032)
-exprContainers(#20033,#20001)
+expr_containers(#20033,#20001)
 literals("foo","foo",#20033)
 bind(#20033,#20030)
 #20034=*

javascript/extractor/tests/es2015/output/trap/export9.js.trap

@@ -96,7 +96,7 @@ stmt_containers(#20030,#20001)
 exprs(#20032,78,#20030,0,"C")
 hasLocation(#20032,#20011)
 enclosing_stmt(#20032,#20030)
-exprContainers(#20032,#20001)
+expr_containers(#20032,#20001)
 literals("C","C",#20032)
 decl(#20032,#20026)
 typedecl(#20032,#20027)
@@ -113,13 +113,13 @@ hasLocation(#20034,#20035)
 exprs(#20036,0,#20034,0,"constructor")
 hasLocation(#20036,#20035)
 enclosing_stmt(#20036,#20030)
-exprContainers(#20036,#20001)
+expr_containers(#20036,#20001)
 literals("constructor","constructor",#20036)
 #20037=*
 exprs(#20037,9,#20034,1,"() {}")
 hasLocation(#20037,#20035)
 enclosing_stmt(#20037,#20030)
-exprContainers(#20037,#20001)
+expr_containers(#20037,#20001)
 #20038=*
 scopes(#20038,1)
 scopenodes(#20037,#20038)
@@ -142,7 +142,7 @@ stmt_containers(#20041,#20001)
 exprs(#20043,7,#20041,0,"[,]")
 hasLocation(#20043,#20042)
 enclosing_stmt(#20043,#20041)
-exprContainers(#20043,#20001)
+expr_containers(#20043,#20001)
 arraySize(#20043,1)
 #20044=*
 entry_cfg_node(#20044,#20001)

javascript/extractor/tests/es2015/output/trap/forof.js.trap

@@ -258,24 +258,24 @@ exprs(#20094,7,#20092,1,"[1,2,3]")
 locations_default(#20095,#10000,1,15,1,21)
 hasLocation(#20094,#20095)
 enclosing_stmt(#20094,#20092)
-exprContainers(#20094,#20001)
+expr_containers(#20094,#20001)
 #20096=*
 exprs(#20096,3,#20094,0,"1")
 hasLocation(#20096,#20029)
 enclosing_stmt(#20096,#20092)
-exprContainers(#20096,#20001)
+expr_containers(#20096,#20001)
 literals("1","1",#20096)
 #20097=*
 exprs(#20097,3,#20094,1,"2")
 hasLocation(#20097,#20033)
 enclosing_stmt(#20097,#20092)
-exprContainers(#20097,#20001)
+expr_containers(#20097,#20001)
 literals("2","2",#20097)
 #20098=*
 exprs(#20098,3,#20094,2,"3")
 hasLocation(#20098,#20037)
 enclosing_stmt(#20098,#20092)
-exprContainers(#20098,#20001)
+expr_containers(#20098,#20001)
 literals("3","3",#20098)
 arraySize(#20094,3)
 #20099=*
@@ -294,12 +294,12 @@ stmt_containers(#20101,#20001)
 exprs(#20103,64,#20101,0,"x")
 hasLocation(#20103,#20023)
 enclosing_stmt(#20103,#20101)
-exprContainers(#20103,#20001)
+expr_containers(#20103,#20001)
 #20104=*
 exprs(#20104,78,#20103,0,"x")
 hasLocation(#20104,#20023)
 enclosing_stmt(#20104,#20101)
-exprContainers(#20104,#20001)
+expr_containers(#20104,#20001)
 literals("x","x",#20104)
 decl(#20104,#20100)
 #20105=*
@@ -326,12 +326,12 @@ exprs(#20111,64,#20109,0,"y = x+1")
 locations_default(#20112,#10000,2,9,2,15)
 hasLocation(#20111,#20112)
 enclosing_stmt(#20111,#20109)
-exprContainers(#20111,#20001)
+expr_containers(#20111,#20001)
 #20113=*
 exprs(#20113,78,#20111,0,"y")
 hasLocation(#20113,#20047)
 enclosing_stmt(#20113,#20109)
-exprContainers(#20113,#20001)
+expr_containers(#20113,#20001)
 literals("y","y",#20113)
 decl(#20113,#20108)
 #20114=*
@@ -340,19 +340,19 @@ exprs(#20114,34,#20111,1,"x+1")
 locations_default(#20115,#10000,2,13,2,15)
 hasLocation(#20114,#20115)
 enclosing_stmt(#20114,#20109)
-exprContainers(#20114,#20001)
+expr_containers(#20114,#20001)
 #20116=*
 exprs(#20116,79,#20114,0,"x")
 hasLocation(#20116,#20051)
 enclosing_stmt(#20116,#20109)
-exprContainers(#20116,#20001)
+expr_containers(#20116,#20001)
 literals("x","x",#20116)
 bind(#20116,#20100)
 #20117=*
 exprs(#20117,3,#20114,1,"1")
 hasLocation(#20117,#20055)
 enclosing_stmt(#20117,#20109)
-exprContainers(#20117,#20001)
+expr_containers(#20117,#20001)
 literals("1","1",#20117)
 #20118=*
 stmts(#20118,17,#20001,1,"functio ...  []);\n}")
@@ -363,7 +363,7 @@ stmt_containers(#20118,#20001)
 #20120=*
 exprs(#20120,78,#20118,-1,"f")
 hasLocation(#20120,#20062)
-exprContainers(#20120,#20118)
+expr_containers(#20120,#20118)
 literals("f","f",#20120)
 decl(#20120,#20091)
 #20121=*
@@ -393,7 +393,7 @@ exprs(#20128,7,#20126,1,"[]")
 locations_default(#20129,#10000,6,19,6,20)
 hasLocation(#20128,#20129)
 enclosing_stmt(#20128,#20126)
-exprContainers(#20128,#20118)
+expr_containers(#20128,#20118)
 arraySize(#20128,0)
 #20130=*
 stmts(#20130,18,#20126,0,"var x")
@@ -405,12 +405,12 @@ stmt_containers(#20130,#20118)
 exprs(#20132,64,#20130,0,"x")
 hasLocation(#20132,#20076)
 enclosing_stmt(#20132,#20130)
-exprContainers(#20132,#20118)
+expr_containers(#20132,#20118)
 #20133=*
 exprs(#20133,78,#20132,0,"x")
 hasLocation(#20133,#20076)
 enclosing_stmt(#20133,#20130)
-exprContainers(#20133,#20118)
+expr_containers(#20133,#20118)
 literals("x","x",#20133)
 decl(#20133,#20122)
 #20134=*

javascript/extractor/tests/es2015/output/trap/import1.js.trap

@@ -70,7 +70,7 @@ stmt_containers(#20020,#20001)
 exprs(#20021,4,#20020,-1,"'foo'")
 hasLocation(#20021,#20011)
 enclosing_stmt(#20021,#20020)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 literals("foo","'foo'",#20021)
 #20022=*
 regexpterm(#20022,14,#20021,0,"foo")
@@ -82,12 +82,12 @@ regexpConstValue(#20022,"foo")
 exprs(#20024,84,#20020,0,"x")
 hasLocation(#20024,#20007)
 enclosing_stmt(#20024,#20020)
-exprContainers(#20024,#20001)
+expr_containers(#20024,#20001)
 #20025=*
 exprs(#20025,78,#20024,1,"x")
 hasLocation(#20025,#20007)
 enclosing_stmt(#20025,#20020)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 literals("x","x",#20025)
 decl(#20025,#20017)
 typedecl(#20025,#20018)

javascript/extractor/tests/es2015/output/trap/import2.js.trap

@@ -80,7 +80,7 @@ stmt_containers(#20024,#20001)
 exprs(#20025,4,#20024,-1,"'foo'")
 hasLocation(#20025,#20015)
 enclosing_stmt(#20025,#20024)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 literals("foo","'foo'",#20025)
 #20026=*
 regexpterm(#20026,14,#20025,0,"foo")
@@ -92,18 +92,18 @@ regexpConstValue(#20026,"foo")
 exprs(#20028,83,#20024,0,"y")
 hasLocation(#20028,#20009)
 enclosing_stmt(#20028,#20024)
-exprContainers(#20028,#20001)
+expr_containers(#20028,#20001)
 #20029=*
 exprs(#20029,0,#20028,0,"y")
 hasLocation(#20029,#20009)
 enclosing_stmt(#20029,#20024)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 literals("y","y",#20029)
 #20030=*
 exprs(#20030,78,#20028,1,"y")
 hasLocation(#20030,#20009)
 enclosing_stmt(#20030,#20024)
-exprContainers(#20030,#20001)
+expr_containers(#20030,#20001)
 literals("y","y",#20030)
 decl(#20030,#20021)
 typedecl(#20030,#20022)

javascript/extractor/tests/es2015/output/trap/import3.js.trap

@@ -90,7 +90,7 @@ stmt_containers(#20028,#20001)
 exprs(#20029,4,#20028,-1,"'foo'")
 hasLocation(#20029,#20019)
 enclosing_stmt(#20029,#20028)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 literals("foo","'foo'",#20029)
 #20030=*
 regexpterm(#20030,14,#20029,0,"foo")
@@ -104,18 +104,18 @@ exprs(#20032,83,#20028,0,"y as z")
 locations_default(#20033,#10000,1,10,1,15)
 hasLocation(#20032,#20033)
 enclosing_stmt(#20032,#20028)
-exprContainers(#20032,#20001)
+expr_containers(#20032,#20001)
 #20034=*
 exprs(#20034,0,#20032,0,"y")
 hasLocation(#20034,#20009)
 enclosing_stmt(#20034,#20028)
-exprContainers(#20034,#20001)
+expr_containers(#20034,#20001)
 literals("y","y",#20034)
 #20035=*
 exprs(#20035,78,#20032,1,"z")
 hasLocation(#20035,#20013)
 enclosing_stmt(#20035,#20028)
-exprContainers(#20035,#20001)
+expr_containers(#20035,#20001)
 literals("z","z",#20035)
 decl(#20035,#20025)
 typedecl(#20035,#20026)

javascript/extractor/tests/es2015/output/trap/import4.js.trap

@@ -109,7 +109,7 @@ stmt_containers(#20035,#20001)
 exprs(#20036,4,#20035,-1,"'foo'")
 hasLocation(#20036,#20023)
 enclosing_stmt(#20036,#20035)
-exprContainers(#20036,#20001)
+expr_containers(#20036,#20001)
 literals("foo","'foo'",#20036)
 #20037=*
 regexpterm(#20037,14,#20036,0,"foo")
@@ -121,12 +121,12 @@ regexpConstValue(#20037,"foo")
 exprs(#20039,84,#20035,0,"x")
 hasLocation(#20039,#20007)
 enclosing_stmt(#20039,#20035)
-exprContainers(#20039,#20001)
+expr_containers(#20039,#20001)
 #20040=*
 exprs(#20040,78,#20039,1,"x")
 hasLocation(#20040,#20007)
 enclosing_stmt(#20040,#20035)
-exprContainers(#20040,#20001)
+expr_containers(#20040,#20001)
 literals("x","x",#20040)
 decl(#20040,#20029)
 typedecl(#20040,#20031)
@@ -137,18 +137,18 @@ exprs(#20041,83,#20035,1,"y as z")
 locations_default(#20042,#10000,1,13,1,18)
 hasLocation(#20041,#20042)
 enclosing_stmt(#20041,#20035)
-exprContainers(#20041,#20001)
+expr_containers(#20041,#20001)
 #20043=*
 exprs(#20043,0,#20041,0,"y")
 hasLocation(#20043,#20013)
 enclosing_stmt(#20043,#20035)
-exprContainers(#20043,#20001)
+expr_containers(#20043,#20001)
 literals("y","y",#20043)
 #20044=*
 exprs(#20044,78,#20041,1,"z")
 hasLocation(#20044,#20017)
 enclosing_stmt(#20044,#20035)
-exprContainers(#20044,#20001)
+expr_containers(#20044,#20001)
 literals("z","z",#20044)
 decl(#20044,#20030)
 typedecl(#20044,#20032)

javascript/extractor/tests/es2015/output/trap/import5.js.trap

@@ -80,7 +80,7 @@ stmt_containers(#20024,#20001)
 exprs(#20025,4,#20024,-1,"'foo'")
 hasLocation(#20025,#20015)
 enclosing_stmt(#20025,#20024)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 literals("foo","'foo'",#20025)
 #20026=*
 regexpterm(#20026,14,#20025,0,"foo")
@@ -94,12 +94,12 @@ exprs(#20028,85,#20024,0,"* as foo")
 locations_default(#20029,#10000,1,8,1,15)
 hasLocation(#20028,#20029)
 enclosing_stmt(#20028,#20024)
-exprContainers(#20028,#20001)
+expr_containers(#20028,#20001)
 #20030=*
 exprs(#20030,78,#20028,1,"foo")
 hasLocation(#20030,#20011)
 enclosing_stmt(#20030,#20024)
-exprContainers(#20030,#20001)
+expr_containers(#20030,#20001)
 literals("foo","foo",#20030)
 decl(#20030,#20021)
 typedecl(#20030,#20022)

javascript/extractor/tests/es2015/output/trap/import6.js.trap

@@ -51,7 +51,7 @@ stmt_containers(#20013,#20001)
 exprs(#20014,4,#20013,-1,"'foo'")
 hasLocation(#20014,#20007)
 enclosing_stmt(#20014,#20013)
-exprContainers(#20014,#20001)
+expr_containers(#20014,#20001)
 literals("foo","'foo'",#20014)
 #20015=*
 regexpterm(#20015,14,#20014,0,"foo")

javascript/extractor/tests/es2015/output/trap/import7.js.trap

@@ -153,7 +153,7 @@ stmt_containers(#20052,#20001)
 exprs(#20053,4,#20052,-1,"'foo'")
 hasLocation(#20053,#20015)
 enclosing_stmt(#20053,#20052)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 literals("foo","'foo'",#20053)
 #20054=*
 regexpterm(#20054,14,#20053,0,"foo")
@@ -165,12 +165,12 @@ regexpConstValue(#20054,"foo")
 exprs(#20056,84,#20052,0,"x")
 hasLocation(#20056,#20011)
 enclosing_stmt(#20056,#20052)
-exprContainers(#20056,#20001)
+expr_containers(#20056,#20001)
 #20057=*
 exprs(#20057,78,#20056,1,"x")
 hasLocation(#20057,#20011)
 enclosing_stmt(#20057,#20052)
-exprContainers(#20057,#20001)
+expr_containers(#20057,#20001)
 literals("x","x",#20057)
 decl(#20057,#20046)
 typedecl(#20057,#20048)
@@ -183,7 +183,7 @@ stmt_containers(#20058,#20001)
 exprs(#20059,4,#20058,-1,"'bar'")
 hasLocation(#20059,#20021)
 enclosing_stmt(#20059,#20058)
-exprContainers(#20059,#20001)
+expr_containers(#20059,#20001)
 literals("bar","'bar'",#20059)
 #20060=*
 regexpterm(#20060,14,#20059,0,"bar")
@@ -199,7 +199,7 @@ stmt_containers(#20062,#20001)
 exprs(#20063,4,#20062,-1,"'baz'")
 hasLocation(#20063,#20039)
 enclosing_stmt(#20063,#20062)
-exprContainers(#20063,#20001)
+expr_containers(#20063,#20001)
 literals("baz","'baz'",#20063)
 #20064=*
 regexpterm(#20064,14,#20063,0,"baz")
@@ -213,18 +213,18 @@ exprs(#20066,83,#20062,0,"y as z")
 locations_default(#20067,#10000,3,10,3,15)
 hasLocation(#20066,#20067)
 enclosing_stmt(#20066,#20062)
-exprContainers(#20066,#20001)
+expr_containers(#20066,#20001)
 #20068=*
 exprs(#20068,0,#20066,0,"y")
 hasLocation(#20068,#20029)
 enclosing_stmt(#20068,#20062)
-exprContainers(#20068,#20001)
+expr_containers(#20068,#20001)
 literals("y","y",#20068)
 #20069=*
 exprs(#20069,78,#20066,1,"z")
 hasLocation(#20069,#20033)
 enclosing_stmt(#20069,#20062)
-exprContainers(#20069,#20001)
+expr_containers(#20069,#20001)
 literals("z","z",#20069)
 decl(#20069,#20047)
 typedecl(#20069,#20049)

javascript/extractor/tests/es2015/output/trap/let.js.trap

@@ -393,19 +393,19 @@ exprs(#20142,64,#20140,0,"x = 23")
 locations_default(#20143,#10000,2,9,2,14)
 hasLocation(#20142,#20143)
 enclosing_stmt(#20142,#20140)
-exprContainers(#20142,#20001)
+expr_containers(#20142,#20001)
 #20144=*
 exprs(#20144,78,#20142,0,"x")
 hasLocation(#20144,#20030)
 enclosing_stmt(#20144,#20140)
-exprContainers(#20144,#20001)
+expr_containers(#20144,#20001)
 literals("x","x",#20144)
 decl(#20144,#20139)
 #20145=*
 exprs(#20145,3,#20142,1,"23")
 hasLocation(#20145,#20034)
 enclosing_stmt(#20145,#20140)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 literals("23","23",#20145)
 #20146=*
 stmts(#20146,1,#20137,1,"{\n      ... ;\n    }")
@@ -431,19 +431,19 @@ exprs(#20152,64,#20150,0,"x = 42")
 locations_default(#20153,#10000,4,13,4,18)
 hasLocation(#20152,#20153)
 enclosing_stmt(#20152,#20150)
-exprContainers(#20152,#20001)
+expr_containers(#20152,#20001)
 #20154=*
 exprs(#20154,78,#20152,0,"x")
 hasLocation(#20154,#20042)
 enclosing_stmt(#20154,#20150)
-exprContainers(#20154,#20001)
+expr_containers(#20154,#20001)
 literals("x","x",#20154)
 decl(#20154,#20149)
 #20155=*
 exprs(#20155,3,#20152,1,"42")
 hasLocation(#20155,#20046)
 enclosing_stmt(#20155,#20150)
-exprContainers(#20155,#20001)
+expr_containers(#20155,#20001)
 literals("42","42",#20155)
 #20156=*
 stmts(#20156,14,#20146,1,"for (le ...       }")
@@ -463,19 +463,19 @@ exprs(#20160,27,#20156,1,"x<42")
 locations_default(#20161,#10000,5,28,5,31)
 hasLocation(#20160,#20161)
 enclosing_stmt(#20160,#20156)
-exprContainers(#20160,#20001)
+expr_containers(#20160,#20001)
 #20162=*
 exprs(#20162,79,#20160,0,"x")
 hasLocation(#20162,#20068)
 enclosing_stmt(#20162,#20156)
-exprContainers(#20162,#20001)
+expr_containers(#20162,#20001)
 literals("x","x",#20162)
 bind(#20162,#20159)
 #20163=*
 exprs(#20163,3,#20160,1,"42")
 hasLocation(#20163,#20072)
 enclosing_stmt(#20163,#20156)
-exprContainers(#20163,#20001)
+expr_containers(#20163,#20001)
 literals("42","42",#20163)
 #20164=*
 stmts(#20164,23,#20156,0,"let x = x-19")
@@ -489,12 +489,12 @@ exprs(#20166,64,#20164,0,"x = x-19")
 locations_default(#20167,#10000,5,18,5,25)
 hasLocation(#20166,#20167)
 enclosing_stmt(#20166,#20164)
-exprContainers(#20166,#20001)
+expr_containers(#20166,#20001)
 #20168=*
 exprs(#20168,78,#20166,0,"x")
 hasLocation(#20168,#20056)
 enclosing_stmt(#20168,#20164)
-exprContainers(#20168,#20001)
+expr_containers(#20168,#20001)
 literals("x","x",#20168)
 decl(#20168,#20159)
 #20169=*
@@ -503,19 +503,19 @@ exprs(#20169,35,#20166,1,"x-19")
 locations_default(#20170,#10000,5,22,5,25)
 hasLocation(#20169,#20170)
 enclosing_stmt(#20169,#20164)
-exprContainers(#20169,#20001)
+expr_containers(#20169,#20001)
 #20171=*
 exprs(#20171,79,#20169,0,"x")
 hasLocation(#20171,#20060)
 enclosing_stmt(#20171,#20164)
-exprContainers(#20171,#20001)
+expr_containers(#20171,#20001)
 literals("x","x",#20171)
 bind(#20171,#20149)
 #20172=*
 exprs(#20172,3,#20169,1,"19")
 hasLocation(#20172,#20064)
 enclosing_stmt(#20172,#20164)
-exprContainers(#20172,#20001)
+expr_containers(#20172,#20001)
 literals("19","19",#20172)
 #20173=*
 stmts(#20173,1,#20156,3,"{\n      ...       }")
@@ -541,19 +541,19 @@ exprs(#20179,64,#20177,0,"x = 56")
 locations_default(#20180,#10000,6,17,6,22)
 hasLocation(#20179,#20180)
 enclosing_stmt(#20179,#20177)
-exprContainers(#20179,#20001)
+expr_containers(#20179,#20001)
 #20181=*
 exprs(#20181,78,#20179,0,"x")
 hasLocation(#20181,#20082)
 enclosing_stmt(#20181,#20177)
-exprContainers(#20181,#20001)
+expr_containers(#20181,#20001)
 literals("x","x",#20181)
 decl(#20181,#20176)
 #20182=*
 exprs(#20182,3,#20179,1,"56")
 hasLocation(#20182,#20086)
 enclosing_stmt(#20182,#20177)
-exprContainers(#20182,#20001)
+expr_containers(#20182,#20001)
 literals("56","56",#20182)
 #20183=*
 stmts(#20183,2,#20173,1,"console.log(x);")
@@ -567,19 +567,19 @@ exprs(#20185,13,#20183,0,"console.log(x)")
 locations_default(#20186,#10000,7,13,7,26)
 hasLocation(#20185,#20186)
 enclosing_stmt(#20185,#20183)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 #20187=*
 exprs(#20187,14,#20185,-1,"console.log")
 #20188=@"loc,{#10000},7,13,7,23"
 locations_default(#20188,#10000,7,13,7,23)
 hasLocation(#20187,#20188)
 enclosing_stmt(#20187,#20183)
-exprContainers(#20187,#20001)
+expr_containers(#20187,#20001)
 #20189=*
 exprs(#20189,79,#20187,0,"console")
 hasLocation(#20189,#20090)
 enclosing_stmt(#20189,#20183)
-exprContainers(#20189,#20001)
+expr_containers(#20189,#20001)
 literals("console","console",#20189)
 #20190=@"var;{console};{#20000}"
 variables(#20190,"console",#20000)
@@ -588,13 +588,13 @@ bind(#20189,#20190)
 exprs(#20191,0,#20187,1,"log")
 hasLocation(#20191,#20094)
 enclosing_stmt(#20191,#20183)
-exprContainers(#20191,#20001)
+expr_containers(#20191,#20001)
 literals("log","log",#20191)
 #20192=*
 exprs(#20192,79,#20185,0,"x")
 hasLocation(#20192,#20098)
 enclosing_stmt(#20192,#20183)
-exprContainers(#20192,#20001)
+expr_containers(#20192,#20001)
 literals("x","x",#20192)
 bind(#20192,#20176)
 #20193=*
@@ -609,7 +609,7 @@ exprs(#20195,8,#20193,1,"{ x: x }")
 locations_default(#20196,#10000,9,23,9,30)
 hasLocation(#20195,#20196)
 enclosing_stmt(#20195,#20193)
-exprContainers(#20195,#20001)
+expr_containers(#20195,#20001)
 #20197=*
 properties(#20197,#20195,0,0,"x: x")
 #20198=@"loc,{#10000},9,25,9,28"
@@ -619,13 +619,13 @@ hasLocation(#20197,#20198)
 exprs(#20199,0,#20197,0,"x")
 hasLocation(#20199,#20118)
 enclosing_stmt(#20199,#20193)
-exprContainers(#20199,#20001)
+expr_containers(#20199,#20001)
 literals("x","x",#20199)
 #20200=*
 exprs(#20200,79,#20197,1,"x")
 hasLocation(#20200,#20122)
 enclosing_stmt(#20200,#20193)
-exprContainers(#20200,#20001)
+expr_containers(#20200,#20001)
 literals("x","x",#20200)
 bind(#20200,#20149)
 #20201=*
@@ -644,12 +644,12 @@ stmt_containers(#20203,#20001)
 exprs(#20205,64,#20203,0,"x")
 hasLocation(#20205,#20112)
 enclosing_stmt(#20205,#20203)
-exprContainers(#20205,#20001)
+expr_containers(#20205,#20001)
 #20206=*
 exprs(#20206,78,#20205,0,"x")
 hasLocation(#20206,#20112)
 enclosing_stmt(#20206,#20203)
-exprContainers(#20206,#20001)
+expr_containers(#20206,#20001)
 literals("x","x",#20206)
 decl(#20206,#20202)
 #20207=*
@@ -662,7 +662,7 @@ stmt_containers(#20207,#20001)
 exprs(#20209,79,#20207,0,"x")
 hasLocation(#20209,#20128)
 enclosing_stmt(#20209,#20207)
-exprContainers(#20209,#20001)
+expr_containers(#20209,#20001)
 literals("x","x",#20209)
 bind(#20209,#20202)
 #20210=*

javascript/extractor/tests/es2015/output/trap/let2.js.trap

@@ -68,19 +68,19 @@ exprs(#20021,64,#20020,0,"x = 42")
 locations_default(#20022,#10000,1,12,1,17)
 hasLocation(#20021,#20022)
 enclosing_stmt(#20021,#20020)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 #20023=*
 exprs(#20023,78,#20021,0,"x")
 hasLocation(#20023,#20009)
 enclosing_stmt(#20023,#20020)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 literals("x","x",#20023)
 decl(#20023,#20019)
 #20024=*
 exprs(#20024,3,#20021,1,"42")
 hasLocation(#20024,#20013)
 enclosing_stmt(#20024,#20020)
-exprContainers(#20024,#20001)
+expr_containers(#20024,#20001)
 literals("42","42",#20024)
 #20025=*
 entry_cfg_node(#20025,#20001)

javascript/extractor/tests/es2015/output/trap/nested_import.js.trap

@@ -203,7 +203,7 @@ stmt_containers(#20071,#20001)
 exprs(#20072,4,#20071,-1,"'m'")
 hasLocation(#20072,#20023)
 enclosing_stmt(#20072,#20071)
-exprContainers(#20072,#20001)
+expr_containers(#20072,#20001)
 literals("m","'m'",#20072)
 #20073=*
 regexpterm(#20073,14,#20072,0,"m")
@@ -215,18 +215,18 @@ regexpConstValue(#20073,"m")
 exprs(#20075,83,#20071,0,"x")
 hasLocation(#20075,#20017)
 enclosing_stmt(#20075,#20071)
-exprContainers(#20075,#20001)
+expr_containers(#20075,#20001)
 #20076=*
 exprs(#20076,0,#20075,0,"x")
 hasLocation(#20076,#20017)
 enclosing_stmt(#20076,#20071)
-exprContainers(#20076,#20001)
+expr_containers(#20076,#20001)
 literals("x","x",#20076)
 #20077=*
 exprs(#20077,78,#20075,1,"x")
 hasLocation(#20077,#20017)
 enclosing_stmt(#20077,#20071)
-exprContainers(#20077,#20001)
+expr_containers(#20077,#20001)
 literals("x","x",#20077)
 decl(#20077,#20065)
 typedecl(#20077,#20067)
@@ -243,12 +243,12 @@ exprs(#20080,18,#20078,0,"!x")
 locations_default(#20081,#10000,2,5,2,6)
 hasLocation(#20080,#20081)
 enclosing_stmt(#20080,#20078)
-exprContainers(#20080,#20001)
+expr_containers(#20080,#20001)
 #20082=*
 exprs(#20082,79,#20080,0,"x")
 hasLocation(#20082,#20033)
 enclosing_stmt(#20082,#20078)
-exprContainers(#20082,#20001)
+expr_containers(#20082,#20001)
 literals("x","x",#20082)
 bind(#20082,#20065)
 #20083=*
@@ -277,7 +277,7 @@ stmt_containers(#20089,#20001)
 exprs(#20091,4,#20089,-1,"'m'")
 hasLocation(#20091,#20049)
 enclosing_stmt(#20091,#20089)
-exprContainers(#20091,#20001)
+expr_containers(#20091,#20001)
 literals("m","'m'",#20091)
 #20092=*
 regexpterm(#20092,14,#20091,0,"m")
@@ -289,18 +289,18 @@ regexpConstValue(#20092,"m")
 exprs(#20094,83,#20089,0,"y")
 hasLocation(#20094,#20043)
 enclosing_stmt(#20094,#20089)
-exprContainers(#20094,#20001)
+expr_containers(#20094,#20001)
 #20095=*
 exprs(#20095,0,#20094,0,"y")
 hasLocation(#20095,#20043)
 enclosing_stmt(#20095,#20089)
-exprContainers(#20095,#20001)
+expr_containers(#20095,#20001)
 literals("y","y",#20095)
 #20096=*
 exprs(#20096,78,#20094,1,"y")
 hasLocation(#20096,#20043)
 enclosing_stmt(#20096,#20089)
-exprContainers(#20096,#20001)
+expr_containers(#20096,#20001)
 literals("y","y",#20096)
 decl(#20096,#20086)
 typedecl(#20096,#20087)
@@ -317,19 +317,19 @@ exprs(#20099,47,#20097,0,"x = y")
 locations_default(#20100,#10000,4,3,4,7)
 hasLocation(#20099,#20100)
 enclosing_stmt(#20099,#20097)
-exprContainers(#20099,#20001)
+expr_containers(#20099,#20001)
 #20101=*
 exprs(#20101,79,#20099,0,"x")
 hasLocation(#20101,#20053)
 enclosing_stmt(#20101,#20097)
-exprContainers(#20101,#20001)
+expr_containers(#20101,#20001)
 literals("x","x",#20101)
 bind(#20101,#20065)
 #20102=*
 exprs(#20102,79,#20099,1,"y")
 hasLocation(#20102,#20057)
 enclosing_stmt(#20102,#20097)
-exprContainers(#20102,#20001)
+expr_containers(#20102,#20001)
 literals("y","y",#20102)
 bind(#20102,#20086)
 #20103=*

javascript/extractor/tests/es2015/output/trap/new_target.js.trap

@@ -109,7 +109,7 @@ stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,78,#20037,-1,"f")
 hasLocation(#20038,#20011)
-exprContainers(#20038,#20037)
+expr_containers(#20038,#20037)
 literals("f","f",#20038)
 decl(#20038,#20036)
 #20039=*
@@ -137,21 +137,21 @@ exprs(#20045,18,#20043,0,"!!new.target")
 locations_default(#20046,#10000,2,10,2,21)
 hasLocation(#20045,#20046)
 enclosing_stmt(#20045,#20043)
-exprContainers(#20045,#20037)
+expr_containers(#20045,#20037)
 #20047=*
 exprs(#20047,18,#20045,0,"!new.target")
 #20048=@"loc,{#10000},2,11,2,21"
 locations_default(#20048,#10000,2,11,2,21)
 hasLocation(#20047,#20048)
 enclosing_stmt(#20047,#20043)
-exprContainers(#20047,#20037)
+expr_containers(#20047,#20037)
 #20049=*
 exprs(#20049,82,#20047,0,"new.target")
 #20050=@"loc,{#10000},2,12,2,21"
 locations_default(#20050,#10000,2,12,2,21)
 hasLocation(#20049,#20050)
 enclosing_stmt(#20049,#20043)
-exprContainers(#20049,#20037)
+expr_containers(#20049,#20037)
 #20051=*
 entry_cfg_node(#20051,#20001)
 #20052=@"loc,{#10000},1,1,1,0"

javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap

@@ -48,7 +48,7 @@ stmt_containers(#20013,#20001)
 exprs(#20014,71,#20013,0,"``")
 hasLocation(#20014,#20003)
 enclosing_stmt(#20014,#20013)
-exprContainers(#20014,#20001)
+expr_containers(#20014,#20001)
 #20015=*
 entry_cfg_node(#20015,#20001)
 #20016=@"loc,{#10000},1,1,1,0"

javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap

@@ -115,7 +115,7 @@ stmt_containers(#20038,#20001)
 exprs(#20040,78,#20038,0,"C")
 hasLocation(#20040,#20011)
 enclosing_stmt(#20040,#20038)
-exprContainers(#20040,#20001)
+expr_containers(#20040,#20001)
 literals("C","C",#20040)
 decl(#20040,#20036)
 typedecl(#20040,#20037)
@@ -132,7 +132,7 @@ hasLocation(#20042,#20043)
 exprs(#20044,1,#20042,0,"null")
 hasLocation(#20044,#20019)
 enclosing_stmt(#20044,#20038)
-exprContainers(#20044,#20001)
+expr_containers(#20044,#20001)
 literals("null","null",#20044)
 #20045=*
 exprs(#20045,9,#20042,1,"(v) { }")
@@ -140,7 +140,7 @@ exprs(#20045,9,#20042,1,"(v) { }")
 locations_default(#20046,#10000,2,13,2,19)
 hasLocation(#20045,#20046)
 enclosing_stmt(#20045,#20038)
-exprContainers(#20045,#20001)
+expr_containers(#20045,#20001)
 #20047=*
 scopes(#20047,1)
 scopenodes(#20045,#20047)
@@ -150,7 +150,7 @@ variables(#20048,"v",#20047)
 #20049=*
 exprs(#20049,78,#20045,0,"v")
 hasLocation(#20049,#20025)
-exprContainers(#20049,#20045)
+expr_containers(#20049,#20045)
 literals("v","v",#20049)
 decl(#20049,#20048)
 #20050=@"var;{arguments};{#20047}"
@@ -173,13 +173,13 @@ hasLocation(#20053,#20054)
 exprs(#20055,0,#20053,0,"constructor")
 hasLocation(#20055,#20054)
 enclosing_stmt(#20055,#20038)
-exprContainers(#20055,#20001)
+expr_containers(#20055,#20001)
 literals("constructor","constructor",#20055)
 #20056=*
 exprs(#20056,9,#20053,1,"() {}")
 hasLocation(#20056,#20054)
 enclosing_stmt(#20056,#20038)
-exprContainers(#20056,#20001)
+expr_containers(#20056,#20001)
 #20057=*
 scopes(#20057,1)
 scopenodes(#20056,#20057)

javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap

@@ -116,7 +116,7 @@ stmt_containers(#20039,#20001)
 #20040=*
 exprs(#20040,78,#20039,-1,"test")
 hasLocation(#20040,#20013)
-exprContainers(#20040,#20039)
+expr_containers(#20040,#20039)
 literals("test","test",#20040)
 decl(#20040,#20038)
 #20041=*
@@ -142,7 +142,7 @@ stmt_containers(#20045,#20039)
 exprs(#20047,79,#20045,0,"arguments")
 hasLocation(#20047,#20021)
 enclosing_stmt(#20047,#20045)
-exprContainers(#20047,#20039)
+expr_containers(#20047,#20039)
 literals("arguments","arguments",#20047)
 bind(#20047,#20042)
 #20048=*
@@ -157,12 +157,12 @@ exprs(#20050,13,#20048,0,"let (arguments)")
 locations_default(#20051,#10000,3,5,3,19)
 hasLocation(#20050,#20051)
 enclosing_stmt(#20050,#20048)
-exprContainers(#20050,#20039)
+expr_containers(#20050,#20039)
 #20052=*
 exprs(#20052,79,#20050,-1,"let")
 hasLocation(#20052,#20025)
 enclosing_stmt(#20052,#20048)
-exprContainers(#20052,#20039)
+expr_containers(#20052,#20039)
 literals("let","let",#20052)
 #20053=@"var;{let};{#20000}"
 variables(#20053,"let",#20000)
@@ -171,7 +171,7 @@ bind(#20052,#20053)
 exprs(#20054,79,#20050,0,"arguments")
 hasLocation(#20054,#20029)
 enclosing_stmt(#20054,#20048)
-exprContainers(#20054,#20039)
+expr_containers(#20054,#20039)
 literals("arguments","arguments",#20054)
 bind(#20054,#20042)
 #20055=*

javascript/extractor/tests/es2015/output/trap/properties.js.trap

@@ -233,19 +233,19 @@ exprs(#20084,64,#20083,0,"x = 42")
 locations_default(#20085,#10000,1,5,1,10)
 hasLocation(#20084,#20085)
 enclosing_stmt(#20084,#20083)
-exprContainers(#20084,#20001)
+expr_containers(#20084,#20001)
 #20086=*
 exprs(#20086,78,#20084,0,"x")
 hasLocation(#20086,#20017)
 enclosing_stmt(#20086,#20083)
-exprContainers(#20086,#20001)
+expr_containers(#20086,#20001)
 literals("x","x",#20086)
 decl(#20086,#20081)
 #20087=*
 exprs(#20087,3,#20084,1,"42")
 hasLocation(#20087,#20021)
 enclosing_stmt(#20087,#20083)
-exprContainers(#20087,#20001)
+expr_containers(#20087,#20001)
 literals("42","42",#20087)
 #20088=*
 exprs(#20088,64,#20083,1,"o = {\n  ... }\n    }")
@@ -253,12 +253,12 @@ exprs(#20088,64,#20083,1,"o = {\n  ... }\n    }")
 locations_default(#20089,#10000,2,5,6,5)
 hasLocation(#20088,#20089)
 enclosing_stmt(#20088,#20083)
-exprContainers(#20088,#20001)
+expr_containers(#20088,#20001)
 #20090=*
 exprs(#20090,78,#20088,0,"o")
 hasLocation(#20090,#20025)
 enclosing_stmt(#20090,#20083)
-exprContainers(#20090,#20001)
+expr_containers(#20090,#20001)
 literals("o","o",#20090)
 decl(#20090,#20082)
 #20091=*
@@ -267,7 +267,7 @@ exprs(#20091,8,#20088,1,"{\n      ... }\n    }")
 locations_default(#20092,#10000,2,9,6,5)
 hasLocation(#20091,#20092)
 enclosing_stmt(#20091,#20083)
-exprContainers(#20091,#20001)
+expr_containers(#20091,#20001)
 #20093=*
 properties(#20093,#20091,0,0,"[""prop"" ... ()]: 23")
 #20094=@"loc,{#10000},3,9,3,36"
@@ -279,12 +279,12 @@ exprs(#20095,34,#20093,0,"""prop""  ... andom()")
 locations_default(#20096,#10000,3,10,3,31)
 hasLocation(#20095,#20096)
 enclosing_stmt(#20095,#20083)
-exprContainers(#20095,#20001)
+expr_containers(#20095,#20001)
 #20097=*
 exprs(#20097,4,#20095,0,"""prop""")
 hasLocation(#20097,#20033)
 enclosing_stmt(#20097,#20083)
-exprContainers(#20097,#20001)
+expr_containers(#20097,#20001)
 literals("prop","""prop""",#20097)
 #20098=*
 regexpterm(#20098,14,#20097,0,"prop")
@@ -298,19 +298,19 @@ exprs(#20100,13,#20095,1,"Math.random()")
 locations_default(#20101,#10000,3,19,3,31)
 hasLocation(#20100,#20101)
 enclosing_stmt(#20100,#20083)
-exprContainers(#20100,#20001)
+expr_containers(#20100,#20001)
 #20102=*
 exprs(#20102,14,#20100,-1,"Math.random")
 #20103=@"loc,{#10000},3,19,3,29"
 locations_default(#20103,#10000,3,19,3,29)
 hasLocation(#20102,#20103)
 enclosing_stmt(#20102,#20083)
-exprContainers(#20102,#20001)
+expr_containers(#20102,#20001)
 #20104=*
 exprs(#20104,79,#20102,0,"Math")
 hasLocation(#20104,#20037)
 enclosing_stmt(#20104,#20083)
-exprContainers(#20104,#20001)
+expr_containers(#20104,#20001)
 literals("Math","Math",#20104)
 #20105=@"var;{Math};{#20000}"
 variables(#20105,"Math",#20000)
@@ -319,13 +319,13 @@ bind(#20104,#20105)
 exprs(#20106,0,#20102,1,"random")
 hasLocation(#20106,#20041)
 enclosing_stmt(#20106,#20083)
-exprContainers(#20106,#20001)
+expr_containers(#20106,#20001)
 literals("random","random",#20106)
 #20107=*
 exprs(#20107,3,#20093,1,"23")
 hasLocation(#20107,#20051)
 enclosing_stmt(#20107,#20083)
-exprContainers(#20107,#20001)
+expr_containers(#20107,#20001)
 literals("23","23",#20107)
 isComputed(#20093)
 #20108=*
@@ -335,13 +335,13 @@ hasLocation(#20108,#20055)
 exprs(#20109,0,#20108,0,"x")
 hasLocation(#20109,#20055)
 enclosing_stmt(#20109,#20083)
-exprContainers(#20109,#20001)
+expr_containers(#20109,#20001)
 literals("x","x",#20109)
 #20110=*
 exprs(#20110,79,#20108,1,"x")
 hasLocation(#20110,#20055)
 enclosing_stmt(#20110,#20083)
-exprContainers(#20110,#20001)
+expr_containers(#20110,#20001)
 literals("x","x",#20110)
 bind(#20110,#20081)
 #20111=*
@@ -353,7 +353,7 @@ hasLocation(#20111,#20112)
 exprs(#20113,0,#20111,0,"m")
 hasLocation(#20113,#20059)
 enclosing_stmt(#20113,#20083)
-exprContainers(#20113,#20001)
+expr_containers(#20113,#20001)
 literals("m","m",#20113)
 #20114=*
 exprs(#20114,9,#20111,1,"() { return 56; }")
@@ -361,7 +361,7 @@ exprs(#20114,9,#20111,1,"() { return 56; }")
 locations_default(#20115,#10000,5,10,5,26)
 hasLocation(#20114,#20115)
 enclosing_stmt(#20114,#20083)
-exprContainers(#20114,#20001)
+expr_containers(#20114,#20001)
 #20116=*
 scopes(#20116,1)
 scopenodes(#20114,#20116)
@@ -385,7 +385,7 @@ stmt_containers(#20120,#20114)
 exprs(#20122,3,#20120,0,"56")
 hasLocation(#20122,#20069)
 enclosing_stmt(#20122,#20120)
-exprContainers(#20122,#20114)
+expr_containers(#20122,#20114)
 literals("56","56",#20122)
 isMethod(#20111)
 #20123=*

javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap

@@ -82,7 +82,7 @@ exprs(#20027,65,#20026,0,"({x = 1}) => x")
 locations_default(#20028,#10000,1,1,1,14)
 hasLocation(#20027,#20028)
 enclosing_stmt(#20027,#20026)
-exprContainers(#20027,#20001)
+expr_containers(#20027,#20001)
 #20029=*
 scopes(#20029,1)
 scopenodes(#20027,#20029)
@@ -94,7 +94,7 @@ exprs(#20031,68,#20027,0,"{x = 1}")
 #20032=@"loc,{#10000},1,2,1,8"
 locations_default(#20032,#10000,1,2,1,8)
 hasLocation(#20031,#20032)
-exprContainers(#20031,#20027)
+expr_containers(#20031,#20027)
 #20033=*
 properties(#20033,#20031,0,0,"x = 1")
 #20034=@"loc,{#10000},1,3,1,7"
@@ -103,23 +103,23 @@ hasLocation(#20033,#20034)
 #20035=*
 exprs(#20035,0,#20033,0,"x")
 hasLocation(#20035,#20009)
-exprContainers(#20035,#20027)
+expr_containers(#20035,#20027)
 literals("x","x",#20035)
 #20036=*
 exprs(#20036,78,#20033,1,"x")
 hasLocation(#20036,#20009)
-exprContainers(#20036,#20027)
+expr_containers(#20036,#20027)
 literals("x","x",#20036)
 decl(#20036,#20030)
 #20037=*
 exprs(#20037,3,#20033,2,"1")
 hasLocation(#20037,#20013)
-exprContainers(#20037,#20027)
+expr_containers(#20037,#20027)
 literals("1","1",#20037)
 #20038=*
 exprs(#20038,79,#20027,-2,"x")
 hasLocation(#20038,#20021)
-exprContainers(#20038,#20027)
+expr_containers(#20038,#20027)
 literals("x","x",#20038)
 bind(#20038,#20030)
 #20039=*

javascript/extractor/tests/es2015/output/trap/restparms.js.trap

@@ -87,7 +87,7 @@ stmt_containers(#20029,#20001)
 #20030=*
 exprs(#20030,78,#20029,-1,"f")
 hasLocation(#20030,#20009)
-exprContainers(#20030,#20029)
+expr_containers(#20030,#20029)
 literals("f","f",#20030)
 decl(#20030,#20028)
 #20031=*
@@ -99,7 +99,7 @@ variables(#20032,"x",#20031)
 #20033=*
 exprs(#20033,78,#20029,0,"x")
 hasLocation(#20033,#20013)
-exprContainers(#20033,#20029)
+expr_containers(#20033,#20029)
 literals("x","x",#20033)
 decl(#20033,#20032)
 #20034=@"var;{ys};{#20031}"
@@ -107,7 +107,7 @@ variables(#20034,"ys",#20031)
 #20035=*
 exprs(#20035,78,#20029,1,"ys")
 hasLocation(#20035,#20019)
-exprContainers(#20035,#20029)
+expr_containers(#20035,#20029)
 literals("ys","ys",#20035)
 decl(#20035,#20034)
 #20036=@"var;{arguments};{#20031}"

javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap

@@ -110,12 +110,12 @@ exprs(#20038,7,#20037,0,"[a, ...as]")
 locations_default(#20039,#10000,1,1,1,10)
 hasLocation(#20038,#20039)
 enclosing_stmt(#20038,#20037)
-exprContainers(#20038,#20001)
+expr_containers(#20038,#20001)
 #20040=*
 exprs(#20040,79,#20038,0,"a")
 hasLocation(#20040,#20009)
 enclosing_stmt(#20040,#20037)
-exprContainers(#20040,#20001)
+expr_containers(#20040,#20001)
 literals("a","a",#20040)
 #20041=@"var;{a};{#20000}"
 variables(#20041,"a",#20000)
@@ -126,12 +126,12 @@ exprs(#20042,66,#20038,1,"...as")
 locations_default(#20043,#10000,1,5,1,9)
 hasLocation(#20042,#20043)
 enclosing_stmt(#20042,#20037)
-exprContainers(#20042,#20001)
+expr_containers(#20042,#20001)
 #20044=*
 exprs(#20044,79,#20042,0,"as")
 hasLocation(#20044,#20015)
 enclosing_stmt(#20044,#20037)
-exprContainers(#20044,#20001)
+expr_containers(#20044,#20001)
 literals("as","as",#20044)
 #20045=@"var;{as};{#20000}"
 variables(#20045,"as",#20000)
@@ -147,12 +147,12 @@ exprs(#20047,12,#20046,0,"new Array(...elts)")
 locations_default(#20048,#10000,2,1,2,18)
 hasLocation(#20047,#20048)
 enclosing_stmt(#20047,#20046)
-exprContainers(#20047,#20001)
+expr_containers(#20047,#20001)
 #20049=*
 exprs(#20049,79,#20047,-1,"Array")
 hasLocation(#20049,#20023)
 enclosing_stmt(#20049,#20046)
-exprContainers(#20049,#20001)
+expr_containers(#20049,#20001)
 literals("Array","Array",#20049)
 #20050=@"var;{Array};{#20000}"
 variables(#20050,"Array",#20000)
@@ -163,12 +163,12 @@ exprs(#20051,66,#20047,0,"...elts")
 locations_default(#20052,#10000,2,11,2,17)
 hasLocation(#20051,#20052)
 enclosing_stmt(#20051,#20046)
-exprContainers(#20051,#20001)
+expr_containers(#20051,#20001)
 #20053=*
 exprs(#20053,79,#20051,0,"elts")
 hasLocation(#20053,#20029)
 enclosing_stmt(#20053,#20046)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 literals("elts","elts",#20053)
 #20054=@"var;{elts};{#20000}"
 variables(#20054,"elts",#20000)

javascript/extractor/tests/es2015/output/trap/super_call.js.trap

@@ -161,7 +161,7 @@ stmt_containers(#20056,#20001)
 exprs(#20057,78,#20056,0,"A")
 hasLocation(#20057,#20015)
 enclosing_stmt(#20057,#20056)
-exprContainers(#20057,#20001)
+expr_containers(#20057,#20001)
 literals("A","A",#20057)
 decl(#20057,#20054)
 typedecl(#20057,#20055)
@@ -173,7 +173,7 @@ scopenesting(#20058,#20000)
 exprs(#20059,79,#20056,1,"B")
 hasLocation(#20059,#20019)
 enclosing_stmt(#20059,#20056)
-exprContainers(#20059,#20001)
+expr_containers(#20059,#20001)
 literals("B","B",#20059)
 #20060=@"var;{B};{#20000}"
 variables(#20060,"B",#20000)
@@ -187,7 +187,7 @@ hasLocation(#20061,#20062)
 exprs(#20063,0,#20061,0,"m")
 hasLocation(#20063,#20023)
 enclosing_stmt(#20063,#20056)
-exprContainers(#20063,#20001)
+expr_containers(#20063,#20001)
 literals("m","m",#20063)
 #20064=*
 exprs(#20064,9,#20061,1,"() {\n   ... 19;\n  }")
@@ -195,7 +195,7 @@ exprs(#20064,9,#20061,1,"() {\n   ... 19;\n  }")
 locations_default(#20065,#10000,2,4,4,3)
 hasLocation(#20064,#20065)
 enclosing_stmt(#20064,#20056)
-exprContainers(#20064,#20001)
+expr_containers(#20064,#20001)
 #20066=*
 scopes(#20066,1)
 scopenodes(#20064,#20066)
@@ -221,37 +221,37 @@ exprs(#20072,34,#20070,0,"super.m() + 19")
 locations_default(#20073,#10000,3,12,3,25)
 hasLocation(#20072,#20073)
 enclosing_stmt(#20072,#20070)
-exprContainers(#20072,#20064)
+expr_containers(#20072,#20064)
 #20074=*
 exprs(#20074,13,#20072,0,"super.m()")
 #20075=@"loc,{#10000},3,12,3,20"
 locations_default(#20075,#10000,3,12,3,20)
 hasLocation(#20074,#20075)
 enclosing_stmt(#20074,#20070)
-exprContainers(#20074,#20064)
+expr_containers(#20074,#20064)
 #20076=*
 exprs(#20076,14,#20074,-1,"super.m")
 #20077=@"loc,{#10000},3,12,3,18"
 locations_default(#20077,#10000,3,12,3,18)
 hasLocation(#20076,#20077)
 enclosing_stmt(#20076,#20070)
-exprContainers(#20076,#20064)
+expr_containers(#20076,#20064)
 #20078=*
 exprs(#20078,81,#20076,0,"super")
 hasLocation(#20078,#20033)
 enclosing_stmt(#20078,#20070)
-exprContainers(#20078,#20064)
+expr_containers(#20078,#20064)
 #20079=*
 exprs(#20079,0,#20076,1,"m")
 hasLocation(#20079,#20037)
 enclosing_stmt(#20079,#20070)
-exprContainers(#20079,#20064)
+expr_containers(#20079,#20064)
 literals("m","m",#20079)
 #20080=*
 exprs(#20080,3,#20072,1,"19")
 hasLocation(#20080,#20045)
 enclosing_stmt(#20080,#20070)
-exprContainers(#20080,#20064)
+expr_containers(#20080,#20064)
 literals("19","19",#20080)
 isMethod(#20061)
 #20081=*
@@ -263,13 +263,13 @@ hasLocation(#20081,#20082)
 exprs(#20083,0,#20081,0,"constructor")
 hasLocation(#20083,#20082)
 enclosing_stmt(#20083,#20056)
-exprContainers(#20083,#20001)
+expr_containers(#20083,#20001)
 literals("constructor","constructor",#20083)
 #20084=*
 exprs(#20084,9,#20081,1,"(...arg ... rgs); }")
 hasLocation(#20084,#20082)
 enclosing_stmt(#20084,#20056)
-exprContainers(#20084,#20001)
+expr_containers(#20084,#20001)
 #20085=*
 scopes(#20085,1)
 scopenodes(#20084,#20085)
@@ -279,7 +279,7 @@ variables(#20086,"args",#20085)
 #20087=*
 exprs(#20087,78,#20084,0,"args")
 hasLocation(#20087,#20082)
-exprContainers(#20087,#20084)
+expr_containers(#20087,#20084)
 literals("args","args",#20087)
 decl(#20087,#20086)
 #20088=@"var;{arguments};{#20085}"
@@ -298,22 +298,22 @@ stmt_containers(#20090,#20084)
 exprs(#20091,13,#20090,0,"super(...args)")
 hasLocation(#20091,#20082)
 enclosing_stmt(#20091,#20090)
-exprContainers(#20091,#20084)
+expr_containers(#20091,#20084)
 #20092=*
 exprs(#20092,81,#20091,-1,"super")
 hasLocation(#20092,#20082)
 enclosing_stmt(#20092,#20090)
-exprContainers(#20092,#20084)
+expr_containers(#20092,#20084)
 #20093=*
 exprs(#20093,66,#20091,0,"...args")
 hasLocation(#20093,#20082)
 enclosing_stmt(#20093,#20090)
-exprContainers(#20093,#20084)
+expr_containers(#20093,#20084)
 #20094=*
 exprs(#20094,79,#20093,0,"args")
 hasLocation(#20094,#20082)
 enclosing_stmt(#20094,#20090)
-exprContainers(#20094,#20084)
+expr_containers(#20094,#20084)
 literals("args","args",#20094)
 bind(#20094,#20086)
 isMethod(#20081)

javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap

@@ -141,7 +141,7 @@ stmt_containers(#20048,#20001)
 exprs(#20049,78,#20048,0,"A")
 hasLocation(#20049,#20015)
 enclosing_stmt(#20049,#20048)
-exprContainers(#20049,#20001)
+expr_containers(#20049,#20001)
 literals("A","A",#20049)
 decl(#20049,#20046)
 typedecl(#20049,#20047)
@@ -153,7 +153,7 @@ scopenesting(#20050,#20000)
 exprs(#20051,79,#20048,1,"B")
 hasLocation(#20051,#20019)
 enclosing_stmt(#20051,#20048)
-exprContainers(#20051,#20001)
+expr_containers(#20051,#20001)
 literals("B","B",#20051)
 #20052=@"var;{B};{#20000}"
 variables(#20052,"B",#20000)
@@ -167,7 +167,7 @@ hasLocation(#20053,#20054)
 exprs(#20055,0,#20053,0,"constructor")
 hasLocation(#20055,#20023)
 enclosing_stmt(#20055,#20048)
-exprContainers(#20055,#20001)
+expr_containers(#20055,#20001)
 literals("constructor","constructor",#20055)
 #20056=*
 exprs(#20056,9,#20053,1,"() {\n   ... 2);\n  }")
@@ -175,7 +175,7 @@ exprs(#20056,9,#20053,1,"() {\n   ... 2);\n  }")
 locations_default(#20057,#10000,2,14,4,3)
 hasLocation(#20056,#20057)
 enclosing_stmt(#20056,#20048)
-exprContainers(#20056,#20001)
+expr_containers(#20056,#20001)
 #20058=*
 scopes(#20058,1)
 scopenodes(#20056,#20058)
@@ -201,17 +201,17 @@ exprs(#20064,13,#20062,0,"super(42)")
 locations_default(#20065,#10000,3,5,3,13)
 hasLocation(#20064,#20065)
 enclosing_stmt(#20064,#20062)
-exprContainers(#20064,#20056)
+expr_containers(#20064,#20056)
 #20066=*
 exprs(#20066,81,#20064,-1,"super")
 hasLocation(#20066,#20031)
 enclosing_stmt(#20066,#20062)
-exprContainers(#20066,#20056)
+expr_containers(#20066,#20056)
 #20067=*
 exprs(#20067,3,#20064,0,"42")
 hasLocation(#20067,#20035)
 enclosing_stmt(#20067,#20062)
-exprContainers(#20067,#20056)
+expr_containers(#20067,#20056)
 literals("42","42",#20067)
 isMethod(#20053)
 #20068=*

javascript/extractor/tests/es2015/output/trap/templates.js.trap

@@ -415,7 +415,7 @@ stmt_containers(#20157,#20001)
 #20159=*
 exprs(#20159,78,#20157,-1,"tag")
 hasLocation(#20159,#20021)
-exprContainers(#20159,#20157)
+expr_containers(#20159,#20157)
 literals("tag","tag",#20159)
 decl(#20159,#20154)
 #20160=*
@@ -427,7 +427,7 @@ variables(#20161,"strings",#20160)
 #20162=*
 exprs(#20162,78,#20157,0,"strings")
 hasLocation(#20162,#20025)
-exprContainers(#20162,#20157)
+expr_containers(#20162,#20157)
 literals("strings","strings",#20162)
 decl(#20162,#20161)
 #20163=@"var;{values};{#20160}"
@@ -435,7 +435,7 @@ variables(#20163,"values",#20160)
 #20164=*
 exprs(#20164,78,#20157,1,"values")
 hasLocation(#20164,#20031)
-exprContainers(#20164,#20157)
+expr_containers(#20164,#20157)
 literals("values","values",#20164)
 decl(#20164,#20163)
 #20165=@"var;{arguments};{#20160}"
@@ -460,12 +460,12 @@ exprs(#20170,34,#20168,0,"""values ... n(', ')")
 locations_default(#20171,#10000,2,10,2,39)
 hasLocation(#20170,#20171)
 enclosing_stmt(#20170,#20168)
-exprContainers(#20170,#20157)
+expr_containers(#20170,#20157)
 #20172=*
 exprs(#20172,4,#20170,0,"""values: """)
 hasLocation(#20172,#20039)
 enclosing_stmt(#20172,#20168)
-exprContainers(#20172,#20157)
+expr_containers(#20172,#20157)
 literals("values: ","""values: """,#20172)
 #20173=*
 regexpterm(#20173,14,#20172,0,"values: ")
@@ -479,32 +479,32 @@ exprs(#20175,13,#20170,1,"values.join(', ')")
 locations_default(#20176,#10000,2,23,2,39)
 hasLocation(#20175,#20176)
 enclosing_stmt(#20175,#20168)
-exprContainers(#20175,#20157)
+expr_containers(#20175,#20157)
 #20177=*
 exprs(#20177,14,#20175,-1,"values.join")
 #20178=@"loc,{#10000},2,23,2,33"
 locations_default(#20178,#10000,2,23,2,33)
 hasLocation(#20177,#20178)
 enclosing_stmt(#20177,#20168)
-exprContainers(#20177,#20157)
+expr_containers(#20177,#20157)
 #20179=*
 exprs(#20179,79,#20177,0,"values")
 hasLocation(#20179,#20043)
 enclosing_stmt(#20179,#20168)
-exprContainers(#20179,#20157)
+expr_containers(#20179,#20157)
 literals("values","values",#20179)
 bind(#20179,#20163)
 #20180=*
 exprs(#20180,0,#20177,1,"join")
 hasLocation(#20180,#20047)
 enclosing_stmt(#20180,#20168)
-exprContainers(#20180,#20157)
+expr_containers(#20180,#20157)
 literals("join","join",#20180)
 #20181=*
 exprs(#20181,4,#20175,0,"', '")
 hasLocation(#20181,#20051)
 enclosing_stmt(#20181,#20168)
-exprContainers(#20181,#20157)
+expr_containers(#20181,#20157)
 literals(", ","', '",#20181)
 #20182=*
 regexpterm(#20182,14,#20181,0,", ")
@@ -522,19 +522,19 @@ exprs(#20185,64,#20184,0,"x = 23")
 locations_default(#20186,#10000,5,5,5,10)
 hasLocation(#20185,#20186)
 enclosing_stmt(#20185,#20184)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 #20187=*
 exprs(#20187,78,#20185,0,"x")
 hasLocation(#20187,#20060)
 enclosing_stmt(#20187,#20184)
-exprContainers(#20187,#20001)
+expr_containers(#20187,#20001)
 literals("x","x",#20187)
 decl(#20187,#20155)
 #20188=*
 exprs(#20188,3,#20185,1,"23")
 hasLocation(#20188,#20064)
 enclosing_stmt(#20188,#20184)
-exprContainers(#20188,#20001)
+expr_containers(#20188,#20001)
 literals("23","23",#20188)
 #20189=*
 stmts(#20189,18,#20001,2,"var y = 19;")
@@ -546,19 +546,19 @@ exprs(#20190,64,#20189,0,"y = 19")
 locations_default(#20191,#10000,6,5,6,10)
 hasLocation(#20190,#20191)
 enclosing_stmt(#20190,#20189)
-exprContainers(#20190,#20001)
+expr_containers(#20190,#20001)
 #20192=*
 exprs(#20192,78,#20190,0,"y")
 hasLocation(#20192,#20070)
 enclosing_stmt(#20192,#20189)
-exprContainers(#20192,#20001)
+expr_containers(#20192,#20001)
 literals("y","y",#20192)
 decl(#20192,#20156)
 #20193=*
 exprs(#20193,3,#20190,1,"19")
 hasLocation(#20193,#20074)
 enclosing_stmt(#20193,#20189)
-exprContainers(#20193,#20001)
+expr_containers(#20193,#20001)
 literals("19","19",#20193)
 #20194=*
 stmts(#20194,2,#20001,3,"`${x} + ...  + y}`;")
@@ -570,32 +570,32 @@ exprs(#20195,71,#20194,0,"`${x} + ... x + y}`")
 locations_default(#20196,#10000,7,1,7,24)
 hasLocation(#20195,#20196)
 enclosing_stmt(#20195,#20194)
-exprContainers(#20195,#20001)
+expr_containers(#20195,#20001)
 #20197=*
 exprs(#20197,79,#20195,0,"x")
 hasLocation(#20197,#20084)
 enclosing_stmt(#20197,#20194)
-exprContainers(#20197,#20001)
+expr_containers(#20197,#20001)
 literals("x","x",#20197)
 bind(#20197,#20155)
 #20198=*
 exprs(#20198,72,#20195,1," + ")
 hasLocation(#20198,#20088)
 enclosing_stmt(#20198,#20194)
-exprContainers(#20198,#20001)
+expr_containers(#20198,#20001)
 literals(" + "," + ",#20198)
 #20199=*
 exprs(#20199,79,#20195,2,"y")
 hasLocation(#20199,#20092)
 enclosing_stmt(#20199,#20194)
-exprContainers(#20199,#20001)
+expr_containers(#20199,#20001)
 literals("y","y",#20199)
 bind(#20199,#20156)
 #20200=*
 exprs(#20200,72,#20195,3," = ")
 hasLocation(#20200,#20096)
 enclosing_stmt(#20200,#20194)
-exprContainers(#20200,#20001)
+expr_containers(#20200,#20001)
 literals(" = "," = ",#20200)
 #20201=*
 exprs(#20201,34,#20195,4,"x + y")
@@ -603,19 +603,19 @@ exprs(#20201,34,#20195,4,"x + y")
 locations_default(#20202,#10000,7,18,7,22)
 hasLocation(#20201,#20202)
 enclosing_stmt(#20201,#20194)
-exprContainers(#20201,#20001)
+expr_containers(#20201,#20001)
 #20203=*
 exprs(#20203,79,#20201,0,"x")
 hasLocation(#20203,#20100)
 enclosing_stmt(#20203,#20194)
-exprContainers(#20203,#20001)
+expr_containers(#20203,#20001)
 literals("x","x",#20203)
 bind(#20203,#20155)
 #20204=*
 exprs(#20204,79,#20201,1,"y")
 hasLocation(#20204,#20104)
 enclosing_stmt(#20204,#20194)
-exprContainers(#20204,#20001)
+expr_containers(#20204,#20001)
 literals("y","y",#20204)
 bind(#20204,#20156)
 #20205=*
@@ -628,12 +628,12 @@ exprs(#20206,70,#20205,0,"tag `${ ... x + y}`")
 locations_default(#20207,#10000,8,1,8,28)
 hasLocation(#20206,#20207)
 enclosing_stmt(#20206,#20205)
-exprContainers(#20206,#20001)
+expr_containers(#20206,#20001)
 #20208=*
 exprs(#20208,79,#20206,0,"tag")
 hasLocation(#20208,#20114)
 enclosing_stmt(#20208,#20205)
-exprContainers(#20208,#20001)
+expr_containers(#20208,#20001)
 literals("tag","tag",#20208)
 bind(#20208,#20154)
 #20209=*
@@ -642,32 +642,32 @@ exprs(#20209,71,#20206,1,"`${x} + ... x + y}`")
 locations_default(#20210,#10000,8,5,8,28)
 hasLocation(#20209,#20210)
 enclosing_stmt(#20209,#20205)
-exprContainers(#20209,#20001)
+expr_containers(#20209,#20001)
 #20211=*
 exprs(#20211,79,#20209,0,"x")
 hasLocation(#20211,#20122)
 enclosing_stmt(#20211,#20205)
-exprContainers(#20211,#20001)
+expr_containers(#20211,#20001)
 literals("x","x",#20211)
 bind(#20211,#20155)
 #20212=*
 exprs(#20212,72,#20209,1," + ")
 hasLocation(#20212,#20126)
 enclosing_stmt(#20212,#20205)
-exprContainers(#20212,#20001)
+expr_containers(#20212,#20001)
 literals(" + "," + ",#20212)
 #20213=*
 exprs(#20213,79,#20209,2,"y")
 hasLocation(#20213,#20130)
 enclosing_stmt(#20213,#20205)
-exprContainers(#20213,#20001)
+expr_containers(#20213,#20001)
 literals("y","y",#20213)
 bind(#20213,#20156)
 #20214=*
 exprs(#20214,72,#20209,3," = ")
 hasLocation(#20214,#20134)
 enclosing_stmt(#20214,#20205)
-exprContainers(#20214,#20001)
+expr_containers(#20214,#20001)
 literals(" = "," = ",#20214)
 #20215=*
 exprs(#20215,34,#20209,4,"x + y")
@@ -675,19 +675,19 @@ exprs(#20215,34,#20209,4,"x + y")
 locations_default(#20216,#10000,8,22,8,26)
 hasLocation(#20215,#20216)
 enclosing_stmt(#20215,#20205)
-exprContainers(#20215,#20001)
+expr_containers(#20215,#20001)
 #20217=*
 exprs(#20217,79,#20215,0,"x")
 hasLocation(#20217,#20138)
 enclosing_stmt(#20217,#20205)
-exprContainers(#20217,#20001)
+expr_containers(#20217,#20001)
 literals("x","x",#20217)
 bind(#20217,#20155)
 #20218=*
 exprs(#20218,79,#20215,1,"y")
 hasLocation(#20218,#20142)
 enclosing_stmt(#20218,#20205)
-exprContainers(#20218,#20001)
+expr_containers(#20218,#20001)
 literals("y","y",#20218)
 bind(#20218,#20156)
 #20219=*

javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap

@@ -94,7 +94,7 @@ stmt_containers(#20031,#20001)
 #20032=*
 exprs(#20032,78,#20031,-1,"g")
 hasLocation(#20032,#20011)
-exprContainers(#20032,#20031)
+expr_containers(#20032,#20031)
 literals("g","g",#20032)
 decl(#20032,#20030)
 #20033=*
@@ -122,7 +122,7 @@ exprs(#20039,82,#20037,0,"new.source")
 locations_default(#20040,#10000,2,3,2,12)
 hasLocation(#20039,#20040)
 enclosing_stmt(#20039,#20037)
-exprContainers(#20039,#20031)
+expr_containers(#20039,#20031)
 #20041=*
 entry_cfg_node(#20041,#20001)
 #20042=@"loc,{#10000},1,1,1,0"

javascript/extractor/tests/es2015/output/trap/yield.js.trap

@@ -174,7 +174,7 @@ stmt_containers(#20061,#20001)
 #20062=*
 exprs(#20062,78,#20061,-1,"foo")
 hasLocation(#20062,#20019)
-exprContainers(#20062,#20061)
+expr_containers(#20062,#20061)
 literals("foo","foo",#20062)
 decl(#20062,#20060)
 #20063=*
@@ -205,19 +205,19 @@ exprs(#20070,64,#20068,0,"index = 0")
 locations_default(#20071,#10000,2,7,2,15)
 hasLocation(#20070,#20071)
 enclosing_stmt(#20070,#20068)
-exprContainers(#20070,#20061)
+expr_containers(#20070,#20061)
 #20072=*
 exprs(#20072,78,#20070,0,"index")
 hasLocation(#20072,#20029)
 enclosing_stmt(#20072,#20068)
-exprContainers(#20072,#20061)
+expr_containers(#20072,#20061)
 literals("index","index",#20072)
 decl(#20072,#20064)
 #20073=*
 exprs(#20073,3,#20070,1,"0")
 hasLocation(#20073,#20033)
 enclosing_stmt(#20073,#20068)
-exprContainers(#20073,#20061)
+expr_containers(#20073,#20061)
 literals("0","0",#20073)
 #20074=*
 stmts(#20074,12,#20066,1,"while(i ... ndex++;")
@@ -231,19 +231,19 @@ exprs(#20076,28,#20074,0,"index <= 2")
 locations_default(#20077,#10000,3,9,3,18)
 hasLocation(#20076,#20077)
 enclosing_stmt(#20076,#20074)
-exprContainers(#20076,#20061)
+expr_containers(#20076,#20061)
 #20078=*
 exprs(#20078,79,#20076,0,"index")
 hasLocation(#20078,#20041)
 enclosing_stmt(#20078,#20074)
-exprContainers(#20078,#20061)
+expr_containers(#20078,#20061)
 literals("index","index",#20078)
 bind(#20078,#20064)
 #20079=*
 exprs(#20079,3,#20076,1,"2")
 hasLocation(#20079,#20045)
 enclosing_stmt(#20079,#20074)
-exprContainers(#20079,#20061)
+expr_containers(#20079,#20061)
 literals("2","2",#20079)
 #20080=*
 stmts(#20080,2,#20074,1,"yield index++;")
@@ -257,19 +257,19 @@ exprs(#20082,69,#20080,0,"yield index++")
 locations_default(#20083,#10000,4,5,4,17)
 hasLocation(#20082,#20083)
 enclosing_stmt(#20082,#20080)
-exprContainers(#20082,#20061)
+expr_containers(#20082,#20061)
 #20084=*
 exprs(#20084,60,#20082,0,"index++")
 #20085=@"loc,{#10000},4,11,4,17"
 locations_default(#20085,#10000,4,11,4,17)
 hasLocation(#20084,#20085)
 enclosing_stmt(#20084,#20080)
-exprContainers(#20084,#20061)
+expr_containers(#20084,#20061)
 #20086=*
 exprs(#20086,79,#20084,0,"index")
 hasLocation(#20086,#20051)
 enclosing_stmt(#20086,#20080)
-exprContainers(#20086,#20061)
+expr_containers(#20086,#20061)
 literals("index","index",#20086)
 bind(#20086,#20064)
 #20087=*

javascript/extractor/tests/es2015/output/trap/yield2.js.trap

@@ -92,7 +92,7 @@ stmt_containers(#20029,#20001)
 #20031=*
 exprs(#20031,78,#20029,-1,"f")
 hasLocation(#20031,#20013)
-exprContainers(#20031,#20029)
+expr_containers(#20031,#20029)
 literals("f","f",#20031)
 decl(#20031,#20028)
 #20032=*
@@ -119,7 +119,7 @@ stmt_containers(#20036,#20029)
 exprs(#20038,69,#20036,0,"yield")
 hasLocation(#20038,#20021)
 enclosing_stmt(#20038,#20036)
-exprContainers(#20038,#20029)
+expr_containers(#20038,#20029)
 #20039=*
 entry_cfg_node(#20039,#20001)
 #20040=@"loc,{#10000},1,1,1,0"

javascript/extractor/tests/es2016/output/trap/exp.js.trap

@@ -68,18 +68,18 @@ stmt_containers(#20021,#20001)
 exprs(#20022,87,#20021,0,"1**0")
 hasLocation(#20022,#20003)
 enclosing_stmt(#20022,#20021)
-exprContainers(#20022,#20001)
+expr_containers(#20022,#20001)
 #20023=*
 exprs(#20023,3,#20022,0,"1")
 hasLocation(#20023,#20007)
 enclosing_stmt(#20023,#20021)
-exprContainers(#20023,#20001)
+expr_containers(#20023,#20001)
 literals("1","1",#20023)
 #20024=*
 exprs(#20024,3,#20022,1,"0")
 hasLocation(#20024,#20011)
 enclosing_stmt(#20024,#20021)
-exprContainers(#20024,#20001)
+expr_containers(#20024,#20001)
 literals("0","0",#20024)
 #20025=*
 stmts(#20025,2,#20001,1,"x**=2")
@@ -89,12 +89,12 @@ stmt_containers(#20025,#20001)
 exprs(#20026,88,#20025,0,"x**=2")
 hasLocation(#20026,#20005)
 enclosing_stmt(#20026,#20025)
-exprContainers(#20026,#20001)
+expr_containers(#20026,#20001)
 #20027=*
 exprs(#20027,79,#20026,0,"x")
 hasLocation(#20027,#20013)
 enclosing_stmt(#20027,#20025)
-exprContainers(#20027,#20001)
+expr_containers(#20027,#20001)
 literals("x","x",#20027)
 #20028=@"var;{x};{#20000}"
 variables(#20028,"x",#20000)
@@ -103,7 +103,7 @@ bind(#20027,#20028)
 exprs(#20029,3,#20026,1,"2")
 hasLocation(#20029,#20017)
 enclosing_stmt(#20029,#20025)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 literals("2","2",#20029)
 #20030=*
 entry_cfg_node(#20030,#20001)

javascript/extractor/tests/es2016/output/trap/usestrict.js.trap

@@ -86,7 +86,7 @@ stmt_containers(#20029,#20001)
 #20030=*
 exprs(#20030,78,#20029,-1,"f")
 hasLocation(#20030,#20007)
-exprContainers(#20030,#20029)
+expr_containers(#20030,#20029)
 literals("f","f",#20030)
 decl(#20030,#20028)
 #20031=*
@@ -98,7 +98,7 @@ variables(#20032,"a",#20031)
 #20033=*
 exprs(#20033,78,#20029,0,"a")
 hasLocation(#20033,#20011)
-exprContainers(#20033,#20029)
+expr_containers(#20033,#20029)
 literals("a","a",#20033)
 decl(#20033,#20032)
 #20034=@"var;{arguments};{#20031}"
@@ -107,7 +107,7 @@ isArgumentsObject(#20034)
 #20035=*
 exprs(#20035,3,#20029,-5,"2")
 hasLocation(#20035,#20015)
-exprContainers(#20035,#20029)
+expr_containers(#20035,#20029)
 literals("2","2",#20035)
 #20036=*
 stmts(#20036,1,#20029,-2,"{ 'use strict'; }")
@@ -125,7 +125,7 @@ stmt_containers(#20038,#20029)
 exprs(#20040,4,#20038,0,"'use strict'")
 hasLocation(#20040,#20021)
 enclosing_stmt(#20040,#20038)
-exprContainers(#20040,#20029)
+expr_containers(#20040,#20029)
 literals("use strict","'use strict'",#20040)
 #20041=*
 regexpterm(#20041,14,#20040,0,"use strict")

javascript/extractor/tests/es2017/output/trap/async-await.js.trap

@@ -214,7 +214,7 @@ stmt_containers(#20073,#20001)
 #20075=*
 exprs(#20075,78,#20073,-1,"foo")
 hasLocation(#20075,#20023)
-exprContainers(#20075,#20073)
+expr_containers(#20075,#20073)
 literals("foo","foo",#20075)
 decl(#20075,#20070)
 #20076=*
@@ -226,7 +226,7 @@ variables(#20077,"x",#20076)
 #20078=*
 exprs(#20078,78,#20073,0,"x")
 hasLocation(#20078,#20027)
-exprContainers(#20078,#20073)
+expr_containers(#20078,#20073)
 literals("x","x",#20078)
 decl(#20078,#20077)
 #20079=@"var;{arguments};{#20076}"
@@ -263,12 +263,12 @@ exprs(#20088,92,#20086,0,"await x")
 locations_default(#20089,#10000,3,5,3,11)
 hasLocation(#20088,#20089)
 enclosing_stmt(#20088,#20086)
-exprContainers(#20088,#20073)
+expr_containers(#20088,#20073)
 #20090=*
 exprs(#20090,79,#20088,0,"x")
 hasLocation(#20090,#20039)
 enclosing_stmt(#20090,#20086)
-exprContainers(#20090,#20073)
+expr_containers(#20090,#20073)
 literals("x","x",#20090)
 bind(#20090,#20077)
 #20091=*
@@ -287,7 +287,7 @@ variables(#20094,"e",#20093)
 exprs(#20095,78,#20091,0,"e")
 hasLocation(#20095,#20049)
 enclosing_stmt(#20095,#20091)
-exprContainers(#20095,#20073)
+expr_containers(#20095,#20073)
 literals("e","e",#20095)
 decl(#20095,#20094)
 #20096=*
@@ -306,7 +306,7 @@ stmt_containers(#20098,#20073)
 exprs(#20100,1,#20098,0,"null")
 hasLocation(#20100,#20057)
 enclosing_stmt(#20100,#20098)
-exprContainers(#20100,#20073)
+expr_containers(#20100,#20073)
 literals("null","null",#20100)
 #20101=*
 stmts(#20101,0,#20001,1,";")

javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap

@@ -98,7 +98,7 @@ stmt_containers(#20031,#20001)
 #20033=*
 exprs(#20033,78,#20031,-1,"f")
 hasLocation(#20033,#20013)
-exprContainers(#20033,#20031)
+expr_containers(#20033,#20031)
 literals("f","f",#20033)
 decl(#20033,#20028)
 #20034=*

javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap

@@ -88,7 +88,7 @@ exprs(#20028,9,#20026,0,"async function () {}")
 locations_default(#20029,#10000,1,16,1,35)
 hasLocation(#20028,#20029)
 enclosing_stmt(#20028,#20026)
-exprContainers(#20028,#20001)
+expr_containers(#20028,#20001)
 #20030=*
 scopes(#20030,1)
 scopenodes(#20028,#20030)

javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap

@@ -80,12 +80,12 @@ stmt_containers(#20026,#20001)
 exprs(#20027,47,#20026,0,"f = async ((x)) => x")
 hasLocation(#20027,#20003)
 enclosing_stmt(#20027,#20026)
-exprContainers(#20027,#20001)
+expr_containers(#20027,#20001)
 #20028=*
 exprs(#20028,79,#20027,0,"f")
 hasLocation(#20028,#20005)
 enclosing_stmt(#20028,#20026)
-exprContainers(#20028,#20001)
+expr_containers(#20028,#20001)
 literals("f","f",#20028)
 #20029=@"var;{f};{#20000}"
 variables(#20029,"f",#20000)
@@ -96,7 +96,7 @@ exprs(#20030,65,#20027,1,"async ((x)) => x")
 locations_default(#20031,#10000,1,5,1,20)
 hasLocation(#20030,#20031)
 enclosing_stmt(#20030,#20026)
-exprContainers(#20030,#20001)
+expr_containers(#20030,#20001)
 #20032=*
 scopes(#20032,1)
 scopenodes(#20030,#20032)
@@ -106,14 +106,14 @@ variables(#20033,"x",#20032)
 #20034=*
 exprs(#20034,78,#20030,0,"x")
 hasLocation(#20034,#20015)
-exprContainers(#20034,#20030)
+expr_containers(#20034,#20030)
 literals("x","x",#20034)
 decl(#20034,#20033)
 isAsync(#20030)
 #20035=*
 exprs(#20035,79,#20030,-2,"x")
 hasLocation(#20035,#20023)
-exprContainers(#20035,#20030)
+expr_containers(#20035,#20030)
 literals("x","x",#20035)
 bind(#20035,#20033)
 #20036=*

javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap

@@ -65,14 +65,14 @@ exprs(#20020,63,#20019,0,"({ async })")
 locations_default(#20021,#10000,1,1,1,11)
 hasLocation(#20020,#20021)
 enclosing_stmt(#20020,#20019)
-exprContainers(#20020,#20001)
+expr_containers(#20020,#20001)
 #20022=*
 exprs(#20022,8,#20020,0,"{ async }")
 #20023=@"loc,{#10000},1,2,1,10"
 locations_default(#20023,#10000,1,2,1,10)
 hasLocation(#20022,#20023)
 enclosing_stmt(#20022,#20019)
-exprContainers(#20022,#20001)
+expr_containers(#20022,#20001)
 #20024=*
 properties(#20024,#20022,0,0,"async")
 hasLocation(#20024,#20009)
@@ -80,13 +80,13 @@ hasLocation(#20024,#20009)
 exprs(#20025,0,#20024,0,"async")
 hasLocation(#20025,#20009)
 enclosing_stmt(#20025,#20019)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 literals("async","async",#20025)
 #20026=*
 exprs(#20026,79,#20024,1,"async")
 hasLocation(#20026,#20009)
 enclosing_stmt(#20026,#20019)
-exprContainers(#20026,#20001)
+expr_containers(#20026,#20001)
 literals("async","async",#20026)
 #20027=@"var;{async};{#20000}"
 variables(#20027,"async",#20000)

javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap

@@ -370,7 +370,7 @@ stmt_containers(#20137,#20001)
 #20138=*
 exprs(#20138,78,#20137,-1,"asyncFn")
 hasLocation(#20138,#20031)
-exprContainers(#20138,#20137)
+expr_containers(#20138,#20137)
 literals("asyncFn","asyncFn",#20138)
 decl(#20138,#20133)
 #20139=*
@@ -398,7 +398,7 @@ stmt_containers(#20143,#20001)
 exprs(#20145,78,#20143,0,"C")
 hasLocation(#20145,#20043)
 enclosing_stmt(#20145,#20143)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 literals("C","C",#20145)
 decl(#20145,#20135)
 typedecl(#20145,#20136)
@@ -415,7 +415,7 @@ hasLocation(#20147,#20148)
 exprs(#20149,0,#20147,0,"asyncMeth")
 hasLocation(#20149,#20051)
 enclosing_stmt(#20149,#20143)
-exprContainers(#20149,#20001)
+expr_containers(#20149,#20001)
 literals("asyncMeth","asyncMeth",#20149)
 #20150=*
 exprs(#20150,9,#20147,1,"() {}")
@@ -423,7 +423,7 @@ exprs(#20150,9,#20147,1,"() {}")
 locations_default(#20151,#10000,4,19,4,23)
 hasLocation(#20150,#20151)
 enclosing_stmt(#20150,#20143)
-exprContainers(#20150,#20001)
+expr_containers(#20150,#20001)
 #20152=*
 scopes(#20152,1)
 scopenodes(#20150,#20152)
@@ -451,12 +451,12 @@ exprs(#20158,14,#20156,0,"Symbol.asyncIterator")
 locations_default(#20159,#10000,5,11,5,30)
 hasLocation(#20158,#20159)
 enclosing_stmt(#20158,#20143)
-exprContainers(#20158,#20001)
+expr_containers(#20158,#20001)
 #20160=*
 exprs(#20160,79,#20158,0,"Symbol")
 hasLocation(#20160,#20067)
 enclosing_stmt(#20160,#20143)
-exprContainers(#20160,#20001)
+expr_containers(#20160,#20001)
 literals("Symbol","Symbol",#20160)
 #20161=@"var;{Symbol};{#20000}"
 variables(#20161,"Symbol",#20000)
@@ -465,7 +465,7 @@ bind(#20160,#20161)
 exprs(#20162,0,#20158,1,"asyncIterator")
 hasLocation(#20162,#20071)
 enclosing_stmt(#20162,#20143)
-exprContainers(#20162,#20001)
+expr_containers(#20162,#20001)
 literals("asyncIterator","asyncIterator",#20162)
 #20163=*
 exprs(#20163,9,#20156,1,"() {}")
@@ -473,7 +473,7 @@ exprs(#20163,9,#20156,1,"() {}")
 locations_default(#20164,#10000,5,32,5,36)
 hasLocation(#20163,#20164)
 enclosing_stmt(#20163,#20143)
-exprContainers(#20163,#20001)
+expr_containers(#20163,#20001)
 #20165=*
 scopes(#20165,1)
 scopenodes(#20163,#20165)
@@ -500,13 +500,13 @@ hasLocation(#20169,#20170)
 exprs(#20171,0,#20169,0,"constructor")
 hasLocation(#20171,#20170)
 enclosing_stmt(#20171,#20143)
-exprContainers(#20171,#20001)
+expr_containers(#20171,#20001)
 literals("constructor","constructor",#20171)
 #20172=*
 exprs(#20172,9,#20169,1,"() {}")
 hasLocation(#20172,#20170)
 enclosing_stmt(#20172,#20143)
-exprContainers(#20172,#20001)
+expr_containers(#20172,#20001)
 #20173=*
 scopes(#20173,1)
 scopenodes(#20172,#20173)
@@ -531,12 +531,12 @@ exprs(#20178,64,#20176,0,"o = {\n  ... () {}\n}")
 locations_default(#20179,#10000,8,5,11,1)
 hasLocation(#20178,#20179)
 enclosing_stmt(#20178,#20176)
-exprContainers(#20178,#20001)
+expr_containers(#20178,#20001)
 #20180=*
 exprs(#20180,78,#20178,0,"o")
 hasLocation(#20180,#20086)
 enclosing_stmt(#20180,#20176)
-exprContainers(#20180,#20001)
+expr_containers(#20180,#20001)
 literals("o","o",#20180)
 decl(#20180,#20134)
 #20181=*
@@ -545,7 +545,7 @@ exprs(#20181,8,#20178,1,"{\n  asy ... () {}\n}")
 locations_default(#20182,#10000,8,9,11,1)
 hasLocation(#20181,#20182)
 enclosing_stmt(#20181,#20176)
-exprContainers(#20181,#20001)
+expr_containers(#20181,#20001)
 #20183=*
 properties(#20183,#20181,0,0,"async * ... th() {}")
 #20184=@"loc,{#10000},9,3,9,23"
@@ -555,7 +555,7 @@ hasLocation(#20183,#20184)
 exprs(#20185,0,#20183,0,"asyncMeth")
 hasLocation(#20185,#20096)
 enclosing_stmt(#20185,#20176)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 literals("asyncMeth","asyncMeth",#20185)
 #20186=*
 exprs(#20186,9,#20183,1,"() {}")
@@ -563,7 +563,7 @@ exprs(#20186,9,#20183,1,"() {}")
 locations_default(#20187,#10000,9,19,9,23)
 hasLocation(#20186,#20187)
 enclosing_stmt(#20186,#20176)
-exprContainers(#20186,#20001)
+expr_containers(#20186,#20001)
 #20188=*
 scopes(#20188,1)
 scopenodes(#20186,#20188)
@@ -591,19 +591,19 @@ exprs(#20194,14,#20192,0,"Symbol.asyncIterator")
 locations_default(#20195,#10000,10,11,10,30)
 hasLocation(#20194,#20195)
 enclosing_stmt(#20194,#20176)
-exprContainers(#20194,#20001)
+expr_containers(#20194,#20001)
 #20196=*
 exprs(#20196,79,#20194,0,"Symbol")
 hasLocation(#20196,#20114)
 enclosing_stmt(#20196,#20176)
-exprContainers(#20196,#20001)
+expr_containers(#20196,#20001)
 literals("Symbol","Symbol",#20196)
 bind(#20196,#20161)
 #20197=*
 exprs(#20197,0,#20194,1,"asyncIterator")
 hasLocation(#20197,#20118)
 enclosing_stmt(#20197,#20176)
-exprContainers(#20197,#20001)
+expr_containers(#20197,#20001)
 literals("asyncIterator","asyncIterator",#20197)
 #20198=*
 exprs(#20198,9,#20192,1,"() {}")
@@ -611,7 +611,7 @@ exprs(#20198,9,#20192,1,"() {}")
 locations_default(#20199,#10000,10,32,10,36)
 hasLocation(#20198,#20199)
 enclosing_stmt(#20198,#20176)
-exprContainers(#20198,#20001)
+expr_containers(#20198,#20001)
 #20200=*
 scopes(#20200,1)
 scopenodes(#20198,#20200)

javascript/extractor/tests/es2018/output/trap/templates.js.trap

@@ -386,52 +386,52 @@ stmt_containers(#20143,#20001)
 exprs(#20145,70,#20143,0,"`foo`\n` ... \u25a0`")
 hasLocation(#20145,#20144)
 enclosing_stmt(#20145,#20143)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 #20146=*
 exprs(#20146,70,#20145,0,"`foo`\n`foo\u25a0`")
 #20147=@"loc,{#10000},1,1,2,11"
 locations_default(#20147,#10000,1,1,2,11)
 hasLocation(#20146,#20147)
 enclosing_stmt(#20146,#20143)
-exprContainers(#20146,#20001)
+expr_containers(#20146,#20001)
 #20148=*
 exprs(#20148,71,#20146,0,"`foo`")
 hasLocation(#20148,#20003)
 enclosing_stmt(#20148,#20143)
-exprContainers(#20148,#20001)
+expr_containers(#20148,#20001)
 #20149=*
 exprs(#20149,72,#20148,0,"foo")
 hasLocation(#20149,#20029)
 enclosing_stmt(#20149,#20143)
-exprContainers(#20149,#20001)
+expr_containers(#20149,#20001)
 literals("foo","foo",#20149)
 #20150=*
 exprs(#20150,71,#20146,1,"`foo\u25a0`")
 hasLocation(#20150,#20005)
 enclosing_stmt(#20150,#20143)
-exprContainers(#20150,#20001)
+expr_containers(#20150,#20001)
 #20151=*
 exprs(#20151,72,#20150,0,"foo\u25a0")
 hasLocation(#20151,#20035)
 enclosing_stmt(#20151,#20143)
-exprContainers(#20151,#20001)
+expr_containers(#20151,#20001)
 literals("foo■","foo\u25a0",#20151)
 #20152=*
 exprs(#20152,71,#20145,1,"`foo${bar}\u25a0`")
 hasLocation(#20152,#20007)
 enclosing_stmt(#20152,#20143)
-exprContainers(#20152,#20001)
+expr_containers(#20152,#20001)
 #20153=*
 exprs(#20153,72,#20152,0,"foo")
 hasLocation(#20153,#20041)
 enclosing_stmt(#20153,#20143)
-exprContainers(#20153,#20001)
+expr_containers(#20153,#20001)
 literals("foo","foo",#20153)
 #20154=*
 exprs(#20154,79,#20152,1,"bar")
 hasLocation(#20154,#20045)
 enclosing_stmt(#20154,#20143)
-exprContainers(#20154,#20001)
+expr_containers(#20154,#20001)
 literals("bar","bar",#20154)
 #20155=@"var;{bar};{#20000}"
 variables(#20155,"bar",#20000)
@@ -440,7 +440,7 @@ bind(#20154,#20155)
 exprs(#20156,72,#20152,2,"\u25a0")
 hasLocation(#20156,#20049)
 enclosing_stmt(#20156,#20143)
-exprContainers(#20156,#20001)
+expr_containers(#20156,#20001)
 literals("■","\u25a0",#20156)
 #20157=*
 stmts(#20157,2,#20001,1,"foo `\u25a0`")
@@ -450,12 +450,12 @@ stmt_containers(#20157,#20001)
 exprs(#20158,70,#20157,0,"foo `\u25a0`")
 hasLocation(#20158,#20009)
 enclosing_stmt(#20158,#20157)
-exprContainers(#20158,#20001)
+expr_containers(#20158,#20001)
 #20159=*
 exprs(#20159,79,#20158,0,"foo")
 hasLocation(#20159,#20053)
 enclosing_stmt(#20159,#20157)
-exprContainers(#20159,#20001)
+expr_containers(#20159,#20001)
 literals("foo","foo",#20159)
 #20160=@"var;{foo};{#20000}"
 variables(#20160,"foo",#20000)
@@ -466,12 +466,12 @@ exprs(#20161,71,#20158,1,"`\u25a0`")
 locations_default(#20162,#10000,4,5,4,12)
 hasLocation(#20161,#20162)
 enclosing_stmt(#20161,#20157)
-exprContainers(#20161,#20001)
+expr_containers(#20161,#20001)
 #20163=*
 exprs(#20163,72,#20161,0,"\u25a0")
 hasLocation(#20163,#20057)
 enclosing_stmt(#20163,#20157)
-exprContainers(#20163,#20001)
+expr_containers(#20163,#20001)
 literals("■","\u25a0",#20163)
 #20164=*
 stmts(#20164,2,#20001,2,"foo `fo ... \u25a0`")
@@ -481,12 +481,12 @@ stmt_containers(#20164,#20001)
 exprs(#20165,70,#20164,0,"foo `fo ... \u25a0`")
 hasLocation(#20165,#20011)
 enclosing_stmt(#20165,#20164)
-exprContainers(#20165,#20001)
+expr_containers(#20165,#20001)
 #20166=*
 exprs(#20166,79,#20165,0,"foo")
 hasLocation(#20166,#20061)
 enclosing_stmt(#20166,#20164)
-exprContainers(#20166,#20001)
+expr_containers(#20166,#20001)
 literals("foo","foo",#20166)
 bind(#20166,#20160)
 #20167=*
@@ -495,25 +495,25 @@ exprs(#20167,71,#20165,1,"`foo${bar}\u25a0`")
 locations_default(#20168,#10000,5,5,5,21)
 hasLocation(#20167,#20168)
 enclosing_stmt(#20167,#20164)
-exprContainers(#20167,#20001)
+expr_containers(#20167,#20001)
 #20169=*
 exprs(#20169,72,#20167,0,"foo")
 hasLocation(#20169,#20065)
 enclosing_stmt(#20169,#20164)
-exprContainers(#20169,#20001)
+expr_containers(#20169,#20001)
 literals("foo","foo",#20169)
 #20170=*
 exprs(#20170,79,#20167,1,"bar")
 hasLocation(#20170,#20069)
 enclosing_stmt(#20170,#20164)
-exprContainers(#20170,#20001)
+expr_containers(#20170,#20001)
 literals("bar","bar",#20170)
 bind(#20170,#20155)
 #20171=*
 exprs(#20171,72,#20167,2,"\u25a0")
 hasLocation(#20171,#20073)
 enclosing_stmt(#20171,#20164)
-exprContainers(#20171,#20001)
+expr_containers(#20171,#20001)
 literals("■","\u25a0",#20171)
 #20172=*
 stmts(#20172,2,#20001,3,"foo `\unicode`")
@@ -523,12 +523,12 @@ stmt_containers(#20172,#20001)
 exprs(#20173,70,#20172,0,"foo `\unicode`")
 hasLocation(#20173,#20013)
 enclosing_stmt(#20173,#20172)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 #20174=*
 exprs(#20174,79,#20173,0,"foo")
 hasLocation(#20174,#20077)
 enclosing_stmt(#20174,#20172)
-exprContainers(#20174,#20001)
+expr_containers(#20174,#20001)
 literals("foo","foo",#20174)
 bind(#20174,#20160)
 #20175=*
@@ -537,12 +537,12 @@ exprs(#20175,71,#20173,1,"`\unicode`")
 locations_default(#20176,#10000,6,5,6,14)
 hasLocation(#20175,#20176)
 enclosing_stmt(#20175,#20172)
-exprContainers(#20175,#20001)
+expr_containers(#20175,#20001)
 #20177=*
 exprs(#20177,72,#20175,0,"\unicode")
 hasLocation(#20177,#20081)
 enclosing_stmt(#20177,#20172)
-exprContainers(#20177,#20001)
+expr_containers(#20177,#20001)
 literals("","\unicode",#20177)
 #20178=*
 stmts(#20178,2,#20001,4,"foo `fo ... nicode`")
@@ -552,12 +552,12 @@ stmt_containers(#20178,#20001)
 exprs(#20179,70,#20178,0,"foo `fo ... nicode`")
 hasLocation(#20179,#20015)
 enclosing_stmt(#20179,#20178)
-exprContainers(#20179,#20001)
+expr_containers(#20179,#20001)
 #20180=*
 exprs(#20180,79,#20179,0,"foo")
 hasLocation(#20180,#20085)
 enclosing_stmt(#20180,#20178)
-exprContainers(#20180,#20001)
+expr_containers(#20180,#20001)
 literals("foo","foo",#20180)
 bind(#20180,#20160)
 #20181=*
@@ -566,25 +566,25 @@ exprs(#20181,71,#20179,1,"`foo${bar}\unicode`")
 locations_default(#20182,#10000,7,5,7,23)
 hasLocation(#20181,#20182)
 enclosing_stmt(#20181,#20178)
-exprContainers(#20181,#20001)
+expr_containers(#20181,#20001)
 #20183=*
 exprs(#20183,72,#20181,0,"foo")
 hasLocation(#20183,#20089)
 enclosing_stmt(#20183,#20178)
-exprContainers(#20183,#20001)
+expr_containers(#20183,#20001)
 literals("foo","foo",#20183)
 #20184=*
 exprs(#20184,79,#20181,1,"bar")
 hasLocation(#20184,#20093)
 enclosing_stmt(#20184,#20178)
-exprContainers(#20184,#20001)
+expr_containers(#20184,#20001)
 literals("bar","bar",#20184)
 bind(#20184,#20155)
 #20185=*
 exprs(#20185,72,#20181,2,"\unicode")
 hasLocation(#20185,#20097)
 enclosing_stmt(#20185,#20178)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 literals("","\unicode",#20185)
 #20186=*
 stmts(#20186,2,#20001,5,"foo `\u`")
@@ -594,12 +594,12 @@ stmt_containers(#20186,#20001)
 exprs(#20187,70,#20186,0,"foo `\u`")
 hasLocation(#20187,#20017)
 enclosing_stmt(#20187,#20186)
-exprContainers(#20187,#20001)
+expr_containers(#20187,#20001)
 #20188=*
 exprs(#20188,79,#20187,0,"foo")
 hasLocation(#20188,#20101)
 enclosing_stmt(#20188,#20186)
-exprContainers(#20188,#20001)
+expr_containers(#20188,#20001)
 literals("foo","foo",#20188)
 bind(#20188,#20160)
 #20189=*
@@ -608,12 +608,12 @@ exprs(#20189,71,#20187,1,"`\u`")
 locations_default(#20190,#10000,8,5,8,8)
 hasLocation(#20189,#20190)
 enclosing_stmt(#20189,#20186)
-exprContainers(#20189,#20001)
+expr_containers(#20189,#20001)
 #20191=*
 exprs(#20191,72,#20189,0,"\u")
 hasLocation(#20191,#20105)
 enclosing_stmt(#20191,#20186)
-exprContainers(#20191,#20001)
+expr_containers(#20191,#20001)
 literals("","\u",#20191)
 #20192=*
 stmts(#20192,2,#20001,6,"foo `\u{`")
@@ -623,12 +623,12 @@ stmt_containers(#20192,#20001)
 exprs(#20193,70,#20192,0,"foo `\u{`")
 hasLocation(#20193,#20019)
 enclosing_stmt(#20193,#20192)
-exprContainers(#20193,#20001)
+expr_containers(#20193,#20001)
 #20194=*
 exprs(#20194,79,#20193,0,"foo")
 hasLocation(#20194,#20109)
 enclosing_stmt(#20194,#20192)
-exprContainers(#20194,#20001)
+expr_containers(#20194,#20001)
 literals("foo","foo",#20194)
 bind(#20194,#20160)
 #20195=*
@@ -637,12 +637,12 @@ exprs(#20195,71,#20193,1,"`\u{`")
 locations_default(#20196,#10000,9,5,9,9)
 hasLocation(#20195,#20196)
 enclosing_stmt(#20195,#20192)
-exprContainers(#20195,#20001)
+expr_containers(#20195,#20001)
 #20197=*
 exprs(#20197,72,#20195,0,"\u{")
 hasLocation(#20197,#20113)
 enclosing_stmt(#20197,#20192)
-exprContainers(#20197,#20001)
+expr_containers(#20197,#20001)
 literals("","\u{",#20197)
 #20198=*
 stmts(#20198,2,#20001,7,"foo `\u{abcdx`")
@@ -652,12 +652,12 @@ stmt_containers(#20198,#20001)
 exprs(#20199,70,#20198,0,"foo `\u{abcdx`")
 hasLocation(#20199,#20021)
 enclosing_stmt(#20199,#20198)
-exprContainers(#20199,#20001)
+expr_containers(#20199,#20001)
 #20200=*
 exprs(#20200,79,#20199,0,"foo")
 hasLocation(#20200,#20117)
 enclosing_stmt(#20200,#20198)
-exprContainers(#20200,#20001)
+expr_containers(#20200,#20001)
 literals("foo","foo",#20200)
 bind(#20200,#20160)
 #20201=*
@@ -666,12 +666,12 @@ exprs(#20201,71,#20199,1,"`\u{abcdx`")
 locations_default(#20202,#10000,10,5,10,14)
 hasLocation(#20201,#20202)
 enclosing_stmt(#20201,#20198)
-exprContainers(#20201,#20001)
+expr_containers(#20201,#20001)
 #20203=*
 exprs(#20203,72,#20201,0,"\u{abcdx")
 hasLocation(#20203,#20121)
 enclosing_stmt(#20203,#20198)
-exprContainers(#20203,#20001)
+expr_containers(#20203,#20001)
 literals("","\u{abcdx",#20203)
 #20204=*
 stmts(#20204,2,#20001,8,"foo `\u{abcdx}`")
@@ -681,12 +681,12 @@ stmt_containers(#20204,#20001)
 exprs(#20205,70,#20204,0,"foo `\u{abcdx}`")
 hasLocation(#20205,#20023)
 enclosing_stmt(#20205,#20204)
-exprContainers(#20205,#20001)
+expr_containers(#20205,#20001)
 #20206=*
 exprs(#20206,79,#20205,0,"foo")
 hasLocation(#20206,#20125)
 enclosing_stmt(#20206,#20204)
-exprContainers(#20206,#20001)
+expr_containers(#20206,#20001)
 literals("foo","foo",#20206)
 bind(#20206,#20160)
 #20207=*
@@ -695,12 +695,12 @@ exprs(#20207,71,#20205,1,"`\u{abcdx}`")
 locations_default(#20208,#10000,11,5,11,15)
 hasLocation(#20207,#20208)
 enclosing_stmt(#20207,#20204)
-exprContainers(#20207,#20001)
+expr_containers(#20207,#20001)
 #20209=*
 exprs(#20209,72,#20207,0,"\u{abcdx}")
 hasLocation(#20209,#20129)
 enclosing_stmt(#20209,#20204)
-exprContainers(#20209,#20001)
+expr_containers(#20209,#20001)
 literals("","\u{abcdx}",#20209)
 #20210=*
 stmts(#20210,2,#20001,9,"foo `\unicode\\`")
@@ -710,12 +710,12 @@ stmt_containers(#20210,#20001)
 exprs(#20211,70,#20210,0,"foo `\unicode\\`")
 hasLocation(#20211,#20025)
 enclosing_stmt(#20211,#20210)
-exprContainers(#20211,#20001)
+expr_containers(#20211,#20001)
 #20212=*
 exprs(#20212,79,#20211,0,"foo")
 hasLocation(#20212,#20133)
 enclosing_stmt(#20212,#20210)
-exprContainers(#20212,#20001)
+expr_containers(#20212,#20001)
 literals("foo","foo",#20212)
 bind(#20212,#20160)
 #20213=*
@@ -724,12 +724,12 @@ exprs(#20213,71,#20211,1,"`\unicode\\`")
 locations_default(#20214,#10000,12,5,12,16)
 hasLocation(#20213,#20214)
 enclosing_stmt(#20213,#20210)
-exprContainers(#20213,#20001)
+expr_containers(#20213,#20001)
 #20215=*
 exprs(#20215,72,#20213,0,"\unicode\\")
 hasLocation(#20215,#20137)
 enclosing_stmt(#20215,#20210)
-exprContainers(#20215,#20001)
+expr_containers(#20215,#20001)
 literals("","\unicode\\",#20215)
 #20216=*
 entry_cfg_node(#20216,#20001)

javascript/extractor/tests/es2019/output/trap/json-superset.js.trap

@@ -105,19 +105,19 @@ exprs(#20036,64,#20034,0,"s1 = ""ab\u2028c""")
 locations_default(#20037,#10000,1,5,1,15)
 hasLocation(#20036,#20037)
 enclosing_stmt(#20036,#20034)
-exprContainers(#20036,#20001)
+expr_containers(#20036,#20001)
 #20038=*
 exprs(#20038,78,#20036,0,"s1")
 hasLocation(#20038,#20013)
 enclosing_stmt(#20038,#20034)
-exprContainers(#20038,#20001)
+expr_containers(#20038,#20001)
 literals("s1","s1",#20038)
 decl(#20038,#20032)
 #20039=*
 exprs(#20039,4,#20036,1,"""ab\u2028c""")
 hasLocation(#20039,#20017)
 enclosing_stmt(#20039,#20034)
-exprContainers(#20039,#20001)
+expr_containers(#20039,#20001)
 literals("ab
c","""ab
c""",#20039)
 #20040=*
 regexpterm(#20040,14,#20039,0,"ab
c")
@@ -137,19 +137,19 @@ exprs(#20044,64,#20042,0,"s2 = ""ab\u2029c""")
 locations_default(#20045,#10000,2,5,2,15)
 hasLocation(#20044,#20045)
 enclosing_stmt(#20044,#20042)
-exprContainers(#20044,#20001)
+expr_containers(#20044,#20001)
 #20046=*
 exprs(#20046,78,#20044,0,"s2")
 hasLocation(#20046,#20022)
 enclosing_stmt(#20046,#20042)
-exprContainers(#20046,#20001)
+expr_containers(#20046,#20001)
 literals("s2","s2",#20046)
 decl(#20046,#20033)
 #20047=*
 exprs(#20047,4,#20044,1,"""ab\u2029c""")
 hasLocation(#20047,#20026)
 enclosing_stmt(#20047,#20042)
-exprContainers(#20047,#20001)
+expr_containers(#20047,#20001)
 literals("ab
c","""ab
c""",#20047)
 #20048=*
 regexpterm(#20048,14,#20047,0,"ab
c")

javascript/extractor/tests/esnext/output/trap/async-generators.js.trap

@@ -195,7 +195,7 @@ stmt_containers(#20069,#20001)
 #20071=*
 exprs(#20071,78,#20069,-1,"foo")
 hasLocation(#20071,#20021)
-exprContainers(#20071,#20069)
+expr_containers(#20071,#20069)
 literals("foo","foo",#20071)
 decl(#20071,#20067)
 #20072=*
@@ -222,7 +222,7 @@ stmt_containers(#20076,#20001)
 #20078=*
 exprs(#20078,78,#20076,-1,"bar")
 hasLocation(#20078,#20034)
-exprContainers(#20078,#20076)
+expr_containers(#20078,#20076)
 literals("bar","bar",#20078)
 decl(#20078,#20068)
 #20079=*
@@ -253,12 +253,12 @@ exprs(#20086,13,#20084,1,"foo()")
 locations_default(#20087,#10000,5,22,5,26)
 hasLocation(#20086,#20087)
 enclosing_stmt(#20086,#20084)
-exprContainers(#20086,#20076)
+expr_containers(#20086,#20076)
 #20088=*
 exprs(#20088,79,#20086,-1,"foo")
 hasLocation(#20088,#20054)
 enclosing_stmt(#20088,#20084)
-exprContainers(#20088,#20076)
+expr_containers(#20088,#20076)
 literals("foo","foo",#20088)
 bind(#20088,#20067)
 #20089=*
@@ -271,12 +271,12 @@ stmt_containers(#20089,#20076)
 exprs(#20091,64,#20089,0,"x")
 hasLocation(#20091,#20050)
 enclosing_stmt(#20091,#20089)
-exprContainers(#20091,#20076)
+expr_containers(#20091,#20076)
 #20092=*
 exprs(#20092,78,#20091,0,"x")
 hasLocation(#20092,#20050)
 enclosing_stmt(#20092,#20089)
-exprContainers(#20092,#20076)
+expr_containers(#20092,#20076)
 literals("x","x",#20092)
 decl(#20092,#20080)
 #20093=*

javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap

@@ -380,7 +380,7 @@ variables(#20141,"e",#20140)
 exprs(#20142,78,#20139,0,"e")
 hasLocation(#20142,#20033)
 enclosing_stmt(#20142,#20139)
-exprContainers(#20142,#20001)
+expr_containers(#20142,#20001)
 literals("e","e",#20142)
 decl(#20142,#20141)
 #20143=*
@@ -389,19 +389,19 @@ exprs(#20143,43,#20139,2,"e insta ... peError")
 locations_default(#20144,#10000,2,13,2,34)
 hasLocation(#20143,#20144)
 enclosing_stmt(#20143,#20139)
-exprContainers(#20143,#20001)
+expr_containers(#20143,#20001)
 #20145=*
 exprs(#20145,79,#20143,0,"e")
 hasLocation(#20145,#20037)
 enclosing_stmt(#20145,#20139)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 literals("e","e",#20145)
 bind(#20145,#20141)
 #20146=*
 exprs(#20146,79,#20143,1,"TypeError")
 hasLocation(#20146,#20041)
 enclosing_stmt(#20146,#20139)
-exprContainers(#20146,#20001)
+expr_containers(#20146,#20001)
 literals("TypeError","TypeError",#20146)
 #20147=@"var;{TypeError};{#20000}"
 variables(#20147,"TypeError",#20000)
@@ -426,7 +426,7 @@ variables(#20152,"e",#20151)
 exprs(#20153,78,#20150,0,"e")
 hasLocation(#20153,#20053)
 enclosing_stmt(#20153,#20150)
-exprContainers(#20153,#20001)
+expr_containers(#20153,#20001)
 literals("e","e",#20153)
 decl(#20153,#20152)
 #20154=*
@@ -435,19 +435,19 @@ exprs(#20154,43,#20150,2,"e instanceof Error")
 locations_default(#20155,#10000,3,13,3,30)
 hasLocation(#20154,#20155)
 enclosing_stmt(#20154,#20150)
-exprContainers(#20154,#20001)
+expr_containers(#20154,#20001)
 #20156=*
 exprs(#20156,79,#20154,0,"e")
 hasLocation(#20156,#20057)
 enclosing_stmt(#20156,#20150)
-exprContainers(#20156,#20001)
+expr_containers(#20156,#20001)
 literals("e","e",#20156)
 bind(#20156,#20152)
 #20157=*
 exprs(#20157,79,#20154,1,"Error")
 hasLocation(#20157,#20061)
 enclosing_stmt(#20157,#20150)
-exprContainers(#20157,#20001)
+expr_containers(#20157,#20001)
 literals("Error","Error",#20157)
 #20158=@"var;{Error};{#20000}"
 variables(#20158,"Error",#20000)
@@ -498,7 +498,7 @@ variables(#20171,"e",#20170)
 exprs(#20172,78,#20169,0,"e")
 hasLocation(#20172,#20085)
 enclosing_stmt(#20172,#20169)
-exprContainers(#20172,#20001)
+expr_containers(#20172,#20001)
 literals("e","e",#20172)
 decl(#20172,#20171)
 #20173=*
@@ -507,19 +507,19 @@ exprs(#20173,43,#20169,2,"e insta ... peError")
 locations_default(#20174,#10000,7,13,7,34)
 hasLocation(#20173,#20174)
 enclosing_stmt(#20173,#20169)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 #20175=*
 exprs(#20175,79,#20173,0,"e")
 hasLocation(#20175,#20089)
 enclosing_stmt(#20175,#20169)
-exprContainers(#20175,#20001)
+expr_containers(#20175,#20001)
 literals("e","e",#20175)
 bind(#20175,#20171)
 #20176=*
 exprs(#20176,79,#20173,1,"TypeError")
 hasLocation(#20176,#20093)
 enclosing_stmt(#20176,#20169)
-exprContainers(#20176,#20001)
+expr_containers(#20176,#20001)
 literals("TypeError","TypeError",#20176)
 bind(#20176,#20147)
 #20177=*
@@ -542,7 +542,7 @@ variables(#20181,"e",#20180)
 exprs(#20182,78,#20179,0,"e")
 hasLocation(#20182,#20105)
 enclosing_stmt(#20182,#20179)
-exprContainers(#20182,#20001)
+expr_containers(#20182,#20001)
 literals("e","e",#20182)
 decl(#20182,#20181)
 #20183=*
@@ -551,19 +551,19 @@ exprs(#20183,43,#20179,2,"e instanceof Error")
 locations_default(#20184,#10000,8,13,8,30)
 hasLocation(#20183,#20184)
 enclosing_stmt(#20183,#20179)
-exprContainers(#20183,#20001)
+expr_containers(#20183,#20001)
 #20185=*
 exprs(#20185,79,#20183,0,"e")
 hasLocation(#20185,#20109)
 enclosing_stmt(#20185,#20179)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 literals("e","e",#20185)
 bind(#20185,#20181)
 #20186=*
 exprs(#20186,79,#20183,1,"Error")
 hasLocation(#20186,#20113)
 enclosing_stmt(#20186,#20179)
-exprContainers(#20186,#20001)
+expr_containers(#20186,#20001)
 literals("Error","Error",#20186)
 bind(#20186,#20158)
 #20187=*

javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap

@@ -203,12 +203,12 @@ exprs(#20073,99,#20072,0,"import(""m"")")
 locations_default(#20074,#10000,1,1,1,11)
 hasLocation(#20073,#20074)
 enclosing_stmt(#20073,#20072)
-exprContainers(#20073,#20001)
+expr_containers(#20073,#20001)
 #20075=*
 exprs(#20075,4,#20073,0,"""m""")
 hasLocation(#20075,#20013)
 enclosing_stmt(#20075,#20072)
-exprContainers(#20075,#20001)
+expr_containers(#20075,#20001)
 literals("m","""m""",#20075)
 #20076=*
 regexpterm(#20076,14,#20075,0,"m")
@@ -226,12 +226,12 @@ exprs(#20079,11,#20078,0,"b ? import(""n"") : {}")
 locations_default(#20080,#10000,2,1,2,20)
 hasLocation(#20079,#20080)
 enclosing_stmt(#20079,#20078)
-exprContainers(#20079,#20001)
+expr_containers(#20079,#20001)
 #20081=*
 exprs(#20081,79,#20079,0,"b")
 hasLocation(#20081,#20019)
 enclosing_stmt(#20081,#20078)
-exprContainers(#20081,#20001)
+expr_containers(#20081,#20001)
 literals("b","b",#20081)
 #20082=@"var;{b};{#20000}"
 variables(#20082,"b",#20000)
@@ -242,12 +242,12 @@ exprs(#20083,99,#20079,1,"import(""n"")")
 locations_default(#20084,#10000,2,5,2,15)
 hasLocation(#20083,#20084)
 enclosing_stmt(#20083,#20078)
-exprContainers(#20083,#20001)
+expr_containers(#20083,#20001)
 #20085=*
 exprs(#20085,4,#20083,0,"""n""")
 hasLocation(#20085,#20027)
 enclosing_stmt(#20085,#20078)
-exprContainers(#20085,#20001)
+expr_containers(#20085,#20001)
 literals("n","""n""",#20085)
 #20086=*
 regexpterm(#20086,14,#20085,0,"n")
@@ -261,7 +261,7 @@ exprs(#20088,8,#20079,2,"{}")
 locations_default(#20089,#10000,2,19,2,20)
 hasLocation(#20088,#20089)
 enclosing_stmt(#20088,#20078)
-exprContainers(#20088,#20001)
+expr_containers(#20088,#20001)
 #20090=*
 stmts(#20090,2,#20001,2,"import( ... => {});")
 hasLocation(#20090,#20007)
@@ -272,26 +272,26 @@ exprs(#20091,13,#20090,0,"import( ...  => {})")
 locations_default(#20092,#10000,3,1,3,27)
 hasLocation(#20091,#20092)
 enclosing_stmt(#20091,#20090)
-exprContainers(#20091,#20001)
+expr_containers(#20091,#20001)
 #20093=*
 exprs(#20093,14,#20091,-1,"import(""o"").then")
 #20094=@"loc,{#10000},3,1,3,16"
 locations_default(#20094,#10000,3,1,3,16)
 hasLocation(#20093,#20094)
 enclosing_stmt(#20093,#20090)
-exprContainers(#20093,#20001)
+expr_containers(#20093,#20001)
 #20095=*
 exprs(#20095,99,#20093,0,"import(""o"")")
 #20096=@"loc,{#10000},3,1,3,11"
 locations_default(#20096,#10000,3,1,3,11)
 hasLocation(#20095,#20096)
 enclosing_stmt(#20095,#20090)
-exprContainers(#20095,#20001)
+expr_containers(#20095,#20001)
 #20097=*
 exprs(#20097,4,#20095,0,"""o""")
 hasLocation(#20097,#20043)
 enclosing_stmt(#20097,#20090)
-exprContainers(#20097,#20001)
+expr_containers(#20097,#20001)
 literals("o","""o""",#20097)
 #20098=*
 regexpterm(#20098,14,#20097,0,"o")
@@ -303,7 +303,7 @@ regexpConstValue(#20098,"o")
 exprs(#20100,0,#20093,1,"then")
 hasLocation(#20100,#20049)
 enclosing_stmt(#20100,#20090)
-exprContainers(#20100,#20001)
+expr_containers(#20100,#20001)
 literals("then","then",#20100)
 #20101=*
 exprs(#20101,65,#20091,0,"(o) => {}")
@@ -311,7 +311,7 @@ exprs(#20101,65,#20091,0,"(o) => {}")
 locations_default(#20102,#10000,3,18,3,26)
 hasLocation(#20101,#20102)
 enclosing_stmt(#20101,#20090)
-exprContainers(#20101,#20001)
+expr_containers(#20101,#20001)
 #20103=*
 scopes(#20103,1)
 scopenodes(#20101,#20103)
@@ -321,7 +321,7 @@ variables(#20104,"o",#20103)
 #20105=*
 exprs(#20105,78,#20101,0,"o")
 hasLocation(#20105,#20055)
-exprContainers(#20105,#20101)
+expr_containers(#20105,#20101)
 literals("o","o",#20105)
 decl(#20105,#20104)
 #20106=*

javascript/extractor/tests/esnext/output/trap/fields.js.trap

@@ -244,7 +244,7 @@ stmt_containers(#20086,#20001)
 exprs(#20088,78,#20086,0,"A")
 hasLocation(#20088,#20027)
 enclosing_stmt(#20088,#20086)
-exprContainers(#20088,#20001)
+expr_containers(#20088,#20001)
 literals("A","A",#20088)
 decl(#20088,#20080)
 typedecl(#20088,#20083)
@@ -261,14 +261,14 @@ hasLocation(#20090,#20091)
 #20093=*
 exprs(#20093,0,#20090,0,"x")
 hasLocation(#20093,#20031)
-exprContainers(#20093,#20092)
+expr_containers(#20093,#20092)
 literals("x","x",#20093)
 #20094=*
 exprs(#20094,82,#20090,1,"new.target")
 #20095=@"loc,{#10000},2,7,2,16"
 locations_default(#20095,#10000,2,7,2,16)
 hasLocation(#20094,#20095)
-exprContainers(#20094,#20092)
+expr_containers(#20094,#20092)
 #20096=*
 properties(#20096,#20086,3,0,"constructor() {}")
 #20097=@"loc,{#10000},1,9,1,8"
@@ -278,12 +278,12 @@ hasLocation(#20096,#20097)
 exprs(#20098,0,#20096,0,"constructor")
 hasLocation(#20098,#20097)
 enclosing_stmt(#20098,#20086)
-exprContainers(#20098,#20001)
+expr_containers(#20098,#20001)
 literals("constructor","constructor",#20098)
 exprs(#20092,9,#20096,1,"() {}")
 hasLocation(#20092,#20097)
 enclosing_stmt(#20092,#20086)
-exprContainers(#20092,#20001)
+expr_containers(#20092,#20001)
 #20099=*
 scopes(#20099,1)
 scopenodes(#20092,#20099)
@@ -306,7 +306,7 @@ stmt_containers(#20102,#20001)
 exprs(#20104,78,#20102,0,"B")
 hasLocation(#20104,#20046)
 enclosing_stmt(#20104,#20102)
-exprContainers(#20104,#20001)
+expr_containers(#20104,#20001)
 literals("B","B",#20104)
 decl(#20104,#20081)
 typedecl(#20104,#20084)
@@ -318,7 +318,7 @@ scopenesting(#20105,#20000)
 exprs(#20106,79,#20102,1,"A")
 hasLocation(#20106,#20050)
 enclosing_stmt(#20106,#20102)
-exprContainers(#20106,#20001)
+expr_containers(#20106,#20001)
 literals("A","A",#20106)
 bind(#20106,#20080)
 #20107=*
@@ -330,22 +330,22 @@ hasLocation(#20107,#20108)
 #20110=*
 exprs(#20110,0,#20107,0,"y")
 hasLocation(#20110,#20054)
-exprContainers(#20110,#20109)
+expr_containers(#20110,#20109)
 literals("y","y",#20110)
 #20111=*
 exprs(#20111,14,#20107,1,"super.x")
 #20112=@"loc,{#10000},6,7,6,13"
 locations_default(#20112,#10000,6,7,6,13)
 hasLocation(#20111,#20112)
-exprContainers(#20111,#20109)
+expr_containers(#20111,#20109)
 #20113=*
 exprs(#20113,81,#20111,0,"super")
 hasLocation(#20113,#20058)
-exprContainers(#20113,#20109)
+expr_containers(#20113,#20109)
 #20114=*
 exprs(#20114,0,#20111,1,"x")
 hasLocation(#20114,#20062)
-exprContainers(#20114,#20109)
+expr_containers(#20114,#20109)
 literals("x","x",#20114)
 #20115=*
 properties(#20115,#20102,3,0,"constru ... rgs); }")
@@ -356,12 +356,12 @@ hasLocation(#20115,#20116)
 exprs(#20117,0,#20115,0,"constructor")
 hasLocation(#20117,#20116)
 enclosing_stmt(#20117,#20102)
-exprContainers(#20117,#20001)
+expr_containers(#20117,#20001)
 literals("constructor","constructor",#20117)
 exprs(#20109,9,#20115,1,"(...arg ... rgs); }")
 hasLocation(#20109,#20116)
 enclosing_stmt(#20109,#20102)
-exprContainers(#20109,#20001)
+expr_containers(#20109,#20001)
 #20118=*
 scopes(#20118,1)
 scopenodes(#20109,#20118)
@@ -371,7 +371,7 @@ variables(#20119,"args",#20118)
 #20120=*
 exprs(#20120,78,#20109,0,"args")
 hasLocation(#20120,#20116)
-exprContainers(#20120,#20109)
+expr_containers(#20120,#20109)
 literals("args","args",#20120)
 decl(#20120,#20119)
 #20121=@"var;{arguments};{#20118}"
@@ -390,22 +390,22 @@ stmt_containers(#20123,#20109)
 exprs(#20124,13,#20123,0,"super(...args)")
 hasLocation(#20124,#20116)
 enclosing_stmt(#20124,#20123)
-exprContainers(#20124,#20109)
+expr_containers(#20124,#20109)
 #20125=*
 exprs(#20125,81,#20124,-1,"super")
 hasLocation(#20125,#20116)
 enclosing_stmt(#20125,#20123)
-exprContainers(#20125,#20109)
+expr_containers(#20125,#20109)
 #20126=*
 exprs(#20126,66,#20124,0,"...args")
 hasLocation(#20126,#20116)
 enclosing_stmt(#20126,#20123)
-exprContainers(#20126,#20109)
+expr_containers(#20126,#20109)
 #20127=*
 exprs(#20127,79,#20126,0,"args")
 hasLocation(#20127,#20116)
 enclosing_stmt(#20127,#20123)
-exprContainers(#20127,#20109)
+expr_containers(#20127,#20109)
 literals("args","args",#20127)
 bind(#20127,#20119)
 isMethod(#20115)
@@ -419,7 +419,7 @@ stmt_containers(#20128,#20001)
 exprs(#20130,78,#20128,0,"C")
 hasLocation(#20130,#20069)
 enclosing_stmt(#20130,#20128)
-exprContainers(#20130,#20001)
+expr_containers(#20130,#20001)
 literals("C","C",#20130)
 decl(#20130,#20082)
 typedecl(#20130,#20085)
@@ -436,7 +436,7 @@ hasLocation(#20132,#20133)
 #20135=*
 exprs(#20135,0,#20132,0,"async")
 hasLocation(#20135,#20073)
-exprContainers(#20135,#20134)
+expr_containers(#20135,#20134)
 literals("async","async",#20135)
 #20136=*
 properties(#20136,#20128,3,0,"constructor() {}")
@@ -447,12 +447,12 @@ hasLocation(#20136,#20137)
 exprs(#20138,0,#20136,0,"constructor")
 hasLocation(#20138,#20137)
 enclosing_stmt(#20138,#20128)
-exprContainers(#20138,#20001)
+expr_containers(#20138,#20001)
 literals("constructor","constructor",#20138)
 exprs(#20134,9,#20136,1,"() {}")
 hasLocation(#20134,#20137)
 enclosing_stmt(#20134,#20128)
-exprContainers(#20134,#20001)
+expr_containers(#20134,#20001)
 #20139=*
 scopes(#20139,1)
 scopenodes(#20134,#20139)

javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap

@@ -210,12 +210,12 @@ exprs(#20076,107,#20075,0,"x1 ?? y1")
 locations_default(#20077,#10000,1,1,1,8)
 hasLocation(#20076,#20077)
 enclosing_stmt(#20076,#20075)
-exprContainers(#20076,#20001)
+expr_containers(#20076,#20001)
 #20078=*
 exprs(#20078,79,#20076,0,"x1")
 hasLocation(#20078,#20017)
 enclosing_stmt(#20078,#20075)
-exprContainers(#20078,#20001)
+expr_containers(#20078,#20001)
 literals("x1","x1",#20078)
 #20079=@"var;{x1};{#20000}"
 variables(#20079,"x1",#20000)
@@ -224,7 +224,7 @@ bind(#20078,#20079)
 exprs(#20080,79,#20076,1,"y1")
 hasLocation(#20080,#20021)
 enclosing_stmt(#20080,#20075)
-exprContainers(#20080,#20001)
+expr_containers(#20080,#20001)
 literals("y1","y1",#20080)
 #20081=@"var;{y1};{#20000}"
 variables(#20081,"y1",#20000)
@@ -239,19 +239,19 @@ exprs(#20083,107,#20082,0,"x2 || y2 ?? z2")
 locations_default(#20084,#10000,3,1,3,14)
 hasLocation(#20083,#20084)
 enclosing_stmt(#20083,#20082)
-exprContainers(#20083,#20001)
+expr_containers(#20083,#20001)
 #20085=*
 exprs(#20085,45,#20083,0,"x2 || y2")
 #20086=@"loc,{#10000},3,1,3,8"
 locations_default(#20086,#10000,3,1,3,8)
 hasLocation(#20085,#20086)
 enclosing_stmt(#20085,#20082)
-exprContainers(#20085,#20001)
+expr_containers(#20085,#20001)
 #20087=*
 exprs(#20087,79,#20085,0,"x2")
 hasLocation(#20087,#20025)
 enclosing_stmt(#20087,#20082)
-exprContainers(#20087,#20001)
+expr_containers(#20087,#20001)
 literals("x2","x2",#20087)
 #20088=@"var;{x2};{#20000}"
 variables(#20088,"x2",#20000)
@@ -260,7 +260,7 @@ bind(#20087,#20088)
 exprs(#20089,79,#20085,1,"y2")
 hasLocation(#20089,#20029)
 enclosing_stmt(#20089,#20082)
-exprContainers(#20089,#20001)
+expr_containers(#20089,#20001)
 literals("y2","y2",#20089)
 #20090=@"var;{y2};{#20000}"
 variables(#20090,"y2",#20000)
@@ -269,7 +269,7 @@ bind(#20089,#20090)
 exprs(#20091,79,#20083,1,"z2")
 hasLocation(#20091,#20033)
 enclosing_stmt(#20091,#20082)
-exprContainers(#20091,#20001)
+expr_containers(#20091,#20001)
 literals("z2","z2",#20091)
 #20092=@"var;{z2};{#20000}"
 variables(#20092,"z2",#20000)
@@ -284,19 +284,19 @@ exprs(#20094,45,#20093,0,"x3 ?? y3 || z3")
 locations_default(#20095,#10000,4,1,4,14)
 hasLocation(#20094,#20095)
 enclosing_stmt(#20094,#20093)
-exprContainers(#20094,#20001)
+expr_containers(#20094,#20001)
 #20096=*
 exprs(#20096,107,#20094,0,"x3 ?? y3")
 #20097=@"loc,{#10000},4,1,4,8"
 locations_default(#20097,#10000,4,1,4,8)
 hasLocation(#20096,#20097)
 enclosing_stmt(#20096,#20093)
-exprContainers(#20096,#20001)
+expr_containers(#20096,#20001)
 #20098=*
 exprs(#20098,79,#20096,0,"x3")
 hasLocation(#20098,#20037)
 enclosing_stmt(#20098,#20093)
-exprContainers(#20098,#20001)
+expr_containers(#20098,#20001)
 literals("x3","x3",#20098)
 #20099=@"var;{x3};{#20000}"
 variables(#20099,"x3",#20000)
@@ -305,7 +305,7 @@ bind(#20098,#20099)
 exprs(#20100,79,#20096,1,"y3")
 hasLocation(#20100,#20041)
 enclosing_stmt(#20100,#20093)
-exprContainers(#20100,#20001)
+expr_containers(#20100,#20001)
 literals("y3","y3",#20100)
 #20101=@"var;{y3};{#20000}"
 variables(#20101,"y3",#20000)
@@ -314,7 +314,7 @@ bind(#20100,#20101)
 exprs(#20102,79,#20094,1,"z3")
 hasLocation(#20102,#20045)
 enclosing_stmt(#20102,#20093)
-exprContainers(#20102,#20001)
+expr_containers(#20102,#20001)
 literals("z3","z3",#20102)
 #20103=@"var;{z3};{#20000}"
 variables(#20103,"z3",#20000)
@@ -329,19 +329,19 @@ exprs(#20105,107,#20104,0,"x4 && y4 ?? z4")
 locations_default(#20106,#10000,6,1,6,14)
 hasLocation(#20105,#20106)
 enclosing_stmt(#20105,#20104)
-exprContainers(#20105,#20001)
+expr_containers(#20105,#20001)
 #20107=*
 exprs(#20107,44,#20105,0,"x4 && y4")
 #20108=@"loc,{#10000},6,1,6,8"
 locations_default(#20108,#10000,6,1,6,8)
 hasLocation(#20107,#20108)
 enclosing_stmt(#20107,#20104)
-exprContainers(#20107,#20001)
+expr_containers(#20107,#20001)
 #20109=*
 exprs(#20109,79,#20107,0,"x4")
 hasLocation(#20109,#20049)
 enclosing_stmt(#20109,#20104)
-exprContainers(#20109,#20001)
+expr_containers(#20109,#20001)
 literals("x4","x4",#20109)
 #20110=@"var;{x4};{#20000}"
 variables(#20110,"x4",#20000)
@@ -350,7 +350,7 @@ bind(#20109,#20110)
 exprs(#20111,79,#20107,1,"y4")
 hasLocation(#20111,#20053)
 enclosing_stmt(#20111,#20104)
-exprContainers(#20111,#20001)
+expr_containers(#20111,#20001)
 literals("y4","y4",#20111)
 #20112=@"var;{y4};{#20000}"
 variables(#20112,"y4",#20000)
@@ -359,7 +359,7 @@ bind(#20111,#20112)
 exprs(#20113,79,#20105,1,"z4")
 hasLocation(#20113,#20057)
 enclosing_stmt(#20113,#20104)
-exprContainers(#20113,#20001)
+expr_containers(#20113,#20001)
 literals("z4","z4",#20113)
 #20114=@"var;{z4};{#20000}"
 variables(#20114,"z4",#20000)
@@ -374,12 +374,12 @@ exprs(#20116,107,#20115,0,"x5 ?? y5 && z5")
 locations_default(#20117,#10000,7,1,7,14)
 hasLocation(#20116,#20117)
 enclosing_stmt(#20116,#20115)
-exprContainers(#20116,#20001)
+expr_containers(#20116,#20001)
 #20118=*
 exprs(#20118,79,#20116,0,"x5")
 hasLocation(#20118,#20061)
 enclosing_stmt(#20118,#20115)
-exprContainers(#20118,#20001)
+expr_containers(#20118,#20001)
 literals("x5","x5",#20118)
 #20119=@"var;{x5};{#20000}"
 variables(#20119,"x5",#20000)
@@ -390,12 +390,12 @@ exprs(#20120,44,#20116,1,"y5 && z5")
 locations_default(#20121,#10000,7,7,7,14)
 hasLocation(#20120,#20121)
 enclosing_stmt(#20120,#20115)
-exprContainers(#20120,#20001)
+expr_containers(#20120,#20001)
 #20122=*
 exprs(#20122,79,#20120,0,"y5")
 hasLocation(#20122,#20065)
 enclosing_stmt(#20122,#20115)
-exprContainers(#20122,#20001)
+expr_containers(#20122,#20001)
 literals("y5","y5",#20122)
 #20123=@"var;{y5};{#20000}"
 variables(#20123,"y5",#20000)
@@ -404,7 +404,7 @@ bind(#20122,#20123)
 exprs(#20124,79,#20120,1,"z5")
 hasLocation(#20124,#20069)
 enclosing_stmt(#20124,#20115)
-exprContainers(#20124,#20001)
+expr_containers(#20124,#20001)
 literals("z5","z5",#20124)
 #20125=@"var;{z5};{#20000}"
 variables(#20125,"z5",#20000)

javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap

@@ -336,12 +336,12 @@ exprs(#20124,14,#20123,0,"a1?.b1")
 locations_default(#20125,#10000,1,1,1,6)
 hasLocation(#20124,#20125)
 enclosing_stmt(#20124,#20123)
-exprContainers(#20124,#20001)
+expr_containers(#20124,#20001)
 #20126=*
 exprs(#20126,79,#20124,0,"a1")
 hasLocation(#20126,#20029)
 enclosing_stmt(#20126,#20123)
-exprContainers(#20126,#20001)
+expr_containers(#20126,#20001)
 literals("a1","a1",#20126)
 #20127=@"var;{a1};{#20000}"
 variables(#20127,"a1",#20000)
@@ -350,7 +350,7 @@ bind(#20126,#20127)
 exprs(#20128,0,#20124,1,"b1")
 hasLocation(#20128,#20033)
 enclosing_stmt(#20128,#20123)
-exprContainers(#20128,#20001)
+expr_containers(#20128,#20001)
 literals("b1","b1",#20128)
 isOptionalChaining(#20124)
 #20129=*
@@ -363,12 +363,12 @@ exprs(#20130,15,#20129,0,"a2?.[x2]")
 locations_default(#20131,#10000,3,1,3,8)
 hasLocation(#20130,#20131)
 enclosing_stmt(#20130,#20129)
-exprContainers(#20130,#20001)
+expr_containers(#20130,#20001)
 #20132=*
 exprs(#20132,79,#20130,0,"a2")
 hasLocation(#20132,#20037)
 enclosing_stmt(#20132,#20129)
-exprContainers(#20132,#20001)
+expr_containers(#20132,#20001)
 literals("a2","a2",#20132)
 #20133=@"var;{a2};{#20000}"
 variables(#20133,"a2",#20000)
@@ -377,7 +377,7 @@ bind(#20132,#20133)
 exprs(#20134,79,#20130,1,"x2")
 hasLocation(#20134,#20043)
 enclosing_stmt(#20134,#20129)
-exprContainers(#20134,#20001)
+expr_containers(#20134,#20001)
 literals("x2","x2",#20134)
 #20135=@"var;{x2};{#20000}"
 variables(#20135,"x2",#20000)
@@ -393,19 +393,19 @@ exprs(#20137,13,#20136,0,"a3?.b3()")
 locations_default(#20138,#10000,5,1,5,8)
 hasLocation(#20137,#20138)
 enclosing_stmt(#20137,#20136)
-exprContainers(#20137,#20001)
+expr_containers(#20137,#20001)
 #20139=*
 exprs(#20139,14,#20137,-1,"a3?.b3")
 #20140=@"loc,{#10000},5,1,5,6"
 locations_default(#20140,#10000,5,1,5,6)
 hasLocation(#20139,#20140)
 enclosing_stmt(#20139,#20136)
-exprContainers(#20139,#20001)
+expr_containers(#20139,#20001)
 #20141=*
 exprs(#20141,79,#20139,0,"a3")
 hasLocation(#20141,#20049)
 enclosing_stmt(#20141,#20136)
-exprContainers(#20141,#20001)
+expr_containers(#20141,#20001)
 literals("a3","a3",#20141)
 #20142=@"var;{a3};{#20000}"
 variables(#20142,"a3",#20000)
@@ -414,7 +414,7 @@ bind(#20141,#20142)
 exprs(#20143,0,#20139,1,"b3")
 hasLocation(#20143,#20053)
 enclosing_stmt(#20143,#20136)
-exprContainers(#20143,#20001)
+expr_containers(#20143,#20001)
 literals("b3","b3",#20143)
 isOptionalChaining(#20139)
 #20144=*
@@ -427,12 +427,12 @@ exprs(#20145,13,#20144,0,"a4?.()")
 locations_default(#20146,#10000,7,1,7,6)
 hasLocation(#20145,#20146)
 enclosing_stmt(#20145,#20144)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 #20147=*
 exprs(#20147,79,#20145,-1,"a4")
 hasLocation(#20147,#20061)
 enclosing_stmt(#20147,#20144)
-exprContainers(#20147,#20001)
+expr_containers(#20147,#20001)
 literals("a4","a4",#20147)
 #20148=@"var;{a4};{#20000}"
 variables(#20148,"a4",#20000)
@@ -448,12 +448,12 @@ exprs(#20150,11,#20149,0,"o5?.3:2")
 locations_default(#20151,#10000,9,1,9,7)
 hasLocation(#20150,#20151)
 enclosing_stmt(#20150,#20149)
-exprContainers(#20150,#20001)
+expr_containers(#20150,#20001)
 #20152=*
 exprs(#20152,79,#20150,0,"o5")
 hasLocation(#20152,#20071)
 enclosing_stmt(#20152,#20149)
-exprContainers(#20152,#20001)
+expr_containers(#20152,#20001)
 literals("o5","o5",#20152)
 #20153=@"var;{o5};{#20000}"
 variables(#20153,"o5",#20000)
@@ -462,13 +462,13 @@ bind(#20152,#20153)
 exprs(#20154,3,#20150,1,".3")
 hasLocation(#20154,#20075)
 enclosing_stmt(#20154,#20149)
-exprContainers(#20154,#20001)
+expr_containers(#20154,#20001)
 literals("0.3",".3",#20154)
 #20155=*
 exprs(#20155,3,#20150,2,"2")
 hasLocation(#20155,#20079)
 enclosing_stmt(#20155,#20149)
-exprContainers(#20155,#20001)
+expr_containers(#20155,#20001)
 literals("2","2",#20155)
 #20156=*
 stmts(#20156,2,#20001,5,"a6?.b6[ ... y6).d6;")
@@ -480,40 +480,40 @@ exprs(#20157,14,#20156,0,"a6?.b6[ ... (y6).d6")
 locations_default(#20158,#10000,11,1,11,22)
 hasLocation(#20157,#20158)
 enclosing_stmt(#20157,#20156)
-exprContainers(#20157,#20001)
+expr_containers(#20157,#20001)
 #20159=*
 exprs(#20159,13,#20157,0,"a6?.b6[x6].c6?.(y6)")
 #20160=@"loc,{#10000},11,1,11,19"
 locations_default(#20160,#10000,11,1,11,19)
 hasLocation(#20159,#20160)
 enclosing_stmt(#20159,#20156)
-exprContainers(#20159,#20001)
+expr_containers(#20159,#20001)
 #20161=*
 exprs(#20161,14,#20159,-1,"a6?.b6[x6].c6")
 #20162=@"loc,{#10000},11,1,11,13"
 locations_default(#20162,#10000,11,1,11,13)
 hasLocation(#20161,#20162)
 enclosing_stmt(#20161,#20156)
-exprContainers(#20161,#20001)
+expr_containers(#20161,#20001)
 #20163=*
 exprs(#20163,15,#20161,0,"a6?.b6[x6]")
 #20164=@"loc,{#10000},11,1,11,10"
 locations_default(#20164,#10000,11,1,11,10)
 hasLocation(#20163,#20164)
 enclosing_stmt(#20163,#20156)
-exprContainers(#20163,#20001)
+expr_containers(#20163,#20001)
 #20165=*
 exprs(#20165,14,#20163,0,"a6?.b6")
 #20166=@"loc,{#10000},11,1,11,6"
 locations_default(#20166,#10000,11,1,11,6)
 hasLocation(#20165,#20166)
 enclosing_stmt(#20165,#20156)
-exprContainers(#20165,#20001)
+expr_containers(#20165,#20001)
 #20167=*
 exprs(#20167,79,#20165,0,"a6")
 hasLocation(#20167,#20083)
 enclosing_stmt(#20167,#20156)
-exprContainers(#20167,#20001)
+expr_containers(#20167,#20001)
 literals("a6","a6",#20167)
 #20168=@"var;{a6};{#20000}"
 variables(#20168,"a6",#20000)
@@ -522,14 +522,14 @@ bind(#20167,#20168)
 exprs(#20169,0,#20165,1,"b6")
 hasLocation(#20169,#20087)
 enclosing_stmt(#20169,#20156)
-exprContainers(#20169,#20001)
+expr_containers(#20169,#20001)
 literals("b6","b6",#20169)
 isOptionalChaining(#20165)
 #20170=*
 exprs(#20170,79,#20163,1,"x6")
 hasLocation(#20170,#20091)
 enclosing_stmt(#20170,#20156)
-exprContainers(#20170,#20001)
+expr_containers(#20170,#20001)
 literals("x6","x6",#20170)
 #20171=@"var;{x6};{#20000}"
 variables(#20171,"x6",#20000)
@@ -538,13 +538,13 @@ bind(#20170,#20171)
 exprs(#20172,0,#20161,1,"c6")
 hasLocation(#20172,#20097)
 enclosing_stmt(#20172,#20156)
-exprContainers(#20172,#20001)
+expr_containers(#20172,#20001)
 literals("c6","c6",#20172)
 #20173=*
 exprs(#20173,79,#20159,0,"y6")
 hasLocation(#20173,#20103)
 enclosing_stmt(#20173,#20156)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 literals("y6","y6",#20173)
 #20174=@"var;{y6};{#20000}"
 variables(#20174,"y6",#20000)
@@ -554,7 +554,7 @@ isOptionalChaining(#20159)
 exprs(#20175,0,#20157,1,"d6")
 hasLocation(#20175,#20109)
 enclosing_stmt(#20175,#20156)
-exprContainers(#20175,#20001)
+expr_containers(#20175,#20001)
 literals("d6","d6",#20175)
 #20176=*
 stmts(#20176,2,#20001,6,"delete a?.b")
@@ -564,19 +564,19 @@ stmt_containers(#20176,#20001)
 exprs(#20177,22,#20176,0,"delete a?.b")
 hasLocation(#20177,#20027)
 enclosing_stmt(#20177,#20176)
-exprContainers(#20177,#20001)
+expr_containers(#20177,#20001)
 #20178=*
 exprs(#20178,14,#20177,0,"a?.b")
 #20179=@"loc,{#10000},13,8,13,11"
 locations_default(#20179,#10000,13,8,13,11)
 hasLocation(#20178,#20179)
 enclosing_stmt(#20178,#20176)
-exprContainers(#20178,#20001)
+expr_containers(#20178,#20001)
 #20180=*
 exprs(#20180,79,#20178,0,"a")
 hasLocation(#20180,#20115)
 enclosing_stmt(#20180,#20176)
-exprContainers(#20180,#20001)
+expr_containers(#20180,#20001)
 literals("a","a",#20180)
 #20181=@"var;{a};{#20000}"
 variables(#20181,"a",#20000)
@@ -585,7 +585,7 @@ bind(#20180,#20181)
 exprs(#20182,0,#20178,1,"b")
 hasLocation(#20182,#20119)
 enclosing_stmt(#20182,#20176)
-exprContainers(#20182,#20001)
+expr_containers(#20182,#20001)
 literals("b","b",#20182)
 isOptionalChaining(#20178)
 #20183=*

javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap

@@ -873,33 +873,33 @@ exprs(#20329,14,#20328,0,"a?.b.c(++x).d")
 locations_default(#20330,#10000,1,1,1,13)
 hasLocation(#20329,#20330)
 enclosing_stmt(#20329,#20328)
-exprContainers(#20329,#20001)
+expr_containers(#20329,#20001)
 #20331=*
 exprs(#20331,13,#20329,0,"a?.b.c(++x)")
 #20332=@"loc,{#10000},1,1,1,11"
 locations_default(#20332,#10000,1,1,1,11)
 hasLocation(#20331,#20332)
 enclosing_stmt(#20331,#20328)
-exprContainers(#20331,#20001)
+expr_containers(#20331,#20001)
 #20333=*
 exprs(#20333,14,#20331,-1,"a?.b.c")
 #20334=@"loc,{#10000},1,1,1,6"
 locations_default(#20334,#10000,1,1,1,6)
 hasLocation(#20333,#20334)
 enclosing_stmt(#20333,#20328)
-exprContainers(#20333,#20001)
+expr_containers(#20333,#20001)
 #20335=*
 exprs(#20335,14,#20333,0,"a?.b")
 #20336=@"loc,{#10000},1,1,1,4"
 locations_default(#20336,#10000,1,1,1,4)
 hasLocation(#20335,#20336)
 enclosing_stmt(#20335,#20328)
-exprContainers(#20335,#20001)
+expr_containers(#20335,#20001)
 #20337=*
 exprs(#20337,79,#20335,0,"a")
 hasLocation(#20337,#20061)
 enclosing_stmt(#20337,#20328)
-exprContainers(#20337,#20001)
+expr_containers(#20337,#20001)
 literals("a","a",#20337)
 #20338=@"var;{a};{#20000}"
 variables(#20338,"a",#20000)
@@ -908,14 +908,14 @@ bind(#20337,#20338)
 exprs(#20339,0,#20335,1,"b")
 hasLocation(#20339,#20065)
 enclosing_stmt(#20339,#20328)
-exprContainers(#20339,#20001)
+expr_containers(#20339,#20001)
 literals("b","b",#20339)
 isOptionalChaining(#20335)
 #20340=*
 exprs(#20340,0,#20333,1,"c")
 hasLocation(#20340,#20069)
 enclosing_stmt(#20340,#20328)
-exprContainers(#20340,#20001)
+expr_containers(#20340,#20001)
 literals("c","c",#20340)
 #20341=*
 exprs(#20341,59,#20331,0,"++x")
@@ -923,12 +923,12 @@ exprs(#20341,59,#20331,0,"++x")
 locations_default(#20342,#10000,1,8,1,10)
 hasLocation(#20341,#20342)
 enclosing_stmt(#20341,#20328)
-exprContainers(#20341,#20001)
+expr_containers(#20341,#20001)
 #20343=*
 exprs(#20343,79,#20341,0,"x")
 hasLocation(#20343,#20075)
 enclosing_stmt(#20343,#20328)
-exprContainers(#20343,#20001)
+expr_containers(#20343,#20001)
 literals("x","x",#20343)
 #20344=@"var;{x};{#20000}"
 variables(#20344,"x",#20000)
@@ -937,7 +937,7 @@ bind(#20343,#20344)
 exprs(#20345,0,#20329,1,"d")
 hasLocation(#20345,#20081)
 enclosing_stmt(#20345,#20328)
-exprContainers(#20345,#20001)
+expr_containers(#20345,#20001)
 literals("d","d",#20345)
 #20346=*
 stmts(#20346,2,#20001,1,"a?.b[3].c?.(x).d;")
@@ -949,66 +949,66 @@ exprs(#20347,14,#20346,0,"a?.b[3].c?.(x).d")
 locations_default(#20348,#10000,3,1,3,16)
 hasLocation(#20347,#20348)
 enclosing_stmt(#20347,#20346)
-exprContainers(#20347,#20001)
+expr_containers(#20347,#20001)
 #20349=*
 exprs(#20349,13,#20347,0,"a?.b[3].c?.(x)")
 #20350=@"loc,{#10000},3,1,3,14"
 locations_default(#20350,#10000,3,1,3,14)
 hasLocation(#20349,#20350)
 enclosing_stmt(#20349,#20346)
-exprContainers(#20349,#20001)
+expr_containers(#20349,#20001)
 #20351=*
 exprs(#20351,14,#20349,-1,"a?.b[3].c")
 #20352=@"loc,{#10000},3,1,3,9"
 locations_default(#20352,#10000,3,1,3,9)
 hasLocation(#20351,#20352)
 enclosing_stmt(#20351,#20346)
-exprContainers(#20351,#20001)
+expr_containers(#20351,#20001)
 #20353=*
 exprs(#20353,15,#20351,0,"a?.b[3]")
 #20354=@"loc,{#10000},3,1,3,7"
 locations_default(#20354,#10000,3,1,3,7)
 hasLocation(#20353,#20354)
 enclosing_stmt(#20353,#20346)
-exprContainers(#20353,#20001)
+expr_containers(#20353,#20001)
 #20355=*
 exprs(#20355,14,#20353,0,"a?.b")
 #20356=@"loc,{#10000},3,1,3,4"
 locations_default(#20356,#10000,3,1,3,4)
 hasLocation(#20355,#20356)
 enclosing_stmt(#20355,#20346)
-exprContainers(#20355,#20001)
+expr_containers(#20355,#20001)
 #20357=*
 exprs(#20357,79,#20355,0,"a")
 hasLocation(#20357,#20085)
 enclosing_stmt(#20357,#20346)
-exprContainers(#20357,#20001)
+expr_containers(#20357,#20001)
 literals("a","a",#20357)
 bind(#20357,#20338)
 #20358=*
 exprs(#20358,0,#20355,1,"b")
 hasLocation(#20358,#20089)
 enclosing_stmt(#20358,#20346)
-exprContainers(#20358,#20001)
+expr_containers(#20358,#20001)
 literals("b","b",#20358)
 isOptionalChaining(#20355)
 #20359=*
 exprs(#20359,3,#20353,1,"3")
 hasLocation(#20359,#20093)
 enclosing_stmt(#20359,#20346)
-exprContainers(#20359,#20001)
+expr_containers(#20359,#20001)
 literals("3","3",#20359)
 #20360=*
 exprs(#20360,0,#20351,1,"c")
 hasLocation(#20360,#20099)
 enclosing_stmt(#20360,#20346)
-exprContainers(#20360,#20001)
+expr_containers(#20360,#20001)
 literals("c","c",#20360)
 #20361=*
 exprs(#20361,79,#20349,0,"x")
 hasLocation(#20361,#20105)
 enclosing_stmt(#20361,#20346)
-exprContainers(#20361,#20001)
+expr_containers(#20361,#20001)
 literals("x","x",#20361)
 bind(#20361,#20344)
 isOptionalChaining(#20349)
@@ -1016,7 +1016,7 @@ isOptionalChaining(#20349)
 exprs(#20362,0,#20347,1,"d")
 hasLocation(#20362,#20111)
 enclosing_stmt(#20362,#20346)
-exprContainers(#20362,#20001)
+expr_containers(#20362,#20001)
 literals("d","d",#20362)
 #20363=*
 stmts(#20363,2,#20001,2,"(a?.b).c;")
@@ -1028,40 +1028,40 @@ exprs(#20364,14,#20363,0,"(a?.b).c")
 locations_default(#20365,#10000,5,1,5,8)
 hasLocation(#20364,#20365)
 enclosing_stmt(#20364,#20363)
-exprContainers(#20364,#20001)
+expr_containers(#20364,#20001)
 #20366=*
 exprs(#20366,63,#20364,0,"(a?.b)")
 #20367=@"loc,{#10000},5,1,5,6"
 locations_default(#20367,#10000,5,1,5,6)
 hasLocation(#20366,#20367)
 enclosing_stmt(#20366,#20363)
-exprContainers(#20366,#20001)
+expr_containers(#20366,#20001)
 #20368=*
 exprs(#20368,14,#20366,0,"a?.b")
 #20369=@"loc,{#10000},5,2,5,5"
 locations_default(#20369,#10000,5,2,5,5)
 hasLocation(#20368,#20369)
 enclosing_stmt(#20368,#20363)
-exprContainers(#20368,#20001)
+expr_containers(#20368,#20001)
 #20370=*
 exprs(#20370,79,#20368,0,"a")
 hasLocation(#20370,#20117)
 enclosing_stmt(#20370,#20363)
-exprContainers(#20370,#20001)
+expr_containers(#20370,#20001)
 literals("a","a",#20370)
 bind(#20370,#20338)
 #20371=*
 exprs(#20371,0,#20368,1,"b")
 hasLocation(#20371,#20121)
 enclosing_stmt(#20371,#20363)
-exprContainers(#20371,#20001)
+expr_containers(#20371,#20001)
 literals("b","b",#20371)
 isOptionalChaining(#20368)
 #20372=*
 exprs(#20372,0,#20364,1,"c")
 hasLocation(#20372,#20127)
 enclosing_stmt(#20372,#20363)
-exprContainers(#20372,#20001)
+expr_containers(#20372,#20001)
 literals("c","c",#20372)
 #20373=*
 stmts(#20373,2,#20001,3,"(a?.b.c).d;")
@@ -1073,53 +1073,53 @@ exprs(#20374,14,#20373,0,"(a?.b.c).d")
 locations_default(#20375,#10000,7,1,7,10)
 hasLocation(#20374,#20375)
 enclosing_stmt(#20374,#20373)
-exprContainers(#20374,#20001)
+expr_containers(#20374,#20001)
 #20376=*
 exprs(#20376,63,#20374,0,"(a?.b.c)")
 #20377=@"loc,{#10000},7,1,7,8"
 locations_default(#20377,#10000,7,1,7,8)
 hasLocation(#20376,#20377)
 enclosing_stmt(#20376,#20373)
-exprContainers(#20376,#20001)
+expr_containers(#20376,#20001)
 #20378=*
 exprs(#20378,14,#20376,0,"a?.b.c")
 #20379=@"loc,{#10000},7,2,7,7"
 locations_default(#20379,#10000,7,2,7,7)
 hasLocation(#20378,#20379)
 enclosing_stmt(#20378,#20373)
-exprContainers(#20378,#20001)
+expr_containers(#20378,#20001)
 #20380=*
 exprs(#20380,14,#20378,0,"a?.b")
 #20381=@"loc,{#10000},7,2,7,5"
 locations_default(#20381,#10000,7,2,7,5)
 hasLocation(#20380,#20381)
 enclosing_stmt(#20380,#20373)
-exprContainers(#20380,#20001)
+expr_containers(#20380,#20001)
 #20382=*
 exprs(#20382,79,#20380,0,"a")
 hasLocation(#20382,#20133)
 enclosing_stmt(#20382,#20373)
-exprContainers(#20382,#20001)
+expr_containers(#20382,#20001)
 literals("a","a",#20382)
 bind(#20382,#20338)
 #20383=*
 exprs(#20383,0,#20380,1,"b")
 hasLocation(#20383,#20137)
 enclosing_stmt(#20383,#20373)
-exprContainers(#20383,#20001)
+expr_containers(#20383,#20001)
 literals("b","b",#20383)
 isOptionalChaining(#20380)
 #20384=*
 exprs(#20384,0,#20378,1,"c")
 hasLocation(#20384,#20141)
 enclosing_stmt(#20384,#20373)
-exprContainers(#20384,#20001)
+expr_containers(#20384,#20001)
 literals("c","c",#20384)
 #20385=*
 exprs(#20385,0,#20374,1,"d")
 hasLocation(#20385,#20147)
 enclosing_stmt(#20385,#20373)
-exprContainers(#20385,#20001)
+expr_containers(#20385,#20001)
 literals("d","d",#20385)
 #20386=*
 stmts(#20386,2,#20001,4,"a?.[b?.c?.d].e?.f;")
@@ -1131,26 +1131,26 @@ exprs(#20387,14,#20386,0,"a?.[b?.c?.d].e?.f")
 locations_default(#20388,#10000,9,1,9,17)
 hasLocation(#20387,#20388)
 enclosing_stmt(#20387,#20386)
-exprContainers(#20387,#20001)
+expr_containers(#20387,#20001)
 #20389=*
 exprs(#20389,14,#20387,0,"a?.[b?.c?.d].e")
 #20390=@"loc,{#10000},9,1,9,14"
 locations_default(#20390,#10000,9,1,9,14)
 hasLocation(#20389,#20390)
 enclosing_stmt(#20389,#20386)
-exprContainers(#20389,#20001)
+expr_containers(#20389,#20001)
 #20391=*
 exprs(#20391,15,#20389,0,"a?.[b?.c?.d]")
 #20392=@"loc,{#10000},9,1,9,12"
 locations_default(#20392,#10000,9,1,9,12)
 hasLocation(#20391,#20392)
 enclosing_stmt(#20391,#20386)
-exprContainers(#20391,#20001)
+expr_containers(#20391,#20001)
 #20393=*
 exprs(#20393,79,#20391,0,"a")
 hasLocation(#20393,#20151)
 enclosing_stmt(#20393,#20386)
-exprContainers(#20393,#20001)
+expr_containers(#20393,#20001)
 literals("a","a",#20393)
 bind(#20393,#20338)
 #20394=*
@@ -1159,19 +1159,19 @@ exprs(#20394,14,#20391,1,"b?.c?.d")
 locations_default(#20395,#10000,9,5,9,11)
 hasLocation(#20394,#20395)
 enclosing_stmt(#20394,#20386)
-exprContainers(#20394,#20001)
+expr_containers(#20394,#20001)
 #20396=*
 exprs(#20396,14,#20394,0,"b?.c")
 #20397=@"loc,{#10000},9,5,9,8"
 locations_default(#20397,#10000,9,5,9,8)
 hasLocation(#20396,#20397)
 enclosing_stmt(#20396,#20386)
-exprContainers(#20396,#20001)
+expr_containers(#20396,#20001)
 #20398=*
 exprs(#20398,79,#20396,0,"b")
 hasLocation(#20398,#20157)
 enclosing_stmt(#20398,#20386)
-exprContainers(#20398,#20001)
+expr_containers(#20398,#20001)
 literals("b","b",#20398)
 #20399=@"var;{b};{#20000}"
 variables(#20399,"b",#20000)
@@ -1180,14 +1180,14 @@ bind(#20398,#20399)
 exprs(#20400,0,#20396,1,"c")
 hasLocation(#20400,#20161)
 enclosing_stmt(#20400,#20386)
-exprContainers(#20400,#20001)
+expr_containers(#20400,#20001)
 literals("c","c",#20400)
 isOptionalChaining(#20396)
 #20401=*
 exprs(#20401,0,#20394,1,"d")
 hasLocation(#20401,#20165)
 enclosing_stmt(#20401,#20386)
-exprContainers(#20401,#20001)
+expr_containers(#20401,#20001)
 literals("d","d",#20401)
 isOptionalChaining(#20394)
 isOptionalChaining(#20391)
@@ -1195,13 +1195,13 @@ isOptionalChaining(#20391)
 exprs(#20402,0,#20389,1,"e")
 hasLocation(#20402,#20171)
 enclosing_stmt(#20402,#20386)
-exprContainers(#20402,#20001)
+expr_containers(#20402,#20001)
 literals("e","e",#20402)
 #20403=*
 exprs(#20403,0,#20387,1,"f")
 hasLocation(#20403,#20175)
 enclosing_stmt(#20403,#20386)
-exprContainers(#20403,#20001)
+expr_containers(#20403,#20001)
 literals("f","f",#20403)
 isOptionalChaining(#20387)
 #20404=*
@@ -1214,40 +1214,40 @@ exprs(#20405,14,#20404,0,"a?.()[b ... e?.().f")
 locations_default(#20406,#10000,11,1,11,28)
 hasLocation(#20405,#20406)
 enclosing_stmt(#20405,#20404)
-exprContainers(#20405,#20001)
+expr_containers(#20405,#20001)
 #20407=*
 exprs(#20407,13,#20405,0,"a?.()[b ... ].e?.()")
 #20408=@"loc,{#10000},11,1,11,26"
 locations_default(#20408,#10000,11,1,11,26)
 hasLocation(#20407,#20408)
 enclosing_stmt(#20407,#20404)
-exprContainers(#20407,#20001)
+expr_containers(#20407,#20001)
 #20409=*
 exprs(#20409,14,#20407,-1,"a?.()[b ... ().d].e")
 #20410=@"loc,{#10000},11,1,11,22"
 locations_default(#20410,#10000,11,1,11,22)
 hasLocation(#20409,#20410)
 enclosing_stmt(#20409,#20404)
-exprContainers(#20409,#20001)
+expr_containers(#20409,#20001)
 #20411=*
 exprs(#20411,15,#20409,0,"a?.()[b?.().c?.().d]")
 #20412=@"loc,{#10000},11,1,11,20"
 locations_default(#20412,#10000,11,1,11,20)
 hasLocation(#20411,#20412)
 enclosing_stmt(#20411,#20404)
-exprContainers(#20411,#20001)
+expr_containers(#20411,#20001)
 #20413=*
 exprs(#20413,13,#20411,0,"a?.()")
 #20414=@"loc,{#10000},11,1,11,5"
 locations_default(#20414,#10000,11,1,11,5)
 hasLocation(#20413,#20414)
 enclosing_stmt(#20413,#20404)
-exprContainers(#20413,#20001)
+expr_containers(#20413,#20001)
 #20415=*
 exprs(#20415,79,#20413,-1,"a")
 hasLocation(#20415,#20179)
 enclosing_stmt(#20415,#20404)
-exprContainers(#20415,#20001)
+expr_containers(#20415,#20001)
 literals("a","a",#20415)
 bind(#20415,#20338)
 isOptionalChaining(#20413)
@@ -1257,33 +1257,33 @@ exprs(#20416,14,#20411,1,"b?.().c?.().d")
 locations_default(#20417,#10000,11,7,11,19)
 hasLocation(#20416,#20417)
 enclosing_stmt(#20416,#20404)
-exprContainers(#20416,#20001)
+expr_containers(#20416,#20001)
 #20418=*
 exprs(#20418,13,#20416,0,"b?.().c?.()")
 #20419=@"loc,{#10000},11,7,11,17"
 locations_default(#20419,#10000,11,7,11,17)
 hasLocation(#20418,#20419)
 enclosing_stmt(#20418,#20404)
-exprContainers(#20418,#20001)
+expr_containers(#20418,#20001)
 #20420=*
 exprs(#20420,14,#20418,-1,"b?.().c")
 #20421=@"loc,{#10000},11,7,11,13"
 locations_default(#20421,#10000,11,7,11,13)
 hasLocation(#20420,#20421)
 enclosing_stmt(#20420,#20404)
-exprContainers(#20420,#20001)
+expr_containers(#20420,#20001)
 #20422=*
 exprs(#20422,13,#20420,0,"b?.()")
 #20423=@"loc,{#10000},11,7,11,11"
 locations_default(#20423,#10000,11,7,11,11)
 hasLocation(#20422,#20423)
 enclosing_stmt(#20422,#20404)
-exprContainers(#20422,#20001)
+expr_containers(#20422,#20001)
 #20424=*
 exprs(#20424,79,#20422,-1,"b")
 hasLocation(#20424,#20189)
 enclosing_stmt(#20424,#20404)
-exprContainers(#20424,#20001)
+expr_containers(#20424,#20001)
 literals("b","b",#20424)
 bind(#20424,#20399)
 isOptionalChaining(#20422)
@@ -1291,27 +1291,27 @@ isOptionalChaining(#20422)
 exprs(#20425,0,#20420,1,"c")
 hasLocation(#20425,#20199)
 enclosing_stmt(#20425,#20404)
-exprContainers(#20425,#20001)
+expr_containers(#20425,#20001)
 literals("c","c",#20425)
 isOptionalChaining(#20418)
 #20426=*
 exprs(#20426,0,#20416,1,"d")
 hasLocation(#20426,#20209)
 enclosing_stmt(#20426,#20404)
-exprContainers(#20426,#20001)
+expr_containers(#20426,#20001)
 literals("d","d",#20426)
 #20427=*
 exprs(#20427,0,#20409,1,"e")
 hasLocation(#20427,#20215)
 enclosing_stmt(#20427,#20404)
-exprContainers(#20427,#20001)
+expr_containers(#20427,#20001)
 literals("e","e",#20427)
 isOptionalChaining(#20407)
 #20428=*
 exprs(#20428,0,#20405,1,"f")
 hasLocation(#20428,#20225)
 enclosing_stmt(#20428,#20404)
-exprContainers(#20428,#20001)
+expr_containers(#20428,#20001)
 literals("f","f",#20428)
 #20429=*
 stmts(#20429,3,#20001,6,"if (a?. ... alse;\n}")
@@ -1325,19 +1325,19 @@ exprs(#20431,14,#20429,0,"a?.b")
 locations_default(#20432,#10000,13,5,13,8)
 hasLocation(#20431,#20432)
 enclosing_stmt(#20431,#20429)
-exprContainers(#20431,#20001)
+expr_containers(#20431,#20001)
 #20433=*
 exprs(#20433,79,#20431,0,"a")
 hasLocation(#20433,#20233)
 enclosing_stmt(#20433,#20429)
-exprContainers(#20433,#20001)
+expr_containers(#20433,#20001)
 literals("a","a",#20433)
 bind(#20433,#20338)
 #20434=*
 exprs(#20434,0,#20431,1,"b")
 hasLocation(#20434,#20237)
 enclosing_stmt(#20434,#20429)
-exprContainers(#20434,#20001)
+expr_containers(#20434,#20001)
 literals("b","b",#20434)
 isOptionalChaining(#20431)
 #20435=*
@@ -1356,7 +1356,7 @@ stmt_containers(#20437,#20001)
 exprs(#20439,2,#20437,0,"true")
 hasLocation(#20439,#20243)
 enclosing_stmt(#20439,#20437)
-exprContainers(#20439,#20001)
+expr_containers(#20439,#20001)
 literals("true","true",#20439)
 #20440=*
 stmts(#20440,1,#20429,2,"{\n    false;\n}")
@@ -1374,7 +1374,7 @@ stmt_containers(#20442,#20001)
 exprs(#20444,2,#20442,0,"false")
 hasLocation(#20444,#20253)
 enclosing_stmt(#20444,#20442)
-exprContainers(#20444,#20001)
+expr_containers(#20444,#20001)
 literals("false","false",#20444)
 #20445=*
 stmts(#20445,3,#20001,7,"if (!a? ... alse;\n}")
@@ -1388,26 +1388,26 @@ exprs(#20447,18,#20445,0,"!a?.b")
 locations_default(#20448,#10000,19,5,19,9)
 hasLocation(#20447,#20448)
 enclosing_stmt(#20447,#20445)
-exprContainers(#20447,#20001)
+expr_containers(#20447,#20001)
 #20449=*
 exprs(#20449,14,#20447,0,"a?.b")
 #20450=@"loc,{#10000},19,6,19,9"
 locations_default(#20450,#10000,19,6,19,9)
 hasLocation(#20449,#20450)
 enclosing_stmt(#20449,#20445)
-exprContainers(#20449,#20001)
+expr_containers(#20449,#20001)
 #20451=*
 exprs(#20451,79,#20449,0,"a")
 hasLocation(#20451,#20264)
 enclosing_stmt(#20451,#20445)
-exprContainers(#20451,#20001)
+expr_containers(#20451,#20001)
 literals("a","a",#20451)
 bind(#20451,#20338)
 #20452=*
 exprs(#20452,0,#20449,1,"b")
 hasLocation(#20452,#20268)
 enclosing_stmt(#20452,#20445)
-exprContainers(#20452,#20001)
+expr_containers(#20452,#20001)
 literals("b","b",#20452)
 isOptionalChaining(#20449)
 #20453=*
@@ -1426,7 +1426,7 @@ stmt_containers(#20455,#20001)
 exprs(#20457,2,#20455,0,"true")
 hasLocation(#20457,#20274)
 enclosing_stmt(#20457,#20455)
-exprContainers(#20457,#20001)
+expr_containers(#20457,#20001)
 literals("true","true",#20457)
 #20458=*
 stmts(#20458,1,#20445,2,"{\n    false;\n}")
@@ -1444,7 +1444,7 @@ stmt_containers(#20460,#20001)
 exprs(#20462,2,#20460,0,"false")
 hasLocation(#20462,#20284)
 enclosing_stmt(#20462,#20460)
-exprContainers(#20462,#20001)
+expr_containers(#20462,#20001)
 literals("false","false",#20462)
 #20463=*
 stmts(#20463,3,#20001,8,"if (a?. ... alse;\n}")
@@ -1458,26 +1458,26 @@ exprs(#20465,44,#20463,0,"a?.b && c?.d")
 locations_default(#20466,#10000,25,5,25,16)
 hasLocation(#20465,#20466)
 enclosing_stmt(#20465,#20463)
-exprContainers(#20465,#20001)
+expr_containers(#20465,#20001)
 #20467=*
 exprs(#20467,14,#20465,0,"a?.b")
 #20468=@"loc,{#10000},25,5,25,8"
 locations_default(#20468,#10000,25,5,25,8)
 hasLocation(#20467,#20468)
 enclosing_stmt(#20467,#20463)
-exprContainers(#20467,#20001)
+expr_containers(#20467,#20001)
 #20469=*
 exprs(#20469,79,#20467,0,"a")
 hasLocation(#20469,#20293)
 enclosing_stmt(#20469,#20463)
-exprContainers(#20469,#20001)
+expr_containers(#20469,#20001)
 literals("a","a",#20469)
 bind(#20469,#20338)
 #20470=*
 exprs(#20470,0,#20467,1,"b")
 hasLocation(#20470,#20297)
 enclosing_stmt(#20470,#20463)
-exprContainers(#20470,#20001)
+expr_containers(#20470,#20001)
 literals("b","b",#20470)
 isOptionalChaining(#20467)
 #20471=*
@@ -1486,12 +1486,12 @@ exprs(#20471,14,#20465,1,"c?.d")
 locations_default(#20472,#10000,25,13,25,16)
 hasLocation(#20471,#20472)
 enclosing_stmt(#20471,#20463)
-exprContainers(#20471,#20001)
+expr_containers(#20471,#20001)
 #20473=*
 exprs(#20473,79,#20471,0,"c")
 hasLocation(#20473,#20301)
 enclosing_stmt(#20473,#20463)
-exprContainers(#20473,#20001)
+expr_containers(#20473,#20001)
 literals("c","c",#20473)
 #20474=@"var;{c};{#20000}"
 variables(#20474,"c",#20000)
@@ -1500,7 +1500,7 @@ bind(#20473,#20474)
 exprs(#20475,0,#20471,1,"d")
 hasLocation(#20475,#20305)
 enclosing_stmt(#20475,#20463)
-exprContainers(#20475,#20001)
+expr_containers(#20475,#20001)
 literals("d","d",#20475)
 isOptionalChaining(#20471)
 #20476=*
@@ -1519,7 +1519,7 @@ stmt_containers(#20478,#20001)
 exprs(#20480,2,#20478,0,"true")
 hasLocation(#20480,#20311)
 enclosing_stmt(#20480,#20478)
-exprContainers(#20480,#20001)
+expr_containers(#20480,#20001)
 literals("true","true",#20480)
 #20481=*
 stmts(#20481,1,#20463,2,"{\n    false;\n}")
@@ -1537,7 +1537,7 @@ stmt_containers(#20483,#20001)
 exprs(#20485,2,#20483,0,"false")
 hasLocation(#20485,#20321)
 enclosing_stmt(#20485,#20483)
-exprContainers(#20485,#20001)
+expr_containers(#20485,#20001)
 literals("false","false",#20485)
 #20486=*
 entry_cfg_node(#20486,#20001)

javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap

@@ -166,7 +166,7 @@ stmt_containers(#20058,#20001)
 exprs(#20059,4,#20058,-1,"'settings'")
 hasLocation(#20059,#20017)
 enclosing_stmt(#20059,#20058)
-exprContainers(#20059,#20001)
+expr_containers(#20059,#20001)
 literals("settings","'settings'",#20059)
 #20060=*
 regexpterm(#20060,14,#20059,0,"settings")
@@ -178,18 +178,18 @@ regexpConstValue(#20060,"settings")
 exprs(#20062,83,#20058,0,"language")
 hasLocation(#20062,#20011)
 enclosing_stmt(#20062,#20058)
-exprContainers(#20062,#20001)
+expr_containers(#20062,#20001)
 #20063=*
 exprs(#20063,0,#20062,0,"language")
 hasLocation(#20063,#20011)
 enclosing_stmt(#20063,#20058)
-exprContainers(#20063,#20001)
+expr_containers(#20063,#20001)
 literals("language","language",#20063)
 #20064=*
 exprs(#20064,78,#20062,1,"language")
 hasLocation(#20064,#20011)
 enclosing_stmt(#20064,#20058)
-exprContainers(#20064,#20001)
+expr_containers(#20064,#20001)
 literals("language","language",#20064)
 decl(#20064,#20054)
 typedecl(#20064,#20055)
@@ -204,12 +204,12 @@ exprs(#20066,64,#20065,0,"strings ... uage}`)")
 locations_default(#20067,#10000,2,7,2,50)
 hasLocation(#20066,#20067)
 enclosing_stmt(#20066,#20065)
-exprContainers(#20066,#20001)
+expr_containers(#20066,#20001)
 #20068=*
 exprs(#20068,78,#20066,0,"strings")
 hasLocation(#20068,#20023)
 enclosing_stmt(#20068,#20065)
-exprContainers(#20068,#20001)
+expr_containers(#20068,#20001)
 literals("strings","strings",#20068)
 decl(#20068,#20057)
 #20069=*
@@ -218,32 +218,32 @@ exprs(#20069,92,#20066,1,"await i ... uage}`)")
 locations_default(#20070,#10000,2,17,2,50)
 hasLocation(#20069,#20070)
 enclosing_stmt(#20069,#20065)
-exprContainers(#20069,#20001)
+expr_containers(#20069,#20001)
 #20071=*
 exprs(#20071,99,#20069,0,"import( ... uage}`)")
 #20072=@"loc,{#10000},2,23,2,50"
 locations_default(#20072,#10000,2,23,2,50)
 hasLocation(#20071,#20072)
 enclosing_stmt(#20071,#20065)
-exprContainers(#20071,#20001)
+expr_containers(#20071,#20001)
 #20073=*
 exprs(#20073,71,#20071,0,"`./i18n/${language}`")
 #20074=@"loc,{#10000},2,30,2,49"
 locations_default(#20074,#10000,2,30,2,49)
 hasLocation(#20073,#20074)
 enclosing_stmt(#20073,#20065)
-exprContainers(#20073,#20001)
+expr_containers(#20073,#20001)
 #20075=*
 exprs(#20075,72,#20073,0,"./i18n/")
 hasLocation(#20075,#20035)
 enclosing_stmt(#20075,#20065)
-exprContainers(#20075,#20001)
+expr_containers(#20075,#20001)
 literals("./i18n/","./i18n/",#20075)
 #20076=*
 exprs(#20076,79,#20073,1,"language")
 hasLocation(#20076,#20039)
 enclosing_stmt(#20076,#20065)
-exprContainers(#20076,#20001)
+expr_containers(#20076,#20001)
 literals("language","language",#20076)
 bind(#20076,#20054)
 #20077=*

javascript/extractor/tests/esnext/output/trap/yield-import.js.trap

@@ -107,7 +107,7 @@ stmt_containers(#20035,#20001)
 #20037=*
 exprs(#20037,78,#20035,-1,"f")
 hasLocation(#20037,#20013)
-exprContainers(#20037,#20035)
+expr_containers(#20037,#20035)
 literals("f","f",#20037)
 decl(#20037,#20034)
 #20038=*
@@ -134,19 +134,19 @@ stmt_containers(#20042,#20035)
 exprs(#20044,69,#20042,0,"yield import(""foo"")")
 hasLocation(#20044,#20043)
 enclosing_stmt(#20044,#20042)
-exprContainers(#20044,#20035)
+expr_containers(#20044,#20035)
 #20045=*
 exprs(#20045,99,#20044,0,"import(""foo"")")
 #20046=@"loc,{#10000},2,9,2,21"
 locations_default(#20046,#10000,2,9,2,21)
 hasLocation(#20045,#20046)
 enclosing_stmt(#20045,#20042)
-exprContainers(#20045,#20035)
+expr_containers(#20045,#20035)
 #20047=*
 exprs(#20047,4,#20045,0,"""foo""")
 hasLocation(#20047,#20027)
 enclosing_stmt(#20047,#20042)
-exprContainers(#20047,#20035)
+expr_containers(#20047,#20035)
 literals("foo","""foo""",#20047)
 #20048=*
 regexpterm(#20048,14,#20047,0,"foo")

javascript/extractor/tests/excludes/output/trap/a.js.trap

@@ -33,7 +33,7 @@ stmt_containers(#20007,#20001)
 exprs(#20008,3,#20007,0,"42")
 hasLocation(#20008,#20003)
 enclosing_stmt(#20008,#20007)
-exprContainers(#20008,#20001)
+expr_containers(#20008,#20001)
 literals("42","42",#20008)
 #20009=*
 entry_cfg_node(#20009,#20001)

javascript/extractor/tests/exprs/output/trap/assignment.js.trap

@@ -340,12 +340,12 @@ exprs(#20126,47,#20125,0,"a = 23")
 locations_default(#20127,#10000,1,1,1,6)
 hasLocation(#20126,#20127)
 enclosing_stmt(#20126,#20125)
-exprContainers(#20126,#20001)
+expr_containers(#20126,#20001)
 #20128=*
 exprs(#20128,79,#20126,0,"a")
 hasLocation(#20128,#20027)
 enclosing_stmt(#20128,#20125)
-exprContainers(#20128,#20001)
+expr_containers(#20128,#20001)
 literals("a","a",#20128)
 #20129=@"var;{a};{#20000}"
 variables(#20129,"a",#20000)
@@ -354,7 +354,7 @@ bind(#20128,#20129)
 exprs(#20130,3,#20126,1,"23")
 hasLocation(#20130,#20031)
 enclosing_stmt(#20130,#20125)
-exprContainers(#20130,#20001)
+expr_containers(#20130,#20001)
 literals("23","23",#20130)
 #20131=*
 stmts(#20131,2,#20001,1,"a += 19;")
@@ -366,19 +366,19 @@ exprs(#20132,48,#20131,0,"a += 19")
 locations_default(#20133,#10000,2,1,2,7)
 hasLocation(#20132,#20133)
 enclosing_stmt(#20132,#20131)
-exprContainers(#20132,#20001)
+expr_containers(#20132,#20001)
 #20134=*
 exprs(#20134,79,#20132,0,"a")
 hasLocation(#20134,#20035)
 enclosing_stmt(#20134,#20131)
-exprContainers(#20134,#20001)
+expr_containers(#20134,#20001)
 literals("a","a",#20134)
 bind(#20134,#20129)
 #20135=*
 exprs(#20135,3,#20132,1,"19")
 hasLocation(#20135,#20039)
 enclosing_stmt(#20135,#20131)
-exprContainers(#20135,#20001)
+expr_containers(#20135,#20001)
 literals("19","19",#20135)
 #20136=*
 stmts(#20136,2,#20001,2,"a -= 9;")
@@ -390,19 +390,19 @@ exprs(#20137,49,#20136,0,"a -= 9")
 locations_default(#20138,#10000,3,1,3,6)
 hasLocation(#20137,#20138)
 enclosing_stmt(#20137,#20136)
-exprContainers(#20137,#20001)
+expr_containers(#20137,#20001)
 #20139=*
 exprs(#20139,79,#20137,0,"a")
 hasLocation(#20139,#20043)
 enclosing_stmt(#20139,#20136)
-exprContainers(#20139,#20001)
+expr_containers(#20139,#20001)
 literals("a","a",#20139)
 bind(#20139,#20129)
 #20140=*
 exprs(#20140,3,#20137,1,"9")
 hasLocation(#20140,#20047)
 enclosing_stmt(#20140,#20136)
-exprContainers(#20140,#20001)
+expr_containers(#20140,#20001)
 literals("9","9",#20140)
 #20141=*
 stmts(#20141,2,#20001,3,"a *= b;")
@@ -414,19 +414,19 @@ exprs(#20142,50,#20141,0,"a *= b")
 locations_default(#20143,#10000,4,1,4,6)
 hasLocation(#20142,#20143)
 enclosing_stmt(#20142,#20141)
-exprContainers(#20142,#20001)
+expr_containers(#20142,#20001)
 #20144=*
 exprs(#20144,79,#20142,0,"a")
 hasLocation(#20144,#20051)
 enclosing_stmt(#20144,#20141)
-exprContainers(#20144,#20001)
+expr_containers(#20144,#20001)
 literals("a","a",#20144)
 bind(#20144,#20129)
 #20145=*
 exprs(#20145,79,#20142,1,"b")
 hasLocation(#20145,#20055)
 enclosing_stmt(#20145,#20141)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 literals("b","b",#20145)
 #20146=@"var;{b};{#20000}"
 variables(#20146,"b",#20000)
@@ -441,19 +441,19 @@ exprs(#20148,51,#20147,0,"a /= 2")
 locations_default(#20149,#10000,5,1,5,6)
 hasLocation(#20148,#20149)
 enclosing_stmt(#20148,#20147)
-exprContainers(#20148,#20001)
+expr_containers(#20148,#20001)
 #20150=*
 exprs(#20150,79,#20148,0,"a")
 hasLocation(#20150,#20059)
 enclosing_stmt(#20150,#20147)
-exprContainers(#20150,#20001)
+expr_containers(#20150,#20001)
 literals("a","a",#20150)
 bind(#20150,#20129)
 #20151=*
 exprs(#20151,3,#20148,1,"2")
 hasLocation(#20151,#20063)
 enclosing_stmt(#20151,#20147)
-exprContainers(#20151,#20001)
+expr_containers(#20151,#20001)
 literals("2","2",#20151)
 #20152=*
 stmts(#20152,2,#20001,5,"a %= 2;")
@@ -465,19 +465,19 @@ exprs(#20153,52,#20152,0,"a %= 2")
 locations_default(#20154,#10000,6,1,6,6)
 hasLocation(#20153,#20154)
 enclosing_stmt(#20153,#20152)
-exprContainers(#20153,#20001)
+expr_containers(#20153,#20001)
 #20155=*
 exprs(#20155,79,#20153,0,"a")
 hasLocation(#20155,#20067)
 enclosing_stmt(#20155,#20152)
-exprContainers(#20155,#20001)
+expr_containers(#20155,#20001)
 literals("a","a",#20155)
 bind(#20155,#20129)
 #20156=*
 exprs(#20156,3,#20153,1,"2")
 hasLocation(#20156,#20071)
 enclosing_stmt(#20156,#20152)
-exprContainers(#20156,#20001)
+expr_containers(#20156,#20001)
 literals("2","2",#20156)
 #20157=*
 stmts(#20157,2,#20001,6,"a <<= 8;")
@@ -489,19 +489,19 @@ exprs(#20158,53,#20157,0,"a <<= 8")
 locations_default(#20159,#10000,7,1,7,7)
 hasLocation(#20158,#20159)
 enclosing_stmt(#20158,#20157)
-exprContainers(#20158,#20001)
+expr_containers(#20158,#20001)
 #20160=*
 exprs(#20160,79,#20158,0,"a")
 hasLocation(#20160,#20075)
 enclosing_stmt(#20160,#20157)
-exprContainers(#20160,#20001)
+expr_containers(#20160,#20001)
 literals("a","a",#20160)
 bind(#20160,#20129)
 #20161=*
 exprs(#20161,3,#20158,1,"8")
 hasLocation(#20161,#20079)
 enclosing_stmt(#20161,#20157)
-exprContainers(#20161,#20001)
+expr_containers(#20161,#20001)
 literals("8","8",#20161)
 #20162=*
 stmts(#20162,2,#20001,7,"a >>= 7;")
@@ -513,19 +513,19 @@ exprs(#20163,54,#20162,0,"a >>= 7")
 locations_default(#20164,#10000,8,1,8,7)
 hasLocation(#20163,#20164)
 enclosing_stmt(#20163,#20162)
-exprContainers(#20163,#20001)
+expr_containers(#20163,#20001)
 #20165=*
 exprs(#20165,79,#20163,0,"a")
 hasLocation(#20165,#20083)
 enclosing_stmt(#20165,#20162)
-exprContainers(#20165,#20001)
+expr_containers(#20165,#20001)
 literals("a","a",#20165)
 bind(#20165,#20129)
 #20166=*
 exprs(#20166,3,#20163,1,"7")
 hasLocation(#20166,#20087)
 enclosing_stmt(#20166,#20162)
-exprContainers(#20166,#20001)
+expr_containers(#20166,#20001)
 literals("7","7",#20166)
 #20167=*
 stmts(#20167,2,#20001,8,"a >>>= 2;")
@@ -537,19 +537,19 @@ exprs(#20168,55,#20167,0,"a >>>= 2")
 locations_default(#20169,#10000,9,1,9,8)
 hasLocation(#20168,#20169)
 enclosing_stmt(#20168,#20167)
-exprContainers(#20168,#20001)
+expr_containers(#20168,#20001)
 #20170=*
 exprs(#20170,79,#20168,0,"a")
 hasLocation(#20170,#20091)
 enclosing_stmt(#20170,#20167)
-exprContainers(#20170,#20001)
+expr_containers(#20170,#20001)
 literals("a","a",#20170)
 bind(#20170,#20129)
 #20171=*
 exprs(#20171,3,#20168,1,"2")
 hasLocation(#20171,#20095)
 enclosing_stmt(#20171,#20167)
-exprContainers(#20171,#20001)
+expr_containers(#20171,#20001)
 literals("2","2",#20171)
 #20172=*
 stmts(#20172,2,#20001,9,"a |= 2;")
@@ -561,19 +561,19 @@ exprs(#20173,56,#20172,0,"a |= 2")
 locations_default(#20174,#10000,10,1,10,6)
 hasLocation(#20173,#20174)
 enclosing_stmt(#20173,#20172)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 #20175=*
 exprs(#20175,79,#20173,0,"a")
 hasLocation(#20175,#20099)
 enclosing_stmt(#20175,#20172)
-exprContainers(#20175,#20001)
+expr_containers(#20175,#20001)
 literals("a","a",#20175)
 bind(#20175,#20129)
 #20176=*
 exprs(#20176,3,#20173,1,"2")
 hasLocation(#20176,#20103)
 enclosing_stmt(#20176,#20172)
-exprContainers(#20176,#20001)
+expr_containers(#20176,#20001)
 literals("2","2",#20176)
 #20177=*
 stmts(#20177,2,#20001,10,"a ^= 1;")
@@ -585,19 +585,19 @@ exprs(#20178,57,#20177,0,"a ^= 1")
 locations_default(#20179,#10000,11,1,11,6)
 hasLocation(#20178,#20179)
 enclosing_stmt(#20178,#20177)
-exprContainers(#20178,#20001)
+expr_containers(#20178,#20001)
 #20180=*
 exprs(#20180,79,#20178,0,"a")
 hasLocation(#20180,#20107)
 enclosing_stmt(#20180,#20177)
-exprContainers(#20180,#20001)
+expr_containers(#20180,#20001)
 literals("a","a",#20180)
 bind(#20180,#20129)
 #20181=*
 exprs(#20181,3,#20178,1,"1")
 hasLocation(#20181,#20111)
 enclosing_stmt(#20181,#20177)
-exprContainers(#20181,#20001)
+expr_containers(#20181,#20001)
 literals("1","1",#20181)
 #20182=*
 stmts(#20182,2,#20001,11,"a &= 3;")
@@ -609,19 +609,19 @@ exprs(#20183,58,#20182,0,"a &= 3")
 locations_default(#20184,#10000,12,1,12,6)
 hasLocation(#20183,#20184)
 enclosing_stmt(#20183,#20182)
-exprContainers(#20183,#20001)
+expr_containers(#20183,#20001)
 #20185=*
 exprs(#20185,79,#20183,0,"a")
 hasLocation(#20185,#20115)
 enclosing_stmt(#20185,#20182)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 literals("a","a",#20185)
 bind(#20185,#20129)
 #20186=*
 exprs(#20186,3,#20183,1,"3")
 hasLocation(#20186,#20119)
 enclosing_stmt(#20186,#20182)
-exprContainers(#20186,#20001)
+expr_containers(#20186,#20001)
 literals("3","3",#20186)
 #20187=*
 entry_cfg_node(#20187,#20001)

javascript/extractor/tests/exprs/output/trap/binary.js.trap

@@ -424,18 +424,18 @@ exprs(#20158,31,#20157,0,"1 << 2")
 locations_default(#20159,#10000,1,1,1,6)
 hasLocation(#20158,#20159)
 enclosing_stmt(#20158,#20157)
-exprContainers(#20158,#20001)
+expr_containers(#20158,#20001)
 #20160=*
 exprs(#20160,3,#20158,0,"1")
 hasLocation(#20160,#20033)
 enclosing_stmt(#20160,#20157)
-exprContainers(#20160,#20001)
+expr_containers(#20160,#20001)
 literals("1","1",#20160)
 #20161=*
 exprs(#20161,3,#20158,1,"2")
 hasLocation(#20161,#20037)
 enclosing_stmt(#20161,#20157)
-exprContainers(#20161,#20001)
+expr_containers(#20161,#20001)
 literals("2","2",#20161)
 #20162=*
 stmts(#20162,2,#20001,1,"2 >> 1;")
@@ -447,18 +447,18 @@ exprs(#20163,32,#20162,0,"2 >> 1")
 locations_default(#20164,#10000,2,1,2,6)
 hasLocation(#20163,#20164)
 enclosing_stmt(#20163,#20162)
-exprContainers(#20163,#20001)
+expr_containers(#20163,#20001)
 #20165=*
 exprs(#20165,3,#20163,0,"2")
 hasLocation(#20165,#20041)
 enclosing_stmt(#20165,#20162)
-exprContainers(#20165,#20001)
+expr_containers(#20165,#20001)
 literals("2","2",#20165)
 #20166=*
 exprs(#20166,3,#20163,1,"1")
 hasLocation(#20166,#20045)
 enclosing_stmt(#20166,#20162)
-exprContainers(#20166,#20001)
+expr_containers(#20166,#20001)
 literals("1","1",#20166)
 #20167=*
 stmts(#20167,2,#20001,2,"2 >>> 1;")
@@ -470,18 +470,18 @@ exprs(#20168,33,#20167,0,"2 >>> 1")
 locations_default(#20169,#10000,3,1,3,7)
 hasLocation(#20168,#20169)
 enclosing_stmt(#20168,#20167)
-exprContainers(#20168,#20001)
+expr_containers(#20168,#20001)
 #20170=*
 exprs(#20170,3,#20168,0,"2")
 hasLocation(#20170,#20049)
 enclosing_stmt(#20170,#20167)
-exprContainers(#20170,#20001)
+expr_containers(#20170,#20001)
 literals("2","2",#20170)
 #20171=*
 exprs(#20171,3,#20168,1,"1")
 hasLocation(#20171,#20053)
 enclosing_stmt(#20171,#20167)
-exprContainers(#20171,#20001)
+expr_containers(#20171,#20001)
 literals("1","1",#20171)
 #20172=*
 stmts(#20172,2,#20001,3,"23 + 19;")
@@ -493,18 +493,18 @@ exprs(#20173,34,#20172,0,"23 + 19")
 locations_default(#20174,#10000,4,1,4,7)
 hasLocation(#20173,#20174)
 enclosing_stmt(#20173,#20172)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 #20175=*
 exprs(#20175,3,#20173,0,"23")
 hasLocation(#20175,#20057)
 enclosing_stmt(#20175,#20172)
-exprContainers(#20175,#20001)
+expr_containers(#20175,#20001)
 literals("23","23",#20175)
 #20176=*
 exprs(#20176,3,#20173,1,"19")
 hasLocation(#20176,#20061)
 enclosing_stmt(#20176,#20172)
-exprContainers(#20176,#20001)
+expr_containers(#20176,#20001)
 literals("19","19",#20176)
 #20177=*
 stmts(#20177,2,#20001,4,"42 - 19;")
@@ -516,18 +516,18 @@ exprs(#20178,35,#20177,0,"42 - 19")
 locations_default(#20179,#10000,5,1,5,7)
 hasLocation(#20178,#20179)
 enclosing_stmt(#20178,#20177)
-exprContainers(#20178,#20001)
+expr_containers(#20178,#20001)
 #20180=*
 exprs(#20180,3,#20178,0,"42")
 hasLocation(#20180,#20065)
 enclosing_stmt(#20180,#20177)
-exprContainers(#20180,#20001)
+expr_containers(#20180,#20001)
 literals("42","42",#20180)
 #20181=*
 exprs(#20181,3,#20178,1,"19")
 hasLocation(#20181,#20069)
 enclosing_stmt(#20181,#20177)
-exprContainers(#20181,#20001)
+expr_containers(#20181,#20001)
 literals("19","19",#20181)
 #20182=*
 stmts(#20182,2,#20001,5,"2 * 3;")
@@ -539,18 +539,18 @@ exprs(#20183,36,#20182,0,"2 * 3")
 locations_default(#20184,#10000,6,1,6,5)
 hasLocation(#20183,#20184)
 enclosing_stmt(#20183,#20182)
-exprContainers(#20183,#20001)
+expr_containers(#20183,#20001)
 #20185=*
 exprs(#20185,3,#20183,0,"2")
 hasLocation(#20185,#20073)
 enclosing_stmt(#20185,#20182)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 literals("2","2",#20185)
 #20186=*
 exprs(#20186,3,#20183,1,"3")
 hasLocation(#20186,#20077)
 enclosing_stmt(#20186,#20182)
-exprContainers(#20186,#20001)
+expr_containers(#20186,#20001)
 literals("3","3",#20186)
 #20187=*
 stmts(#20187,2,#20001,6,"8 / 5;")
@@ -562,18 +562,18 @@ exprs(#20188,37,#20187,0,"8 / 5")
 locations_default(#20189,#10000,7,1,7,5)
 hasLocation(#20188,#20189)
 enclosing_stmt(#20188,#20187)
-exprContainers(#20188,#20001)
+expr_containers(#20188,#20001)
 #20190=*
 exprs(#20190,3,#20188,0,"8")
 hasLocation(#20190,#20081)
 enclosing_stmt(#20190,#20187)
-exprContainers(#20190,#20001)
+expr_containers(#20190,#20001)
 literals("8","8",#20190)
 #20191=*
 exprs(#20191,3,#20188,1,"5")
 hasLocation(#20191,#20085)
 enclosing_stmt(#20191,#20187)
-exprContainers(#20191,#20001)
+expr_containers(#20191,#20001)
 literals("5","5",#20191)
 #20192=*
 stmts(#20192,2,#20001,7,"2 % 1;")
@@ -585,18 +585,18 @@ exprs(#20193,38,#20192,0,"2 % 1")
 locations_default(#20194,#10000,8,1,8,5)
 hasLocation(#20193,#20194)
 enclosing_stmt(#20193,#20192)
-exprContainers(#20193,#20001)
+expr_containers(#20193,#20001)
 #20195=*
 exprs(#20195,3,#20193,0,"2")
 hasLocation(#20195,#20089)
 enclosing_stmt(#20195,#20192)
-exprContainers(#20195,#20001)
+expr_containers(#20195,#20001)
 literals("2","2",#20195)
 #20196=*
 exprs(#20196,3,#20193,1,"1")
 hasLocation(#20196,#20093)
 enclosing_stmt(#20196,#20192)
-exprContainers(#20196,#20001)
+expr_containers(#20196,#20001)
 literals("1","1",#20196)
 #20197=*
 stmts(#20197,2,#20001,8,"2 | 3;")
@@ -608,18 +608,18 @@ exprs(#20198,39,#20197,0,"2 | 3")
 locations_default(#20199,#10000,9,1,9,5)
 hasLocation(#20198,#20199)
 enclosing_stmt(#20198,#20197)
-exprContainers(#20198,#20001)
+expr_containers(#20198,#20001)
 #20200=*
 exprs(#20200,3,#20198,0,"2")
 hasLocation(#20200,#20097)
 enclosing_stmt(#20200,#20197)
-exprContainers(#20200,#20001)
+expr_containers(#20200,#20001)
 literals("2","2",#20200)
 #20201=*
 exprs(#20201,3,#20198,1,"3")
 hasLocation(#20201,#20101)
 enclosing_stmt(#20201,#20197)
-exprContainers(#20201,#20001)
+expr_containers(#20201,#20001)
 literals("3","3",#20201)
 #20202=*
 stmts(#20202,2,#20001,9,"2 ^ 3;")
@@ -631,18 +631,18 @@ exprs(#20203,40,#20202,0,"2 ^ 3")
 locations_default(#20204,#10000,10,1,10,5)
 hasLocation(#20203,#20204)
 enclosing_stmt(#20203,#20202)
-exprContainers(#20203,#20001)
+expr_containers(#20203,#20001)
 #20205=*
 exprs(#20205,3,#20203,0,"2")
 hasLocation(#20205,#20105)
 enclosing_stmt(#20205,#20202)
-exprContainers(#20205,#20001)
+expr_containers(#20205,#20001)
 literals("2","2",#20205)
 #20206=*
 exprs(#20206,3,#20203,1,"3")
 hasLocation(#20206,#20109)
 enclosing_stmt(#20206,#20202)
-exprContainers(#20206,#20001)
+expr_containers(#20206,#20001)
 literals("3","3",#20206)
 #20207=*
 stmts(#20207,2,#20001,10,"2 & 3;")
@@ -654,18 +654,18 @@ exprs(#20208,41,#20207,0,"2 & 3")
 locations_default(#20209,#10000,11,1,11,5)
 hasLocation(#20208,#20209)
 enclosing_stmt(#20208,#20207)
-exprContainers(#20208,#20001)
+expr_containers(#20208,#20001)
 #20210=*
 exprs(#20210,3,#20208,0,"2")
 hasLocation(#20210,#20113)
 enclosing_stmt(#20210,#20207)
-exprContainers(#20210,#20001)
+expr_containers(#20210,#20001)
 literals("2","2",#20210)
 #20211=*
 exprs(#20211,3,#20208,1,"3")
 hasLocation(#20211,#20117)
 enclosing_stmt(#20211,#20207)
-exprContainers(#20211,#20001)
+expr_containers(#20211,#20001)
 literals("3","3",#20211)
 #20212=*
 stmts(#20212,2,#20001,11,"'protot ... Object;")
@@ -677,12 +677,12 @@ exprs(#20213,42,#20212,0,"'protot ...  Object")
 locations_default(#20214,#10000,12,1,12,21)
 hasLocation(#20213,#20214)
 enclosing_stmt(#20213,#20212)
-exprContainers(#20213,#20001)
+expr_containers(#20213,#20001)
 #20215=*
 exprs(#20215,4,#20213,0,"'prototype'")
 hasLocation(#20215,#20121)
 enclosing_stmt(#20215,#20212)
-exprContainers(#20215,#20001)
+expr_containers(#20215,#20001)
 literals("prototype","'prototype'",#20215)
 #20216=*
 regexpterm(#20216,14,#20215,0,"prototype")
@@ -694,7 +694,7 @@ regexpConstValue(#20216,"prototype")
 exprs(#20218,79,#20213,1,"Object")
 hasLocation(#20218,#20125)
 enclosing_stmt(#20218,#20212)
-exprContainers(#20218,#20001)
+expr_containers(#20218,#20001)
 literals("Object","Object",#20218)
 #20219=@"var;{Object};{#20000}"
 variables(#20219,"Object",#20000)
@@ -709,20 +709,20 @@ exprs(#20221,43,#20220,0,"[] instanceof Array")
 locations_default(#20222,#10000,13,1,13,19)
 hasLocation(#20221,#20222)
 enclosing_stmt(#20221,#20220)
-exprContainers(#20221,#20001)
+expr_containers(#20221,#20001)
 #20223=*
 exprs(#20223,7,#20221,0,"[]")
 #20224=@"loc,{#10000},13,1,13,2"
 locations_default(#20224,#10000,13,1,13,2)
 hasLocation(#20223,#20224)
 enclosing_stmt(#20223,#20220)
-exprContainers(#20223,#20001)
+expr_containers(#20223,#20001)
 arraySize(#20223,0)
 #20225=*
 exprs(#20225,79,#20221,1,"Array")
 hasLocation(#20225,#20135)
 enclosing_stmt(#20225,#20220)
-exprContainers(#20225,#20001)
+expr_containers(#20225,#20001)
 literals("Array","Array",#20225)
 #20226=@"var;{Array};{#20000}"
 variables(#20226,"Array",#20000)
@@ -737,18 +737,18 @@ exprs(#20228,44,#20227,0,"1 && 2")
 locations_default(#20229,#10000,14,1,14,6)
 hasLocation(#20228,#20229)
 enclosing_stmt(#20228,#20227)
-exprContainers(#20228,#20001)
+expr_containers(#20228,#20001)
 #20230=*
 exprs(#20230,3,#20228,0,"1")
 hasLocation(#20230,#20139)
 enclosing_stmt(#20230,#20227)
-exprContainers(#20230,#20001)
+expr_containers(#20230,#20001)
 literals("1","1",#20230)
 #20231=*
 exprs(#20231,3,#20228,1,"2")
 hasLocation(#20231,#20143)
 enclosing_stmt(#20231,#20227)
-exprContainers(#20231,#20001)
+expr_containers(#20231,#20001)
 literals("2","2",#20231)
 #20232=*
 stmts(#20232,2,#20001,14,"1 || 2;")
@@ -760,18 +760,18 @@ exprs(#20233,45,#20232,0,"1 || 2")
 locations_default(#20234,#10000,15,1,15,6)
 hasLocation(#20233,#20234)
 enclosing_stmt(#20233,#20232)
-exprContainers(#20233,#20001)
+expr_containers(#20233,#20001)
 #20235=*
 exprs(#20235,3,#20233,0,"1")
 hasLocation(#20235,#20147)
 enclosing_stmt(#20235,#20232)
-exprContainers(#20235,#20001)
+expr_containers(#20235,#20001)
 literals("1","1",#20235)
 #20236=*
 exprs(#20236,3,#20233,1,"2")
 hasLocation(#20236,#20151)
 enclosing_stmt(#20236,#20232)
-exprContainers(#20236,#20001)
+expr_containers(#20236,#20001)
 literals("2","2",#20236)
 #20237=*
 entry_cfg_node(#20237,#20001)

javascript/extractor/tests/exprs/output/trap/comparison.js.trap

@@ -237,18 +237,18 @@ exprs(#20086,23,#20085,0,"1 == 1")
 locations_default(#20087,#10000,1,1,1,6)
 hasLocation(#20086,#20087)
 enclosing_stmt(#20086,#20085)
-exprContainers(#20086,#20001)
+expr_containers(#20086,#20001)
 #20088=*
 exprs(#20088,3,#20086,0,"1")
 hasLocation(#20088,#20019)
 enclosing_stmt(#20088,#20085)
-exprContainers(#20088,#20001)
+expr_containers(#20088,#20001)
 literals("1","1",#20088)
 #20089=*
 exprs(#20089,3,#20086,1,"1")
 hasLocation(#20089,#20023)
 enclosing_stmt(#20089,#20085)
-exprContainers(#20089,#20001)
+expr_containers(#20089,#20001)
 literals("1","1",#20089)
 #20090=*
 stmts(#20090,2,#20001,1,"1 != 2;")
@@ -260,18 +260,18 @@ exprs(#20091,24,#20090,0,"1 != 2")
 locations_default(#20092,#10000,2,1,2,6)
 hasLocation(#20091,#20092)
 enclosing_stmt(#20091,#20090)
-exprContainers(#20091,#20001)
+expr_containers(#20091,#20001)
 #20093=*
 exprs(#20093,3,#20091,0,"1")
 hasLocation(#20093,#20027)
 enclosing_stmt(#20093,#20090)
-exprContainers(#20093,#20001)
+expr_containers(#20093,#20001)
 literals("1","1",#20093)
 #20094=*
 exprs(#20094,3,#20091,1,"2")
 hasLocation(#20094,#20031)
 enclosing_stmt(#20094,#20090)
-exprContainers(#20094,#20001)
+expr_containers(#20094,#20001)
 literals("2","2",#20094)
 #20095=*
 stmts(#20095,2,#20001,2,"1 === 1;")
@@ -283,18 +283,18 @@ exprs(#20096,25,#20095,0,"1 === 1")
 locations_default(#20097,#10000,3,1,3,7)
 hasLocation(#20096,#20097)
 enclosing_stmt(#20096,#20095)
-exprContainers(#20096,#20001)
+expr_containers(#20096,#20001)
 #20098=*
 exprs(#20098,3,#20096,0,"1")
 hasLocation(#20098,#20035)
 enclosing_stmt(#20098,#20095)
-exprContainers(#20098,#20001)
+expr_containers(#20098,#20001)
 literals("1","1",#20098)
 #20099=*
 exprs(#20099,3,#20096,1,"1")
 hasLocation(#20099,#20039)
 enclosing_stmt(#20099,#20095)
-exprContainers(#20099,#20001)
+expr_containers(#20099,#20001)
 literals("1","1",#20099)
 #20100=*
 stmts(#20100,2,#20001,3,"1 !== 2;")
@@ -306,18 +306,18 @@ exprs(#20101,26,#20100,0,"1 !== 2")
 locations_default(#20102,#10000,4,1,4,7)
 hasLocation(#20101,#20102)
 enclosing_stmt(#20101,#20100)
-exprContainers(#20101,#20001)
+expr_containers(#20101,#20001)
 #20103=*
 exprs(#20103,3,#20101,0,"1")
 hasLocation(#20103,#20043)
 enclosing_stmt(#20103,#20100)
-exprContainers(#20103,#20001)
+expr_containers(#20103,#20001)
 literals("1","1",#20103)
 #20104=*
 exprs(#20104,3,#20101,1,"2")
 hasLocation(#20104,#20047)
 enclosing_stmt(#20104,#20100)
-exprContainers(#20104,#20001)
+expr_containers(#20104,#20001)
 literals("2","2",#20104)
 #20105=*
 stmts(#20105,2,#20001,4,"1 < 2;")
@@ -329,18 +329,18 @@ exprs(#20106,27,#20105,0,"1 < 2")
 locations_default(#20107,#10000,5,1,5,5)
 hasLocation(#20106,#20107)
 enclosing_stmt(#20106,#20105)
-exprContainers(#20106,#20001)
+expr_containers(#20106,#20001)
 #20108=*
 exprs(#20108,3,#20106,0,"1")
 hasLocation(#20108,#20051)
 enclosing_stmt(#20108,#20105)
-exprContainers(#20108,#20001)
+expr_containers(#20108,#20001)
 literals("1","1",#20108)
 #20109=*
 exprs(#20109,3,#20106,1,"2")
 hasLocation(#20109,#20055)
 enclosing_stmt(#20109,#20105)
-exprContainers(#20109,#20001)
+expr_containers(#20109,#20001)
 literals("2","2",#20109)
 #20110=*
 stmts(#20110,2,#20001,5,"1 <= 2;")
@@ -352,18 +352,18 @@ exprs(#20111,28,#20110,0,"1 <= 2")
 locations_default(#20112,#10000,6,1,6,6)
 hasLocation(#20111,#20112)
 enclosing_stmt(#20111,#20110)
-exprContainers(#20111,#20001)
+expr_containers(#20111,#20001)
 #20113=*
 exprs(#20113,3,#20111,0,"1")
 hasLocation(#20113,#20059)
 enclosing_stmt(#20113,#20110)
-exprContainers(#20113,#20001)
+expr_containers(#20113,#20001)
 literals("1","1",#20113)
 #20114=*
 exprs(#20114,3,#20111,1,"2")
 hasLocation(#20114,#20063)
 enclosing_stmt(#20114,#20110)
-exprContainers(#20114,#20001)
+expr_containers(#20114,#20001)
 literals("2","2",#20114)
 #20115=*
 stmts(#20115,2,#20001,6,"2 > 1;")
@@ -375,18 +375,18 @@ exprs(#20116,29,#20115,0,"2 > 1")
 locations_default(#20117,#10000,7,1,7,5)
 hasLocation(#20116,#20117)
 enclosing_stmt(#20116,#20115)
-exprContainers(#20116,#20001)
+expr_containers(#20116,#20001)
 #20118=*
 exprs(#20118,3,#20116,0,"2")
 hasLocation(#20118,#20067)
 enclosing_stmt(#20118,#20115)
-exprContainers(#20118,#20001)
+expr_containers(#20118,#20001)
 literals("2","2",#20118)
 #20119=*
 exprs(#20119,3,#20116,1,"1")
 hasLocation(#20119,#20071)
 enclosing_stmt(#20119,#20115)
-exprContainers(#20119,#20001)
+expr_containers(#20119,#20001)
 literals("1","1",#20119)
 #20120=*
 stmts(#20120,2,#20001,7,"2 >= 1;")
@@ -398,18 +398,18 @@ exprs(#20121,30,#20120,0,"2 >= 1")
 locations_default(#20122,#10000,8,1,8,6)
 hasLocation(#20121,#20122)
 enclosing_stmt(#20121,#20120)
-exprContainers(#20121,#20001)
+expr_containers(#20121,#20001)
 #20123=*
 exprs(#20123,3,#20121,0,"2")
 hasLocation(#20123,#20075)
 enclosing_stmt(#20123,#20120)
-exprContainers(#20123,#20001)
+expr_containers(#20123,#20001)
 literals("2","2",#20123)
 #20124=*
 exprs(#20124,3,#20121,1,"1")
 hasLocation(#20124,#20079)
 enclosing_stmt(#20124,#20120)
-exprContainers(#20124,#20001)
+expr_containers(#20124,#20001)
 literals("1","1",#20124)
 #20125=*
 entry_cfg_node(#20125,#20001)

javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap

@@ -87,12 +87,12 @@ exprs(#20029,13,#20028,0,"f(function(){}, 23)")
 locations_default(#20030,#10000,1,1,1,19)
 hasLocation(#20029,#20030)
 enclosing_stmt(#20029,#20028)
-exprContainers(#20029,#20001)
+expr_containers(#20029,#20001)
 #20031=*
 exprs(#20031,79,#20029,-1,"f")
 hasLocation(#20031,#20005)
 enclosing_stmt(#20031,#20028)
-exprContainers(#20031,#20001)
+expr_containers(#20031,#20001)
 literals("f","f",#20031)
 #20032=@"var;{f};{#20000}"
 variables(#20032,"f",#20000)
@@ -103,7 +103,7 @@ exprs(#20033,9,#20029,0,"function(){}")
 locations_default(#20034,#10000,1,3,1,14)
 hasLocation(#20033,#20034)
 enclosing_stmt(#20033,#20028)
-exprContainers(#20033,#20001)
+expr_containers(#20033,#20001)
 #20035=*
 scopes(#20035,1)
 scopenodes(#20033,#20035)
@@ -121,7 +121,7 @@ stmt_containers(#20037,#20033)
 exprs(#20039,3,#20029,1,"23")
 hasLocation(#20039,#20021)
 enclosing_stmt(#20039,#20028)
-exprContainers(#20039,#20001)
+expr_containers(#20039,#20001)
 literals("23","23",#20039)
 #20040=*
 entry_cfg_node(#20040,#20001)

javascript/extractor/tests/exprs/output/trap/others.js.trap

@@ -127,18 +127,18 @@ exprs(#20044,10,#20043,0,"23, 42")
 locations_default(#20045,#10000,1,1,1,6)
 hasLocation(#20044,#20045)
 enclosing_stmt(#20044,#20043)
-exprContainers(#20044,#20001)
+expr_containers(#20044,#20001)
 #20046=*
 exprs(#20046,3,#20044,0,"23")
 hasLocation(#20046,#20009)
 enclosing_stmt(#20046,#20043)
-exprContainers(#20046,#20001)
+expr_containers(#20046,#20001)
 literals("23","23",#20046)
 #20047=*
 exprs(#20047,3,#20044,1,"42")
 hasLocation(#20047,#20013)
 enclosing_stmt(#20047,#20043)
-exprContainers(#20047,#20001)
+expr_containers(#20047,#20001)
 literals("42","42",#20047)
 #20048=*
 stmts(#20048,2,#20001,1,"23, 42, 56;")
@@ -150,24 +150,24 @@ exprs(#20049,10,#20048,0,"23, 42, 56")
 locations_default(#20050,#10000,2,1,2,10)
 hasLocation(#20049,#20050)
 enclosing_stmt(#20049,#20048)
-exprContainers(#20049,#20001)
+expr_containers(#20049,#20001)
 #20051=*
 exprs(#20051,3,#20049,0,"23")
 hasLocation(#20051,#20017)
 enclosing_stmt(#20051,#20048)
-exprContainers(#20051,#20001)
+expr_containers(#20051,#20001)
 literals("23","23",#20051)
 #20052=*
 exprs(#20052,3,#20049,1,"42")
 hasLocation(#20052,#20021)
 enclosing_stmt(#20052,#20048)
-exprContainers(#20052,#20001)
+expr_containers(#20052,#20001)
 literals("42","42",#20052)
 #20053=*
 exprs(#20053,3,#20049,2,"56")
 hasLocation(#20053,#20025)
 enclosing_stmt(#20053,#20048)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 literals("56","56",#20053)
 #20054=*
 stmts(#20054,2,#20001,2,"true ? 0 : 1;")
@@ -179,24 +179,24 @@ exprs(#20055,11,#20054,0,"true ? 0 : 1")
 locations_default(#20056,#10000,3,1,3,12)
 hasLocation(#20055,#20056)
 enclosing_stmt(#20055,#20054)
-exprContainers(#20055,#20001)
+expr_containers(#20055,#20001)
 #20057=*
 exprs(#20057,2,#20055,0,"true")
 hasLocation(#20057,#20029)
 enclosing_stmt(#20057,#20054)
-exprContainers(#20057,#20001)
+expr_containers(#20057,#20001)
 literals("true","true",#20057)
 #20058=*
 exprs(#20058,3,#20055,1,"0")
 hasLocation(#20058,#20033)
 enclosing_stmt(#20058,#20054)
-exprContainers(#20058,#20001)
+expr_containers(#20058,#20001)
 literals("0","0",#20058)
 #20059=*
 exprs(#20059,3,#20055,2,"1")
 hasLocation(#20059,#20037)
 enclosing_stmt(#20059,#20054)
-exprContainers(#20059,#20001)
+expr_containers(#20059,#20001)
 literals("1","1",#20059)
 #20060=*
 entry_cfg_node(#20060,#20001)

javascript/extractor/tests/exprs/output/trap/parens.js.trap

@@ -57,19 +57,19 @@ exprs(#20017,61,#20016,0,"--(NaN)")
 locations_default(#20018,#10000,1,1,1,7)
 hasLocation(#20017,#20018)
 enclosing_stmt(#20017,#20016)
-exprContainers(#20017,#20001)
+expr_containers(#20017,#20001)
 #20019=*
 exprs(#20019,63,#20017,0,"(NaN)")
 #20020=@"loc,{#10000},1,3,1,7"
 locations_default(#20020,#10000,1,3,1,7)
 hasLocation(#20019,#20020)
 enclosing_stmt(#20019,#20016)
-exprContainers(#20019,#20001)
+expr_containers(#20019,#20001)
 #20021=*
 exprs(#20021,79,#20019,0,"NaN")
 hasLocation(#20021,#20009)
 enclosing_stmt(#20021,#20016)
-exprContainers(#20021,#20001)
+expr_containers(#20021,#20001)
 literals("NaN","NaN",#20021)
 #20022=@"var;{NaN};{#20000}"
 variables(#20022,"NaN",#20000)