renamed "stmtContainers" to "stmt_containers"

2026-05-02 12:15:17 +02:00 · 2020-09-04 11:51:44 +02:00
parent 07fd747069
commit 059d72858a
224 changed files with 1155 additions and 1148 deletions
--- a/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
@@ -333,7 +333,7 @@ hasLocation(#20001,#20124)
 #20125=*
 stmts(#20125,2,#20001,0,"a = 23;")
 hasLocation(#20125,#20003)
-stmtContainers(#20125,#20001)
+stmt_containers(#20125,#20001)
 #20126=*
 exprs(#20126,47,#20125,0,"a = 23")
 #20127=@"loc,{#10000},1,1,1,6"
@@ -359,7 +359,7 @@ literals("23","23",#20130)
 #20131=*
 stmts(#20131,2,#20001,1,"a += 19;")
 hasLocation(#20131,#20005)
-stmtContainers(#20131,#20001)
+stmt_containers(#20131,#20001)
 #20132=*
 exprs(#20132,48,#20131,0,"a += 19")
 #20133=@"loc,{#10000},2,1,2,7"
@@ -383,7 +383,7 @@ literals("19","19",#20135)
 #20136=*
 stmts(#20136,2,#20001,2,"a -= 9;")
 hasLocation(#20136,#20007)
-stmtContainers(#20136,#20001)
+stmt_containers(#20136,#20001)
 #20137=*
 exprs(#20137,49,#20136,0,"a -= 9")
 #20138=@"loc,{#10000},3,1,3,6"
@@ -407,7 +407,7 @@ literals("9","9",#20140)
 #20141=*
 stmts(#20141,2,#20001,3,"a *= b;")
 hasLocation(#20141,#20009)
-stmtContainers(#20141,#20001)
+stmt_containers(#20141,#20001)
 #20142=*
 exprs(#20142,50,#20141,0,"a *= b")
 #20143=@"loc,{#10000},4,1,4,6"
@@ -434,7 +434,7 @@ bind(#20145,#20146)
 #20147=*
 stmts(#20147,2,#20001,4,"a /= 2;")
 hasLocation(#20147,#20011)
-stmtContainers(#20147,#20001)
+stmt_containers(#20147,#20001)
 #20148=*
 exprs(#20148,51,#20147,0,"a /= 2")
 #20149=@"loc,{#10000},5,1,5,6"
@@ -458,7 +458,7 @@ literals("2","2",#20151)
 #20152=*
 stmts(#20152,2,#20001,5,"a %= 2;")
 hasLocation(#20152,#20013)
-stmtContainers(#20152,#20001)
+stmt_containers(#20152,#20001)
 #20153=*
 exprs(#20153,52,#20152,0,"a %= 2")
 #20154=@"loc,{#10000},6,1,6,6"
@@ -482,7 +482,7 @@ literals("2","2",#20156)
 #20157=*
 stmts(#20157,2,#20001,6,"a <<= 8;")
 hasLocation(#20157,#20015)
-stmtContainers(#20157,#20001)
+stmt_containers(#20157,#20001)
 #20158=*
 exprs(#20158,53,#20157,0,"a <<= 8")
 #20159=@"loc,{#10000},7,1,7,7"
@@ -506,7 +506,7 @@ literals("8","8",#20161)
 #20162=*
 stmts(#20162,2,#20001,7,"a >>= 7;")
 hasLocation(#20162,#20017)
-stmtContainers(#20162,#20001)
+stmt_containers(#20162,#20001)
 #20163=*
 exprs(#20163,54,#20162,0,"a >>= 7")
 #20164=@"loc,{#10000},8,1,8,7"
@@ -530,7 +530,7 @@ literals("7","7",#20166)
 #20167=*
 stmts(#20167,2,#20001,8,"a >>>= 2;")
 hasLocation(#20167,#20019)
-stmtContainers(#20167,#20001)
+stmt_containers(#20167,#20001)
 #20168=*
 exprs(#20168,55,#20167,0,"a >>>= 2")
 #20169=@"loc,{#10000},9,1,9,8"
@@ -554,7 +554,7 @@ literals("2","2",#20171)
 #20172=*
 stmts(#20172,2,#20001,9,"a |= 2;")
 hasLocation(#20172,#20021)
-stmtContainers(#20172,#20001)
+stmt_containers(#20172,#20001)
 #20173=*
 exprs(#20173,56,#20172,0,"a |= 2")
 #20174=@"loc,{#10000},10,1,10,6"
@@ -578,7 +578,7 @@ literals("2","2",#20176)
 #20177=*
 stmts(#20177,2,#20001,10,"a ^= 1;")
 hasLocation(#20177,#20023)
-stmtContainers(#20177,#20001)
+stmt_containers(#20177,#20001)
 #20178=*
 exprs(#20178,57,#20177,0,"a ^= 1")
 #20179=@"loc,{#10000},11,1,11,6"
@@ -602,7 +602,7 @@ literals("1","1",#20181)
 #20182=*
 stmts(#20182,2,#20001,11,"a &= 3;")
 hasLocation(#20182,#20025)
-stmtContainers(#20182,#20001)
+stmt_containers(#20182,#20001)
 #20183=*
 exprs(#20183,58,#20182,0,"a &= 3")
 #20184=@"loc,{#10000},12,1,12,6"
--- a/javascript/extractor/tests/exprs/output/trap/binary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/binary.js.trap
@@ -417,7 +417,7 @@ hasLocation(#20001,#20156)
 #20157=*
 stmts(#20157,2,#20001,0,"1 << 2;")
 hasLocation(#20157,#20003)
-stmtContainers(#20157,#20001)
+stmt_containers(#20157,#20001)
 #20158=*
 exprs(#20158,31,#20157,0,"1 << 2")
 #20159=@"loc,{#10000},1,1,1,6"
@@ -440,7 +440,7 @@ literals("2","2",#20161)
 #20162=*
 stmts(#20162,2,#20001,1,"2 >> 1;")
 hasLocation(#20162,#20005)
-stmtContainers(#20162,#20001)
+stmt_containers(#20162,#20001)
 #20163=*
 exprs(#20163,32,#20162,0,"2 >> 1")
 #20164=@"loc,{#10000},2,1,2,6"
@@ -463,7 +463,7 @@ literals("1","1",#20166)
 #20167=*
 stmts(#20167,2,#20001,2,"2 >>> 1;")
 hasLocation(#20167,#20007)
-stmtContainers(#20167,#20001)
+stmt_containers(#20167,#20001)
 #20168=*
 exprs(#20168,33,#20167,0,"2 >>> 1")
 #20169=@"loc,{#10000},3,1,3,7"
@@ -486,7 +486,7 @@ literals("1","1",#20171)
 #20172=*
 stmts(#20172,2,#20001,3,"23 + 19;")
 hasLocation(#20172,#20009)
-stmtContainers(#20172,#20001)
+stmt_containers(#20172,#20001)
 #20173=*
 exprs(#20173,34,#20172,0,"23 + 19")
 #20174=@"loc,{#10000},4,1,4,7"
@@ -509,7 +509,7 @@ literals("19","19",#20176)
 #20177=*
 stmts(#20177,2,#20001,4,"42 - 19;")
 hasLocation(#20177,#20011)
-stmtContainers(#20177,#20001)
+stmt_containers(#20177,#20001)
 #20178=*
 exprs(#20178,35,#20177,0,"42 - 19")
 #20179=@"loc,{#10000},5,1,5,7"
@@ -532,7 +532,7 @@ literals("19","19",#20181)
 #20182=*
 stmts(#20182,2,#20001,5,"2 * 3;")
 hasLocation(#20182,#20013)
-stmtContainers(#20182,#20001)
+stmt_containers(#20182,#20001)
 #20183=*
 exprs(#20183,36,#20182,0,"2 * 3")
 #20184=@"loc,{#10000},6,1,6,5"
@@ -555,7 +555,7 @@ literals("3","3",#20186)
 #20187=*
 stmts(#20187,2,#20001,6,"8 / 5;")
 hasLocation(#20187,#20015)
-stmtContainers(#20187,#20001)
+stmt_containers(#20187,#20001)
 #20188=*
 exprs(#20188,37,#20187,0,"8 / 5")
 #20189=@"loc,{#10000},7,1,7,5"
@@ -578,7 +578,7 @@ literals("5","5",#20191)
 #20192=*
 stmts(#20192,2,#20001,7,"2 % 1;")
 hasLocation(#20192,#20017)
-stmtContainers(#20192,#20001)
+stmt_containers(#20192,#20001)
 #20193=*
 exprs(#20193,38,#20192,0,"2 % 1")
 #20194=@"loc,{#10000},8,1,8,5"
@@ -601,7 +601,7 @@ literals("1","1",#20196)
 #20197=*
 stmts(#20197,2,#20001,8,"2 | 3;")
 hasLocation(#20197,#20019)
-stmtContainers(#20197,#20001)
+stmt_containers(#20197,#20001)
 #20198=*
 exprs(#20198,39,#20197,0,"2 | 3")
 #20199=@"loc,{#10000},9,1,9,5"
@@ -624,7 +624,7 @@ literals("3","3",#20201)
 #20202=*
 stmts(#20202,2,#20001,9,"2 ^ 3;")
 hasLocation(#20202,#20021)
-stmtContainers(#20202,#20001)
+stmt_containers(#20202,#20001)
 #20203=*
 exprs(#20203,40,#20202,0,"2 ^ 3")
 #20204=@"loc,{#10000},10,1,10,5"
@@ -647,7 +647,7 @@ literals("3","3",#20206)
 #20207=*
 stmts(#20207,2,#20001,10,"2 & 3;")
 hasLocation(#20207,#20023)
-stmtContainers(#20207,#20001)
+stmt_containers(#20207,#20001)
 #20208=*
 exprs(#20208,41,#20207,0,"2 & 3")
 #20209=@"loc,{#10000},11,1,11,5"
@@ -670,7 +670,7 @@ literals("3","3",#20211)
 #20212=*
 stmts(#20212,2,#20001,11,"'protot ... Object;")
 hasLocation(#20212,#20025)
-stmtContainers(#20212,#20001)
+stmt_containers(#20212,#20001)
 #20213=*
 exprs(#20213,42,#20212,0,"'protot ...  Object")
 #20214=@"loc,{#10000},12,1,12,21"
@@ -702,7 +702,7 @@ bind(#20218,#20219)
 #20220=*
 stmts(#20220,2,#20001,12,"[] instanceof Array;")
 hasLocation(#20220,#20027)
-stmtContainers(#20220,#20001)
+stmt_containers(#20220,#20001)
 #20221=*
 exprs(#20221,43,#20220,0,"[] instanceof Array")
 #20222=@"loc,{#10000},13,1,13,19"
@@ -730,7 +730,7 @@ bind(#20225,#20226)
 #20227=*
 stmts(#20227,2,#20001,13,"1 && 2;")
 hasLocation(#20227,#20029)
-stmtContainers(#20227,#20001)
+stmt_containers(#20227,#20001)
 #20228=*
 exprs(#20228,44,#20227,0,"1 && 2")
 #20229=@"loc,{#10000},14,1,14,6"
@@ -753,7 +753,7 @@ literals("2","2",#20231)
 #20232=*
 stmts(#20232,2,#20001,14,"1 || 2;")
 hasLocation(#20232,#20031)
-stmtContainers(#20232,#20001)
+stmt_containers(#20232,#20001)
 #20233=*
 exprs(#20233,45,#20232,0,"1 || 2")
 #20234=@"loc,{#10000},15,1,15,6"
--- a/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
@@ -230,7 +230,7 @@ hasLocation(#20001,#20084)
 #20085=*
 stmts(#20085,2,#20001,0,"1 == 1;")
 hasLocation(#20085,#20003)
-stmtContainers(#20085,#20001)
+stmt_containers(#20085,#20001)
 #20086=*
 exprs(#20086,23,#20085,0,"1 == 1")
 #20087=@"loc,{#10000},1,1,1,6"
@@ -253,7 +253,7 @@ literals("1","1",#20089)
 #20090=*
 stmts(#20090,2,#20001,1,"1 != 2;")
 hasLocation(#20090,#20005)
-stmtContainers(#20090,#20001)
+stmt_containers(#20090,#20001)
 #20091=*
 exprs(#20091,24,#20090,0,"1 != 2")
 #20092=@"loc,{#10000},2,1,2,6"
@@ -276,7 +276,7 @@ literals("2","2",#20094)
 #20095=*
 stmts(#20095,2,#20001,2,"1 === 1;")
 hasLocation(#20095,#20007)
-stmtContainers(#20095,#20001)
+stmt_containers(#20095,#20001)
 #20096=*
 exprs(#20096,25,#20095,0,"1 === 1")
 #20097=@"loc,{#10000},3,1,3,7"
@@ -299,7 +299,7 @@ literals("1","1",#20099)
 #20100=*
 stmts(#20100,2,#20001,3,"1 !== 2;")
 hasLocation(#20100,#20009)
-stmtContainers(#20100,#20001)
+stmt_containers(#20100,#20001)
 #20101=*
 exprs(#20101,26,#20100,0,"1 !== 2")
 #20102=@"loc,{#10000},4,1,4,7"
@@ -322,7 +322,7 @@ literals("2","2",#20104)
 #20105=*
 stmts(#20105,2,#20001,4,"1 < 2;")
 hasLocation(#20105,#20011)
-stmtContainers(#20105,#20001)
+stmt_containers(#20105,#20001)
 #20106=*
 exprs(#20106,27,#20105,0,"1 < 2")
 #20107=@"loc,{#10000},5,1,5,5"
@@ -345,7 +345,7 @@ literals("2","2",#20109)
 #20110=*
 stmts(#20110,2,#20001,5,"1 <= 2;")
 hasLocation(#20110,#20013)
-stmtContainers(#20110,#20001)
+stmt_containers(#20110,#20001)
 #20111=*
 exprs(#20111,28,#20110,0,"1 <= 2")
 #20112=@"loc,{#10000},6,1,6,6"
@@ -368,7 +368,7 @@ literals("2","2",#20114)
 #20115=*
 stmts(#20115,2,#20001,6,"2 > 1;")
 hasLocation(#20115,#20015)
-stmtContainers(#20115,#20001)
+stmt_containers(#20115,#20001)
 #20116=*
 exprs(#20116,29,#20115,0,"2 > 1")
 #20117=@"loc,{#10000},7,1,7,5"
@@ -391,7 +391,7 @@ literals("1","1",#20119)
 #20120=*
 stmts(#20120,2,#20001,7,"2 >= 1;")
 hasLocation(#20120,#20017)
-stmtContainers(#20120,#20001)
+stmt_containers(#20120,#20001)
 #20121=*
 exprs(#20121,30,#20120,0,"2 >= 1")
 #20122=@"loc,{#10000},8,1,8,6"
--- a/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
@@ -80,7 +80,7 @@ hasLocation(#20001,#20003)
 #20028=*
 stmts(#20028,2,#20001,0,"f(function(){}, 23);")
 hasLocation(#20028,#20003)
-stmtContainers(#20028,#20001)
+stmt_containers(#20028,#20001)
 #20029=*
 exprs(#20029,13,#20028,0,"f(function(){}, 23)")
 #20030=@"loc,{#10000},1,1,1,19"
@@ -116,7 +116,7 @@ stmts(#20037,1,#20033,-2,"{}")
 #20038=@"loc,{#10000},1,13,1,14"
 locations_default(#20038,#10000,1,13,1,14)
 hasLocation(#20037,#20038)
-stmtContainers(#20037,#20033)
+stmt_containers(#20037,#20033)
 #20039=*
 exprs(#20039,3,#20029,1,"23")
 hasLocation(#20039,#20021)
--- a/javascript/extractor/tests/exprs/output/trap/others.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/others.js.trap
@@ -120,7 +120,7 @@ hasLocation(#20001,#20042)
 #20043=*
 stmts(#20043,2,#20001,0,"23, 42;")
 hasLocation(#20043,#20003)
-stmtContainers(#20043,#20001)
+stmt_containers(#20043,#20001)
 #20044=*
 exprs(#20044,10,#20043,0,"23, 42")
 #20045=@"loc,{#10000},1,1,1,6"
@@ -143,7 +143,7 @@ literals("42","42",#20047)
 #20048=*
 stmts(#20048,2,#20001,1,"23, 42, 56;")
 hasLocation(#20048,#20005)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20049=*
 exprs(#20049,10,#20048,0,"23, 42, 56")
 #20050=@"loc,{#10000},2,1,2,10"
@@ -172,7 +172,7 @@ literals("56","56",#20053)
 #20054=*
 stmts(#20054,2,#20001,2,"true ? 0 : 1;")
 hasLocation(#20054,#20007)
-stmtContainers(#20054,#20001)
+stmt_containers(#20054,#20001)
 #20055=*
 exprs(#20055,11,#20054,0,"true ? 0 : 1")
 #20056=@"loc,{#10000},3,1,3,12"
--- a/javascript/extractor/tests/exprs/output/trap/parens.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
@@ -50,7 +50,7 @@ hasLocation(#20001,#20003)
 #20016=*
 stmts(#20016,2,#20001,0,"--(NaN);")
 hasLocation(#20016,#20003)
-stmtContainers(#20016,#20001)
+stmt_containers(#20016,#20001)
 #20017=*
 exprs(#20017,61,#20016,0,"--(NaN)")
 #20018=@"loc,{#10000},1,1,1,7"
--- a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
@@ -855,7 +855,7 @@ hasLocation(#20001,#20324)
 #20325=*
 stmts(#20325,2,#20001,0,"null;")
 hasLocation(#20325,#20003)
-stmtContainers(#20325,#20001)
+stmt_containers(#20325,#20001)
 #20326=*
 exprs(#20326,1,#20325,0,"null")
 hasLocation(#20326,#20063)
@@ -865,7 +865,7 @@ literals("null","null",#20326)
 #20327=*
 stmts(#20327,2,#20001,1,"true;")
 hasLocation(#20327,#20005)
-stmtContainers(#20327,#20001)
+stmt_containers(#20327,#20001)
 #20328=*
 exprs(#20328,2,#20327,0,"true")
 hasLocation(#20328,#20067)
@@ -875,7 +875,7 @@ literals("true","true",#20328)
 #20329=*
 stmts(#20329,2,#20001,2,"false;")
 hasLocation(#20329,#20007)
-stmtContainers(#20329,#20001)
+stmt_containers(#20329,#20001)
 #20330=*
 exprs(#20330,2,#20329,0,"false")
 hasLocation(#20330,#20071)
@@ -885,7 +885,7 @@ literals("false","false",#20330)
 #20331=*
 stmts(#20331,2,#20001,3,"23;")
 hasLocation(#20331,#20009)
-stmtContainers(#20331,#20001)
+stmt_containers(#20331,#20001)
 #20332=*
 exprs(#20332,3,#20331,0,"23")
 hasLocation(#20332,#20075)
@@ -895,7 +895,7 @@ literals("23","23",#20332)
 #20333=*
 stmts(#20333,2,#20001,4,"2.3;")
 hasLocation(#20333,#20011)
-stmtContainers(#20333,#20001)
+stmt_containers(#20333,#20001)
 #20334=*
 exprs(#20334,3,#20333,0,"2.3")
 hasLocation(#20334,#20079)
@@ -905,7 +905,7 @@ literals("2.3","2.3",#20334)
 #20335=*
 stmts(#20335,2,#20001,5,".42;")
 hasLocation(#20335,#20013)
-stmtContainers(#20335,#20001)
+stmt_containers(#20335,#20001)
 #20336=*
 exprs(#20336,3,#20335,0,".42")
 hasLocation(#20336,#20083)
@@ -915,7 +915,7 @@ literals("0.42",".42",#20336)
 #20337=*
 stmts(#20337,2,#20001,6,"7.6e23;")
 hasLocation(#20337,#20015)
-stmtContainers(#20337,#20001)
+stmt_containers(#20337,#20001)
 #20338=*
 exprs(#20338,3,#20337,0,"7.6e23")
 hasLocation(#20338,#20087)
@@ -925,7 +925,7 @@ literals("7.6E23","7.6e23",#20338)
 #20339=*
 stmts(#20339,2,#20001,7,"1E-42;")
 hasLocation(#20339,#20017)
-stmtContainers(#20339,#20001)
+stmt_containers(#20339,#20001)
 #20340=*
 exprs(#20340,3,#20339,0,"1E-42")
 hasLocation(#20340,#20091)
@@ -935,7 +935,7 @@ literals("1.0E-42","1E-42",#20340)
 #20341=*
 stmts(#20341,2,#20001,8,"0xdeadbeef;")
 hasLocation(#20341,#20019)
-stmtContainers(#20341,#20001)
+stmt_containers(#20341,#20001)
 #20342=*
 exprs(#20342,3,#20341,0,"0xdeadbeef")
 hasLocation(#20342,#20095)
@@ -945,7 +945,7 @@ literals("3735928559","0xdeadbeef",#20342)
 #20343=*
 stmts(#20343,2,#20001,9,"""Hello"";")
 hasLocation(#20343,#20021)
-stmtContainers(#20343,#20001)
+stmt_containers(#20343,#20001)
 #20344=*
 exprs(#20344,4,#20343,0,"""Hello""")
 hasLocation(#20344,#20099)
@@ -961,7 +961,7 @@ regexpConstValue(#20345,"Hello")
 #20347=*
 stmts(#20347,2,#20001,10,"'world';")
 hasLocation(#20347,#20023)
-stmtContainers(#20347,#20001)
+stmt_containers(#20347,#20001)
 #20348=*
 exprs(#20348,4,#20347,0,"'world'")
 hasLocation(#20348,#20103)
@@ -977,7 +977,7 @@ regexpConstValue(#20349,"world")
 #20351=*
 stmts(#20351,2,#20001,11,"""'what?'\x0a"";")
 hasLocation(#20351,#20025)
-stmtContainers(#20351,#20001)
+stmt_containers(#20351,#20001)
 #20352=*
 exprs(#20352,4,#20351,0,"""'what?'\x0a""")
 hasLocation(#20352,#20107)
@@ -1020,7 +1020,7 @@ regexpConstValue(#20361,"'
 #20363=*
 stmts(#20363,2,#20001,12,"'""why?""\n';")
 hasLocation(#20363,#20027)
-stmtContainers(#20363,#20001)
+stmt_containers(#20363,#20001)
 #20364=*
 exprs(#20364,4,#20363,0,"'""why?""\n'")
 hasLocation(#20364,#20111)
@@ -1063,7 +1063,7 @@ regexpConstValue(#20373,"""
 #20375=*
 stmts(#20375,2,#20001,13,"/^(need?le)+/gi;")
 hasLocation(#20375,#20029)
-stmtContainers(#20375,#20001)
+stmt_containers(#20375,#20001)
 #20376=*
 exprs(#20376,5,#20375,0,"/^(need?le)+/gi")
 hasLocation(#20376,#20115)
@@ -1124,7 +1124,7 @@ regexpConstValue(#20393,"le")
 #20395=*
 stmts(#20395,2,#20001,14,"(23);")
 hasLocation(#20395,#20031)
-stmtContainers(#20395,#20001)
+stmt_containers(#20395,#20001)
 #20396=*
 exprs(#20396,63,#20395,0,"(23)")
 #20397=@"loc,{#10000},15,1,15,4"
@@ -1141,7 +1141,7 @@ literals("23","23",#20398)
 #20399=*
 stmts(#20399,2,#20001,15,"[23, 42, , ""hi"" ];")
 hasLocation(#20399,#20033)
-stmtContainers(#20399,#20001)
+stmt_containers(#20399,#20001)
 #20400=*
 exprs(#20400,7,#20399,0,"[23, 42, , ""hi"" ]")
 #20401=@"loc,{#10000},16,1,16,17"
@@ -1179,7 +1179,7 @@ stmts(#20407,2,#20001,16,"({ x: 2 ... ) {}});")
 #20408=@"loc,{#10000},17,1,21,17"
 locations_default(#20408,#10000,17,1,21,17)
 hasLocation(#20407,#20408)
-stmtContainers(#20407,#20001)
+stmt_containers(#20407,#20001)
 #20409=*
 exprs(#20409,63,#20407,0,"({ x: 2 ... v) {}})")
 #20410=@"loc,{#10000},17,1,21,16"
@@ -1257,7 +1257,7 @@ stmts(#20428,1,#20424,-2,"{}")
 #20429=@"loc,{#10000},19,12,19,13"
 locations_default(#20429,#10000,19,12,19,13)
 hasLocation(#20428,#20429)
-stmtContainers(#20428,#20424)
+stmt_containers(#20428,#20424)
 #20430=*
 properties(#20430,#20411,3,1,"get p() {}")
 #20431=@"loc,{#10000},20,4,20,13"
@@ -1288,7 +1288,7 @@ stmts(#20437,1,#20433,-2,"{}")
 #20438=@"loc,{#10000},20,12,20,13"
 locations_default(#20438,#10000,20,12,20,13)
 hasLocation(#20437,#20438)
-stmtContainers(#20437,#20433)
+stmt_containers(#20437,#20433)
 #20439=*
 properties(#20439,#20411,4,2,"set p(v) {}")
 #20440=@"loc,{#10000},21,4,21,14"
@@ -1327,11 +1327,11 @@ stmts(#20448,1,#20442,-2,"{}")
 #20449=@"loc,{#10000},21,13,21,14"
 locations_default(#20449,#10000,21,13,21,14)
 hasLocation(#20448,#20449)
-stmtContainers(#20448,#20442)
+stmt_containers(#20448,#20442)
 #20450=*
 stmts(#20450,2,#20001,17,"new Array;")
 hasLocation(#20450,#20045)
-stmtContainers(#20450,#20001)
+stmt_containers(#20450,#20001)
 #20451=*
 exprs(#20451,12,#20450,0,"new Array")
 #20452=@"loc,{#10000},22,1,22,9"
@@ -1351,7 +1351,7 @@ bind(#20453,#20454)
 #20455=*
 stmts(#20455,2,#20001,18,"new Object();")
 hasLocation(#20455,#20047)
-stmtContainers(#20455,#20001)
+stmt_containers(#20455,#20001)
 #20456=*
 exprs(#20456,12,#20455,0,"new Object()")
 #20457=@"loc,{#10000},23,1,23,12"
@@ -1371,7 +1371,7 @@ bind(#20458,#20459)
 #20460=*
 stmts(#20460,2,#20001,19,"new String(""hi"");")
 hasLocation(#20460,#20049)
-stmtContainers(#20460,#20001)
+stmt_containers(#20460,#20001)
 #20461=*
 exprs(#20461,12,#20460,0,"new String(""hi"")")
 #20462=@"loc,{#10000},24,1,24,16"
@@ -1403,7 +1403,7 @@ regexpConstValue(#20466,"hi")
 #20468=*
 stmts(#20468,2,#20001,20,"String("""");")
 hasLocation(#20468,#20051)
-stmtContainers(#20468,#20001)
+stmt_containers(#20468,#20001)
 #20469=*
 exprs(#20469,13,#20468,0,"String("""")")
 #20470=@"loc,{#10000},25,1,25,10"
@@ -1432,7 +1432,7 @@ hasLocation(#20473,#20474)
 #20475=*
 stmts(#20475,2,#20001,21,"Object.create({});")
 hasLocation(#20475,#20053)
-stmtContainers(#20475,#20001)
+stmt_containers(#20475,#20001)
 #20476=*
 exprs(#20476,13,#20475,0,"Object.create({})")
 #20477=@"loc,{#10000},26,1,26,17"
@@ -1470,7 +1470,7 @@ exprContainers(#20482,#20001)
 #20484=*
 stmts(#20484,2,#20001,22,"String[ ... rse()];")
 hasLocation(#20484,#20055)
-stmtContainers(#20484,#20001)
+stmt_containers(#20484,#20001)
 #20485=*
 exprs(#20485,15,#20484,0,"String[ ... erse()]")
 #20486=@"loc,{#10000},27,1,27,29"
@@ -1520,7 +1520,7 @@ literals("reverse","reverse",#20495)
 #20496=*
 stmts(#20496,2,#20001,23,"[,,];")
 hasLocation(#20496,#20057)
-stmtContainers(#20496,#20001)
+stmt_containers(#20496,#20001)
 #20497=*
 exprs(#20497,7,#20496,0,"[,,]")
 #20498=@"loc,{#10000},28,1,28,4"
@@ -1532,7 +1532,7 @@ arraySize(#20497,2)
 #20499=*
 stmts(#20499,2,#20001,24,"[1,];")
 hasLocation(#20499,#20059)
-stmtContainers(#20499,#20001)
+stmt_containers(#20499,#20001)
 #20500=*
 exprs(#20500,7,#20499,0,"[1,]")
 #20501=@"loc,{#10000},29,1,29,4"
@@ -1550,7 +1550,7 @@ arraySize(#20500,1)
 #20503=*
 stmts(#20503,2,#20001,25,"({ z: 56, });")
 hasLocation(#20503,#20061)
-stmtContainers(#20503,#20001)
+stmt_containers(#20503,#20001)
 #20504=*
 exprs(#20504,63,#20503,0,"({ z: 56, })")
 #20505=@"loc,{#10000},30,1,30,12"
--- a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
@@ -725,7 +725,7 @@ hasLocation(#20001,#20268)
 #20269=*
 stmts(#20269,2,#20001,0,"/t/;")
 hasLocation(#20269,#20003)
-stmtContainers(#20269,#20001)
+stmt_containers(#20269,#20001)
 #20270=*
 exprs(#20270,5,#20269,0,"/t/")
 hasLocation(#20270,#20091)
@@ -741,7 +741,7 @@ regexpConstValue(#20271,"t")
 #20273=*
 stmts(#20273,2,#20001,1,"/foo|bar/;")
 hasLocation(#20273,#20005)
-stmtContainers(#20273,#20001)
+stmt_containers(#20273,#20001)
 #20274=*
 exprs(#20274,5,#20273,0,"/foo|bar/")
 hasLocation(#20274,#20095)
@@ -768,7 +768,7 @@ regexpConstValue(#20279,"bar")
 #20281=*
 stmts(#20281,2,#20001,2,"/(?:)/;")
 hasLocation(#20281,#20007)
-stmtContainers(#20281,#20001)
+stmt_containers(#20281,#20001)
 #20282=*
 exprs(#20282,5,#20281,0,"/(?:)/")
 hasLocation(#20282,#20099)
@@ -788,7 +788,7 @@ hasLocation(#20285,#20286)
 #20287=*
 stmts(#20287,2,#20001,3,"/^abc$/;")
 hasLocation(#20287,#20009)
-stmtContainers(#20287,#20001)
+stmt_containers(#20287,#20001)
 #20288=*
 exprs(#20288,5,#20287,0,"/^abc$/")
 hasLocation(#20288,#20103)
@@ -819,7 +819,7 @@ hasLocation(#20295,#20296)
 #20297=*
 stmts(#20297,2,#20001,4,"/\bx\b/;")
 hasLocation(#20297,#20011)
-stmtContainers(#20297,#20001)
+stmt_containers(#20297,#20001)
 #20298=*
 exprs(#20298,5,#20297,0,"/\bx\b/")
 hasLocation(#20298,#20107)
@@ -850,7 +850,7 @@ hasLocation(#20305,#20306)
 #20307=*
 stmts(#20307,2,#20001,5,"/\bx\B/;")
 hasLocation(#20307,#20013)
-stmtContainers(#20307,#20001)
+stmt_containers(#20307,#20001)
 #20308=*
 exprs(#20308,5,#20307,0,"/\bx\B/")
 hasLocation(#20308,#20111)
@@ -881,7 +881,7 @@ hasLocation(#20315,#20316)
 #20317=*
 stmts(#20317,2,#20001,6,"/x(?=y)/;")
 hasLocation(#20317,#20015)
-stmtContainers(#20317,#20001)
+stmt_containers(#20317,#20001)
 #20318=*
 exprs(#20318,5,#20317,0,"/x(?=y)/")
 hasLocation(#20318,#20115)
@@ -913,7 +913,7 @@ regexpConstValue(#20325,"y")
 #20327=*
 stmts(#20327,2,#20001,7,"/x(?!z)/;")
 hasLocation(#20327,#20017)
-stmtContainers(#20327,#20001)
+stmt_containers(#20327,#20001)
 #20328=*
 exprs(#20328,5,#20327,0,"/x(?!z)/")
 hasLocation(#20328,#20119)
@@ -945,7 +945,7 @@ regexpConstValue(#20335,"z")
 #20337=*
 stmts(#20337,2,#20001,8,"/a*/;")
 hasLocation(#20337,#20019)
-stmtContainers(#20337,#20001)
+stmt_containers(#20337,#20001)
 #20338=*
 exprs(#20338,5,#20337,0,"/a*/")
 hasLocation(#20338,#20123)
@@ -967,7 +967,7 @@ regexpConstValue(#20341,"a")
 #20343=*
 stmts(#20343,2,#20001,9,"/a*?/;")
 hasLocation(#20343,#20021)
-stmtContainers(#20343,#20001)
+stmt_containers(#20343,#20001)
 #20344=*
 exprs(#20344,5,#20343,0,"/a*?/")
 hasLocation(#20344,#20127)
@@ -988,7 +988,7 @@ regexpConstValue(#20347,"a")
 #20349=*
 stmts(#20349,2,#20001,10,"/a+/;")
 hasLocation(#20349,#20023)
-stmtContainers(#20349,#20001)
+stmt_containers(#20349,#20001)
 #20350=*
 exprs(#20350,5,#20349,0,"/a+/")
 hasLocation(#20350,#20131)
@@ -1010,7 +1010,7 @@ regexpConstValue(#20353,"a")
 #20355=*
 stmts(#20355,2,#20001,11,"/a+?/;")
 hasLocation(#20355,#20025)
-stmtContainers(#20355,#20001)
+stmt_containers(#20355,#20001)
 #20356=*
 exprs(#20356,5,#20355,0,"/a+?/")
 hasLocation(#20356,#20135)
@@ -1031,7 +1031,7 @@ regexpConstValue(#20359,"a")
 #20361=*
 stmts(#20361,2,#20001,12,"/a?/;")
 hasLocation(#20361,#20027)
-stmtContainers(#20361,#20001)
+stmt_containers(#20361,#20001)
 #20362=*
 exprs(#20362,5,#20361,0,"/a?/")
 hasLocation(#20362,#20139)
@@ -1053,7 +1053,7 @@ regexpConstValue(#20365,"a")
 #20367=*
 stmts(#20367,2,#20001,13,"/a??/;")
 hasLocation(#20367,#20029)
-stmtContainers(#20367,#20001)
+stmt_containers(#20367,#20001)
 #20368=*
 exprs(#20368,5,#20367,0,"/a??/")
 hasLocation(#20368,#20143)
@@ -1074,7 +1074,7 @@ regexpConstValue(#20371,"a")
 #20373=*
 stmts(#20373,2,#20001,14,"/a{1}/;")
 hasLocation(#20373,#20031)
-stmtContainers(#20373,#20001)
+stmt_containers(#20373,#20001)
 #20374=*
 exprs(#20374,5,#20373,0,"/a{1}/")
 hasLocation(#20374,#20147)
@@ -1098,7 +1098,7 @@ regexpConstValue(#20377,"a")
 #20379=*
 stmts(#20379,2,#20001,15,"/a{1,}/;")
 hasLocation(#20379,#20033)
-stmtContainers(#20379,#20001)
+stmt_containers(#20379,#20001)
 #20380=*
 exprs(#20380,5,#20379,0,"/a{1,}/")
 hasLocation(#20380,#20151)
@@ -1121,7 +1121,7 @@ regexpConstValue(#20383,"a")
 #20385=*
 stmts(#20385,2,#20001,16,"/a{1,2}/;")
 hasLocation(#20385,#20035)
-stmtContainers(#20385,#20001)
+stmt_containers(#20385,#20001)
 #20386=*
 exprs(#20386,5,#20385,0,"/a{1,2}/")
 hasLocation(#20386,#20155)
@@ -1145,7 +1145,7 @@ regexpConstValue(#20389,"a")
 #20391=*
 stmts(#20391,2,#20001,17,"/a{1}?/;")
 hasLocation(#20391,#20037)
-stmtContainers(#20391,#20001)
+stmt_containers(#20391,#20001)
 #20392=*
 exprs(#20392,5,#20391,0,"/a{1}?/")
 hasLocation(#20392,#20159)
@@ -1168,7 +1168,7 @@ regexpConstValue(#20395,"a")
 #20397=*
 stmts(#20397,2,#20001,18,"/a{1,}?/;")
 hasLocation(#20397,#20039)
-stmtContainers(#20397,#20001)
+stmt_containers(#20397,#20001)
 #20398=*
 exprs(#20398,5,#20397,0,"/a{1,}?/")
 hasLocation(#20398,#20163)
@@ -1190,7 +1190,7 @@ regexpConstValue(#20401,"a")
 #20403=*
 stmts(#20403,2,#20001,19,"/a{1,2}?/;")
 hasLocation(#20403,#20041)
-stmtContainers(#20403,#20001)
+stmt_containers(#20403,#20001)
 #20404=*
 exprs(#20404,5,#20403,0,"/a{1,2}?/")
 hasLocation(#20404,#20167)
@@ -1213,7 +1213,7 @@ regexpConstValue(#20407,"a")
 #20409=*
 stmts(#20409,2,#20001,20,"/./;")
 hasLocation(#20409,#20043)
-stmtContainers(#20409,#20001)
+stmt_containers(#20409,#20001)
 #20410=*
 exprs(#20410,5,#20409,0,"/./")
 hasLocation(#20410,#20171)
@@ -1228,7 +1228,7 @@ hasLocation(#20411,#20412)
 #20413=*
 stmts(#20413,2,#20001,21,"/(abc)/;")
 hasLocation(#20413,#20045)
-stmtContainers(#20413,#20001)
+stmt_containers(#20413,#20001)
 #20414=*
 exprs(#20414,5,#20413,0,"/(abc)/")
 hasLocation(#20414,#20175)
@@ -1250,7 +1250,7 @@ regexpConstValue(#20417,"abc")
 #20419=*
 stmts(#20419,2,#20001,22,"/(?:abc)/;")
 hasLocation(#20419,#20047)
-stmtContainers(#20419,#20001)
+stmt_containers(#20419,#20001)
 #20420=*
 exprs(#20420,5,#20419,0,"/(?:abc)/")
 hasLocation(#20420,#20179)
@@ -1271,7 +1271,7 @@ regexpConstValue(#20423,"abc")
 #20425=*
 stmts(#20425,2,#20001,23,"/\x0a/;")
 hasLocation(#20425,#20049)
-stmtContainers(#20425,#20001)
+stmt_containers(#20425,#20001)
 #20426=*
 exprs(#20426,5,#20425,0,"/\x0a/")
 hasLocation(#20426,#20183)
@@ -1288,7 +1288,7 @@ regexpConstValue(#20427,"
 #20429=*
 stmts(#20429,2,#20001,24,"/\u000a/;")
 hasLocation(#20429,#20051)
-stmtContainers(#20429,#20001)
+stmt_containers(#20429,#20001)
 #20430=*
 exprs(#20430,5,#20429,0,"/\u000a/")
 hasLocation(#20430,#20187)
@@ -1305,7 +1305,7 @@ regexpConstValue(#20431,"
 #20433=*
 stmts(#20433,2,#20001,25,"/\10/;")
 hasLocation(#20433,#20053)
-stmtContainers(#20433,#20001)
+stmt_containers(#20433,#20001)
 #20434=*
 exprs(#20434,5,#20433,0,"/\10/")
 hasLocation(#20434,#20191)
@@ -1324,7 +1324,7 @@ hasLocation(#20437,#20436)
 #20438=*
 stmts(#20438,2,#20001,26,"/\t\n\r\f\v/;")
 hasLocation(#20438,#20055)
-stmtContainers(#20438,#20001)
+stmt_containers(#20438,#20001)
 #20439=*
 exprs(#20439,5,#20438,0,"/\t\n\r\f\v/")
 hasLocation(#20439,#20195)
@@ -1370,7 +1370,7 @@ regexpConstValue(#20450,"")
 regexpConstValue(#20450,"")
 #20452=*
 stmts(#20452,2,#20001,27,"/\ca\cN/;")
-hasLocation(#20452,#20057)
+hasLocation(#20452,#20057)
 stmt_containers(#20452,#20001)
 #20453=*
 exprs(#20453,5,#20452,0,"/\ca\cN/")
@@ -1397,7 +1397,7 @@ regexpConstValue(#20458,"")
 regexpConstValue(#20458,"")
 #20460=*
 stmts(#20460,2,#20001,28,"/\w\S/;")
-hasLocation(#20460,#20059)
+hasLocation(#20460,#20059)
 stmt_containers(#20460,#20001)
 #20461=*
 exprs(#20461,5,#20460,0,"/\w\S/")
@@ -1424,7 +1424,7 @@ charClassEscape(#20466,"S")
 charClassEscape(#20466,"S")
 #20468=*
 stmts(#20468,2,#20001,29,"/\\/;")
-hasLocation(#20468,#20061)
+hasLocation(#20468,#20061)
 stmt_containers(#20468,#20001)
 #20469=*
 exprs(#20469,5,#20468,0,"/\\/")
@@ -1440,7 +1440,7 @@ regexpConstValue(#20470,"\")
 regexpConstValue(#20470,"\")
 #20472=*
 stmts(#20472,2,#20001,30,"/[abc]/;")
-hasLocation(#20472,#20063)
+hasLocation(#20472,#20063)
 stmt_containers(#20472,#20001)
 #20473=*
 exprs(#20473,5,#20472,0,"/[abc]/")
@@ -1473,7 +1473,7 @@ regexpConstValue(#20480,"c")
 regexpConstValue(#20480,"c")
 #20482=*
 stmts(#20482,2,#20001,31,"/[a-z]/;")
-hasLocation(#20482,#20065)
+hasLocation(#20482,#20065)
 stmt_containers(#20482,#20001)
 #20483=*
 exprs(#20483,5,#20482,0,"/[a-z]/")
@@ -1505,7 +1505,7 @@ regexpConstValue(#20490,"z")
 regexpConstValue(#20490,"z")
 #20492=*
 stmts(#20492,2,#20001,32,"/[a-zA-Z]/;")
-hasLocation(#20492,#20067)
+hasLocation(#20492,#20067)
 stmt_containers(#20492,#20001)
 #20493=*
 exprs(#20493,5,#20492,0,"/[a-zA-Z]/")
@@ -1554,7 +1554,7 @@ regexpConstValue(#20506,"Z")
 regexpConstValue(#20506,"Z")
 #20508=*
 stmts(#20508,2,#20001,33,"/[-a-z]/;")
-hasLocation(#20508,#20069)
+hasLocation(#20508,#20069)
 stmt_containers(#20508,#20001)
 #20509=*
 exprs(#20509,5,#20508,0,"/[-a-z]/")
@@ -1592,7 +1592,7 @@ regexpConstValue(#20518,"z")
 regexpConstValue(#20518,"z")
 #20520=*
 stmts(#20520,2,#20001,34,"/[^a-z]/;")
-hasLocation(#20520,#20071)
+hasLocation(#20520,#20071)
 stmt_containers(#20520,#20001)
 #20521=*
 exprs(#20521,5,#20520,0,"/[^a-z]/")
@@ -1625,7 +1625,7 @@ regexpConstValue(#20528,"z")
 regexpConstValue(#20528,"z")
 #20530=*
 stmts(#20530,2,#20001,35,"/[a\b\x0c]/;")
-hasLocation(#20530,#20073)
+hasLocation(#20530,#20073)
 stmt_containers(#20530,#20001)
 #20531=*
 exprs(#20531,5,#20530,0,"/[a\b\x0c]/")
@@ -1658,7 +1658,7 @@ regexpConstValue(#20538,"")
 regexpConstValue(#20538,"")
 #20540=*
 stmts(#20540,2,#20001,36,"/a{/;")
-hasLocation(#20540,#20075)
+hasLocation(#20540,#20075)
 stmt_containers(#20540,#20001)
 #20541=*
 exprs(#20541,5,#20540,0,"/a{/")
@@ -1692,7 +1692,7 @@ hasLocation(#20548,#20549)
 hasLocation(#20548,#20549)
 #20550=*
 stmts(#20550,2,#20001,37,"/a{b}/;")
-hasLocation(#20550,#20077)
+hasLocation(#20550,#20077)
 stmt_containers(#20550,#20001)
 #20551=*
 exprs(#20551,5,#20550,0,"/a{b}/")
@@ -1744,7 +1744,7 @@ hasLocation(#20565,#20561)
 hasLocation(#20565,#20561)
 #20566=*
 stmts(#20566,2,#20001,38,"/a{2/;")
-hasLocation(#20566,#20079)
+hasLocation(#20566,#20079)
 stmt_containers(#20566,#20001)
 #20567=*
 exprs(#20567,5,#20566,0,"/a{2/")
@@ -1773,7 +1773,7 @@ hasLocation(#20572,#20573)
 hasLocation(#20572,#20573)
 #20574=*
 stmts(#20574,2,#20001,39,"/\xa/;")
-hasLocation(#20574,#20081)
+hasLocation(#20574,#20081)
 stmt_containers(#20574,#20001)
 #20575=*
 exprs(#20575,5,#20574,0,"/\xa/")
@@ -1795,7 +1795,7 @@ hasLocation(#20578,#20579)
 hasLocation(#20578,#20579)
 #20580=*
 stmts(#20580,2,#20001,40,"/\c0/;")
-hasLocation(#20580,#20083)
+hasLocation(#20580,#20083)
 stmt_containers(#20580,#20001)
 #20581=*
 exprs(#20581,5,#20580,0,"/\c0/")
@@ -1816,7 +1816,7 @@ hasLocation(#20584,#20585)
 hasLocation(#20584,#20585)
 #20586=*
 stmts(#20586,2,#20001,41,"/[]/;")
-hasLocation(#20586,#20085)
+hasLocation(#20586,#20085)
 stmt_containers(#20586,#20001)
 #20587=*
 exprs(#20587,5,#20586,0,"/[]/")
@@ -1831,7 +1831,7 @@ hasLocation(#20588,#20589)
 hasLocation(#20588,#20589)
 #20590=*
 stmts(#20590,2,#20001,42,"/[^]/;")
-hasLocation(#20590,#20087)
+hasLocation(#20590,#20087)
 stmt_containers(#20590,#20001)
 #20591=*
 exprs(#20591,5,#20590,0,"/[^]/")
@@ -1847,7 +1847,7 @@ isInverted(#20592)
 isInverted(#20592)
 #20594=*
 stmts(#20594,2,#20001,43,"/<tpl\b ... /tpl>/;")
-hasLocation(#20594,#20089)
+hasLocation(#20594,#20089)
 stmt_containers(#20594,#20001)
 #20595=*
 exprs(#20595,5,#20594,0,"/<tpl\b ... \/tpl>/")
--- a/javascript/extractor/tests/exprs/output/trap/unary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
@@ -188,7 +188,7 @@ hasLocation(#20001,#20068)
 #20069=*
 stmts(#20069,2,#20001,0,"-23;")
 hasLocation(#20069,#20003)
-stmtContainers(#20069,#20001)
+stmt_containers(#20069,#20001)
 #20070=*
 exprs(#20070,16,#20069,0,"-23")
 #20071=@"loc,{#10000},1,1,1,3"
@@ -205,7 +205,7 @@ literals("23","23",#20072)
 #20073=*
 stmts(#20073,2,#20001,1,"+42;")
 hasLocation(#20073,#20005)
-stmtContainers(#20073,#20001)
+stmt_containers(#20073,#20001)
 #20074=*
 exprs(#20074,17,#20073,0,"+42")
 #20075=@"loc,{#10000},2,1,2,3"
@@ -222,7 +222,7 @@ literals("42","42",#20076)
 #20077=*
 stmts(#20077,2,#20001,2,"!true;")
 hasLocation(#20077,#20007)
-stmtContainers(#20077,#20001)
+stmt_containers(#20077,#20001)
 #20078=*
 exprs(#20078,18,#20077,0,"!true")
 #20079=@"loc,{#10000},3,1,3,5"
@@ -239,7 +239,7 @@ literals("true","true",#20080)
 #20081=*
 stmts(#20081,2,#20001,3,"~2;")
 hasLocation(#20081,#20009)
-stmtContainers(#20081,#20001)
+stmt_containers(#20081,#20001)
 #20082=*
 exprs(#20082,19,#20081,0,"~2")
 #20083=@"loc,{#10000},4,1,4,2"
@@ -256,7 +256,7 @@ literals("2","2",#20084)
 #20085=*
 stmts(#20085,2,#20001,4,"typeof Object;")
 hasLocation(#20085,#20011)
-stmtContainers(#20085,#20001)
+stmt_containers(#20085,#20001)
 #20086=*
 exprs(#20086,20,#20085,0,"typeof Object")
 #20087=@"loc,{#10000},5,1,5,13"
@@ -276,7 +276,7 @@ bind(#20088,#20089)
 #20090=*
 stmts(#20090,2,#20001,5,"void(0);")
 hasLocation(#20090,#20013)
-stmtContainers(#20090,#20001)
+stmt_containers(#20090,#20001)
 #20091=*
 exprs(#20091,21,#20090,0,"void(0)")
 #20092=@"loc,{#10000},6,1,6,7"
@@ -300,7 +300,7 @@ literals("0","0",#20095)
 #20096=*
 stmts(#20096,2,#20001,6,"delete  ... totype;")
 hasLocation(#20096,#20015)
-stmtContainers(#20096,#20001)
+stmt_containers(#20096,#20001)
 #20097=*
 exprs(#20097,22,#20096,0,"delete  ... ototype")
 #20098=@"loc,{#10000},7,1,7,23"
--- a/javascript/extractor/tests/exprs/output/trap/update.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/update.js.trap
@@ -106,7 +106,7 @@ hasLocation(#20001,#20036)
 #20037=*
 stmts(#20037,2,#20001,0,"++a;")
 hasLocation(#20037,#20003)
-stmtContainers(#20037,#20001)
+stmt_containers(#20037,#20001)
 #20038=*
 exprs(#20038,59,#20037,0,"++a")
 #20039=@"loc,{#10000},1,1,1,3"
@@ -126,7 +126,7 @@ bind(#20040,#20041)
 #20042=*
 stmts(#20042,2,#20001,1,"a++;")
 hasLocation(#20042,#20005)
-stmtContainers(#20042,#20001)
+stmt_containers(#20042,#20001)
 #20043=*
 exprs(#20043,60,#20042,0,"a++")
 #20044=@"loc,{#10000},2,1,2,3"
@@ -144,7 +144,7 @@ bind(#20045,#20041)
 #20046=*
 stmts(#20046,2,#20001,2,"--b;")
 hasLocation(#20046,#20007)
-stmtContainers(#20046,#20001)
+stmt_containers(#20046,#20001)
 #20047=*
 exprs(#20047,61,#20046,0,"--b")
 #20048=@"loc,{#10000},3,1,3,3"
@@ -164,7 +164,7 @@ bind(#20049,#20050)
 #20051=*
 stmts(#20051,2,#20001,3,"b--;")
 hasLocation(#20051,#20009)
-stmtContainers(#20051,#20001)
+stmt_containers(#20051,#20001)
 #20052=*
 exprs(#20052,62,#20051,0,"b--")
 #20053=@"loc,{#10000},4,1,4,3"