renamed "exprContainers" to "expr_containers"

2026-05-04 21:25:44 +02:00 · 2020-09-04 11:51:49 +02:00
parent 30ba7d29a1
commit 83b89fa52d
223 changed files with 3317 additions and 3310 deletions
--- a/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
@@ -414,14 +414,14 @@ exprs(#20158,73,#20157,0,"[for (y ... ) year]")
 locations_default(#20159,#10000,1,1,1,43)
 hasLocation(#20158,#20159)
 enclosing_stmt(#20158,#20157)
-exprContainers(#20158,#20001)
+expr_containers(#20158,#20001)
 #20160=*
 exprs(#20160,76,#20158,1,"for (year of years)")
 #20161=@"loc,{#10000},1,2,1,20"
 locations_default(#20161,#10000,1,2,1,20)
 hasLocation(#20160,#20161)
 enclosing_stmt(#20160,#20157)
-exprContainers(#20160,#20001)
+expr_containers(#20160,#20001)
 #20162=*
 scopes(#20162,7)
 scopenodes(#20160,#20162)
@@ -432,14 +432,14 @@ variables(#20163,"year",#20162)
 exprs(#20164,78,#20160,0,"year")
 hasLocation(#20164,#20019)
 enclosing_stmt(#20164,#20157)
-exprContainers(#20164,#20001)
+expr_containers(#20164,#20001)
 literals("year","year",#20164)
 decl(#20164,#20163)
 #20165=*
 exprs(#20165,79,#20160,1,"years")
 hasLocation(#20165,#20023)
 enclosing_stmt(#20165,#20157)
-exprContainers(#20165,#20001)
+expr_containers(#20165,#20001)
 literals("years","years",#20165)
 #20166=@"var;{years};{#20000}"
 variables(#20166,"years",#20000)
@@ -450,25 +450,25 @@ exprs(#20167,29,#20158,-1,"year > 2000")
 locations_default(#20168,#10000,1,26,1,36)
 hasLocation(#20167,#20168)
 enclosing_stmt(#20167,#20157)
-exprContainers(#20167,#20001)
+expr_containers(#20167,#20001)
 #20169=*
 exprs(#20169,79,#20167,0,"year")
 hasLocation(#20169,#20031)
 enclosing_stmt(#20169,#20157)
-exprContainers(#20169,#20001)
+expr_containers(#20169,#20001)
 literals("year","year",#20169)
 bind(#20169,#20163)
 #20170=*
 exprs(#20170,3,#20167,1,"2000")
 hasLocation(#20170,#20035)
 enclosing_stmt(#20170,#20157)
-exprContainers(#20170,#20001)
+expr_containers(#20170,#20001)
 literals("2000","2000",#20170)
 #20171=*
 exprs(#20171,79,#20158,0,"year")
 hasLocation(#20171,#20039)
 enclosing_stmt(#20171,#20157)
-exprContainers(#20171,#20001)
+expr_containers(#20171,#20001)
 literals("year","year",#20171)
 bind(#20171,#20163)
 #20172=*
@@ -479,7 +479,7 @@ stmt_containers(#20172,#20001)
 exprs(#20173,79,#20172,0,"year")
 hasLocation(#20173,#20045)
 enclosing_stmt(#20173,#20172)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 literals("year","year",#20173)
 #20174=@"var;{year};{#20000}"
 variables(#20174,"year",#20000)
@@ -494,14 +494,14 @@ exprs(#20176,73,#20175,0,"[for (i ... s) i+j]")
 locations_default(#20177,#10000,3,1,3,43)
 hasLocation(#20176,#20177)
 enclosing_stmt(#20176,#20175)
-exprContainers(#20176,#20001)
+expr_containers(#20176,#20001)
 #20178=*
 exprs(#20178,76,#20176,1,"for (i of numbers)")
 #20179=@"loc,{#10000},3,2,3,19"
 locations_default(#20179,#10000,3,2,3,19)
 hasLocation(#20178,#20179)
 enclosing_stmt(#20178,#20175)
-exprContainers(#20178,#20001)
+expr_containers(#20178,#20001)
 #20180=*
 scopes(#20180,7)
 scopenodes(#20178,#20180)
@@ -512,14 +512,14 @@ variables(#20181,"i",#20180)
 exprs(#20182,78,#20178,0,"i")
 hasLocation(#20182,#20055)
 enclosing_stmt(#20182,#20175)
-exprContainers(#20182,#20001)
+expr_containers(#20182,#20001)
 literals("i","i",#20182)
 decl(#20182,#20181)
 #20183=*
 exprs(#20183,79,#20178,1,"numbers")
 hasLocation(#20183,#20059)
 enclosing_stmt(#20183,#20175)
-exprContainers(#20183,#20001)
+expr_containers(#20183,#20001)
 literals("numbers","numbers",#20183)
 #20184=@"var;{numbers};{#20000}"
 variables(#20184,"numbers",#20000)
@@ -530,7 +530,7 @@ exprs(#20185,76,#20176,2,"for (j of letters)")
 locations_default(#20186,#10000,3,21,3,38)
 hasLocation(#20185,#20186)
 enclosing_stmt(#20185,#20175)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 #20187=*
 scopes(#20187,7)
 scopenodes(#20185,#20187)
@@ -541,14 +541,14 @@ variables(#20188,"j",#20187)
 exprs(#20189,78,#20185,0,"j")
 hasLocation(#20189,#20067)
 enclosing_stmt(#20189,#20175)
-exprContainers(#20189,#20001)
+expr_containers(#20189,#20001)
 literals("j","j",#20189)
 decl(#20189,#20188)
 #20190=*
 exprs(#20190,79,#20185,1,"letters")
 hasLocation(#20190,#20071)
 enclosing_stmt(#20190,#20175)
-exprContainers(#20190,#20001)
+expr_containers(#20190,#20001)
 literals("letters","letters",#20190)
 #20191=@"var;{letters};{#20000}"
 variables(#20191,"letters",#20000)
@@ -559,19 +559,19 @@ exprs(#20192,34,#20176,0,"i+j")
 locations_default(#20193,#10000,3,40,3,42)
 hasLocation(#20192,#20193)
 enclosing_stmt(#20192,#20175)
-exprContainers(#20192,#20001)
+expr_containers(#20192,#20001)
 #20194=*
 exprs(#20194,79,#20192,0,"i")
 hasLocation(#20194,#20075)
 enclosing_stmt(#20194,#20175)
-exprContainers(#20194,#20001)
+expr_containers(#20194,#20001)
 literals("i","i",#20194)
 bind(#20194,#20181)
 #20195=*
 exprs(#20195,79,#20192,1,"j")
 hasLocation(#20195,#20079)
 enclosing_stmt(#20195,#20175)
-exprContainers(#20195,#20001)
+expr_containers(#20195,#20001)
 literals("j","j",#20195)
 bind(#20195,#20188)
 #20196=*
@@ -584,14 +584,14 @@ exprs(#20197,73,#20196,0,"[for (i ... j) i+j]")
 locations_default(#20198,#10000,4,1,4,52)
 hasLocation(#20197,#20198)
 enclosing_stmt(#20197,#20196)
-exprContainers(#20197,#20001)
+expr_containers(#20197,#20001)
 #20199=*
 exprs(#20199,76,#20197,1,"for (i of numbers)")
 #20200=@"loc,{#10000},4,2,4,19"
 locations_default(#20200,#10000,4,2,4,19)
 hasLocation(#20199,#20200)
 enclosing_stmt(#20199,#20196)
-exprContainers(#20199,#20001)
+expr_containers(#20199,#20001)
 #20201=*
 scopes(#20201,7)
 scopenodes(#20199,#20201)
@@ -602,14 +602,14 @@ variables(#20202,"i",#20201)
 exprs(#20203,78,#20199,0,"i")
 hasLocation(#20203,#20091)
 enclosing_stmt(#20203,#20196)
-exprContainers(#20203,#20001)
+expr_containers(#20203,#20001)
 literals("i","i",#20203)
 decl(#20203,#20202)
 #20204=*
 exprs(#20204,79,#20199,1,"numbers")
 hasLocation(#20204,#20095)
 enclosing_stmt(#20204,#20196)
-exprContainers(#20204,#20001)
+expr_containers(#20204,#20001)
 literals("numbers","numbers",#20204)
 bind(#20204,#20184)
 #20205=*
@@ -618,7 +618,7 @@ exprs(#20205,76,#20197,2,"for (j of letters)")
 locations_default(#20206,#10000,4,21,4,38)
 hasLocation(#20205,#20206)
 enclosing_stmt(#20205,#20196)
-exprContainers(#20205,#20001)
+expr_containers(#20205,#20001)
 #20207=*
 scopes(#20207,7)
 scopenodes(#20205,#20207)
@@ -629,14 +629,14 @@ variables(#20208,"j",#20207)
 exprs(#20209,78,#20205,0,"j")
 hasLocation(#20209,#20103)
 enclosing_stmt(#20209,#20196)
-exprContainers(#20209,#20001)
+expr_containers(#20209,#20001)
 literals("j","j",#20209)
 decl(#20209,#20208)
 #20210=*
 exprs(#20210,79,#20205,1,"letters")
 hasLocation(#20210,#20107)
 enclosing_stmt(#20210,#20196)
-exprContainers(#20210,#20001)
+expr_containers(#20210,#20001)
 literals("letters","letters",#20210)
 bind(#20210,#20191)
 #20211=*
@@ -645,19 +645,19 @@ exprs(#20211,27,#20197,-1,"i<j")
 locations_default(#20212,#10000,4,44,4,46)
 hasLocation(#20211,#20212)
 enclosing_stmt(#20211,#20196)
-exprContainers(#20211,#20001)
+expr_containers(#20211,#20001)
 #20213=*
 exprs(#20213,79,#20211,0,"i")
 hasLocation(#20213,#20115)
 enclosing_stmt(#20213,#20196)
-exprContainers(#20213,#20001)
+expr_containers(#20213,#20001)
 literals("i","i",#20213)
 bind(#20213,#20202)
 #20214=*
 exprs(#20214,79,#20211,1,"j")
 hasLocation(#20214,#20119)
 enclosing_stmt(#20214,#20196)
-exprContainers(#20214,#20001)
+expr_containers(#20214,#20001)
 literals("j","j",#20214)
 bind(#20214,#20208)
 #20215=*
@@ -666,19 +666,19 @@ exprs(#20215,34,#20197,0,"i+j")
 locations_default(#20216,#10000,4,49,4,51)
 hasLocation(#20215,#20216)
 enclosing_stmt(#20215,#20196)
-exprContainers(#20215,#20001)
+expr_containers(#20215,#20001)
 #20217=*
 exprs(#20217,79,#20215,0,"i")
 hasLocation(#20217,#20123)
 enclosing_stmt(#20217,#20196)
-exprContainers(#20217,#20001)
+expr_containers(#20217,#20001)
 literals("i","i",#20217)
 bind(#20217,#20202)
 #20218=*
 exprs(#20218,79,#20215,1,"j")
 hasLocation(#20218,#20127)
 enclosing_stmt(#20218,#20196)
-exprContainers(#20218,#20001)
+expr_containers(#20218,#20001)
 literals("j","j",#20218)
 bind(#20218,#20208)
 #20219=*
@@ -691,14 +691,14 @@ exprs(#20220,73,#20219,0,"[for ea ... ers) i]")
 locations_default(#20221,#10000,5,1,5,27)
 hasLocation(#20220,#20221)
 enclosing_stmt(#20220,#20219)
-exprContainers(#20220,#20001)
+expr_containers(#20220,#20001)
 #20222=*
 exprs(#20222,76,#20220,1,"for eac ... umbers)")
 #20223=@"loc,{#10000},5,2,5,24"
 locations_default(#20223,#10000,5,2,5,24)
 hasLocation(#20222,#20223)
 enclosing_stmt(#20222,#20219)
-exprContainers(#20222,#20001)
+expr_containers(#20222,#20001)
 #20224=*
 scopes(#20224,7)
 scopenodes(#20222,#20224)
@@ -709,21 +709,21 @@ variables(#20225,"i",#20224)
 exprs(#20226,78,#20222,0,"i")
 hasLocation(#20226,#20141)
 enclosing_stmt(#20226,#20219)
-exprContainers(#20226,#20001)
+expr_containers(#20226,#20001)
 literals("i","i",#20226)
 decl(#20226,#20225)
 #20227=*
 exprs(#20227,79,#20222,1,"numbers")
 hasLocation(#20227,#20145)
 enclosing_stmt(#20227,#20219)
-exprContainers(#20227,#20001)
+expr_containers(#20227,#20001)
 literals("numbers","numbers",#20227)
 bind(#20227,#20184)
 #20228=*
 exprs(#20228,79,#20220,0,"i")
 hasLocation(#20228,#20149)
 enclosing_stmt(#20228,#20219)
-exprContainers(#20228,#20001)
+expr_containers(#20228,#20001)
 literals("i","i",#20228)
 bind(#20228,#20225)
 #20229=*
--- a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
@@ -211,7 +211,7 @@ stmt_containers(#20075,#20001)
 #20076=*
 exprs(#20076,78,#20075,-1,"f")
 hasLocation(#20076,#20019)
-exprContainers(#20076,#20075)
+expr_containers(#20076,#20075)
 literals("f","f",#20076)
 decl(#20076,#20074)
 #20077=*
@@ -223,7 +223,7 @@ variables(#20078,"x",#20077)
 #20079=*
 exprs(#20079,78,#20075,0,"x")
 hasLocation(#20079,#20023)
-exprContainers(#20079,#20075)
+expr_containers(#20079,#20075)
 literals("x","x",#20079)
 decl(#20079,#20078)
 #20080=@"var;{arguments};{#20077}"
@@ -234,11 +234,11 @@ exprs(#20081,63,#20075,-2,"(""result"")")
 #20082=@"loc,{#10000},1,14,1,23"
 locations_default(#20082,#10000,1,14,1,23)
 hasLocation(#20081,#20082)
-exprContainers(#20081,#20075)
+expr_containers(#20081,#20075)
 #20083=*
 exprs(#20083,4,#20081,0,"""result""")
 hasLocation(#20083,#20029)
-exprContainers(#20083,#20075)
+expr_containers(#20083,#20075)
 literals("result","""result""",#20083)
 #20084=*
 regexpterm(#20084,14,#20083,0,"result")
@@ -256,7 +256,7 @@ stmt_containers(#20086,#20001)
 exprs(#20088,9,#20086,0,"functio ... )\n  }\n}")
 hasLocation(#20088,#20087)
 enclosing_stmt(#20088,#20086)
-exprContainers(#20088,#20001)
+expr_containers(#20088,#20001)
 #20089=*
 scopes(#20089,1)
 scopenodes(#20088,#20089)
@@ -268,7 +268,7 @@ variables(#20091,"b",#20089)
 #20092=*
 exprs(#20092,78,#20088,0,"b")
 hasLocation(#20092,#20037)
-exprContainers(#20092,#20088)
+expr_containers(#20092,#20088)
 literals("b","b",#20092)
 decl(#20092,#20091)
 #20093=@"var;{arguments};{#20089}"
@@ -290,7 +290,7 @@ stmt_containers(#20096,#20088)
 exprs(#20098,79,#20096,0,"b")
 hasLocation(#20098,#20047)
 enclosing_stmt(#20098,#20096)
-exprContainers(#20098,#20088)
+expr_containers(#20098,#20088)
 literals("b","b",#20098)
 bind(#20098,#20091)
 #20099=*
@@ -308,7 +308,7 @@ stmt_containers(#20101,#20088)
 #20103=*
 exprs(#20103,78,#20101,-1,"g")
 hasLocation(#20103,#20055)
-exprContainers(#20103,#20101)
+expr_containers(#20103,#20101)
 literals("g","g",#20103)
 decl(#20103,#20090)
 #20104=*
@@ -320,7 +320,7 @@ variables(#20105,"y",#20104)
 #20106=*
 exprs(#20106,78,#20101,0,"y")
 hasLocation(#20106,#20059)
-exprContainers(#20106,#20101)
+expr_containers(#20106,#20101)
 literals("y","y",#20106)
 decl(#20106,#20105)
 #20107=@"var;{arguments};{#20104}"
@@ -331,11 +331,11 @@ exprs(#20108,63,#20101,-2,"(""other result"")")
 #20109=@"loc,{#10000},5,18,5,33"
 locations_default(#20109,#10000,5,18,5,33)
 hasLocation(#20108,#20109)
-exprContainers(#20108,#20101)
+expr_containers(#20108,#20101)
 #20110=*
 exprs(#20110,4,#20108,0,"""other result""")
 hasLocation(#20110,#20065)
-exprContainers(#20110,#20101)
+expr_containers(#20110,#20101)
 literals("other result","""other result""",#20110)
 #20111=*
 regexpterm(#20111,14,#20110,0,"other result")
--- a/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
@@ -303,19 +303,19 @@ exprs(#20112,64,#20111,0,"sum = 0")
 locations_default(#20113,#10000,1,5,1,11)
 hasLocation(#20112,#20113)
 enclosing_stmt(#20112,#20111)
-exprContainers(#20112,#20001)
+expr_containers(#20112,#20001)
 #20114=*
 exprs(#20114,78,#20112,0,"sum")
 hasLocation(#20114,#20023)
 enclosing_stmt(#20114,#20111)
-exprContainers(#20114,#20001)
+expr_containers(#20114,#20001)
 literals("sum","sum",#20114)
 decl(#20114,#20108)
 #20115=*
 exprs(#20115,3,#20112,1,"0")
 hasLocation(#20115,#20027)
 enclosing_stmt(#20115,#20111)
-exprContainers(#20115,#20001)
+expr_containers(#20115,#20001)
 literals("0","0",#20115)
 #20116=*
 stmts(#20116,18,#20001,1,"var obj ... p3: 8};")
@@ -327,12 +327,12 @@ exprs(#20117,64,#20116,0,"obj = { ... op3: 8}")
 locations_default(#20118,#10000,2,5,2,41)
 hasLocation(#20117,#20118)
 enclosing_stmt(#20117,#20116)
-exprContainers(#20117,#20001)
+expr_containers(#20117,#20001)
 #20119=*
 exprs(#20119,78,#20117,0,"obj")
 hasLocation(#20119,#20033)
 enclosing_stmt(#20119,#20116)
-exprContainers(#20119,#20001)
+expr_containers(#20119,#20001)
 literals("obj","obj",#20119)
 decl(#20119,#20109)
 #20120=*
@@ -341,7 +341,7 @@ exprs(#20120,8,#20117,1,"{prop1: ... op3: 8}")
 locations_default(#20121,#10000,2,11,2,41)
 hasLocation(#20120,#20121)
 enclosing_stmt(#20120,#20116)
-exprContainers(#20120,#20001)
+expr_containers(#20120,#20001)
 #20122=*
 properties(#20122,#20120,0,0,"prop1: 5")
 #20123=@"loc,{#10000},2,12,2,19"
@@ -351,13 +351,13 @@ hasLocation(#20122,#20123)
 exprs(#20124,0,#20122,0,"prop1")
 hasLocation(#20124,#20039)
 enclosing_stmt(#20124,#20116)
-exprContainers(#20124,#20001)
+expr_containers(#20124,#20001)
 literals("prop1","prop1",#20124)
 #20125=*
 exprs(#20125,3,#20122,1,"5")
 hasLocation(#20125,#20043)
 enclosing_stmt(#20125,#20116)
-exprContainers(#20125,#20001)
+expr_containers(#20125,#20001)
 literals("5","5",#20125)
 #20126=*
 properties(#20126,#20120,1,0,"prop2: 13")
@@ -368,13 +368,13 @@ hasLocation(#20126,#20127)
 exprs(#20128,0,#20126,0,"prop2")
 hasLocation(#20128,#20047)
 enclosing_stmt(#20128,#20116)
-exprContainers(#20128,#20001)
+expr_containers(#20128,#20001)
 literals("prop2","prop2",#20128)
 #20129=*
 exprs(#20129,3,#20126,1,"13")
 hasLocation(#20129,#20051)
 enclosing_stmt(#20129,#20116)
-exprContainers(#20129,#20001)
+expr_containers(#20129,#20001)
 literals("13","13",#20129)
 #20130=*
 properties(#20130,#20120,2,0,"prop3: 8")
@@ -385,13 +385,13 @@ hasLocation(#20130,#20131)
 exprs(#20132,0,#20130,0,"prop3")
 hasLocation(#20132,#20055)
 enclosing_stmt(#20132,#20116)
-exprContainers(#20132,#20001)
+expr_containers(#20132,#20001)
 literals("prop3","prop3",#20132)
 #20133=*
 exprs(#20133,3,#20130,1,"8")
 hasLocation(#20133,#20059)
 enclosing_stmt(#20133,#20116)
-exprContainers(#20133,#20001)
+expr_containers(#20133,#20001)
 literals("8","8",#20133)
 #20134=*
 stmts(#20134,25,#20001,2,"for eac ... item;\n}")
@@ -403,7 +403,7 @@ stmt_containers(#20134,#20001)
 exprs(#20136,79,#20134,1,"obj")
 hasLocation(#20136,#20077)
 enclosing_stmt(#20136,#20134)
-exprContainers(#20136,#20001)
+expr_containers(#20136,#20001)
 literals("obj","obj",#20136)
 bind(#20136,#20109)
 #20137=*
@@ -416,12 +416,12 @@ stmt_containers(#20137,#20001)
 exprs(#20139,64,#20137,0,"item")
 hasLocation(#20139,#20073)
 enclosing_stmt(#20139,#20137)
-exprContainers(#20139,#20001)
+expr_containers(#20139,#20001)
 #20140=*
 exprs(#20140,78,#20139,0,"item")
 hasLocation(#20140,#20073)
 enclosing_stmt(#20140,#20137)
-exprContainers(#20140,#20001)
+expr_containers(#20140,#20001)
 literals("item","item",#20140)
 decl(#20140,#20110)
 #20141=*
@@ -442,19 +442,19 @@ exprs(#20145,48,#20143,0,"sum += item")
 locations_default(#20146,#10000,5,3,5,13)
 hasLocation(#20145,#20146)
 enclosing_stmt(#20145,#20143)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 #20147=*
 exprs(#20147,79,#20145,0,"sum")
 hasLocation(#20147,#20083)
 enclosing_stmt(#20147,#20143)
-exprContainers(#20147,#20001)
+expr_containers(#20147,#20001)
 literals("sum","sum",#20147)
 bind(#20147,#20108)
 #20148=*
 exprs(#20148,79,#20145,1,"item")
 hasLocation(#20148,#20087)
 enclosing_stmt(#20148,#20143)
-exprContainers(#20148,#20001)
+expr_containers(#20148,#20001)
 literals("item","item",#20148)
 bind(#20148,#20110)
 #20149=*
@@ -469,19 +469,19 @@ exprs(#20151,13,#20149,0,"console.log(sum)")
 locations_default(#20152,#10000,8,1,8,16)
 hasLocation(#20151,#20152)
 enclosing_stmt(#20151,#20149)
-exprContainers(#20151,#20001)
+expr_containers(#20151,#20001)
 #20153=*
 exprs(#20153,14,#20151,-1,"console.log")
 #20154=@"loc,{#10000},8,1,8,11"
 locations_default(#20154,#10000,8,1,8,11)
 hasLocation(#20153,#20154)
 enclosing_stmt(#20153,#20149)
-exprContainers(#20153,#20001)
+expr_containers(#20153,#20001)
 #20155=*
 exprs(#20155,79,#20153,0,"console")
 hasLocation(#20155,#20092)
 enclosing_stmt(#20155,#20149)
-exprContainers(#20155,#20001)
+expr_containers(#20155,#20001)
 literals("console","console",#20155)
 #20156=@"var;{console};{#20000}"
 variables(#20156,"console",#20000)
@@ -490,13 +490,13 @@ bind(#20155,#20156)
 exprs(#20157,0,#20153,1,"log")
 hasLocation(#20157,#20096)
 enclosing_stmt(#20157,#20149)
-exprContainers(#20157,#20001)
+expr_containers(#20157,#20001)
 literals("log","log",#20157)
 #20158=*
 exprs(#20158,79,#20151,0,"sum")
 hasLocation(#20158,#20100)
 enclosing_stmt(#20158,#20149)
-exprContainers(#20158,#20001)
+expr_containers(#20158,#20001)
 literals("sum","sum",#20158)
 bind(#20158,#20108)
 #20159=*
--- a/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
@@ -490,14 +490,14 @@ exprs(#20188,74,#20187,0,"(for (y ... ) year)")
 locations_default(#20189,#10000,1,1,1,43)
 hasLocation(#20188,#20189)
 enclosing_stmt(#20188,#20187)
-exprContainers(#20188,#20001)
+expr_containers(#20188,#20001)
 #20190=*
 exprs(#20190,76,#20188,1,"for (year of years)")
 #20191=@"loc,{#10000},1,2,1,20"
 locations_default(#20191,#10000,1,2,1,20)
 hasLocation(#20190,#20191)
 enclosing_stmt(#20190,#20187)
-exprContainers(#20190,#20001)
+expr_containers(#20190,#20001)
 #20192=*
 scopes(#20192,7)
 scopenodes(#20190,#20192)
@@ -508,14 +508,14 @@ variables(#20193,"year",#20192)
 exprs(#20194,78,#20190,0,"year")
 hasLocation(#20194,#20021)
 enclosing_stmt(#20194,#20187)
-exprContainers(#20194,#20001)
+expr_containers(#20194,#20001)
 literals("year","year",#20194)
 decl(#20194,#20193)
 #20195=*
 exprs(#20195,79,#20190,1,"years")
 hasLocation(#20195,#20025)
 enclosing_stmt(#20195,#20187)
-exprContainers(#20195,#20001)
+expr_containers(#20195,#20001)
 literals("years","years",#20195)
 #20196=@"var;{years};{#20000}"
 variables(#20196,"years",#20000)
@@ -526,25 +526,25 @@ exprs(#20197,29,#20188,-1,"year > 2000")
 locations_default(#20198,#10000,1,26,1,36)
 hasLocation(#20197,#20198)
 enclosing_stmt(#20197,#20187)
-exprContainers(#20197,#20001)
+expr_containers(#20197,#20001)
 #20199=*
 exprs(#20199,79,#20197,0,"year")
 hasLocation(#20199,#20033)
 enclosing_stmt(#20199,#20187)
-exprContainers(#20199,#20001)
+expr_containers(#20199,#20001)
 literals("year","year",#20199)
 bind(#20199,#20193)
 #20200=*
 exprs(#20200,3,#20197,1,"2000")
 hasLocation(#20200,#20037)
 enclosing_stmt(#20200,#20187)
-exprContainers(#20200,#20001)
+expr_containers(#20200,#20001)
 literals("2000","2000",#20200)
 #20201=*
 exprs(#20201,79,#20188,0,"year")
 hasLocation(#20201,#20041)
 enclosing_stmt(#20201,#20187)
-exprContainers(#20201,#20001)
+expr_containers(#20201,#20001)
 literals("year","year",#20201)
 bind(#20201,#20193)
 #20202=*
@@ -555,7 +555,7 @@ stmt_containers(#20202,#20001)
 exprs(#20203,79,#20202,0,"year")
 hasLocation(#20203,#20047)
 enclosing_stmt(#20203,#20202)
-exprContainers(#20203,#20001)
+expr_containers(#20203,#20001)
 literals("year","year",#20203)
 #20204=@"var;{year};{#20000}"
 variables(#20204,"year",#20000)
@@ -570,14 +570,14 @@ exprs(#20206,74,#20205,0,"(for (i ... s) i+j)")
 locations_default(#20207,#10000,3,1,3,43)
 hasLocation(#20206,#20207)
 enclosing_stmt(#20206,#20205)
-exprContainers(#20206,#20001)
+expr_containers(#20206,#20001)
 #20208=*
 exprs(#20208,76,#20206,1,"for (i of numbers)")
 #20209=@"loc,{#10000},3,2,3,19"
 locations_default(#20209,#10000,3,2,3,19)
 hasLocation(#20208,#20209)
 enclosing_stmt(#20208,#20205)
-exprContainers(#20208,#20001)
+expr_containers(#20208,#20001)
 #20210=*
 scopes(#20210,7)
 scopenodes(#20208,#20210)
@@ -588,14 +588,14 @@ variables(#20211,"i",#20210)
 exprs(#20212,78,#20208,0,"i")
 hasLocation(#20212,#20057)
 enclosing_stmt(#20212,#20205)
-exprContainers(#20212,#20001)
+expr_containers(#20212,#20001)
 literals("i","i",#20212)
 decl(#20212,#20211)
 #20213=*
 exprs(#20213,79,#20208,1,"numbers")
 hasLocation(#20213,#20061)
 enclosing_stmt(#20213,#20205)
-exprContainers(#20213,#20001)
+expr_containers(#20213,#20001)
 literals("numbers","numbers",#20213)
 #20214=@"var;{numbers};{#20000}"
 variables(#20214,"numbers",#20000)
@@ -606,7 +606,7 @@ exprs(#20215,76,#20206,2,"for (j of letters)")
 locations_default(#20216,#10000,3,21,3,38)
 hasLocation(#20215,#20216)
 enclosing_stmt(#20215,#20205)
-exprContainers(#20215,#20001)
+expr_containers(#20215,#20001)
 #20217=*
 scopes(#20217,7)
 scopenodes(#20215,#20217)
@@ -617,14 +617,14 @@ variables(#20218,"j",#20217)
 exprs(#20219,78,#20215,0,"j")
 hasLocation(#20219,#20069)
 enclosing_stmt(#20219,#20205)
-exprContainers(#20219,#20001)
+expr_containers(#20219,#20001)
 literals("j","j",#20219)
 decl(#20219,#20218)
 #20220=*
 exprs(#20220,79,#20215,1,"letters")
 hasLocation(#20220,#20073)
 enclosing_stmt(#20220,#20205)
-exprContainers(#20220,#20001)
+expr_containers(#20220,#20001)
 literals("letters","letters",#20220)
 #20221=@"var;{letters};{#20000}"
 variables(#20221,"letters",#20000)
@@ -635,19 +635,19 @@ exprs(#20222,34,#20206,0,"i+j")
 locations_default(#20223,#10000,3,40,3,42)
 hasLocation(#20222,#20223)
 enclosing_stmt(#20222,#20205)
-exprContainers(#20222,#20001)
+expr_containers(#20222,#20001)
 #20224=*
 exprs(#20224,79,#20222,0,"i")
 hasLocation(#20224,#20077)
 enclosing_stmt(#20224,#20205)
-exprContainers(#20224,#20001)
+expr_containers(#20224,#20001)
 literals("i","i",#20224)
 bind(#20224,#20211)
 #20225=*
 exprs(#20225,79,#20222,1,"j")
 hasLocation(#20225,#20081)
 enclosing_stmt(#20225,#20205)
-exprContainers(#20225,#20001)
+expr_containers(#20225,#20001)
 literals("j","j",#20225)
 bind(#20225,#20218)
 #20226=*
@@ -660,14 +660,14 @@ exprs(#20227,74,#20226,0,"(for (i ... j) i+j)")
 locations_default(#20228,#10000,4,1,4,52)
 hasLocation(#20227,#20228)
 enclosing_stmt(#20227,#20226)
-exprContainers(#20227,#20001)
+expr_containers(#20227,#20001)
 #20229=*
 exprs(#20229,76,#20227,1,"for (i of numbers)")
 #20230=@"loc,{#10000},4,2,4,19"
 locations_default(#20230,#10000,4,2,4,19)
 hasLocation(#20229,#20230)
 enclosing_stmt(#20229,#20226)
-exprContainers(#20229,#20001)
+expr_containers(#20229,#20001)
 #20231=*
 scopes(#20231,7)
 scopenodes(#20229,#20231)
@@ -678,14 +678,14 @@ variables(#20232,"i",#20231)
 exprs(#20233,78,#20229,0,"i")
 hasLocation(#20233,#20093)
 enclosing_stmt(#20233,#20226)
-exprContainers(#20233,#20001)
+expr_containers(#20233,#20001)
 literals("i","i",#20233)
 decl(#20233,#20232)
 #20234=*
 exprs(#20234,79,#20229,1,"numbers")
 hasLocation(#20234,#20097)
 enclosing_stmt(#20234,#20226)
-exprContainers(#20234,#20001)
+expr_containers(#20234,#20001)
 literals("numbers","numbers",#20234)
 bind(#20234,#20214)
 #20235=*
@@ -694,7 +694,7 @@ exprs(#20235,76,#20227,2,"for (j of letters)")
 locations_default(#20236,#10000,4,21,4,38)
 hasLocation(#20235,#20236)
 enclosing_stmt(#20235,#20226)
-exprContainers(#20235,#20001)
+expr_containers(#20235,#20001)
 #20237=*
 scopes(#20237,7)
 scopenodes(#20235,#20237)
@@ -705,14 +705,14 @@ variables(#20238,"j",#20237)
 exprs(#20239,78,#20235,0,"j")
 hasLocation(#20239,#20105)
 enclosing_stmt(#20239,#20226)
-exprContainers(#20239,#20001)
+expr_containers(#20239,#20001)
 literals("j","j",#20239)
 decl(#20239,#20238)
 #20240=*
 exprs(#20240,79,#20235,1,"letters")
 hasLocation(#20240,#20109)
 enclosing_stmt(#20240,#20226)
-exprContainers(#20240,#20001)
+expr_containers(#20240,#20001)
 literals("letters","letters",#20240)
 bind(#20240,#20221)
 #20241=*
@@ -721,19 +721,19 @@ exprs(#20241,27,#20227,-1,"i<j")
 locations_default(#20242,#10000,4,44,4,46)
 hasLocation(#20241,#20242)
 enclosing_stmt(#20241,#20226)
-exprContainers(#20241,#20001)
+expr_containers(#20241,#20001)
 #20243=*
 exprs(#20243,79,#20241,0,"i")
 hasLocation(#20243,#20117)
 enclosing_stmt(#20243,#20226)
-exprContainers(#20243,#20001)
+expr_containers(#20243,#20001)
 literals("i","i",#20243)
 bind(#20243,#20232)
 #20244=*
 exprs(#20244,79,#20241,1,"j")
 hasLocation(#20244,#20121)
 enclosing_stmt(#20244,#20226)
-exprContainers(#20244,#20001)
+expr_containers(#20244,#20001)
 literals("j","j",#20244)
 bind(#20244,#20238)
 #20245=*
@@ -742,19 +742,19 @@ exprs(#20245,34,#20227,0,"i+j")
 locations_default(#20246,#10000,4,49,4,51)
 hasLocation(#20245,#20246)
 enclosing_stmt(#20245,#20226)
-exprContainers(#20245,#20001)
+expr_containers(#20245,#20001)
 #20247=*
 exprs(#20247,79,#20245,0,"i")
 hasLocation(#20247,#20125)
 enclosing_stmt(#20247,#20226)
-exprContainers(#20247,#20001)
+expr_containers(#20247,#20001)
 literals("i","i",#20247)
 bind(#20247,#20232)
 #20248=*
 exprs(#20248,79,#20245,1,"j")
 hasLocation(#20248,#20129)
 enclosing_stmt(#20248,#20226)
-exprContainers(#20248,#20001)
+expr_containers(#20248,#20001)
 literals("j","j",#20248)
 bind(#20248,#20238)
 #20249=*
@@ -767,14 +767,14 @@ exprs(#20250,74,#20249,0,"(x.p for (x in xs))")
 locations_default(#20251,#10000,5,1,5,19)
 hasLocation(#20250,#20251)
 enclosing_stmt(#20250,#20249)
-exprContainers(#20250,#20001)
+expr_containers(#20250,#20001)
 #20252=*
 exprs(#20252,75,#20250,1,"for (x in xs)")
 #20253=@"loc,{#10000},5,6,5,18"
 locations_default(#20253,#10000,5,6,5,18)
 hasLocation(#20252,#20253)
 enclosing_stmt(#20252,#20249)
-exprContainers(#20252,#20001)
+expr_containers(#20252,#20001)
 #20254=*
 scopes(#20254,7)
 scopenodes(#20252,#20254)
@@ -785,14 +785,14 @@ variables(#20255,"x",#20254)
 exprs(#20256,78,#20252,0,"x")
 hasLocation(#20256,#20147)
 enclosing_stmt(#20256,#20249)
-exprContainers(#20256,#20001)
+expr_containers(#20256,#20001)
 literals("x","x",#20256)
 decl(#20256,#20255)
 #20257=*
 exprs(#20257,79,#20252,1,"xs")
 hasLocation(#20257,#20151)
 enclosing_stmt(#20257,#20249)
-exprContainers(#20257,#20001)
+expr_containers(#20257,#20001)
 literals("xs","xs",#20257)
 #20258=@"var;{xs};{#20000}"
 variables(#20258,"xs",#20000)
@@ -803,19 +803,19 @@ exprs(#20259,14,#20250,0,"x.p")
 locations_default(#20260,#10000,5,2,5,4)
 hasLocation(#20259,#20260)
 enclosing_stmt(#20259,#20249)
-exprContainers(#20259,#20001)
+expr_containers(#20259,#20001)
 #20261=*
 exprs(#20261,79,#20259,0,"x")
 hasLocation(#20261,#20137)
 enclosing_stmt(#20261,#20249)
-exprContainers(#20261,#20001)
+expr_containers(#20261,#20001)
 literals("x","x",#20261)
 bind(#20261,#20255)
 #20262=*
 exprs(#20262,0,#20259,1,"p")
 hasLocation(#20262,#20141)
 enclosing_stmt(#20262,#20249)
-exprContainers(#20262,#20001)
+expr_containers(#20262,#20001)
 literals("p","p",#20262)
 #20263=*
 stmts(#20263,2,#20001,5,"(x.p fo ... n xs));")
@@ -827,14 +827,14 @@ exprs(#20264,74,#20263,0,"(x.p fo ... in xs))")
 locations_default(#20265,#10000,6,1,6,24)
 hasLocation(#20264,#20265)
 enclosing_stmt(#20264,#20263)
-exprContainers(#20264,#20001)
+expr_containers(#20264,#20001)
 #20266=*
 exprs(#20266,76,#20264,1,"for each (x in xs)")
 #20267=@"loc,{#10000},6,6,6,23"
 locations_default(#20267,#10000,6,6,6,23)
 hasLocation(#20266,#20267)
 enclosing_stmt(#20266,#20263)
-exprContainers(#20266,#20001)
+expr_containers(#20266,#20001)
 #20268=*
 scopes(#20268,7)
 scopenodes(#20266,#20268)
@@ -845,14 +845,14 @@ variables(#20269,"x",#20268)
 exprs(#20270,78,#20266,0,"x")
 hasLocation(#20270,#20173)
 enclosing_stmt(#20270,#20263)
-exprContainers(#20270,#20001)
+expr_containers(#20270,#20001)
 literals("x","x",#20270)
 decl(#20270,#20269)
 #20271=*
 exprs(#20271,79,#20266,1,"xs")
 hasLocation(#20271,#20177)
 enclosing_stmt(#20271,#20263)
-exprContainers(#20271,#20001)
+expr_containers(#20271,#20001)
 literals("xs","xs",#20271)
 bind(#20271,#20258)
 #20272=*
@@ -861,19 +861,19 @@ exprs(#20272,14,#20264,0,"x.p")
 locations_default(#20273,#10000,6,2,6,4)
 hasLocation(#20272,#20273)
 enclosing_stmt(#20272,#20263)
-exprContainers(#20272,#20001)
+expr_containers(#20272,#20001)
 #20274=*
 exprs(#20274,79,#20272,0,"x")
 hasLocation(#20274,#20161)
 enclosing_stmt(#20274,#20263)
-exprContainers(#20274,#20001)
+expr_containers(#20274,#20001)
 literals("x","x",#20274)
 bind(#20274,#20269)
 #20275=*
 exprs(#20275,0,#20272,1,"p")
 hasLocation(#20275,#20165)
 enclosing_stmt(#20275,#20263)
-exprContainers(#20275,#20001)
+expr_containers(#20275,#20001)
 literals("p","p",#20275)
 #20276=*
 entry_cfg_node(#20276,#20001)
--- a/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
@@ -306,7 +306,7 @@ stmt_containers(#20111,#20001)
 #20112=*
 exprs(#20112,78,#20111,-1,"f")
 hasLocation(#20112,#20023)
-exprContainers(#20112,#20111)
+expr_containers(#20112,#20111)
 literals("f","f",#20112)
 decl(#20112,#20110)
 #20113=*
@@ -318,7 +318,7 @@ variables(#20114,"g",#20113)
 #20115=*
 exprs(#20115,78,#20111,0,"g")
 hasLocation(#20115,#20027)
-exprContainers(#20115,#20111)
+expr_containers(#20115,#20111)
 literals("g","g",#20115)
 decl(#20115,#20114)
 #20116=@"var;{arguments};{#20113}"
@@ -354,12 +354,12 @@ exprs(#20125,13,#20123,0,"g()")
 locations_default(#20126,#10000,3,3,3,5)
 hasLocation(#20125,#20126)
 enclosing_stmt(#20125,#20123)
-exprContainers(#20125,#20111)
+expr_containers(#20125,#20111)
 #20127=*
 exprs(#20127,79,#20125,-1,"g")
 hasLocation(#20127,#20037)
 enclosing_stmt(#20127,#20123)
-exprContainers(#20127,#20111)
+expr_containers(#20127,#20111)
 literals("g","g",#20127)
 bind(#20127,#20114)
 #20128=*
@@ -378,7 +378,7 @@ variables(#20131,"e",#20130)
 exprs(#20132,78,#20128,0,"e")
 hasLocation(#20132,#20051)
 enclosing_stmt(#20132,#20128)
-exprContainers(#20132,#20111)
+expr_containers(#20132,#20111)
 literals("e","e",#20132)
 decl(#20132,#20131)
 #20133=*
@@ -387,19 +387,19 @@ exprs(#20133,43,#20128,2,"e instanceof Error")
 locations_default(#20134,#10000,4,16,4,33)
 hasLocation(#20133,#20134)
 enclosing_stmt(#20133,#20128)
-exprContainers(#20133,#20111)
+expr_containers(#20133,#20111)
 #20135=*
 exprs(#20135,79,#20133,0,"e")
 hasLocation(#20135,#20055)
 enclosing_stmt(#20135,#20128)
-exprContainers(#20135,#20111)
+expr_containers(#20135,#20111)
 literals("e","e",#20135)
 bind(#20135,#20131)
 #20136=*
 exprs(#20136,79,#20133,1,"Error")
 hasLocation(#20136,#20059)
 enclosing_stmt(#20136,#20128)
-exprContainers(#20136,#20111)
+expr_containers(#20136,#20111)
 literals("Error","Error",#20136)
 #20137=@"var;{Error};{#20000}"
 variables(#20137,"Error",#20000)
@@ -422,19 +422,19 @@ exprs(#20142,13,#20140,0,"console ... rror!"")")
 locations_default(#20143,#10000,5,3,5,23)
 hasLocation(#20142,#20143)
 enclosing_stmt(#20142,#20140)
-exprContainers(#20142,#20111)
+expr_containers(#20142,#20111)
 #20144=*
 exprs(#20144,14,#20142,-1,"console.log")
 #20145=@"loc,{#10000},5,3,5,13"
 locations_default(#20145,#10000,5,3,5,13)
 hasLocation(#20144,#20145)
 enclosing_stmt(#20144,#20140)
-exprContainers(#20144,#20111)
+expr_containers(#20144,#20111)
 #20146=*
 exprs(#20146,79,#20144,0,"console")
 hasLocation(#20146,#20065)
 enclosing_stmt(#20146,#20140)
-exprContainers(#20146,#20111)
+expr_containers(#20146,#20111)
 literals("console","console",#20146)
 #20147=@"var;{console};{#20000}"
 variables(#20147,"console",#20000)
@@ -443,13 +443,13 @@ bind(#20146,#20147)
 exprs(#20148,0,#20144,1,"log")
 hasLocation(#20148,#20069)
 enclosing_stmt(#20148,#20140)
-exprContainers(#20148,#20111)
+expr_containers(#20148,#20111)
 literals("log","log",#20148)
 #20149=*
 exprs(#20149,4,#20142,0,"""error!""")
 hasLocation(#20149,#20073)
 enclosing_stmt(#20149,#20140)
-exprContainers(#20149,#20111)
+expr_containers(#20149,#20111)
 literals("error!","""error!""",#20149)
 #20150=*
 regexpterm(#20150,14,#20149,0,"error!")
@@ -473,7 +473,7 @@ variables(#20155,"e",#20154)
 exprs(#20156,78,#20152,0,"e")
 hasLocation(#20156,#20085)
 enclosing_stmt(#20156,#20152)
-exprContainers(#20156,#20111)
+expr_containers(#20156,#20111)
 literals("e","e",#20156)
 decl(#20156,#20155)
 #20157=*
@@ -494,32 +494,32 @@ exprs(#20161,13,#20159,0,"console ... else!"")")
 locations_default(#20162,#10000,7,3,7,32)
 hasLocation(#20161,#20162)
 enclosing_stmt(#20161,#20159)
-exprContainers(#20161,#20111)
+expr_containers(#20161,#20111)
 #20163=*
 exprs(#20163,14,#20161,-1,"console.log")
 #20164=@"loc,{#10000},7,3,7,13"
 locations_default(#20164,#10000,7,3,7,13)
 hasLocation(#20163,#20164)
 enclosing_stmt(#20163,#20159)
-exprContainers(#20163,#20111)
+expr_containers(#20163,#20111)
 #20165=*
 exprs(#20165,79,#20163,0,"console")
 hasLocation(#20165,#20091)
 enclosing_stmt(#20165,#20159)
-exprContainers(#20165,#20111)
+expr_containers(#20165,#20111)
 literals("console","console",#20165)
 bind(#20165,#20147)
 #20166=*
 exprs(#20166,0,#20163,1,"log")
 hasLocation(#20166,#20095)
 enclosing_stmt(#20166,#20159)
-exprContainers(#20166,#20111)
+expr_containers(#20166,#20111)
 literals("log","log",#20166)
 #20167=*
 exprs(#20167,4,#20161,0,"""something else!""")
 hasLocation(#20167,#20099)
 enclosing_stmt(#20167,#20159)
-exprContainers(#20167,#20111)
+expr_containers(#20167,#20111)
 literals("something else!","""something else!""",#20167)
 #20168=*
 regexpterm(#20168,14,#20167,0,"something else!")
--- a/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
@@ -385,19 +385,19 @@ exprs(#20146,64,#20145,0,"x = 42")
 locations_default(#20147,#10000,1,5,1,10)
 hasLocation(#20146,#20147)
 enclosing_stmt(#20146,#20145)
-exprContainers(#20146,#20001)
+expr_containers(#20146,#20001)
 #20148=*
 exprs(#20148,78,#20146,0,"x")
 hasLocation(#20148,#20019)
 enclosing_stmt(#20148,#20145)
-exprContainers(#20148,#20001)
+expr_containers(#20148,#20001)
 literals("x","x",#20148)
 decl(#20148,#20143)
 #20149=*
 exprs(#20149,3,#20146,1,"42")
 hasLocation(#20149,#20023)
 enclosing_stmt(#20149,#20145)
-exprContainers(#20149,#20001)
+expr_containers(#20149,#20001)
 literals("42","42",#20149)
 #20150=*
 exprs(#20150,64,#20145,1,"y = 19")
@@ -405,19 +405,19 @@ exprs(#20150,64,#20145,1,"y = 19")
 locations_default(#20151,#10000,1,13,1,18)
 hasLocation(#20150,#20151)
 enclosing_stmt(#20150,#20145)
-exprContainers(#20150,#20001)
+expr_containers(#20150,#20001)
 #20152=*
 exprs(#20152,78,#20150,0,"y")
 hasLocation(#20152,#20027)
 enclosing_stmt(#20152,#20145)
-exprContainers(#20152,#20001)
+expr_containers(#20152,#20001)
 literals("y","y",#20152)
 decl(#20152,#20144)
 #20153=*
 exprs(#20153,3,#20150,1,"19")
 hasLocation(#20153,#20031)
 enclosing_stmt(#20153,#20145)
-exprContainers(#20153,#20001)
+expr_containers(#20153,#20001)
 literals("19","19",#20153)
 #20154=*
 stmts(#20154,2,#20001,1,"console ... x + y);")
@@ -429,19 +429,19 @@ exprs(#20155,13,#20154,0,"console ...  x + y)")
 locations_default(#20156,#10000,3,1,3,39)
 hasLocation(#20155,#20156)
 enclosing_stmt(#20155,#20154)
-exprContainers(#20155,#20001)
+expr_containers(#20155,#20001)
 #20157=*
 exprs(#20157,14,#20155,-1,"console.log")
 #20158=@"loc,{#10000},3,1,3,11"
 locations_default(#20158,#10000,3,1,3,11)
 hasLocation(#20157,#20158)
 enclosing_stmt(#20157,#20154)
-exprContainers(#20157,#20001)
+expr_containers(#20157,#20001)
 #20159=*
 exprs(#20159,79,#20157,0,"console")
 hasLocation(#20159,#20035)
 enclosing_stmt(#20159,#20154)
-exprContainers(#20159,#20001)
+expr_containers(#20159,#20001)
 literals("console","console",#20159)
 #20160=@"var;{console};{#20000}"
 variables(#20160,"console",#20000)
@@ -450,7 +450,7 @@ bind(#20159,#20160)
 exprs(#20161,0,#20157,1,"log")
 hasLocation(#20161,#20039)
 enclosing_stmt(#20161,#20154)
-exprContainers(#20161,#20001)
+expr_containers(#20161,#20001)
 literals("log","log",#20161)
 #20162=*
 exprs(#20162,77,#20155,0,"let (x  ... ) x + y")
@@ -458,7 +458,7 @@ exprs(#20162,77,#20155,0,"let (x  ... ) x + y")
 locations_default(#20163,#10000,3,13,3,38)
 hasLocation(#20162,#20163)
 enclosing_stmt(#20162,#20154)
-exprContainers(#20162,#20001)
+expr_containers(#20162,#20001)
 #20164=*
 scopes(#20164,4)
 scopenodes(#20162,#20164)
@@ -473,19 +473,19 @@ exprs(#20167,64,#20162,0,"x = 23")
 locations_default(#20168,#10000,3,18,3,23)
 hasLocation(#20167,#20168)
 enclosing_stmt(#20167,#20154)
-exprContainers(#20167,#20001)
+expr_containers(#20167,#20001)
 #20169=*
 exprs(#20169,78,#20167,0,"x")
 hasLocation(#20169,#20047)
 enclosing_stmt(#20169,#20154)
-exprContainers(#20169,#20001)
+expr_containers(#20169,#20001)
 literals("x","x",#20169)
 decl(#20169,#20165)
 #20170=*
 exprs(#20170,3,#20167,1,"23")
 hasLocation(#20170,#20051)
 enclosing_stmt(#20170,#20154)
-exprContainers(#20170,#20001)
+expr_containers(#20170,#20001)
 literals("23","23",#20170)
 #20171=*
 exprs(#20171,64,#20162,1,"y = 19")
@@ -493,19 +493,19 @@ exprs(#20171,64,#20162,1,"y = 19")
 locations_default(#20172,#10000,3,26,3,31)
 hasLocation(#20171,#20172)
 enclosing_stmt(#20171,#20154)
-exprContainers(#20171,#20001)
+expr_containers(#20171,#20001)
 #20173=*
 exprs(#20173,78,#20171,0,"y")
 hasLocation(#20173,#20055)
 enclosing_stmt(#20173,#20154)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 literals("y","y",#20173)
 decl(#20173,#20166)
 #20174=*
 exprs(#20174,3,#20171,1,"19")
 hasLocation(#20174,#20059)
 enclosing_stmt(#20174,#20154)
-exprContainers(#20174,#20001)
+expr_containers(#20174,#20001)
 literals("19","19",#20174)
 #20175=*
 exprs(#20175,34,#20162,-1,"x + y")
@@ -513,19 +513,19 @@ exprs(#20175,34,#20162,-1,"x + y")
 locations_default(#20176,#10000,3,34,3,38)
 hasLocation(#20175,#20176)
 enclosing_stmt(#20175,#20154)
-exprContainers(#20175,#20001)
+expr_containers(#20175,#20001)
 #20177=*
 exprs(#20177,79,#20175,0,"x")
 hasLocation(#20177,#20063)
 enclosing_stmt(#20177,#20154)
-exprContainers(#20177,#20001)
+expr_containers(#20177,#20001)
 literals("x","x",#20177)
 bind(#20177,#20165)
 #20178=*
 exprs(#20178,79,#20175,1,"y")
 hasLocation(#20178,#20067)
 enclosing_stmt(#20178,#20154)
-exprContainers(#20178,#20001)
+expr_containers(#20178,#20001)
 literals("y","y",#20178)
 bind(#20178,#20166)
 #20179=*
@@ -538,26 +538,26 @@ exprs(#20180,13,#20179,0,"console.log(x - y)")
 locations_default(#20181,#10000,5,1,5,18)
 hasLocation(#20180,#20181)
 enclosing_stmt(#20180,#20179)
-exprContainers(#20180,#20001)
+expr_containers(#20180,#20001)
 #20182=*
 exprs(#20182,14,#20180,-1,"console.log")
 #20183=@"loc,{#10000},5,1,5,11"
 locations_default(#20183,#10000,5,1,5,11)
 hasLocation(#20182,#20183)
 enclosing_stmt(#20182,#20179)
-exprContainers(#20182,#20001)
+expr_containers(#20182,#20001)
 #20184=*
 exprs(#20184,79,#20182,0,"console")
 hasLocation(#20184,#20073)
 enclosing_stmt(#20184,#20179)
-exprContainers(#20184,#20001)
+expr_containers(#20184,#20001)
 literals("console","console",#20184)
 bind(#20184,#20160)
 #20185=*
 exprs(#20185,0,#20182,1,"log")
 hasLocation(#20185,#20077)
 enclosing_stmt(#20185,#20179)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 literals("log","log",#20185)
 #20186=*
 exprs(#20186,35,#20180,0,"x - y")
@@ -565,19 +565,19 @@ exprs(#20186,35,#20180,0,"x - y")
 locations_default(#20187,#10000,5,13,5,17)
 hasLocation(#20186,#20187)
 enclosing_stmt(#20186,#20179)
-exprContainers(#20186,#20001)
+expr_containers(#20186,#20001)
 #20188=*
 exprs(#20188,79,#20186,0,"x")
 hasLocation(#20188,#20081)
 enclosing_stmt(#20188,#20179)
-exprContainers(#20188,#20001)
+expr_containers(#20188,#20001)
 literals("x","x",#20188)
 bind(#20188,#20143)
 #20189=*
 exprs(#20189,79,#20186,1,"y")
 hasLocation(#20189,#20085)
 enclosing_stmt(#20189,#20179)
-exprContainers(#20189,#20001)
+expr_containers(#20189,#20001)
 literals("y","y",#20189)
 bind(#20189,#20144)
 #20190=*
@@ -590,19 +590,19 @@ exprs(#20191,13,#20190,0,"JSON.st ...  y: y})")
 locations_default(#20192,#10000,7,1,7,50)
 hasLocation(#20191,#20192)
 enclosing_stmt(#20191,#20190)
-exprContainers(#20191,#20001)
+expr_containers(#20191,#20001)
 #20193=*
 exprs(#20193,14,#20191,-1,"JSON.stringify")
 #20194=@"loc,{#10000},7,1,7,14"
 locations_default(#20194,#10000,7,1,7,14)
 hasLocation(#20193,#20194)
 enclosing_stmt(#20193,#20190)
-exprContainers(#20193,#20001)
+expr_containers(#20193,#20001)
 #20195=*
 exprs(#20195,79,#20193,0,"JSON")
 hasLocation(#20195,#20091)
 enclosing_stmt(#20195,#20190)
-exprContainers(#20195,#20001)
+expr_containers(#20195,#20001)
 literals("JSON","JSON",#20195)
 #20196=@"var;{JSON};{#20000}"
 variables(#20196,"JSON",#20000)
@@ -611,7 +611,7 @@ bind(#20195,#20196)
 exprs(#20197,0,#20193,1,"stringify")
 hasLocation(#20197,#20095)
 enclosing_stmt(#20197,#20190)
-exprContainers(#20197,#20001)
+expr_containers(#20197,#20001)
 literals("stringify","stringify",#20197)
 #20198=*
 exprs(#20198,77,#20191,0,"let (x  ... , y: y}")
@@ -619,7 +619,7 @@ exprs(#20198,77,#20191,0,"let (x  ... , y: y}")
 locations_default(#20199,#10000,7,16,7,49)
 hasLocation(#20198,#20199)
 enclosing_stmt(#20198,#20190)
-exprContainers(#20198,#20001)
+expr_containers(#20198,#20001)
 #20200=*
 scopes(#20200,4)
 scopenodes(#20198,#20200)
@@ -634,19 +634,19 @@ exprs(#20203,64,#20198,0,"x = 23")
 locations_default(#20204,#10000,7,21,7,26)
 hasLocation(#20203,#20204)
 enclosing_stmt(#20203,#20190)
-exprContainers(#20203,#20001)
+expr_containers(#20203,#20001)
 #20205=*
 exprs(#20205,78,#20203,0,"x")
 hasLocation(#20205,#20103)
 enclosing_stmt(#20205,#20190)
-exprContainers(#20205,#20001)
+expr_containers(#20205,#20001)
 literals("x","x",#20205)
 decl(#20205,#20201)
 #20206=*
 exprs(#20206,3,#20203,1,"23")
 hasLocation(#20206,#20107)
 enclosing_stmt(#20206,#20190)
-exprContainers(#20206,#20001)
+expr_containers(#20206,#20001)
 literals("23","23",#20206)
 #20207=*
 exprs(#20207,64,#20198,1,"y = 19")
@@ -654,19 +654,19 @@ exprs(#20207,64,#20198,1,"y = 19")
 locations_default(#20208,#10000,7,29,7,34)
 hasLocation(#20207,#20208)
 enclosing_stmt(#20207,#20190)
-exprContainers(#20207,#20001)
+expr_containers(#20207,#20001)
 #20209=*
 exprs(#20209,78,#20207,0,"y")
 hasLocation(#20209,#20111)
 enclosing_stmt(#20209,#20190)
-exprContainers(#20209,#20001)
+expr_containers(#20209,#20001)
 literals("y","y",#20209)
 decl(#20209,#20202)
 #20210=*
 exprs(#20210,3,#20207,1,"19")
 hasLocation(#20210,#20115)
 enclosing_stmt(#20210,#20190)
-exprContainers(#20210,#20001)
+expr_containers(#20210,#20001)
 literals("19","19",#20210)
 #20211=*
 exprs(#20211,8,#20198,-1,"{ x: x, y: y}")
@@ -674,7 +674,7 @@ exprs(#20211,8,#20198,-1,"{ x: x, y: y}")
 locations_default(#20212,#10000,7,37,7,49)
 hasLocation(#20211,#20212)
 enclosing_stmt(#20211,#20190)
-exprContainers(#20211,#20001)
+expr_containers(#20211,#20001)
 #20213=*
 properties(#20213,#20211,0,0,"x: x")
 #20214=@"loc,{#10000},7,39,7,42"
@@ -684,13 +684,13 @@ hasLocation(#20213,#20214)
 exprs(#20215,0,#20213,0,"x")
 hasLocation(#20215,#20121)
 enclosing_stmt(#20215,#20190)
-exprContainers(#20215,#20001)
+expr_containers(#20215,#20001)
 literals("x","x",#20215)
 #20216=*
 exprs(#20216,79,#20213,1,"x")
 hasLocation(#20216,#20125)
 enclosing_stmt(#20216,#20190)
-exprContainers(#20216,#20001)
+expr_containers(#20216,#20001)
 literals("x","x",#20216)
 bind(#20216,#20201)
 #20217=*
@@ -702,13 +702,13 @@ hasLocation(#20217,#20218)
 exprs(#20219,0,#20217,0,"y")
 hasLocation(#20219,#20129)
 enclosing_stmt(#20219,#20190)
-exprContainers(#20219,#20001)
+expr_containers(#20219,#20001)
 literals("y","y",#20219)
 #20220=*
 exprs(#20220,79,#20217,1,"y")
 hasLocation(#20220,#20133)
 enclosing_stmt(#20220,#20190)
-exprContainers(#20220,#20001)
+expr_containers(#20220,#20001)
 literals("y","y",#20220)
 bind(#20220,#20202)
 #20221=*
--- a/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
@@ -270,19 +270,19 @@ exprs(#20099,64,#20098,0,"x = 42")
 locations_default(#20100,#10000,1,5,1,10)
 hasLocation(#20099,#20100)
 enclosing_stmt(#20099,#20098)
-exprContainers(#20099,#20001)
+expr_containers(#20099,#20001)
 #20101=*
 exprs(#20101,78,#20099,0,"x")
 hasLocation(#20101,#20019)
 enclosing_stmt(#20101,#20098)
-exprContainers(#20101,#20001)
+expr_containers(#20101,#20001)
 literals("x","x",#20101)
 decl(#20101,#20096)
 #20102=*
 exprs(#20102,3,#20099,1,"42")
 hasLocation(#20102,#20023)
 enclosing_stmt(#20102,#20098)
-exprContainers(#20102,#20001)
+expr_containers(#20102,#20001)
 literals("42","42",#20102)
 #20103=*
 exprs(#20103,64,#20098,1,"y = 19")
@@ -290,19 +290,19 @@ exprs(#20103,64,#20098,1,"y = 19")
 locations_default(#20104,#10000,1,13,1,18)
 hasLocation(#20103,#20104)
 enclosing_stmt(#20103,#20098)
-exprContainers(#20103,#20001)
+expr_containers(#20103,#20001)
 #20105=*
 exprs(#20105,78,#20103,0,"y")
 hasLocation(#20105,#20027)
 enclosing_stmt(#20105,#20098)
-exprContainers(#20105,#20001)
+expr_containers(#20105,#20001)
 literals("y","y",#20105)
 decl(#20105,#20097)
 #20106=*
 exprs(#20106,3,#20103,1,"19")
 hasLocation(#20106,#20031)
 enclosing_stmt(#20106,#20098)
-exprContainers(#20106,#20001)
+expr_containers(#20106,#20001)
 literals("19","19",#20106)
 #20107=*
 stmts(#20107,24,#20001,1,"let (x  ... + y);\n}")
@@ -324,19 +324,19 @@ exprs(#20112,64,#20107,0,"x = 23")
 locations_default(#20113,#10000,3,6,3,11)
 hasLocation(#20112,#20113)
 enclosing_stmt(#20112,#20107)
-exprContainers(#20112,#20001)
+expr_containers(#20112,#20001)
 #20114=*
 exprs(#20114,78,#20112,0,"x")
 hasLocation(#20114,#20039)
 enclosing_stmt(#20114,#20107)
-exprContainers(#20114,#20001)
+expr_containers(#20114,#20001)
 literals("x","x",#20114)
 decl(#20114,#20110)
 #20115=*
 exprs(#20115,3,#20112,1,"23")
 hasLocation(#20115,#20043)
 enclosing_stmt(#20115,#20107)
-exprContainers(#20115,#20001)
+expr_containers(#20115,#20001)
 literals("23","23",#20115)
 #20116=*
 exprs(#20116,64,#20107,1,"y = 19")
@@ -344,19 +344,19 @@ exprs(#20116,64,#20107,1,"y = 19")
 locations_default(#20117,#10000,3,14,3,19)
 hasLocation(#20116,#20117)
 enclosing_stmt(#20116,#20107)
-exprContainers(#20116,#20001)
+expr_containers(#20116,#20001)
 #20118=*
 exprs(#20118,78,#20116,0,"y")
 hasLocation(#20118,#20047)
 enclosing_stmt(#20118,#20107)
-exprContainers(#20118,#20001)
+expr_containers(#20118,#20001)
 literals("y","y",#20118)
 decl(#20118,#20111)
 #20119=*
 exprs(#20119,3,#20116,1,"19")
 hasLocation(#20119,#20051)
 enclosing_stmt(#20119,#20107)
-exprContainers(#20119,#20001)
+expr_containers(#20119,#20001)
 literals("19","19",#20119)
 #20120=*
 stmts(#20120,1,#20107,-1,"{\n  con ... + y);\n}")
@@ -376,19 +376,19 @@ exprs(#20124,13,#20122,0,"console.log(x + y)")
 locations_default(#20125,#10000,4,3,4,20)
 hasLocation(#20124,#20125)
 enclosing_stmt(#20124,#20122)
-exprContainers(#20124,#20001)
+expr_containers(#20124,#20001)
 #20126=*
 exprs(#20126,14,#20124,-1,"console.log")
 #20127=@"loc,{#10000},4,3,4,13"
 locations_default(#20127,#10000,4,3,4,13)
 hasLocation(#20126,#20127)
 enclosing_stmt(#20126,#20122)
-exprContainers(#20126,#20001)
+expr_containers(#20126,#20001)
 #20128=*
 exprs(#20128,79,#20126,0,"console")
 hasLocation(#20128,#20057)
 enclosing_stmt(#20128,#20122)
-exprContainers(#20128,#20001)
+expr_containers(#20128,#20001)
 literals("console","console",#20128)
 #20129=@"var;{console};{#20000}"
 variables(#20129,"console",#20000)
@@ -397,7 +397,7 @@ bind(#20128,#20129)
 exprs(#20130,0,#20126,1,"log")
 hasLocation(#20130,#20061)
 enclosing_stmt(#20130,#20122)
-exprContainers(#20130,#20001)
+expr_containers(#20130,#20001)
 literals("log","log",#20130)
 #20131=*
 exprs(#20131,34,#20124,0,"x + y")
@@ -405,19 +405,19 @@ exprs(#20131,34,#20124,0,"x + y")
 locations_default(#20132,#10000,4,15,4,19)
 hasLocation(#20131,#20132)
 enclosing_stmt(#20131,#20122)
-exprContainers(#20131,#20001)
+expr_containers(#20131,#20001)
 #20133=*
 exprs(#20133,79,#20131,0,"x")
 hasLocation(#20133,#20065)
 enclosing_stmt(#20133,#20122)
-exprContainers(#20133,#20001)
+expr_containers(#20133,#20001)
 literals("x","x",#20133)
 bind(#20133,#20110)
 #20134=*
 exprs(#20134,79,#20131,1,"y")
 hasLocation(#20134,#20069)
 enclosing_stmt(#20134,#20122)
-exprContainers(#20134,#20001)
+expr_containers(#20134,#20001)
 literals("y","y",#20134)
 bind(#20134,#20111)
 #20135=*
@@ -430,26 +430,26 @@ exprs(#20136,13,#20135,0,"console.log(x - y)")
 locations_default(#20137,#10000,7,1,7,18)
 hasLocation(#20136,#20137)
 enclosing_stmt(#20136,#20135)
-exprContainers(#20136,#20001)
+expr_containers(#20136,#20001)
 #20138=*
 exprs(#20138,14,#20136,-1,"console.log")
 #20139=@"loc,{#10000},7,1,7,11"
 locations_default(#20139,#10000,7,1,7,11)
 hasLocation(#20138,#20139)
 enclosing_stmt(#20138,#20135)
-exprContainers(#20138,#20001)
+expr_containers(#20138,#20001)
 #20140=*
 exprs(#20140,79,#20138,0,"console")
 hasLocation(#20140,#20076)
 enclosing_stmt(#20140,#20135)
-exprContainers(#20140,#20001)
+expr_containers(#20140,#20001)
 literals("console","console",#20140)
 bind(#20140,#20129)
 #20141=*
 exprs(#20141,0,#20138,1,"log")
 hasLocation(#20141,#20080)
 enclosing_stmt(#20141,#20135)
-exprContainers(#20141,#20001)
+expr_containers(#20141,#20001)
 literals("log","log",#20141)
 #20142=*
 exprs(#20142,35,#20136,0,"x - y")
@@ -457,19 +457,19 @@ exprs(#20142,35,#20136,0,"x - y")
 locations_default(#20143,#10000,7,13,7,17)
 hasLocation(#20142,#20143)
 enclosing_stmt(#20142,#20135)
-exprContainers(#20142,#20001)
+expr_containers(#20142,#20001)
 #20144=*
 exprs(#20144,79,#20142,0,"x")
 hasLocation(#20144,#20084)
 enclosing_stmt(#20144,#20135)
-exprContainers(#20144,#20001)
+expr_containers(#20144,#20001)
 literals("x","x",#20144)
 bind(#20144,#20096)
 #20145=*
 exprs(#20145,79,#20142,1,"y")
 hasLocation(#20145,#20088)
 enclosing_stmt(#20145,#20135)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 literals("y","y",#20145)
 bind(#20145,#20097)
 #20146=*
--- a/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
@@ -78,19 +78,19 @@ exprs(#20025,64,#20022,0,"x = 0")
 locations_default(#20026,#10000,1,6,1,10)
 hasLocation(#20025,#20026)
 enclosing_stmt(#20025,#20022)
-exprContainers(#20025,#20001)
+expr_containers(#20025,#20001)
 #20027=*
 exprs(#20027,78,#20025,0,"x")
 hasLocation(#20027,#20009)
 enclosing_stmt(#20027,#20022)
-exprContainers(#20027,#20001)
+expr_containers(#20027,#20001)
 literals("x","x",#20027)
 decl(#20027,#20024)
 #20028=*
 exprs(#20028,3,#20025,1,"0")
 hasLocation(#20028,#20013)
 enclosing_stmt(#20028,#20022)
-exprContainers(#20028,#20001)
+expr_containers(#20028,#20001)
 literals("0","0",#20028)
 #20029=*
 stmts(#20029,2,#20022,-1,"1")
@@ -100,7 +100,7 @@ stmt_containers(#20029,#20001)
 exprs(#20030,3,#20029,0,"1")
 hasLocation(#20030,#20017)
 enclosing_stmt(#20030,#20029)
-exprContainers(#20030,#20001)
+expr_containers(#20030,#20001)
 literals("1","1",#20030)
 #20031=*
 entry_cfg_node(#20031,#20001)
--- a/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
@@ -145,12 +145,12 @@ stmt_containers(#20049,#20001)
 exprs(#20050,12,#20049,0,"new A() ... ""bar"" }")
 hasLocation(#20050,#20008)
 enclosing_stmt(#20050,#20049)
-exprContainers(#20050,#20001)
+expr_containers(#20050,#20001)
 #20051=*
 exprs(#20051,79,#20050,-1,"A")
 hasLocation(#20051,#20019)
 enclosing_stmt(#20051,#20049)
-exprContainers(#20051,#20001)
+expr_containers(#20051,#20001)
 literals("A","A",#20051)
 #20052=@"var;{A};{#20000}"
 variables(#20052,"A",#20000)
@@ -161,7 +161,7 @@ exprs(#20053,8,#20050,0,"{ foo: ""bar"" }")
 locations_default(#20054,#10000,2,9,2,22)
 hasLocation(#20053,#20054)
 enclosing_stmt(#20053,#20049)
-exprContainers(#20053,#20001)
+expr_containers(#20053,#20001)
 #20055=*
 properties(#20055,#20053,0,0,"foo: ""bar""")
 #20056=@"loc,{#10000},2,11,2,20"
@@ -171,13 +171,13 @@ hasLocation(#20055,#20056)
 exprs(#20057,0,#20055,0,"foo")
 hasLocation(#20057,#20027)
 enclosing_stmt(#20057,#20049)
-exprContainers(#20057,#20001)
+expr_containers(#20057,#20001)
 literals("foo","foo",#20057)
 #20058=*
 exprs(#20058,4,#20055,1,"""bar""")
 hasLocation(#20058,#20031)
 enclosing_stmt(#20058,#20049)
-exprContainers(#20058,#20001)
+expr_containers(#20058,#20001)
 literals("bar","""bar""",#20058)
 #20059=*
 regexpterm(#20059,14,#20058,0,"bar")
@@ -193,12 +193,12 @@ stmt_containers(#20061,#20001)
 exprs(#20062,12,#20061,0,"new A()")
 hasLocation(#20062,#20013)
 enclosing_stmt(#20062,#20061)
-exprContainers(#20062,#20001)
+expr_containers(#20062,#20001)
 #20063=*
 exprs(#20063,79,#20062,-1,"A")
 hasLocation(#20063,#20037)
 enclosing_stmt(#20063,#20061)
-exprContainers(#20063,#20001)
+expr_containers(#20063,#20001)
 literals("A","A",#20063)
 bind(#20063,#20052)
 #20064=*
--- a/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
+++ b/javascript/extractor/tests/mozilla/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=*
@@ -148,7 +148,7 @@ stmt_containers(#20047,#20039)
 exprs(#20049,79,#20047,0,"arguments")
 hasLocation(#20049,#20021)
 enclosing_stmt(#20049,#20047)
-exprContainers(#20049,#20039)
+expr_containers(#20049,#20039)
 literals("arguments","arguments",#20049)
 bind(#20049,#20046)
 #20050=*
@@ -167,12 +167,12 @@ variables(#20053,"arguments",#20052)
 exprs(#20054,64,#20050,0,"arguments")
 hasLocation(#20054,#20029)
 enclosing_stmt(#20054,#20050)
-exprContainers(#20054,#20039)
+expr_containers(#20054,#20039)
 #20055=*
 exprs(#20055,78,#20054,0,"arguments")
 hasLocation(#20055,#20029)
 enclosing_stmt(#20055,#20050)
-exprContainers(#20055,#20039)
+expr_containers(#20055,#20039)
 literals("arguments","arguments",#20055)
 decl(#20055,#20053)
 #20056=*