renamed "stmtContainers" to "stmt_containers"

javascript/extractor/tests/stmts/output/trap/conditionals.js.trap

@@ -235,7 +235,7 @@ stmts(#20083,3,#20001,0,"if (true)\n    ;")
 #20084=@"loc,{#10000},1,1,2,5"
 locations_default(#20084,#10000,1,1,2,5)
 hasLocation(#20083,#20084)
-stmtContainers(#20083,#20001)
+stmt_containers(#20083,#20001)
 #20085=*
 exprs(#20085,2,#20083,0,"true")
 hasLocation(#20085,#20031)
@@ -245,13 +245,13 @@ literals("true","true",#20085)
 #20086=*
 stmts(#20086,0,#20083,1,";")
 hasLocation(#20086,#20035)
-stmtContainers(#20086,#20001)
+stmt_containers(#20086,#20001)
 #20087=*
 stmts(#20087,3,#20001,1,"if (b)\n ... e\n    ;")
 #20088=@"loc,{#10000},3,1,6,5"
 locations_default(#20088,#10000,3,1,6,5)
 hasLocation(#20087,#20088)
-stmtContainers(#20087,#20001)
+stmt_containers(#20087,#20001)
 #20089=*
 exprs(#20089,79,#20087,0,"b")
 hasLocation(#20089,#20041)
@@ -264,17 +264,17 @@ bind(#20089,#20090)
 #20091=*
 stmts(#20091,0,#20087,1,";")
 hasLocation(#20091,#20045)
-stmtContainers(#20091,#20001)
+stmt_containers(#20091,#20001)
 #20092=*
 stmts(#20092,0,#20087,2,";")
 hasLocation(#20092,#20048)
-stmtContainers(#20092,#20001)
+stmt_containers(#20092,#20001)
 #20093=*
 stmts(#20093,8,#20001,2,"switch  ... ault:\n}")
 #20094=@"loc,{#10000},7,1,12,1"
 locations_default(#20094,#10000,7,1,12,1)
 hasLocation(#20093,#20094)
-stmtContainers(#20093,#20001)
+stmt_containers(#20093,#20001)
 #20095=*
 exprs(#20095,79,#20093,-1,"b")
 hasLocation(#20095,#20054)
@@ -285,7 +285,7 @@ bind(#20095,#20090)
 #20096=*
 stmts(#20096,19,#20093,0,"case 23:")
 hasLocation(#20096,#20017)
-stmtContainers(#20096,#20001)
+stmt_containers(#20096,#20001)
 #20097=*
 exprs(#20097,3,#20096,-1,"23")
 hasLocation(#20097,#20062)
@@ -297,7 +297,7 @@ stmts(#20098,19,#20093,1,"case c:\n    break;")
 #20099=@"loc,{#10000},9,1,10,10"
 locations_default(#20099,#10000,9,1,10,10)
 hasLocation(#20098,#20099)
-stmtContainers(#20098,#20001)
+stmt_containers(#20098,#20001)
 #20100=*
 exprs(#20100,79,#20098,-1,"c")
 hasLocation(#20100,#20068)
@@ -312,12 +312,12 @@ stmts(#20102,5,#20098,0,"break;")
 #20103=@"loc,{#10000},10,5,10,10"
 locations_default(#20103,#10000,10,5,10,10)
 hasLocation(#20102,#20103)
-stmtContainers(#20102,#20001)
+stmt_containers(#20102,#20001)
 jumpTargets(#20102,#20093)
 #20104=*
 stmts(#20104,19,#20093,2,"default:")
 hasLocation(#20104,#20023)
-stmtContainers(#20104,#20001)
+stmt_containers(#20104,#20001)
 #20105=*
 entry_cfg_node(#20105,#20001)
 #20106=@"loc,{#10000},1,1,1,0"

javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap

@@ -159,7 +159,7 @@ hasLocation(#20001,#20058)
 #20059=*
 stmts(#20059,15,#20001,0,"for (a  ... b) f();")
 hasLocation(#20059,#20003)
-stmtContainers(#20059,#20001)
+stmt_containers(#20059,#20001)
 #20060=*
 exprs(#20060,79,#20059,1,"b")
 hasLocation(#20060,#20021)
@@ -189,7 +189,7 @@ stmts(#20065,2,#20059,2,"f();")
 #20066=@"loc,{#10000},1,18,1,21"
 locations_default(#20066,#10000,1,18,1,21)
 hasLocation(#20065,#20066)
-stmtContainers(#20065,#20001)
+stmt_containers(#20065,#20001)
 #20067=*
 exprs(#20067,13,#20065,0,"f()")
 #20068=@"loc,{#10000},1,18,1,20"
@@ -209,7 +209,7 @@ bind(#20069,#20070)
 #20071=*
 stmts(#20071,21,#20001,1,"for (c  ... d) g();")
 hasLocation(#20071,#20007)
-stmtContainers(#20071,#20001)
+stmt_containers(#20071,#20001)
 #20072=*
 exprs(#20072,79,#20071,1,"d")
 hasLocation(#20072,#20045)
@@ -239,7 +239,7 @@ stmts(#20077,2,#20071,2,"g();")
 #20078=@"loc,{#10000},3,18,3,21"
 locations_default(#20078,#10000,3,18,3,21)
 hasLocation(#20077,#20078)
-stmtContainers(#20077,#20001)
+stmt_containers(#20077,#20001)
 #20079=*
 exprs(#20079,13,#20077,0,"g()")
 #20080=@"loc,{#10000},3,18,3,20"

javascript/extractor/tests/stmts/output/trap/functions.js.trap

@@ -314,7 +314,7 @@ stmts(#20115,17,#20001,0,"functio ...  x+y;\n}")
 #20116=@"loc,{#10000},1,1,3,1"
 locations_default(#20116,#10000,1,1,3,1)
 hasLocation(#20115,#20116)
-stmtContainers(#20115,#20001)
+stmt_containers(#20115,#20001)
 #20117=*
 exprs(#20117,78,#20115,-1,"g")
 hasLocation(#20117,#20031)
@@ -349,13 +349,13 @@ stmts(#20124,1,#20115,-2,"{\n    return x+y;\n}")
 #20125=@"loc,{#10000},1,18,3,1"
 locations_default(#20125,#10000,1,18,3,1)
 hasLocation(#20124,#20125)
-stmtContainers(#20124,#20115)
+stmt_containers(#20124,#20115)
 #20126=*
 stmts(#20126,9,#20124,0,"return x+y;")
 #20127=@"loc,{#10000},2,5,2,15"
 locations_default(#20127,#10000,2,5,2,15)
 hasLocation(#20126,#20127)
-stmtContainers(#20126,#20115)
+stmt_containers(#20126,#20115)
 #20128=*
 exprs(#20128,34,#20126,0,"x+y")
 #20129=@"loc,{#10000},2,12,2,14"
@@ -380,7 +380,7 @@ bind(#20131,#20121)
 #20132=*
 stmts(#20132,17,#20001,1,"function h() {}")
 hasLocation(#20132,#20011)
-stmtContainers(#20132,#20001)
+stmt_containers(#20132,#20001)
 #20133=*
 exprs(#20133,78,#20132,-1,"h")
 hasLocation(#20133,#20058)
@@ -399,13 +399,13 @@ stmts(#20136,1,#20132,-2,"{}")
 #20137=@"loc,{#10000},5,14,5,15"
 locations_default(#20137,#10000,5,14,5,15)
 hasLocation(#20136,#20137)
-stmtContainers(#20136,#20132)
+stmt_containers(#20136,#20132)
 #20138=*
 stmts(#20138,2,#20001,2,"k = fun ... turn;\n}")
 #20139=@"loc,{#10000},7,1,9,1"
 locations_default(#20139,#10000,7,1,9,1)
 hasLocation(#20138,#20139)
-stmtContainers(#20138,#20001)
+stmt_containers(#20138,#20001)
 #20140=*
 exprs(#20140,47,#20138,0,"k = fun ... turn;\n}")
 hasLocation(#20140,#20139)
@@ -439,17 +439,17 @@ stmts(#20147,1,#20143,-2,"{\n    return;\n}")
 #20148=@"loc,{#10000},7,16,9,1"
 locations_default(#20148,#10000,7,16,9,1)
 hasLocation(#20147,#20148)
-stmtContainers(#20147,#20143)
+stmt_containers(#20147,#20143)
 #20149=*
 stmts(#20149,9,#20147,0,"return;")
 #20150=@"loc,{#10000},8,5,8,11"
 locations_default(#20150,#10000,8,5,8,11)
 hasLocation(#20149,#20150)
-stmtContainers(#20149,#20143)
+stmt_containers(#20149,#20143)
 #20151=*
 stmts(#20151,2,#20001,3,"l = function f() {}")
 hasLocation(#20151,#20023)
-stmtContainers(#20151,#20001)
+stmt_containers(#20151,#20001)
 #20152=*
 exprs(#20152,47,#20151,0,"l = function f() {}")
 hasLocation(#20152,#20023)
@@ -491,11 +491,11 @@ stmts(#20161,1,#20155,-2,"{}")
 #20162=@"loc,{#10000},11,18,11,19"
 locations_default(#20162,#10000,11,18,11,19)
 hasLocation(#20161,#20162)
-stmtContainers(#20161,#20155)
+stmt_containers(#20161,#20155)
 #20163=*
 stmts(#20163,2,#20001,4,"function() {}")
 hasLocation(#20163,#20027)
-stmtContainers(#20163,#20001)
+stmt_containers(#20163,#20001)
 #20164=*
 exprs(#20164,9,#20163,0,"function() {}")
 hasLocation(#20164,#20027)
@@ -513,7 +513,7 @@ stmts(#20167,1,#20164,-2,"{}")
 #20168=@"loc,{#10000},13,12,13,13"
 locations_default(#20168,#10000,13,12,13,13)
 hasLocation(#20167,#20168)
-stmtContainers(#20167,#20164)
+stmt_containers(#20167,#20164)
 #20169=*
 entry_cfg_node(#20169,#20001)
 #20170=@"loc,{#10000},1,1,1,0"

javascript/extractor/tests/stmts/output/trap/loops.js.trap

@@ -623,7 +623,7 @@ stmts(#20233,12,#20001,0,"while(true)\n    ;")
 #20234=@"loc,{#10000},1,1,2,5"
 locations_default(#20234,#10000,1,1,2,5)
 hasLocation(#20233,#20234)
-stmtContainers(#20233,#20001)
+stmt_containers(#20233,#20001)
 #20235=*
 exprs(#20235,2,#20233,0,"true")
 hasLocation(#20235,#20049)
@@ -633,13 +633,13 @@ literals("true","true",#20235)
 #20236=*
 stmts(#20236,0,#20233,1,";")
 hasLocation(#20236,#20053)
-stmtContainers(#20236,#20001)
+stmt_containers(#20236,#20001)
 #20237=*
 stmts(#20237,4,#20001,1,"outer:  ... inue;\n}")
 #20238=@"loc,{#10000},3,1,11,1"
 locations_default(#20238,#10000,3,1,11,1)
 hasLocation(#20237,#20238)
-stmtContainers(#20237,#20001)
+stmt_containers(#20237,#20001)
 #20239=*
 exprs(#20239,0,#20237,0,"outer")
 hasLocation(#20239,#20055)
@@ -651,7 +651,7 @@ stmts(#20240,14,#20237,1,"for(a;  ... inue;\n}")
 #20241=@"loc,{#10000},3,8,11,1"
 locations_default(#20241,#10000,3,8,11,1)
 hasLocation(#20240,#20241)
-stmtContainers(#20240,#20001)
+stmt_containers(#20240,#20001)
 #20242=*
 exprs(#20242,79,#20240,1,"b")
 hasLocation(#20242,#20067)
@@ -684,19 +684,19 @@ stmts(#20248,1,#20240,3,"{\n    f ... inue;\n}")
 #20249=@"loc,{#10000},3,21,11,1"
 locations_default(#20249,#10000,3,21,11,1)
 hasLocation(#20248,#20249)
-stmtContainers(#20248,#20001)
+stmt_containers(#20248,#20001)
 #20250=*
 stmts(#20250,14,#20248,0,"for(;;) ... ntinue;")
 #20251=@"loc,{#10000},4,5,10,21"
 locations_default(#20251,#10000,4,5,10,21)
 hasLocation(#20250,#20251)
-stmtContainers(#20250,#20001)
+stmt_containers(#20250,#20001)
 #20252=*
 stmts(#20252,3,#20250,3,"if (d)\n ... ntinue;")
 #20253=@"loc,{#10000},5,9,10,21"
 locations_default(#20253,#10000,5,9,10,21)
 hasLocation(#20252,#20253)
-stmtContainers(#20252,#20001)
+stmt_containers(#20252,#20001)
 #20254=*
 exprs(#20254,79,#20252,0,"d")
 hasLocation(#20254,#20091)
@@ -711,7 +711,7 @@ stmts(#20256,6,#20252,1,"continue outer;")
 #20257=@"loc,{#10000},6,13,6,27"
 locations_default(#20257,#10000,6,13,6,27)
 hasLocation(#20256,#20257)
-stmtContainers(#20256,#20001)
+stmt_containers(#20256,#20001)
 #20258=*
 exprs(#20258,0,#20256,0,"outer")
 hasLocation(#20258,#20097)
@@ -724,7 +724,7 @@ stmts(#20259,3,#20252,2,"if (e)\n ... ntinue;")
 #20260=@"loc,{#10000},7,14,10,21"
 locations_default(#20260,#10000,7,14,10,21)
 hasLocation(#20259,#20260)
-stmtContainers(#20259,#20001)
+stmt_containers(#20259,#20001)
 #20261=*
 exprs(#20261,79,#20259,0,"e")
 hasLocation(#20261,#20107)
@@ -739,7 +739,7 @@ stmts(#20263,5,#20259,1,"break outer;")
 #20264=@"loc,{#10000},8,13,8,24"
 locations_default(#20264,#10000,8,13,8,24)
 hasLocation(#20263,#20264)
-stmtContainers(#20263,#20001)
+stmt_containers(#20263,#20001)
 #20265=*
 exprs(#20265,0,#20263,0,"outer")
 hasLocation(#20265,#20113)
@@ -752,14 +752,14 @@ stmts(#20266,6,#20259,2,"continue;")
 #20267=@"loc,{#10000},10,13,10,21"
 locations_default(#20267,#10000,10,13,10,21)
 hasLocation(#20266,#20267)
-stmtContainers(#20266,#20001)
+stmt_containers(#20266,#20001)
 jumpTargets(#20266,#20250)
 #20268=*
 stmts(#20268,13,#20001,2,"do {\n   ... ile(a);")
 #20269=@"loc,{#10000},13,1,15,11"
 locations_default(#20269,#10000,13,1,15,11)
 hasLocation(#20268,#20269)
-stmtContainers(#20268,#20001)
+stmt_containers(#20268,#20001)
 #20270=*
 exprs(#20270,79,#20268,1,"a")
 hasLocation(#20270,#20136)
@@ -772,15 +772,15 @@ stmts(#20271,1,#20268,0,"{\n    ;\n}")
 #20272=@"loc,{#10000},13,4,15,1"
 locations_default(#20272,#10000,13,4,15,1)
 hasLocation(#20271,#20272)
-stmtContainers(#20271,#20001)
+stmt_containers(#20271,#20001)
 #20273=*
 stmts(#20273,0,#20271,0,";")
 hasLocation(#20273,#20128)
-stmtContainers(#20273,#20001)
+stmt_containers(#20273,#20001)
 #20274=*
 stmts(#20274,14,#20001,3,"for (va ... ; ++i);")
 hasLocation(#20274,#20035)
-stmtContainers(#20274,#20001)
+stmt_containers(#20274,#20001)
 #20275=*
 exprs(#20275,27,#20274,1,"i<n")
 #20276=@"loc,{#10000},17,20,17,22"
@@ -821,7 +821,7 @@ stmts(#20282,18,#20274,0,"var i=0,n=10")
 #20283=@"loc,{#10000},17,6,17,17"
 locations_default(#20283,#10000,17,6,17,17)
 hasLocation(#20282,#20283)
-stmtContainers(#20282,#20001)
+stmt_containers(#20282,#20001)
 #20284=*
 exprs(#20284,64,#20282,0,"i=0")
 #20285=@"loc,{#10000},17,10,17,12"
@@ -865,11 +865,11 @@ literals("10","10",#20291)
 #20292=*
 stmts(#20292,0,#20274,3,";")
 hasLocation(#20292,#20178)
-stmtContainers(#20292,#20001)
+stmt_containers(#20292,#20001)
 #20293=*
 stmts(#20293,15,#20001,4,"for (var x in xs);")
 hasLocation(#20293,#20039)
-stmtContainers(#20293,#20001)
+stmt_containers(#20293,#20001)
 #20294=*
 exprs(#20294,79,#20293,1,"xs")
 hasLocation(#20294,#20190)
@@ -884,7 +884,7 @@ stmts(#20296,18,#20293,0,"var x")
 #20297=@"loc,{#10000},19,6,19,10"
 locations_default(#20297,#10000,19,6,19,10)
 hasLocation(#20296,#20297)
-stmtContainers(#20296,#20001)
+stmt_containers(#20296,#20001)
 #20298=*
 exprs(#20298,64,#20296,0,"x")
 hasLocation(#20298,#20186)
@@ -900,11 +900,11 @@ decl(#20299,#20232)
 #20300=*
 stmts(#20300,0,#20293,2,";")
 hasLocation(#20300,#20194)
-stmtContainers(#20300,#20001)
+stmt_containers(#20300,#20001)
 #20301=*
 stmts(#20301,15,#20001,5,"for (x in xs);")
 hasLocation(#20301,#20041)
-stmtContainers(#20301,#20001)
+stmt_containers(#20301,#20001)
 #20302=*
 exprs(#20302,79,#20301,1,"xs")
 hasLocation(#20302,#20204)
@@ -922,11 +922,11 @@ bind(#20303,#20232)
 #20304=*
 stmts(#20304,0,#20301,2,";")
 hasLocation(#20304,#20208)
-stmtContainers(#20304,#20001)
+stmt_containers(#20304,#20001)
 #20305=*
 stmts(#20305,15,#20001,6,"for (x.f in xs);")
 hasLocation(#20305,#20043)
-stmtContainers(#20305,#20001)
+stmt_containers(#20305,#20001)
 #20306=*
 exprs(#20306,79,#20305,1,"xs")
 hasLocation(#20306,#20222)
@@ -957,7 +957,7 @@ literals("f","f",#20310)
 #20311=*
 stmts(#20311,0,#20305,2,";")
 hasLocation(#20311,#20226)
-stmtContainers(#20311,#20001)
+stmt_containers(#20311,#20001)
 #20312=*
 entry_cfg_node(#20312,#20001)
 #20313=@"loc,{#10000},1,1,1,0"

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

@@ -124,7 +124,7 @@ stmts(#20044,7,#20001,0,"with(a) {\n}")
 #20045=@"loc,{#10000},1,1,2,1"
 locations_default(#20045,#10000,1,1,2,1)
 hasLocation(#20044,#20045)
-stmtContainers(#20044,#20001)
+stmt_containers(#20044,#20001)
 #20046=*
 exprs(#20046,79,#20044,0,"a")
 hasLocation(#20046,#20015)
@@ -139,15 +139,15 @@ stmts(#20048,1,#20044,1,"{\n}")
 #20049=@"loc,{#10000},1,9,2,1"
 locations_default(#20049,#10000,1,9,2,1)
 hasLocation(#20048,#20049)
-stmtContainers(#20048,#20001)
+stmt_containers(#20048,#20001)
 #20050=*
 stmts(#20050,16,#20001,1,"debugger;")
 hasLocation(#20050,#20007)
-stmtContainers(#20050,#20001)
+stmt_containers(#20050,#20001)
 #20051=*
 stmts(#20051,18,#20001,2,"var x = 23, y;")
 hasLocation(#20051,#20009)
-stmtContainers(#20051,#20001)
+stmt_containers(#20051,#20001)
 #20052=*
 exprs(#20052,64,#20051,0,"x = 23")
 #20053=@"loc,{#10000},4,5,4,10"

javascript/extractor/tests/stmts/output/trap/switch.js.trap

@@ -364,7 +364,7 @@ stmts(#20130,8,#20001,0,"switch  ... = 19;\n}")
 #20131=@"loc,{#10000},1,1,6,1"
 locations_default(#20131,#10000,1,1,6,1)
 hasLocation(#20130,#20131)
-stmtContainers(#20130,#20001)
+stmt_containers(#20130,#20001)
 #20132=*
 exprs(#20132,79,#20130,-1,"x")
 hasLocation(#20132,#20041)
@@ -379,20 +379,20 @@ stmts(#20134,19,#20130,0,"default:\n    break;")
 #20135=@"loc,{#10000},2,1,3,10"
 locations_default(#20135,#10000,2,1,3,10)
 hasLocation(#20134,#20135)
-stmtContainers(#20134,#20001)
+stmt_containers(#20134,#20001)
 #20136=*
 stmts(#20136,5,#20134,0,"break;")
 #20137=@"loc,{#10000},3,5,3,10"
 locations_default(#20137,#10000,3,5,3,10)
 hasLocation(#20136,#20137)
-stmtContainers(#20136,#20001)
+stmt_containers(#20136,#20001)
 jumpTargets(#20136,#20130)
 #20138=*
 stmts(#20138,19,#20130,1,"case 23 ...  += 19;")
 #20139=@"loc,{#10000},4,1,5,12"
 locations_default(#20139,#10000,4,1,5,12)
 hasLocation(#20138,#20139)
-stmtContainers(#20138,#20001)
+stmt_containers(#20138,#20001)
 #20140=*
 exprs(#20140,3,#20138,-1,"23")
 hasLocation(#20140,#20057)
@@ -404,7 +404,7 @@ stmts(#20141,2,#20138,0,"x += 19;")
 #20142=@"loc,{#10000},5,5,5,12"
 locations_default(#20142,#10000,5,5,5,12)
 hasLocation(#20141,#20142)
-stmtContainers(#20141,#20001)
+stmt_containers(#20141,#20001)
 #20143=*
 exprs(#20143,48,#20141,0,"x += 19")
 #20144=@"loc,{#10000},5,5,5,11"
@@ -430,7 +430,7 @@ stmts(#20147,17,#20001,1,"functio ...     }\n}")
 #20148=@"loc,{#10000},8,1,17,1"
 locations_default(#20148,#10000,8,1,17,1)
 hasLocation(#20147,#20148)
-stmtContainers(#20147,#20001)
+stmt_containers(#20147,#20001)
 #20149=*
 exprs(#20149,78,#20147,-1,"f")
 hasLocation(#20149,#20072)
@@ -449,13 +449,13 @@ stmts(#20152,1,#20147,-2,"{\n    s ...     }\n}")
 #20153=@"loc,{#10000},8,14,17,1"
 locations_default(#20153,#10000,8,14,17,1)
 hasLocation(#20152,#20153)
-stmtContainers(#20152,#20147)
+stmt_containers(#20152,#20147)
 #20154=*
 stmts(#20154,8,#20152,0,"switch( ... ;\n    }")
 #20155=@"loc,{#10000},9,5,16,5"
 locations_default(#20155,#10000,9,5,16,5)
 hasLocation(#20154,#20155)
-stmtContainers(#20154,#20147)
+stmt_containers(#20154,#20147)
 #20156=*
 exprs(#20156,79,#20154,-1,"x")
 hasLocation(#20156,#20084)
@@ -468,7 +468,7 @@ stmts(#20157,19,#20154,0,"case 0: ... urn 23;")
 #20158=@"loc,{#10000},10,5,11,18"
 locations_default(#20158,#10000,10,5,11,18)
 hasLocation(#20157,#20158)
-stmtContainers(#20157,#20147)
+stmt_containers(#20157,#20147)
 #20159=*
 exprs(#20159,3,#20157,-1,"0")
 hasLocation(#20159,#20092)
@@ -480,7 +480,7 @@ stmts(#20160,9,#20157,0,"return 23;")
 #20161=@"loc,{#10000},11,9,11,18"
 locations_default(#20161,#10000,11,9,11,18)
 hasLocation(#20160,#20161)
-stmtContainers(#20160,#20147)
+stmt_containers(#20160,#20147)
 #20162=*
 exprs(#20162,3,#20160,0,"23")
 hasLocation(#20162,#20098)
@@ -492,13 +492,13 @@ stmts(#20163,19,#20154,1,"default ... urn 42;")
 #20164=@"loc,{#10000},12,5,13,18"
 locations_default(#20164,#10000,12,5,13,18)
 hasLocation(#20163,#20164)
-stmtContainers(#20163,#20147)
+stmt_containers(#20163,#20147)
 #20165=*
 stmts(#20165,9,#20163,0,"return 42;")
 #20166=@"loc,{#10000},13,9,13,18"
 locations_default(#20166,#10000,13,9,13,18)
 hasLocation(#20165,#20166)
-stmtContainers(#20165,#20147)
+stmt_containers(#20165,#20147)
 #20167=*
 exprs(#20167,3,#20165,0,"42")
 hasLocation(#20167,#20108)
@@ -510,7 +510,7 @@ stmts(#20168,19,#20154,2,"case 1: ... urn 56;")
 #20169=@"loc,{#10000},14,5,15,18"
 locations_default(#20169,#10000,14,5,15,18)
 hasLocation(#20168,#20169)
-stmtContainers(#20168,#20147)
+stmt_containers(#20168,#20147)
 #20170=*
 exprs(#20170,3,#20168,-1,"1")
 hasLocation(#20170,#20114)
@@ -522,7 +522,7 @@ stmts(#20171,9,#20168,0,"return 56;")
 #20172=@"loc,{#10000},15,9,15,18"
 locations_default(#20172,#10000,15,9,15,18)
 hasLocation(#20171,#20172)
-stmtContainers(#20171,#20147)
+stmt_containers(#20171,#20147)
 #20173=*
 exprs(#20173,3,#20171,0,"56")
 hasLocation(#20173,#20120)

javascript/extractor/tests/stmts/output/trap/switch2.js.trap

@@ -215,7 +215,7 @@ stmts(#20075,17,#20001,0,"functio ...     }\n}")
 #20076=@"loc,{#10000},1,1,9,1"
 locations_default(#20076,#10000,1,1,9,1)
 hasLocation(#20075,#20076)
-stmtContainers(#20075,#20001)
+stmt_containers(#20075,#20001)
 #20077=*
 exprs(#20077,78,#20075,-1,"f")
 hasLocation(#20077,#20023)
@@ -234,13 +234,13 @@ stmts(#20080,1,#20075,-2,"{\n    s ...     }\n}")
 #20081=@"loc,{#10000},1,14,9,1"
 locations_default(#20081,#10000,1,14,9,1)
 hasLocation(#20080,#20081)
-stmtContainers(#20080,#20075)
+stmt_containers(#20080,#20075)
 #20082=*
 stmts(#20082,8,#20080,0,"switch( ... ;\n    }")
 #20083=@"loc,{#10000},2,5,8,5"
 locations_default(#20083,#10000,2,5,8,5)
 hasLocation(#20082,#20083)
-stmtContainers(#20082,#20075)
+stmt_containers(#20082,#20075)
 #20084=*
 exprs(#20084,79,#20082,-1,"x")
 hasLocation(#20084,#20035)
@@ -255,7 +255,7 @@ stmts(#20086,19,#20082,0,"case 0:")
 #20087=@"loc,{#10000},3,5,3,11"
 locations_default(#20087,#10000,3,5,3,11)
 hasLocation(#20086,#20087)
-stmtContainers(#20086,#20075)
+stmt_containers(#20086,#20075)
 #20088=*
 exprs(#20088,3,#20086,-1,"0")
 hasLocation(#20088,#20043)
@@ -267,13 +267,13 @@ stmts(#20089,19,#20082,1,"default ... urn 42;")
 #20090=@"loc,{#10000},4,5,5,18"
 locations_default(#20090,#10000,4,5,5,18)
 hasLocation(#20089,#20090)
-stmtContainers(#20089,#20075)
+stmt_containers(#20089,#20075)
 #20091=*
 stmts(#20091,9,#20089,0,"return 42;")
 #20092=@"loc,{#10000},5,9,5,18"
 locations_default(#20092,#10000,5,9,5,18)
 hasLocation(#20091,#20092)
-stmtContainers(#20091,#20075)
+stmt_containers(#20091,#20075)
 #20093=*
 exprs(#20093,3,#20091,0,"42")
 hasLocation(#20093,#20053)
@@ -285,7 +285,7 @@ stmts(#20094,19,#20082,2,"case 1: ... urn 56;")
 #20095=@"loc,{#10000},6,5,7,18"
 locations_default(#20095,#10000,6,5,7,18)
 hasLocation(#20094,#20095)
-stmtContainers(#20094,#20075)
+stmt_containers(#20094,#20075)
 #20096=*
 exprs(#20096,3,#20094,-1,"1")
 hasLocation(#20096,#20059)
@@ -297,7 +297,7 @@ stmts(#20097,9,#20094,0,"return 56;")
 #20098=@"loc,{#10000},7,9,7,18"
 locations_default(#20098,#10000,7,9,7,18)
 hasLocation(#20097,#20098)
-stmtContainers(#20097,#20075)
+stmt_containers(#20097,#20075)
 #20099=*
 exprs(#20099,3,#20097,0,"56")
 hasLocation(#20099,#20065)

javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap

@@ -58,7 +58,7 @@ hasLocation(#20001,#20018)
 #20019=*
 stmts(#20019,8,#20001,0,"switch(x){}")
 hasLocation(#20019,#20003)
-stmtContainers(#20019,#20001)
+stmt_containers(#20019,#20001)
 #20020=*
 exprs(#20020,79,#20019,-1,"x")
 hasLocation(#20020,#20009)

javascript/extractor/tests/stmts/output/trap/try.js.trap

@@ -214,19 +214,19 @@ stmts(#20079,11,#20001,0,"try {\n  ... ) { ; }")
 #20080=@"loc,{#10000},1,1,3,16"
 locations_default(#20080,#10000,1,1,3,16)
 hasLocation(#20079,#20080)
-stmtContainers(#20079,#20001)
+stmt_containers(#20079,#20001)
 #20081=*
 stmts(#20081,1,#20079,0,"{\n    throw ""!"";\n}")
 #20082=@"loc,{#10000},1,5,3,1"
 locations_default(#20082,#10000,1,5,3,1)
 hasLocation(#20081,#20082)
-stmtContainers(#20081,#20001)
+stmt_containers(#20081,#20001)
 #20083=*
 stmts(#20083,10,#20081,0,"throw ""!"";")
 #20084=@"loc,{#10000},2,5,2,14"
 locations_default(#20084,#10000,2,5,2,14)
 hasLocation(#20083,#20084)
-stmtContainers(#20083,#20001)
+stmt_containers(#20083,#20001)
 #20085=*
 exprs(#20085,4,#20083,0,"""!""")
 hasLocation(#20085,#20019)
@@ -244,7 +244,7 @@ stmts(#20088,20,#20079,1,"catch(x) { ; }")
 #20089=@"loc,{#10000},3,3,3,16"
 locations_default(#20089,#10000,3,3,3,16)
 hasLocation(#20088,#20089)
-stmtContainers(#20088,#20001)
+stmt_containers(#20088,#20001)
 #20090=*
 scopes(#20090,2)
 scopenodes(#20088,#20090)
@@ -263,47 +263,47 @@ stmts(#20093,1,#20088,1,"{ ; }")
 #20094=@"loc,{#10000},3,12,3,16"
 locations_default(#20094,#10000,3,12,3,16)
 hasLocation(#20093,#20094)
-stmtContainers(#20093,#20001)
+stmt_containers(#20093,#20001)
 #20095=*
 stmts(#20095,0,#20093,0,";")
 hasLocation(#20095,#20035)
-stmtContainers(#20095,#20001)
+stmt_containers(#20095,#20001)
 #20096=*
 stmts(#20096,11,#20001,1,"try {} finally { ; }")
 hasLocation(#20096,#20009)
-stmtContainers(#20096,#20001)
+stmt_containers(#20096,#20001)
 #20097=*
 stmts(#20097,1,#20096,0,"{}")
 #20098=@"loc,{#10000},4,5,4,6"
 locations_default(#20098,#10000,4,5,4,6)
 hasLocation(#20097,#20098)
-stmtContainers(#20097,#20001)
+stmt_containers(#20097,#20001)
 #20099=*
 stmts(#20099,1,#20096,-1,"{ ; }")
 #20100=@"loc,{#10000},4,16,4,20"
 locations_default(#20100,#10000,4,16,4,20)
 hasLocation(#20099,#20100)
-stmtContainers(#20099,#20001)
+stmt_containers(#20099,#20001)
 #20101=*
 stmts(#20101,0,#20099,0,";")
 hasLocation(#20101,#20049)
-stmtContainers(#20101,#20001)
+stmt_containers(#20101,#20001)
 #20102=*
 stmts(#20102,11,#20001,2,"try {}  ... ally {}")
 hasLocation(#20102,#20011)
-stmtContainers(#20102,#20001)
+stmt_containers(#20102,#20001)
 #20103=*
 stmts(#20103,1,#20102,0,"{}")
 #20104=@"loc,{#10000},5,5,5,6"
 locations_default(#20104,#10000,5,5,5,6)
 hasLocation(#20103,#20104)
-stmtContainers(#20103,#20001)
+stmt_containers(#20103,#20001)
 #20105=*
 stmts(#20105,20,#20102,1,"catch(x) {}")
 #20106=@"loc,{#10000},5,8,5,18"
 locations_default(#20106,#10000,5,8,5,18)
 hasLocation(#20105,#20106)
-stmtContainers(#20105,#20001)
+stmt_containers(#20105,#20001)
 #20107=*
 scopes(#20107,2)
 scopenodes(#20105,#20107)
@@ -322,13 +322,13 @@ stmts(#20110,1,#20105,1,"{}")
 #20111=@"loc,{#10000},5,17,5,18"
 locations_default(#20111,#10000,5,17,5,18)
 hasLocation(#20110,#20111)
-stmtContainers(#20110,#20001)
+stmt_containers(#20110,#20001)
 #20112=*
 stmts(#20112,1,#20102,-1,"{}")
 #20113=@"loc,{#10000},5,28,5,29"
 locations_default(#20113,#10000,5,28,5,29)
 hasLocation(#20112,#20113)
-stmtContainers(#20112,#20001)
+stmt_containers(#20112,#20001)
 #20114=*
 entry_cfg_node(#20114,#20001)
 #20115=@"loc,{#10000},1,1,1,0"