renamed "exprContainers" to "expr_containers"

2026-05-05 13:45:19 +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/stmts/output/trap/conditionals.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
@@ -240,7 +240,7 @@ stmt_containers(#20083,#20001)
 exprs(#20085,2,#20083,0,"true")
 hasLocation(#20085,#20031)
 enclosing_stmt(#20085,#20083)
-exprContainers(#20085,#20001)
+expr_containers(#20085,#20001)
 literals("true","true",#20085)
 #20086=*
 stmts(#20086,0,#20083,1,";")
@@ -256,7 +256,7 @@ stmt_containers(#20087,#20001)
 exprs(#20089,79,#20087,0,"b")
 hasLocation(#20089,#20041)
 enclosing_stmt(#20089,#20087)
-exprContainers(#20089,#20001)
+expr_containers(#20089,#20001)
 literals("b","b",#20089)
 #20090=@"var;{b};{#20000}"
 variables(#20090,"b",#20000)
@@ -279,7 +279,7 @@ stmt_containers(#20093,#20001)
 exprs(#20095,79,#20093,-1,"b")
 hasLocation(#20095,#20054)
 enclosing_stmt(#20095,#20093)
-exprContainers(#20095,#20001)
+expr_containers(#20095,#20001)
 literals("b","b",#20095)
 bind(#20095,#20090)
 #20096=*
@@ -290,7 +290,7 @@ stmt_containers(#20096,#20001)
 exprs(#20097,3,#20096,-1,"23")
 hasLocation(#20097,#20062)
 enclosing_stmt(#20097,#20096)
-exprContainers(#20097,#20001)
+expr_containers(#20097,#20001)
 literals("23","23",#20097)
 #20098=*
 stmts(#20098,19,#20093,1,"case c:\n    break;")
@@ -302,7 +302,7 @@ stmt_containers(#20098,#20001)
 exprs(#20100,79,#20098,-1,"c")
 hasLocation(#20100,#20068)
 enclosing_stmt(#20100,#20098)
-exprContainers(#20100,#20001)
+expr_containers(#20100,#20001)
 literals("c","c",#20100)
 #20101=@"var;{c};{#20000}"
 variables(#20101,"c",#20000)
--- a/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
@@ -164,7 +164,7 @@ stmt_containers(#20059,#20001)
 exprs(#20060,79,#20059,1,"b")
 hasLocation(#20060,#20021)
 enclosing_stmt(#20060,#20059)
-exprContainers(#20060,#20001)
+expr_containers(#20060,#20001)
 literals("b","b",#20060)
 #20061=@"var;{b};{#20000}"
 variables(#20061,"b",#20000)
@@ -173,7 +173,7 @@ bind(#20060,#20061)
 exprs(#20062,79,#20059,0,"a")
 hasLocation(#20062,#20013)
 enclosing_stmt(#20062,#20059)
-exprContainers(#20062,#20001)
+expr_containers(#20062,#20001)
 literals("a","a",#20062)
 #20063=@"var;{a};{#20000}"
 variables(#20063,"a",#20000)
@@ -182,7 +182,7 @@ bind(#20062,#20063)
 exprs(#20064,3,#20059,-1,"1")
 hasLocation(#20064,#20017)
 enclosing_stmt(#20064,#20059)
-exprContainers(#20064,#20001)
+expr_containers(#20064,#20001)
 literals("1","1",#20064)
 #20065=*
 stmts(#20065,2,#20059,2,"f();")
@@ -196,12 +196,12 @@ exprs(#20067,13,#20065,0,"f()")
 locations_default(#20068,#10000,1,18,1,20)
 hasLocation(#20067,#20068)
 enclosing_stmt(#20067,#20065)
-exprContainers(#20067,#20001)
+expr_containers(#20067,#20001)
 #20069=*
 exprs(#20069,79,#20067,-1,"f")
 hasLocation(#20069,#20025)
 enclosing_stmt(#20069,#20065)
-exprContainers(#20069,#20001)
+expr_containers(#20069,#20001)
 literals("f","f",#20069)
 #20070=@"var;{f};{#20000}"
 variables(#20070,"f",#20000)
@@ -214,7 +214,7 @@ stmt_containers(#20071,#20001)
 exprs(#20072,79,#20071,1,"d")
 hasLocation(#20072,#20045)
 enclosing_stmt(#20072,#20071)
-exprContainers(#20072,#20001)
+expr_containers(#20072,#20001)
 literals("d","d",#20072)
 #20073=@"var;{d};{#20000}"
 variables(#20073,"d",#20000)
@@ -223,7 +223,7 @@ bind(#20072,#20073)
 exprs(#20074,79,#20071,0,"c")
 hasLocation(#20074,#20037)
 enclosing_stmt(#20074,#20071)
-exprContainers(#20074,#20001)
+expr_containers(#20074,#20001)
 literals("c","c",#20074)
 #20075=@"var;{c};{#20000}"
 variables(#20075,"c",#20000)
@@ -232,7 +232,7 @@ bind(#20074,#20075)
 exprs(#20076,3,#20071,-1,"0")
 hasLocation(#20076,#20041)
 enclosing_stmt(#20076,#20071)
-exprContainers(#20076,#20001)
+expr_containers(#20076,#20001)
 literals("0","0",#20076)
 #20077=*
 stmts(#20077,2,#20071,2,"g();")
@@ -246,12 +246,12 @@ exprs(#20079,13,#20077,0,"g()")
 locations_default(#20080,#10000,3,18,3,20)
 hasLocation(#20079,#20080)
 enclosing_stmt(#20079,#20077)
-exprContainers(#20079,#20001)
+expr_containers(#20079,#20001)
 #20081=*
 exprs(#20081,79,#20079,-1,"g")
 hasLocation(#20081,#20049)
 enclosing_stmt(#20081,#20077)
-exprContainers(#20081,#20001)
+expr_containers(#20081,#20001)
 literals("g","g",#20081)
 #20082=@"var;{g};{#20000}"
 variables(#20082,"g",#20000)
--- a/javascript/extractor/tests/stmts/output/trap/functions.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/functions.js.trap
@@ -318,7 +318,7 @@ stmt_containers(#20115,#20001)
 #20117=*
 exprs(#20117,78,#20115,-1,"g")
 hasLocation(#20117,#20031)
-exprContainers(#20117,#20115)
+expr_containers(#20117,#20115)
 literals("g","g",#20117)
 decl(#20117,#20113)
 #20118=*
@@ -330,7 +330,7 @@ variables(#20119,"x",#20118)
 #20120=*
 exprs(#20120,78,#20115,0,"x")
 hasLocation(#20120,#20035)
-exprContainers(#20120,#20115)
+expr_containers(#20120,#20115)
 literals("x","x",#20120)
 decl(#20120,#20119)
 #20121=@"var;{y};{#20118}"
@@ -338,7 +338,7 @@ variables(#20121,"y",#20118)
 #20122=*
 exprs(#20122,78,#20115,1,"y")
 hasLocation(#20122,#20039)
-exprContainers(#20122,#20115)
+expr_containers(#20122,#20115)
 literals("y","y",#20122)
 decl(#20122,#20121)
 #20123=@"var;{arguments};{#20118}"
@@ -362,19 +362,19 @@ exprs(#20128,34,#20126,0,"x+y")
 locations_default(#20129,#10000,2,12,2,14)
 hasLocation(#20128,#20129)
 enclosing_stmt(#20128,#20126)
-exprContainers(#20128,#20115)
+expr_containers(#20128,#20115)
 #20130=*
 exprs(#20130,79,#20128,0,"x")
 hasLocation(#20130,#20047)
 enclosing_stmt(#20130,#20126)
-exprContainers(#20130,#20115)
+expr_containers(#20130,#20115)
 literals("x","x",#20130)
 bind(#20130,#20119)
 #20131=*
 exprs(#20131,79,#20128,1,"y")
 hasLocation(#20131,#20051)
 enclosing_stmt(#20131,#20126)
-exprContainers(#20131,#20115)
+expr_containers(#20131,#20115)
 literals("y","y",#20131)
 bind(#20131,#20121)
 #20132=*
@@ -384,7 +384,7 @@ stmt_containers(#20132,#20001)
 #20133=*
 exprs(#20133,78,#20132,-1,"h")
 hasLocation(#20133,#20058)
-exprContainers(#20133,#20132)
+expr_containers(#20133,#20132)
 literals("h","h",#20133)
 decl(#20133,#20114)
 #20134=*
@@ -410,12 +410,12 @@ stmt_containers(#20138,#20001)
 exprs(#20140,47,#20138,0,"k = fun ... turn;\n}")
 hasLocation(#20140,#20139)
 enclosing_stmt(#20140,#20138)
-exprContainers(#20140,#20001)
+expr_containers(#20140,#20001)
 #20141=*
 exprs(#20141,79,#20140,0,"k")
 hasLocation(#20141,#20068)
 enclosing_stmt(#20141,#20138)
-exprContainers(#20141,#20001)
+expr_containers(#20141,#20001)
 literals("k","k",#20141)
 #20142=@"var;{k};{#20000}"
 variables(#20142,"k",#20000)
@@ -426,7 +426,7 @@ exprs(#20143,9,#20140,1,"functio ... turn;\n}")
 locations_default(#20144,#10000,7,5,9,1)
 hasLocation(#20143,#20144)
 enclosing_stmt(#20143,#20138)
-exprContainers(#20143,#20001)
+expr_containers(#20143,#20001)
 #20145=*
 scopes(#20145,1)
 scopenodes(#20143,#20145)
@@ -454,12 +454,12 @@ stmt_containers(#20151,#20001)
 exprs(#20152,47,#20151,0,"l = function f() {}")
 hasLocation(#20152,#20023)
 enclosing_stmt(#20152,#20151)
-exprContainers(#20152,#20001)
+expr_containers(#20152,#20001)
 #20153=*
 exprs(#20153,79,#20152,0,"l")
 hasLocation(#20153,#20085)
 enclosing_stmt(#20153,#20151)
-exprContainers(#20153,#20001)
+expr_containers(#20153,#20001)
 literals("l","l",#20153)
 #20154=@"var;{l};{#20000}"
 variables(#20154,"l",#20000)
@@ -470,7 +470,7 @@ exprs(#20155,9,#20152,1,"function f() {}")
 locations_default(#20156,#10000,11,5,11,19)
 hasLocation(#20155,#20156)
 enclosing_stmt(#20155,#20151)
-exprContainers(#20155,#20001)
+expr_containers(#20155,#20001)
 #20157=*
 scopes(#20157,1)
 scopenodes(#20155,#20157)
@@ -480,7 +480,7 @@ variables(#20158,"f",#20157)
 #20159=*
 exprs(#20159,78,#20155,-1,"f")
 hasLocation(#20159,#20091)
-exprContainers(#20159,#20155)
+expr_containers(#20159,#20155)
 literals("f","f",#20159)
 decl(#20159,#20158)
 #20160=@"var;{arguments};{#20157}"
@@ -500,7 +500,7 @@ stmt_containers(#20163,#20001)
 exprs(#20164,9,#20163,0,"function() {}")
 hasLocation(#20164,#20027)
 enclosing_stmt(#20164,#20163)
-exprContainers(#20164,#20001)
+expr_containers(#20164,#20001)
 #20165=*
 scopes(#20165,1)
 scopenodes(#20164,#20165)
--- a/javascript/extractor/tests/stmts/output/trap/loops.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/loops.js.trap
@@ -628,7 +628,7 @@ stmt_containers(#20233,#20001)
 exprs(#20235,2,#20233,0,"true")
 hasLocation(#20235,#20049)
 enclosing_stmt(#20235,#20233)
-exprContainers(#20235,#20001)
+expr_containers(#20235,#20001)
 literals("true","true",#20235)
 #20236=*
 stmts(#20236,0,#20233,1,";")
@@ -644,7 +644,7 @@ stmt_containers(#20237,#20001)
 exprs(#20239,0,#20237,0,"outer")
 hasLocation(#20239,#20055)
 enclosing_stmt(#20239,#20237)
-exprContainers(#20239,#20001)
+expr_containers(#20239,#20001)
 literals("outer","outer",#20239)
 #20240=*
 stmts(#20240,14,#20237,1,"for(a;  ... inue;\n}")
@@ -656,7 +656,7 @@ stmt_containers(#20240,#20001)
 exprs(#20242,79,#20240,1,"b")
 hasLocation(#20242,#20067)
 enclosing_stmt(#20242,#20240)
-exprContainers(#20242,#20001)
+expr_containers(#20242,#20001)
 literals("b","b",#20242)
 #20243=@"var;{b};{#20000}"
 variables(#20243,"b",#20000)
@@ -665,7 +665,7 @@ bind(#20242,#20243)
 exprs(#20244,79,#20240,2,"c")
 hasLocation(#20244,#20071)
 enclosing_stmt(#20244,#20240)
-exprContainers(#20244,#20001)
+expr_containers(#20244,#20001)
 literals("c","c",#20244)
 #20245=@"var;{c};{#20000}"
 variables(#20245,"c",#20000)
@@ -674,7 +674,7 @@ bind(#20244,#20245)
 exprs(#20246,79,#20240,0,"a")
 hasLocation(#20246,#20063)
 enclosing_stmt(#20246,#20240)
-exprContainers(#20246,#20001)
+expr_containers(#20246,#20001)
 literals("a","a",#20246)
 #20247=@"var;{a};{#20000}"
 variables(#20247,"a",#20000)
@@ -701,7 +701,7 @@ stmt_containers(#20252,#20001)
 exprs(#20254,79,#20252,0,"d")
 hasLocation(#20254,#20091)
 enclosing_stmt(#20254,#20252)
-exprContainers(#20254,#20001)
+expr_containers(#20254,#20001)
 literals("d","d",#20254)
 #20255=@"var;{d};{#20000}"
 variables(#20255,"d",#20000)
@@ -716,7 +716,7 @@ stmt_containers(#20256,#20001)
 exprs(#20258,0,#20256,0,"outer")
 hasLocation(#20258,#20097)
 enclosing_stmt(#20258,#20256)
-exprContainers(#20258,#20001)
+expr_containers(#20258,#20001)
 literals("outer","outer",#20258)
 jump_targets(#20256,#20237)
 #20259=*
@@ -729,7 +729,7 @@ stmt_containers(#20259,#20001)
 exprs(#20261,79,#20259,0,"e")
 hasLocation(#20261,#20107)
 enclosing_stmt(#20261,#20259)
-exprContainers(#20261,#20001)
+expr_containers(#20261,#20001)
 literals("e","e",#20261)
 #20262=@"var;{e};{#20000}"
 variables(#20262,"e",#20000)
@@ -744,7 +744,7 @@ stmt_containers(#20263,#20001)
 exprs(#20265,0,#20263,0,"outer")
 hasLocation(#20265,#20113)
 enclosing_stmt(#20265,#20263)
-exprContainers(#20265,#20001)
+expr_containers(#20265,#20001)
 literals("outer","outer",#20265)
 jump_targets(#20263,#20237)
 #20266=*
@@ -764,7 +764,7 @@ stmt_containers(#20268,#20001)
 exprs(#20270,79,#20268,1,"a")
 hasLocation(#20270,#20136)
 enclosing_stmt(#20270,#20268)
-exprContainers(#20270,#20001)
+expr_containers(#20270,#20001)
 literals("a","a",#20270)
 bind(#20270,#20247)
 #20271=*
@@ -787,19 +787,19 @@ exprs(#20275,27,#20274,1,"i<n")
 locations_default(#20276,#10000,17,20,17,22)
 hasLocation(#20275,#20276)
 enclosing_stmt(#20275,#20274)
-exprContainers(#20275,#20001)
+expr_containers(#20275,#20001)
 #20277=*
 exprs(#20277,79,#20275,0,"i")
 hasLocation(#20277,#20164)
 enclosing_stmt(#20277,#20274)
-exprContainers(#20277,#20001)
+expr_containers(#20277,#20001)
 literals("i","i",#20277)
 bind(#20277,#20230)
 #20278=*
 exprs(#20278,79,#20275,1,"n")
 hasLocation(#20278,#20168)
 enclosing_stmt(#20278,#20274)
-exprContainers(#20278,#20001)
+expr_containers(#20278,#20001)
 literals("n","n",#20278)
 bind(#20278,#20231)
 #20279=*
@@ -808,12 +808,12 @@ exprs(#20279,59,#20274,2,"++i")
 locations_default(#20280,#10000,17,25,17,27)
 hasLocation(#20279,#20280)
 enclosing_stmt(#20279,#20274)
-exprContainers(#20279,#20001)
+expr_containers(#20279,#20001)
 #20281=*
 exprs(#20281,79,#20279,0,"i")
 hasLocation(#20281,#20174)
 enclosing_stmt(#20281,#20274)
-exprContainers(#20281,#20001)
+expr_containers(#20281,#20001)
 literals("i","i",#20281)
 bind(#20281,#20230)
 #20282=*
@@ -828,19 +828,19 @@ exprs(#20284,64,#20282,0,"i=0")
 locations_default(#20285,#10000,17,10,17,12)
 hasLocation(#20284,#20285)
 enclosing_stmt(#20284,#20282)
-exprContainers(#20284,#20001)
+expr_containers(#20284,#20001)
 #20286=*
 exprs(#20286,78,#20284,0,"i")
 hasLocation(#20286,#20148)
 enclosing_stmt(#20286,#20282)
-exprContainers(#20286,#20001)
+expr_containers(#20286,#20001)
 literals("i","i",#20286)
 decl(#20286,#20230)
 #20287=*
 exprs(#20287,3,#20284,1,"0")
 hasLocation(#20287,#20152)
 enclosing_stmt(#20287,#20282)
-exprContainers(#20287,#20001)
+expr_containers(#20287,#20001)
 literals("0","0",#20287)
 #20288=*
 exprs(#20288,64,#20282,1,"n=10")
@@ -848,19 +848,19 @@ exprs(#20288,64,#20282,1,"n=10")
 locations_default(#20289,#10000,17,14,17,17)
 hasLocation(#20288,#20289)
 enclosing_stmt(#20288,#20282)
-exprContainers(#20288,#20001)
+expr_containers(#20288,#20001)
 #20290=*
 exprs(#20290,78,#20288,0,"n")
 hasLocation(#20290,#20156)
 enclosing_stmt(#20290,#20282)
-exprContainers(#20290,#20001)
+expr_containers(#20290,#20001)
 literals("n","n",#20290)
 decl(#20290,#20231)
 #20291=*
 exprs(#20291,3,#20288,1,"10")
 hasLocation(#20291,#20160)
 enclosing_stmt(#20291,#20282)
-exprContainers(#20291,#20001)
+expr_containers(#20291,#20001)
 literals("10","10",#20291)
 #20292=*
 stmts(#20292,0,#20274,3,";")
@@ -874,7 +874,7 @@ stmt_containers(#20293,#20001)
 exprs(#20294,79,#20293,1,"xs")
 hasLocation(#20294,#20190)
 enclosing_stmt(#20294,#20293)
-exprContainers(#20294,#20001)
+expr_containers(#20294,#20001)
 literals("xs","xs",#20294)
 #20295=@"var;{xs};{#20000}"
 variables(#20295,"xs",#20000)
@@ -889,12 +889,12 @@ stmt_containers(#20296,#20001)
 exprs(#20298,64,#20296,0,"x")
 hasLocation(#20298,#20186)
 enclosing_stmt(#20298,#20296)
-exprContainers(#20298,#20001)
+expr_containers(#20298,#20001)
 #20299=*
 exprs(#20299,78,#20298,0,"x")
 hasLocation(#20299,#20186)
 enclosing_stmt(#20299,#20296)
-exprContainers(#20299,#20001)
+expr_containers(#20299,#20001)
 literals("x","x",#20299)
 decl(#20299,#20232)
 #20300=*
@@ -909,14 +909,14 @@ stmt_containers(#20301,#20001)
 exprs(#20302,79,#20301,1,"xs")
 hasLocation(#20302,#20204)
 enclosing_stmt(#20302,#20301)
-exprContainers(#20302,#20001)
+expr_containers(#20302,#20001)
 literals("xs","xs",#20302)
 bind(#20302,#20295)
 #20303=*
 exprs(#20303,79,#20301,0,"x")
 hasLocation(#20303,#20200)
 enclosing_stmt(#20303,#20301)
-exprContainers(#20303,#20001)
+expr_containers(#20303,#20001)
 literals("x","x",#20303)
 bind(#20303,#20232)
 #20304=*
@@ -931,7 +931,7 @@ stmt_containers(#20305,#20001)
 exprs(#20306,79,#20305,1,"xs")
 hasLocation(#20306,#20222)
 enclosing_stmt(#20306,#20305)
-exprContainers(#20306,#20001)
+expr_containers(#20306,#20001)
 literals("xs","xs",#20306)
 bind(#20306,#20295)
 #20307=*
@@ -940,19 +940,19 @@ exprs(#20307,14,#20305,0,"x.f")
 locations_default(#20308,#10000,21,6,21,8)
 hasLocation(#20307,#20308)
 enclosing_stmt(#20307,#20305)
-exprContainers(#20307,#20001)
+expr_containers(#20307,#20001)
 #20309=*
 exprs(#20309,79,#20307,0,"x")
 hasLocation(#20309,#20214)
 enclosing_stmt(#20309,#20305)
-exprContainers(#20309,#20001)
+expr_containers(#20309,#20001)
 literals("x","x",#20309)
 bind(#20309,#20232)
 #20310=*
 exprs(#20310,0,#20307,1,"f")
 hasLocation(#20310,#20218)
 enclosing_stmt(#20310,#20305)
-exprContainers(#20310,#20001)
+expr_containers(#20310,#20001)
 literals("f","f",#20310)
 #20311=*
 stmts(#20311,0,#20305,2,";")
--- a/javascript/extractor/tests/stmts/output/trap/others.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/others.js.trap
@@ -129,7 +129,7 @@ stmt_containers(#20044,#20001)
 exprs(#20046,79,#20044,0,"a")
 hasLocation(#20046,#20015)
 enclosing_stmt(#20046,#20044)
-exprContainers(#20046,#20001)
+expr_containers(#20046,#20001)
 literals("a","a",#20046)
 #20047=@"var;{a};{#20000}"
 variables(#20047,"a",#20000)
@@ -154,30 +154,30 @@ exprs(#20052,64,#20051,0,"x = 23")
 locations_default(#20053,#10000,4,5,4,10)
 hasLocation(#20052,#20053)
 enclosing_stmt(#20052,#20051)
-exprContainers(#20052,#20001)
+expr_containers(#20052,#20001)
 #20054=*
 exprs(#20054,78,#20052,0,"x")
 hasLocation(#20054,#20028)
 enclosing_stmt(#20054,#20051)
-exprContainers(#20054,#20001)
+expr_containers(#20054,#20001)
 literals("x","x",#20054)
 decl(#20054,#20042)
 #20055=*
 exprs(#20055,3,#20052,1,"23")
 hasLocation(#20055,#20032)
 enclosing_stmt(#20055,#20051)
-exprContainers(#20055,#20001)
+expr_containers(#20055,#20001)
 literals("23","23",#20055)
 #20056=*
 exprs(#20056,64,#20051,1,"y")
 hasLocation(#20056,#20036)
 enclosing_stmt(#20056,#20051)
-exprContainers(#20056,#20001)
+expr_containers(#20056,#20001)
 #20057=*
 exprs(#20057,78,#20056,0,"y")
 hasLocation(#20057,#20036)
 enclosing_stmt(#20057,#20051)
-exprContainers(#20057,#20001)
+expr_containers(#20057,#20001)
 literals("y","y",#20057)
 decl(#20057,#20043)
 #20058=*
--- a/javascript/extractor/tests/stmts/output/trap/switch.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/switch.js.trap
@@ -369,7 +369,7 @@ stmt_containers(#20130,#20001)
 exprs(#20132,79,#20130,-1,"x")
 hasLocation(#20132,#20041)
 enclosing_stmt(#20132,#20130)
-exprContainers(#20132,#20001)
+expr_containers(#20132,#20001)
 literals("x","x",#20132)
 #20133=@"var;{x};{#20000}"
 variables(#20133,"x",#20000)
@@ -397,7 +397,7 @@ stmt_containers(#20138,#20001)
 exprs(#20140,3,#20138,-1,"23")
 hasLocation(#20140,#20057)
 enclosing_stmt(#20140,#20138)
-exprContainers(#20140,#20001)
+expr_containers(#20140,#20001)
 literals("23","23",#20140)
 #20141=*
 stmts(#20141,2,#20138,0,"x += 19;")
@@ -411,19 +411,19 @@ exprs(#20143,48,#20141,0,"x += 19")
 locations_default(#20144,#10000,5,5,5,11)
 hasLocation(#20143,#20144)
 enclosing_stmt(#20143,#20141)
-exprContainers(#20143,#20001)
+expr_containers(#20143,#20001)
 #20145=*
 exprs(#20145,79,#20143,0,"x")
 hasLocation(#20145,#20061)
 enclosing_stmt(#20145,#20141)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 literals("x","x",#20145)
 bind(#20145,#20133)
 #20146=*
 exprs(#20146,3,#20143,1,"19")
 hasLocation(#20146,#20065)
 enclosing_stmt(#20146,#20141)
-exprContainers(#20146,#20001)
+expr_containers(#20146,#20001)
 literals("19","19",#20146)
 #20147=*
 stmts(#20147,17,#20001,1,"functio ...     }\n}")
@@ -434,7 +434,7 @@ stmt_containers(#20147,#20001)
 #20149=*
 exprs(#20149,78,#20147,-1,"f")
 hasLocation(#20149,#20072)
-exprContainers(#20149,#20147)
+expr_containers(#20149,#20147)
 literals("f","f",#20149)
 decl(#20149,#20129)
 #20150=*
@@ -460,7 +460,7 @@ stmt_containers(#20154,#20147)
 exprs(#20156,79,#20154,-1,"x")
 hasLocation(#20156,#20084)
 enclosing_stmt(#20156,#20154)
-exprContainers(#20156,#20147)
+expr_containers(#20156,#20147)
 literals("x","x",#20156)
 bind(#20156,#20133)
 #20157=*
@@ -473,7 +473,7 @@ stmt_containers(#20157,#20147)
 exprs(#20159,3,#20157,-1,"0")
 hasLocation(#20159,#20092)
 enclosing_stmt(#20159,#20157)
-exprContainers(#20159,#20147)
+expr_containers(#20159,#20147)
 literals("0","0",#20159)
 #20160=*
 stmts(#20160,9,#20157,0,"return 23;")
@@ -485,7 +485,7 @@ stmt_containers(#20160,#20147)
 exprs(#20162,3,#20160,0,"23")
 hasLocation(#20162,#20098)
 enclosing_stmt(#20162,#20160)
-exprContainers(#20162,#20147)
+expr_containers(#20162,#20147)
 literals("23","23",#20162)
 #20163=*
 stmts(#20163,19,#20154,1,"default ... urn 42;")
@@ -503,7 +503,7 @@ stmt_containers(#20165,#20147)
 exprs(#20167,3,#20165,0,"42")
 hasLocation(#20167,#20108)
 enclosing_stmt(#20167,#20165)
-exprContainers(#20167,#20147)
+expr_containers(#20167,#20147)
 literals("42","42",#20167)
 #20168=*
 stmts(#20168,19,#20154,2,"case 1: ... urn 56;")
@@ -515,7 +515,7 @@ stmt_containers(#20168,#20147)
 exprs(#20170,3,#20168,-1,"1")
 hasLocation(#20170,#20114)
 enclosing_stmt(#20170,#20168)
-exprContainers(#20170,#20147)
+expr_containers(#20170,#20147)
 literals("1","1",#20170)
 #20171=*
 stmts(#20171,9,#20168,0,"return 56;")
@@ -527,7 +527,7 @@ stmt_containers(#20171,#20147)
 exprs(#20173,3,#20171,0,"56")
 hasLocation(#20173,#20120)
 enclosing_stmt(#20173,#20171)
-exprContainers(#20173,#20147)
+expr_containers(#20173,#20147)
 literals("56","56",#20173)
 #20174=*
 entry_cfg_node(#20174,#20001)
--- a/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
@@ -219,7 +219,7 @@ stmt_containers(#20075,#20001)
 #20077=*
 exprs(#20077,78,#20075,-1,"f")
 hasLocation(#20077,#20023)
-exprContainers(#20077,#20075)
+expr_containers(#20077,#20075)
 literals("f","f",#20077)
 decl(#20077,#20074)
 #20078=*
@@ -245,7 +245,7 @@ stmt_containers(#20082,#20075)
 exprs(#20084,79,#20082,-1,"x")
 hasLocation(#20084,#20035)
 enclosing_stmt(#20084,#20082)
-exprContainers(#20084,#20075)
+expr_containers(#20084,#20075)
 literals("x","x",#20084)
 #20085=@"var;{x};{#20000}"
 variables(#20085,"x",#20000)
@@ -260,7 +260,7 @@ stmt_containers(#20086,#20075)
 exprs(#20088,3,#20086,-1,"0")
 hasLocation(#20088,#20043)
 enclosing_stmt(#20088,#20086)
-exprContainers(#20088,#20075)
+expr_containers(#20088,#20075)
 literals("0","0",#20088)
 #20089=*
 stmts(#20089,19,#20082,1,"default ... urn 42;")
@@ -278,7 +278,7 @@ stmt_containers(#20091,#20075)
 exprs(#20093,3,#20091,0,"42")
 hasLocation(#20093,#20053)
 enclosing_stmt(#20093,#20091)
-exprContainers(#20093,#20075)
+expr_containers(#20093,#20075)
 literals("42","42",#20093)
 #20094=*
 stmts(#20094,19,#20082,2,"case 1: ... urn 56;")
@@ -290,7 +290,7 @@ stmt_containers(#20094,#20075)
 exprs(#20096,3,#20094,-1,"1")
 hasLocation(#20096,#20059)
 enclosing_stmt(#20096,#20094)
-exprContainers(#20096,#20075)
+expr_containers(#20096,#20075)
 literals("1","1",#20096)
 #20097=*
 stmts(#20097,9,#20094,0,"return 56;")
@@ -302,7 +302,7 @@ stmt_containers(#20097,#20075)
 exprs(#20099,3,#20097,0,"56")
 hasLocation(#20099,#20065)
 enclosing_stmt(#20099,#20097)
-exprContainers(#20099,#20075)
+expr_containers(#20099,#20075)
 literals("56","56",#20099)
 #20100=*
 entry_cfg_node(#20100,#20001)
--- a/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
@@ -63,7 +63,7 @@ stmt_containers(#20019,#20001)
 exprs(#20020,79,#20019,-1,"x")
 hasLocation(#20020,#20009)
 enclosing_stmt(#20020,#20019)
-exprContainers(#20020,#20001)
+expr_containers(#20020,#20001)
 literals("x","x",#20020)
 #20021=@"var;{x};{#20000}"
 variables(#20021,"x",#20000)
--- a/javascript/extractor/tests/stmts/output/trap/try.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/try.js.trap
@@ -231,7 +231,7 @@ stmt_containers(#20083,#20001)
 exprs(#20085,4,#20083,0,"""!""")
 hasLocation(#20085,#20019)
 enclosing_stmt(#20085,#20083)
-exprContainers(#20085,#20001)
+expr_containers(#20085,#20001)
 literals("!","""!""",#20085)
 #20086=*
 regexpterm(#20086,14,#20085,0,"!")
@@ -255,7 +255,7 @@ variables(#20091,"x",#20090)
 exprs(#20092,78,#20088,0,"x")
 hasLocation(#20092,#20029)
 enclosing_stmt(#20092,#20088)
-exprContainers(#20092,#20001)
+expr_containers(#20092,#20001)
 literals("x","x",#20092)
 decl(#20092,#20091)
 #20093=*
@@ -314,7 +314,7 @@ variables(#20108,"x",#20107)
 exprs(#20109,78,#20105,0,"x")
 hasLocation(#20109,#20063)
 enclosing_stmt(#20109,#20105)
-exprContainers(#20109,#20001)
+expr_containers(#20109,#20001)
 literals("x","x",#20109)
 decl(#20109,#20108)
 #20110=*