renamed "exprContainers" to "expr_containers"

2026-05-03 04:39:29 +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/esnext/output/trap/async-generators.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
@@ -195,7 +195,7 @@ stmt_containers(#20069,#20001)
 #20071=*
 exprs(#20071,78,#20069,-1,"foo")
 hasLocation(#20071,#20021)
-exprContainers(#20071,#20069)
+expr_containers(#20071,#20069)
 literals("foo","foo",#20071)
 decl(#20071,#20067)
 #20072=*
@@ -222,7 +222,7 @@ stmt_containers(#20076,#20001)
 #20078=*
 exprs(#20078,78,#20076,-1,"bar")
 hasLocation(#20078,#20034)
-exprContainers(#20078,#20076)
+expr_containers(#20078,#20076)
 literals("bar","bar",#20078)
 decl(#20078,#20068)
 #20079=*
@@ -253,12 +253,12 @@ exprs(#20086,13,#20084,1,"foo()")
 locations_default(#20087,#10000,5,22,5,26)
 hasLocation(#20086,#20087)
 enclosing_stmt(#20086,#20084)
-exprContainers(#20086,#20076)
+expr_containers(#20086,#20076)
 #20088=*
 exprs(#20088,79,#20086,-1,"foo")
 hasLocation(#20088,#20054)
 enclosing_stmt(#20088,#20084)
-exprContainers(#20088,#20076)
+expr_containers(#20088,#20076)
 literals("foo","foo",#20088)
 bind(#20088,#20067)
 #20089=*
@@ -271,12 +271,12 @@ stmt_containers(#20089,#20076)
 exprs(#20091,64,#20089,0,"x")
 hasLocation(#20091,#20050)
 enclosing_stmt(#20091,#20089)
-exprContainers(#20091,#20076)
+expr_containers(#20091,#20076)
 #20092=*
 exprs(#20092,78,#20091,0,"x")
 hasLocation(#20092,#20050)
 enclosing_stmt(#20092,#20089)
-exprContainers(#20092,#20076)
+expr_containers(#20092,#20076)
 literals("x","x",#20092)
 decl(#20092,#20080)
 #20093=*
--- a/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
@@ -380,7 +380,7 @@ variables(#20141,"e",#20140)
 exprs(#20142,78,#20139,0,"e")
 hasLocation(#20142,#20033)
 enclosing_stmt(#20142,#20139)
-exprContainers(#20142,#20001)
+expr_containers(#20142,#20001)
 literals("e","e",#20142)
 decl(#20142,#20141)
 #20143=*
@@ -389,19 +389,19 @@ exprs(#20143,43,#20139,2,"e insta ... peError")
 locations_default(#20144,#10000,2,13,2,34)
 hasLocation(#20143,#20144)
 enclosing_stmt(#20143,#20139)
-exprContainers(#20143,#20001)
+expr_containers(#20143,#20001)
 #20145=*
 exprs(#20145,79,#20143,0,"e")
 hasLocation(#20145,#20037)
 enclosing_stmt(#20145,#20139)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 literals("e","e",#20145)
 bind(#20145,#20141)
 #20146=*
 exprs(#20146,79,#20143,1,"TypeError")
 hasLocation(#20146,#20041)
 enclosing_stmt(#20146,#20139)
-exprContainers(#20146,#20001)
+expr_containers(#20146,#20001)
 literals("TypeError","TypeError",#20146)
 #20147=@"var;{TypeError};{#20000}"
 variables(#20147,"TypeError",#20000)
@@ -426,7 +426,7 @@ variables(#20152,"e",#20151)
 exprs(#20153,78,#20150,0,"e")
 hasLocation(#20153,#20053)
 enclosing_stmt(#20153,#20150)
-exprContainers(#20153,#20001)
+expr_containers(#20153,#20001)
 literals("e","e",#20153)
 decl(#20153,#20152)
 #20154=*
@@ -435,19 +435,19 @@ exprs(#20154,43,#20150,2,"e instanceof Error")
 locations_default(#20155,#10000,3,13,3,30)
 hasLocation(#20154,#20155)
 enclosing_stmt(#20154,#20150)
-exprContainers(#20154,#20001)
+expr_containers(#20154,#20001)
 #20156=*
 exprs(#20156,79,#20154,0,"e")
 hasLocation(#20156,#20057)
 enclosing_stmt(#20156,#20150)
-exprContainers(#20156,#20001)
+expr_containers(#20156,#20001)
 literals("e","e",#20156)
 bind(#20156,#20152)
 #20157=*
 exprs(#20157,79,#20154,1,"Error")
 hasLocation(#20157,#20061)
 enclosing_stmt(#20157,#20150)
-exprContainers(#20157,#20001)
+expr_containers(#20157,#20001)
 literals("Error","Error",#20157)
 #20158=@"var;{Error};{#20000}"
 variables(#20158,"Error",#20000)
@@ -498,7 +498,7 @@ variables(#20171,"e",#20170)
 exprs(#20172,78,#20169,0,"e")
 hasLocation(#20172,#20085)
 enclosing_stmt(#20172,#20169)
-exprContainers(#20172,#20001)
+expr_containers(#20172,#20001)
 literals("e","e",#20172)
 decl(#20172,#20171)
 #20173=*
@@ -507,19 +507,19 @@ exprs(#20173,43,#20169,2,"e insta ... peError")
 locations_default(#20174,#10000,7,13,7,34)
 hasLocation(#20173,#20174)
 enclosing_stmt(#20173,#20169)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 #20175=*
 exprs(#20175,79,#20173,0,"e")
 hasLocation(#20175,#20089)
 enclosing_stmt(#20175,#20169)
-exprContainers(#20175,#20001)
+expr_containers(#20175,#20001)
 literals("e","e",#20175)
 bind(#20175,#20171)
 #20176=*
 exprs(#20176,79,#20173,1,"TypeError")
 hasLocation(#20176,#20093)
 enclosing_stmt(#20176,#20169)
-exprContainers(#20176,#20001)
+expr_containers(#20176,#20001)
 literals("TypeError","TypeError",#20176)
 bind(#20176,#20147)
 #20177=*
@@ -542,7 +542,7 @@ variables(#20181,"e",#20180)
 exprs(#20182,78,#20179,0,"e")
 hasLocation(#20182,#20105)
 enclosing_stmt(#20182,#20179)
-exprContainers(#20182,#20001)
+expr_containers(#20182,#20001)
 literals("e","e",#20182)
 decl(#20182,#20181)
 #20183=*
@@ -551,19 +551,19 @@ exprs(#20183,43,#20179,2,"e instanceof Error")
 locations_default(#20184,#10000,8,13,8,30)
 hasLocation(#20183,#20184)
 enclosing_stmt(#20183,#20179)
-exprContainers(#20183,#20001)
+expr_containers(#20183,#20001)
 #20185=*
 exprs(#20185,79,#20183,0,"e")
 hasLocation(#20185,#20109)
 enclosing_stmt(#20185,#20179)
-exprContainers(#20185,#20001)
+expr_containers(#20185,#20001)
 literals("e","e",#20185)
 bind(#20185,#20181)
 #20186=*
 exprs(#20186,79,#20183,1,"Error")
 hasLocation(#20186,#20113)
 enclosing_stmt(#20186,#20179)
-exprContainers(#20186,#20001)
+expr_containers(#20186,#20001)
 literals("Error","Error",#20186)
 bind(#20186,#20158)
 #20187=*
--- a/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
@@ -203,12 +203,12 @@ exprs(#20073,99,#20072,0,"import(""m"")")
 locations_default(#20074,#10000,1,1,1,11)
 hasLocation(#20073,#20074)
 enclosing_stmt(#20073,#20072)
-exprContainers(#20073,#20001)
+expr_containers(#20073,#20001)
 #20075=*
 exprs(#20075,4,#20073,0,"""m""")
 hasLocation(#20075,#20013)
 enclosing_stmt(#20075,#20072)
-exprContainers(#20075,#20001)
+expr_containers(#20075,#20001)
 literals("m","""m""",#20075)
 #20076=*
 regexpterm(#20076,14,#20075,0,"m")
@@ -226,12 +226,12 @@ exprs(#20079,11,#20078,0,"b ? import(""n"") : {}")
 locations_default(#20080,#10000,2,1,2,20)
 hasLocation(#20079,#20080)
 enclosing_stmt(#20079,#20078)
-exprContainers(#20079,#20001)
+expr_containers(#20079,#20001)
 #20081=*
 exprs(#20081,79,#20079,0,"b")
 hasLocation(#20081,#20019)
 enclosing_stmt(#20081,#20078)
-exprContainers(#20081,#20001)
+expr_containers(#20081,#20001)
 literals("b","b",#20081)
 #20082=@"var;{b};{#20000}"
 variables(#20082,"b",#20000)
@@ -242,12 +242,12 @@ exprs(#20083,99,#20079,1,"import(""n"")")
 locations_default(#20084,#10000,2,5,2,15)
 hasLocation(#20083,#20084)
 enclosing_stmt(#20083,#20078)
-exprContainers(#20083,#20001)
+expr_containers(#20083,#20001)
 #20085=*
 exprs(#20085,4,#20083,0,"""n""")
 hasLocation(#20085,#20027)
 enclosing_stmt(#20085,#20078)
-exprContainers(#20085,#20001)
+expr_containers(#20085,#20001)
 literals("n","""n""",#20085)
 #20086=*
 regexpterm(#20086,14,#20085,0,"n")
@@ -261,7 +261,7 @@ exprs(#20088,8,#20079,2,"{}")
 locations_default(#20089,#10000,2,19,2,20)
 hasLocation(#20088,#20089)
 enclosing_stmt(#20088,#20078)
-exprContainers(#20088,#20001)
+expr_containers(#20088,#20001)
 #20090=*
 stmts(#20090,2,#20001,2,"import( ... => {});")
 hasLocation(#20090,#20007)
@@ -272,26 +272,26 @@ exprs(#20091,13,#20090,0,"import( ...  => {})")
 locations_default(#20092,#10000,3,1,3,27)
 hasLocation(#20091,#20092)
 enclosing_stmt(#20091,#20090)
-exprContainers(#20091,#20001)
+expr_containers(#20091,#20001)
 #20093=*
 exprs(#20093,14,#20091,-1,"import(""o"").then")
 #20094=@"loc,{#10000},3,1,3,16"
 locations_default(#20094,#10000,3,1,3,16)
 hasLocation(#20093,#20094)
 enclosing_stmt(#20093,#20090)
-exprContainers(#20093,#20001)
+expr_containers(#20093,#20001)
 #20095=*
 exprs(#20095,99,#20093,0,"import(""o"")")
 #20096=@"loc,{#10000},3,1,3,11"
 locations_default(#20096,#10000,3,1,3,11)
 hasLocation(#20095,#20096)
 enclosing_stmt(#20095,#20090)
-exprContainers(#20095,#20001)
+expr_containers(#20095,#20001)
 #20097=*
 exprs(#20097,4,#20095,0,"""o""")
 hasLocation(#20097,#20043)
 enclosing_stmt(#20097,#20090)
-exprContainers(#20097,#20001)
+expr_containers(#20097,#20001)
 literals("o","""o""",#20097)
 #20098=*
 regexpterm(#20098,14,#20097,0,"o")
@@ -303,7 +303,7 @@ regexpConstValue(#20098,"o")
 exprs(#20100,0,#20093,1,"then")
 hasLocation(#20100,#20049)
 enclosing_stmt(#20100,#20090)
-exprContainers(#20100,#20001)
+expr_containers(#20100,#20001)
 literals("then","then",#20100)
 #20101=*
 exprs(#20101,65,#20091,0,"(o) => {}")
@@ -311,7 +311,7 @@ exprs(#20101,65,#20091,0,"(o) => {}")
 locations_default(#20102,#10000,3,18,3,26)
 hasLocation(#20101,#20102)
 enclosing_stmt(#20101,#20090)
-exprContainers(#20101,#20001)
+expr_containers(#20101,#20001)
 #20103=*
 scopes(#20103,1)
 scopenodes(#20101,#20103)
@@ -321,7 +321,7 @@ variables(#20104,"o",#20103)
 #20105=*
 exprs(#20105,78,#20101,0,"o")
 hasLocation(#20105,#20055)
-exprContainers(#20105,#20101)
+expr_containers(#20105,#20101)
 literals("o","o",#20105)
 decl(#20105,#20104)
 #20106=*
--- a/javascript/extractor/tests/esnext/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
@@ -244,7 +244,7 @@ stmt_containers(#20086,#20001)
 exprs(#20088,78,#20086,0,"A")
 hasLocation(#20088,#20027)
 enclosing_stmt(#20088,#20086)
-exprContainers(#20088,#20001)
+expr_containers(#20088,#20001)
 literals("A","A",#20088)
 decl(#20088,#20080)
 typedecl(#20088,#20083)
@@ -261,14 +261,14 @@ hasLocation(#20090,#20091)
 #20093=*
 exprs(#20093,0,#20090,0,"x")
 hasLocation(#20093,#20031)
-exprContainers(#20093,#20092)
+expr_containers(#20093,#20092)
 literals("x","x",#20093)
 #20094=*
 exprs(#20094,82,#20090,1,"new.target")
 #20095=@"loc,{#10000},2,7,2,16"
 locations_default(#20095,#10000,2,7,2,16)
 hasLocation(#20094,#20095)
-exprContainers(#20094,#20092)
+expr_containers(#20094,#20092)
 #20096=*
 properties(#20096,#20086,3,0,"constructor() {}")
 #20097=@"loc,{#10000},1,9,1,8"
@@ -278,12 +278,12 @@ hasLocation(#20096,#20097)
 exprs(#20098,0,#20096,0,"constructor")
 hasLocation(#20098,#20097)
 enclosing_stmt(#20098,#20086)
-exprContainers(#20098,#20001)
+expr_containers(#20098,#20001)
 literals("constructor","constructor",#20098)
 exprs(#20092,9,#20096,1,"() {}")
 hasLocation(#20092,#20097)
 enclosing_stmt(#20092,#20086)
-exprContainers(#20092,#20001)
+expr_containers(#20092,#20001)
 #20099=*
 scopes(#20099,1)
 scopenodes(#20092,#20099)
@@ -306,7 +306,7 @@ stmt_containers(#20102,#20001)
 exprs(#20104,78,#20102,0,"B")
 hasLocation(#20104,#20046)
 enclosing_stmt(#20104,#20102)
-exprContainers(#20104,#20001)
+expr_containers(#20104,#20001)
 literals("B","B",#20104)
 decl(#20104,#20081)
 typedecl(#20104,#20084)
@@ -318,7 +318,7 @@ scopenesting(#20105,#20000)
 exprs(#20106,79,#20102,1,"A")
 hasLocation(#20106,#20050)
 enclosing_stmt(#20106,#20102)
-exprContainers(#20106,#20001)
+expr_containers(#20106,#20001)
 literals("A","A",#20106)
 bind(#20106,#20080)
 #20107=*
@@ -330,22 +330,22 @@ hasLocation(#20107,#20108)
 #20110=*
 exprs(#20110,0,#20107,0,"y")
 hasLocation(#20110,#20054)
-exprContainers(#20110,#20109)
+expr_containers(#20110,#20109)
 literals("y","y",#20110)
 #20111=*
 exprs(#20111,14,#20107,1,"super.x")
 #20112=@"loc,{#10000},6,7,6,13"
 locations_default(#20112,#10000,6,7,6,13)
 hasLocation(#20111,#20112)
-exprContainers(#20111,#20109)
+expr_containers(#20111,#20109)
 #20113=*
 exprs(#20113,81,#20111,0,"super")
 hasLocation(#20113,#20058)
-exprContainers(#20113,#20109)
+expr_containers(#20113,#20109)
 #20114=*
 exprs(#20114,0,#20111,1,"x")
 hasLocation(#20114,#20062)
-exprContainers(#20114,#20109)
+expr_containers(#20114,#20109)
 literals("x","x",#20114)
 #20115=*
 properties(#20115,#20102,3,0,"constru ... rgs); }")
@@ -356,12 +356,12 @@ hasLocation(#20115,#20116)
 exprs(#20117,0,#20115,0,"constructor")
 hasLocation(#20117,#20116)
 enclosing_stmt(#20117,#20102)
-exprContainers(#20117,#20001)
+expr_containers(#20117,#20001)
 literals("constructor","constructor",#20117)
 exprs(#20109,9,#20115,1,"(...arg ... rgs); }")
 hasLocation(#20109,#20116)
 enclosing_stmt(#20109,#20102)
-exprContainers(#20109,#20001)
+expr_containers(#20109,#20001)
 #20118=*
 scopes(#20118,1)
 scopenodes(#20109,#20118)
@@ -371,7 +371,7 @@ variables(#20119,"args",#20118)
 #20120=*
 exprs(#20120,78,#20109,0,"args")
 hasLocation(#20120,#20116)
-exprContainers(#20120,#20109)
+expr_containers(#20120,#20109)
 literals("args","args",#20120)
 decl(#20120,#20119)
 #20121=@"var;{arguments};{#20118}"
@@ -390,22 +390,22 @@ stmt_containers(#20123,#20109)
 exprs(#20124,13,#20123,0,"super(...args)")
 hasLocation(#20124,#20116)
 enclosing_stmt(#20124,#20123)
-exprContainers(#20124,#20109)
+expr_containers(#20124,#20109)
 #20125=*
 exprs(#20125,81,#20124,-1,"super")
 hasLocation(#20125,#20116)
 enclosing_stmt(#20125,#20123)
-exprContainers(#20125,#20109)
+expr_containers(#20125,#20109)
 #20126=*
 exprs(#20126,66,#20124,0,"...args")
 hasLocation(#20126,#20116)
 enclosing_stmt(#20126,#20123)
-exprContainers(#20126,#20109)
+expr_containers(#20126,#20109)
 #20127=*
 exprs(#20127,79,#20126,0,"args")
 hasLocation(#20127,#20116)
 enclosing_stmt(#20127,#20123)
-exprContainers(#20127,#20109)
+expr_containers(#20127,#20109)
 literals("args","args",#20127)
 bind(#20127,#20119)
 isMethod(#20115)
@@ -419,7 +419,7 @@ stmt_containers(#20128,#20001)
 exprs(#20130,78,#20128,0,"C")
 hasLocation(#20130,#20069)
 enclosing_stmt(#20130,#20128)
-exprContainers(#20130,#20001)
+expr_containers(#20130,#20001)
 literals("C","C",#20130)
 decl(#20130,#20082)
 typedecl(#20130,#20085)
@@ -436,7 +436,7 @@ hasLocation(#20132,#20133)
 #20135=*
 exprs(#20135,0,#20132,0,"async")
 hasLocation(#20135,#20073)
-exprContainers(#20135,#20134)
+expr_containers(#20135,#20134)
 literals("async","async",#20135)
 #20136=*
 properties(#20136,#20128,3,0,"constructor() {}")
@@ -447,12 +447,12 @@ hasLocation(#20136,#20137)
 exprs(#20138,0,#20136,0,"constructor")
 hasLocation(#20138,#20137)
 enclosing_stmt(#20138,#20128)
-exprContainers(#20138,#20001)
+expr_containers(#20138,#20001)
 literals("constructor","constructor",#20138)
 exprs(#20134,9,#20136,1,"() {}")
 hasLocation(#20134,#20137)
 enclosing_stmt(#20134,#20128)
-exprContainers(#20134,#20001)
+expr_containers(#20134,#20001)
 #20139=*
 scopes(#20139,1)
 scopenodes(#20134,#20139)
--- a/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
@@ -210,12 +210,12 @@ exprs(#20076,107,#20075,0,"x1 ?? y1")
 locations_default(#20077,#10000,1,1,1,8)
 hasLocation(#20076,#20077)
 enclosing_stmt(#20076,#20075)
-exprContainers(#20076,#20001)
+expr_containers(#20076,#20001)
 #20078=*
 exprs(#20078,79,#20076,0,"x1")
 hasLocation(#20078,#20017)
 enclosing_stmt(#20078,#20075)
-exprContainers(#20078,#20001)
+expr_containers(#20078,#20001)
 literals("x1","x1",#20078)
 #20079=@"var;{x1};{#20000}"
 variables(#20079,"x1",#20000)
@@ -224,7 +224,7 @@ bind(#20078,#20079)
 exprs(#20080,79,#20076,1,"y1")
 hasLocation(#20080,#20021)
 enclosing_stmt(#20080,#20075)
-exprContainers(#20080,#20001)
+expr_containers(#20080,#20001)
 literals("y1","y1",#20080)
 #20081=@"var;{y1};{#20000}"
 variables(#20081,"y1",#20000)
@@ -239,19 +239,19 @@ exprs(#20083,107,#20082,0,"x2 || y2 ?? z2")
 locations_default(#20084,#10000,3,1,3,14)
 hasLocation(#20083,#20084)
 enclosing_stmt(#20083,#20082)
-exprContainers(#20083,#20001)
+expr_containers(#20083,#20001)
 #20085=*
 exprs(#20085,45,#20083,0,"x2 || y2")
 #20086=@"loc,{#10000},3,1,3,8"
 locations_default(#20086,#10000,3,1,3,8)
 hasLocation(#20085,#20086)
 enclosing_stmt(#20085,#20082)
-exprContainers(#20085,#20001)
+expr_containers(#20085,#20001)
 #20087=*
 exprs(#20087,79,#20085,0,"x2")
 hasLocation(#20087,#20025)
 enclosing_stmt(#20087,#20082)
-exprContainers(#20087,#20001)
+expr_containers(#20087,#20001)
 literals("x2","x2",#20087)
 #20088=@"var;{x2};{#20000}"
 variables(#20088,"x2",#20000)
@@ -260,7 +260,7 @@ bind(#20087,#20088)
 exprs(#20089,79,#20085,1,"y2")
 hasLocation(#20089,#20029)
 enclosing_stmt(#20089,#20082)
-exprContainers(#20089,#20001)
+expr_containers(#20089,#20001)
 literals("y2","y2",#20089)
 #20090=@"var;{y2};{#20000}"
 variables(#20090,"y2",#20000)
@@ -269,7 +269,7 @@ bind(#20089,#20090)
 exprs(#20091,79,#20083,1,"z2")
 hasLocation(#20091,#20033)
 enclosing_stmt(#20091,#20082)
-exprContainers(#20091,#20001)
+expr_containers(#20091,#20001)
 literals("z2","z2",#20091)
 #20092=@"var;{z2};{#20000}"
 variables(#20092,"z2",#20000)
@@ -284,19 +284,19 @@ exprs(#20094,45,#20093,0,"x3 ?? y3 || z3")
 locations_default(#20095,#10000,4,1,4,14)
 hasLocation(#20094,#20095)
 enclosing_stmt(#20094,#20093)
-exprContainers(#20094,#20001)
+expr_containers(#20094,#20001)
 #20096=*
 exprs(#20096,107,#20094,0,"x3 ?? y3")
 #20097=@"loc,{#10000},4,1,4,8"
 locations_default(#20097,#10000,4,1,4,8)
 hasLocation(#20096,#20097)
 enclosing_stmt(#20096,#20093)
-exprContainers(#20096,#20001)
+expr_containers(#20096,#20001)
 #20098=*
 exprs(#20098,79,#20096,0,"x3")
 hasLocation(#20098,#20037)
 enclosing_stmt(#20098,#20093)
-exprContainers(#20098,#20001)
+expr_containers(#20098,#20001)
 literals("x3","x3",#20098)
 #20099=@"var;{x3};{#20000}"
 variables(#20099,"x3",#20000)
@@ -305,7 +305,7 @@ bind(#20098,#20099)
 exprs(#20100,79,#20096,1,"y3")
 hasLocation(#20100,#20041)
 enclosing_stmt(#20100,#20093)
-exprContainers(#20100,#20001)
+expr_containers(#20100,#20001)
 literals("y3","y3",#20100)
 #20101=@"var;{y3};{#20000}"
 variables(#20101,"y3",#20000)
@@ -314,7 +314,7 @@ bind(#20100,#20101)
 exprs(#20102,79,#20094,1,"z3")
 hasLocation(#20102,#20045)
 enclosing_stmt(#20102,#20093)
-exprContainers(#20102,#20001)
+expr_containers(#20102,#20001)
 literals("z3","z3",#20102)
 #20103=@"var;{z3};{#20000}"
 variables(#20103,"z3",#20000)
@@ -329,19 +329,19 @@ exprs(#20105,107,#20104,0,"x4 && y4 ?? z4")
 locations_default(#20106,#10000,6,1,6,14)
 hasLocation(#20105,#20106)
 enclosing_stmt(#20105,#20104)
-exprContainers(#20105,#20001)
+expr_containers(#20105,#20001)
 #20107=*
 exprs(#20107,44,#20105,0,"x4 && y4")
 #20108=@"loc,{#10000},6,1,6,8"
 locations_default(#20108,#10000,6,1,6,8)
 hasLocation(#20107,#20108)
 enclosing_stmt(#20107,#20104)
-exprContainers(#20107,#20001)
+expr_containers(#20107,#20001)
 #20109=*
 exprs(#20109,79,#20107,0,"x4")
 hasLocation(#20109,#20049)
 enclosing_stmt(#20109,#20104)
-exprContainers(#20109,#20001)
+expr_containers(#20109,#20001)
 literals("x4","x4",#20109)
 #20110=@"var;{x4};{#20000}"
 variables(#20110,"x4",#20000)
@@ -350,7 +350,7 @@ bind(#20109,#20110)
 exprs(#20111,79,#20107,1,"y4")
 hasLocation(#20111,#20053)
 enclosing_stmt(#20111,#20104)
-exprContainers(#20111,#20001)
+expr_containers(#20111,#20001)
 literals("y4","y4",#20111)
 #20112=@"var;{y4};{#20000}"
 variables(#20112,"y4",#20000)
@@ -359,7 +359,7 @@ bind(#20111,#20112)
 exprs(#20113,79,#20105,1,"z4")
 hasLocation(#20113,#20057)
 enclosing_stmt(#20113,#20104)
-exprContainers(#20113,#20001)
+expr_containers(#20113,#20001)
 literals("z4","z4",#20113)
 #20114=@"var;{z4};{#20000}"
 variables(#20114,"z4",#20000)
@@ -374,12 +374,12 @@ exprs(#20116,107,#20115,0,"x5 ?? y5 && z5")
 locations_default(#20117,#10000,7,1,7,14)
 hasLocation(#20116,#20117)
 enclosing_stmt(#20116,#20115)
-exprContainers(#20116,#20001)
+expr_containers(#20116,#20001)
 #20118=*
 exprs(#20118,79,#20116,0,"x5")
 hasLocation(#20118,#20061)
 enclosing_stmt(#20118,#20115)
-exprContainers(#20118,#20001)
+expr_containers(#20118,#20001)
 literals("x5","x5",#20118)
 #20119=@"var;{x5};{#20000}"
 variables(#20119,"x5",#20000)
@@ -390,12 +390,12 @@ exprs(#20120,44,#20116,1,"y5 && z5")
 locations_default(#20121,#10000,7,7,7,14)
 hasLocation(#20120,#20121)
 enclosing_stmt(#20120,#20115)
-exprContainers(#20120,#20001)
+expr_containers(#20120,#20001)
 #20122=*
 exprs(#20122,79,#20120,0,"y5")
 hasLocation(#20122,#20065)
 enclosing_stmt(#20122,#20115)
-exprContainers(#20122,#20001)
+expr_containers(#20122,#20001)
 literals("y5","y5",#20122)
 #20123=@"var;{y5};{#20000}"
 variables(#20123,"y5",#20000)
@@ -404,7 +404,7 @@ bind(#20122,#20123)
 exprs(#20124,79,#20120,1,"z5")
 hasLocation(#20124,#20069)
 enclosing_stmt(#20124,#20115)
-exprContainers(#20124,#20001)
+expr_containers(#20124,#20001)
 literals("z5","z5",#20124)
 #20125=@"var;{z5};{#20000}"
 variables(#20125,"z5",#20000)
--- a/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
@@ -336,12 +336,12 @@ exprs(#20124,14,#20123,0,"a1?.b1")
 locations_default(#20125,#10000,1,1,1,6)
 hasLocation(#20124,#20125)
 enclosing_stmt(#20124,#20123)
-exprContainers(#20124,#20001)
+expr_containers(#20124,#20001)
 #20126=*
 exprs(#20126,79,#20124,0,"a1")
 hasLocation(#20126,#20029)
 enclosing_stmt(#20126,#20123)
-exprContainers(#20126,#20001)
+expr_containers(#20126,#20001)
 literals("a1","a1",#20126)
 #20127=@"var;{a1};{#20000}"
 variables(#20127,"a1",#20000)
@@ -350,7 +350,7 @@ bind(#20126,#20127)
 exprs(#20128,0,#20124,1,"b1")
 hasLocation(#20128,#20033)
 enclosing_stmt(#20128,#20123)
-exprContainers(#20128,#20001)
+expr_containers(#20128,#20001)
 literals("b1","b1",#20128)
 isOptionalChaining(#20124)
 #20129=*
@@ -363,12 +363,12 @@ exprs(#20130,15,#20129,0,"a2?.[x2]")
 locations_default(#20131,#10000,3,1,3,8)
 hasLocation(#20130,#20131)
 enclosing_stmt(#20130,#20129)
-exprContainers(#20130,#20001)
+expr_containers(#20130,#20001)
 #20132=*
 exprs(#20132,79,#20130,0,"a2")
 hasLocation(#20132,#20037)
 enclosing_stmt(#20132,#20129)
-exprContainers(#20132,#20001)
+expr_containers(#20132,#20001)
 literals("a2","a2",#20132)
 #20133=@"var;{a2};{#20000}"
 variables(#20133,"a2",#20000)
@@ -377,7 +377,7 @@ bind(#20132,#20133)
 exprs(#20134,79,#20130,1,"x2")
 hasLocation(#20134,#20043)
 enclosing_stmt(#20134,#20129)
-exprContainers(#20134,#20001)
+expr_containers(#20134,#20001)
 literals("x2","x2",#20134)
 #20135=@"var;{x2};{#20000}"
 variables(#20135,"x2",#20000)
@@ -393,19 +393,19 @@ exprs(#20137,13,#20136,0,"a3?.b3()")
 locations_default(#20138,#10000,5,1,5,8)
 hasLocation(#20137,#20138)
 enclosing_stmt(#20137,#20136)
-exprContainers(#20137,#20001)
+expr_containers(#20137,#20001)
 #20139=*
 exprs(#20139,14,#20137,-1,"a3?.b3")
 #20140=@"loc,{#10000},5,1,5,6"
 locations_default(#20140,#10000,5,1,5,6)
 hasLocation(#20139,#20140)
 enclosing_stmt(#20139,#20136)
-exprContainers(#20139,#20001)
+expr_containers(#20139,#20001)
 #20141=*
 exprs(#20141,79,#20139,0,"a3")
 hasLocation(#20141,#20049)
 enclosing_stmt(#20141,#20136)
-exprContainers(#20141,#20001)
+expr_containers(#20141,#20001)
 literals("a3","a3",#20141)
 #20142=@"var;{a3};{#20000}"
 variables(#20142,"a3",#20000)
@@ -414,7 +414,7 @@ bind(#20141,#20142)
 exprs(#20143,0,#20139,1,"b3")
 hasLocation(#20143,#20053)
 enclosing_stmt(#20143,#20136)
-exprContainers(#20143,#20001)
+expr_containers(#20143,#20001)
 literals("b3","b3",#20143)
 isOptionalChaining(#20139)
 #20144=*
@@ -427,12 +427,12 @@ exprs(#20145,13,#20144,0,"a4?.()")
 locations_default(#20146,#10000,7,1,7,6)
 hasLocation(#20145,#20146)
 enclosing_stmt(#20145,#20144)
-exprContainers(#20145,#20001)
+expr_containers(#20145,#20001)
 #20147=*
 exprs(#20147,79,#20145,-1,"a4")
 hasLocation(#20147,#20061)
 enclosing_stmt(#20147,#20144)
-exprContainers(#20147,#20001)
+expr_containers(#20147,#20001)
 literals("a4","a4",#20147)
 #20148=@"var;{a4};{#20000}"
 variables(#20148,"a4",#20000)
@@ -448,12 +448,12 @@ exprs(#20150,11,#20149,0,"o5?.3:2")
 locations_default(#20151,#10000,9,1,9,7)
 hasLocation(#20150,#20151)
 enclosing_stmt(#20150,#20149)
-exprContainers(#20150,#20001)
+expr_containers(#20150,#20001)
 #20152=*
 exprs(#20152,79,#20150,0,"o5")
 hasLocation(#20152,#20071)
 enclosing_stmt(#20152,#20149)
-exprContainers(#20152,#20001)
+expr_containers(#20152,#20001)
 literals("o5","o5",#20152)
 #20153=@"var;{o5};{#20000}"
 variables(#20153,"o5",#20000)
@@ -462,13 +462,13 @@ bind(#20152,#20153)
 exprs(#20154,3,#20150,1,".3")
 hasLocation(#20154,#20075)
 enclosing_stmt(#20154,#20149)
-exprContainers(#20154,#20001)
+expr_containers(#20154,#20001)
 literals("0.3",".3",#20154)
 #20155=*
 exprs(#20155,3,#20150,2,"2")
 hasLocation(#20155,#20079)
 enclosing_stmt(#20155,#20149)
-exprContainers(#20155,#20001)
+expr_containers(#20155,#20001)
 literals("2","2",#20155)
 #20156=*
 stmts(#20156,2,#20001,5,"a6?.b6[ ... y6).d6;")
@@ -480,40 +480,40 @@ exprs(#20157,14,#20156,0,"a6?.b6[ ... (y6).d6")
 locations_default(#20158,#10000,11,1,11,22)
 hasLocation(#20157,#20158)
 enclosing_stmt(#20157,#20156)
-exprContainers(#20157,#20001)
+expr_containers(#20157,#20001)
 #20159=*
 exprs(#20159,13,#20157,0,"a6?.b6[x6].c6?.(y6)")
 #20160=@"loc,{#10000},11,1,11,19"
 locations_default(#20160,#10000,11,1,11,19)
 hasLocation(#20159,#20160)
 enclosing_stmt(#20159,#20156)
-exprContainers(#20159,#20001)
+expr_containers(#20159,#20001)
 #20161=*
 exprs(#20161,14,#20159,-1,"a6?.b6[x6].c6")
 #20162=@"loc,{#10000},11,1,11,13"
 locations_default(#20162,#10000,11,1,11,13)
 hasLocation(#20161,#20162)
 enclosing_stmt(#20161,#20156)
-exprContainers(#20161,#20001)
+expr_containers(#20161,#20001)
 #20163=*
 exprs(#20163,15,#20161,0,"a6?.b6[x6]")
 #20164=@"loc,{#10000},11,1,11,10"
 locations_default(#20164,#10000,11,1,11,10)
 hasLocation(#20163,#20164)
 enclosing_stmt(#20163,#20156)
-exprContainers(#20163,#20001)
+expr_containers(#20163,#20001)
 #20165=*
 exprs(#20165,14,#20163,0,"a6?.b6")
 #20166=@"loc,{#10000},11,1,11,6"
 locations_default(#20166,#10000,11,1,11,6)
 hasLocation(#20165,#20166)
 enclosing_stmt(#20165,#20156)
-exprContainers(#20165,#20001)
+expr_containers(#20165,#20001)
 #20167=*
 exprs(#20167,79,#20165,0,"a6")
 hasLocation(#20167,#20083)
 enclosing_stmt(#20167,#20156)
-exprContainers(#20167,#20001)
+expr_containers(#20167,#20001)
 literals("a6","a6",#20167)
 #20168=@"var;{a6};{#20000}"
 variables(#20168,"a6",#20000)
@@ -522,14 +522,14 @@ bind(#20167,#20168)
 exprs(#20169,0,#20165,1,"b6")
 hasLocation(#20169,#20087)
 enclosing_stmt(#20169,#20156)
-exprContainers(#20169,#20001)
+expr_containers(#20169,#20001)
 literals("b6","b6",#20169)
 isOptionalChaining(#20165)
 #20170=*
 exprs(#20170,79,#20163,1,"x6")
 hasLocation(#20170,#20091)
 enclosing_stmt(#20170,#20156)
-exprContainers(#20170,#20001)
+expr_containers(#20170,#20001)
 literals("x6","x6",#20170)
 #20171=@"var;{x6};{#20000}"
 variables(#20171,"x6",#20000)
@@ -538,13 +538,13 @@ bind(#20170,#20171)
 exprs(#20172,0,#20161,1,"c6")
 hasLocation(#20172,#20097)
 enclosing_stmt(#20172,#20156)
-exprContainers(#20172,#20001)
+expr_containers(#20172,#20001)
 literals("c6","c6",#20172)
 #20173=*
 exprs(#20173,79,#20159,0,"y6")
 hasLocation(#20173,#20103)
 enclosing_stmt(#20173,#20156)
-exprContainers(#20173,#20001)
+expr_containers(#20173,#20001)
 literals("y6","y6",#20173)
 #20174=@"var;{y6};{#20000}"
 variables(#20174,"y6",#20000)
@@ -554,7 +554,7 @@ isOptionalChaining(#20159)
 exprs(#20175,0,#20157,1,"d6")
 hasLocation(#20175,#20109)
 enclosing_stmt(#20175,#20156)
-exprContainers(#20175,#20001)
+expr_containers(#20175,#20001)
 literals("d6","d6",#20175)
 #20176=*
 stmts(#20176,2,#20001,6,"delete a?.b")
@@ -564,19 +564,19 @@ stmt_containers(#20176,#20001)
 exprs(#20177,22,#20176,0,"delete a?.b")
 hasLocation(#20177,#20027)
 enclosing_stmt(#20177,#20176)
-exprContainers(#20177,#20001)
+expr_containers(#20177,#20001)
 #20178=*
 exprs(#20178,14,#20177,0,"a?.b")
 #20179=@"loc,{#10000},13,8,13,11"
 locations_default(#20179,#10000,13,8,13,11)
 hasLocation(#20178,#20179)
 enclosing_stmt(#20178,#20176)
-exprContainers(#20178,#20001)
+expr_containers(#20178,#20001)
 #20180=*
 exprs(#20180,79,#20178,0,"a")
 hasLocation(#20180,#20115)
 enclosing_stmt(#20180,#20176)
-exprContainers(#20180,#20001)
+expr_containers(#20180,#20001)
 literals("a","a",#20180)
 #20181=@"var;{a};{#20000}"
 variables(#20181,"a",#20000)
@@ -585,7 +585,7 @@ bind(#20180,#20181)
 exprs(#20182,0,#20178,1,"b")
 hasLocation(#20182,#20119)
 enclosing_stmt(#20182,#20176)
-exprContainers(#20182,#20001)
+expr_containers(#20182,#20001)
 literals("b","b",#20182)
 isOptionalChaining(#20178)
 #20183=*
--- a/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
@@ -873,33 +873,33 @@ exprs(#20329,14,#20328,0,"a?.b.c(++x).d")
 locations_default(#20330,#10000,1,1,1,13)
 hasLocation(#20329,#20330)
 enclosing_stmt(#20329,#20328)
-exprContainers(#20329,#20001)
+expr_containers(#20329,#20001)
 #20331=*
 exprs(#20331,13,#20329,0,"a?.b.c(++x)")
 #20332=@"loc,{#10000},1,1,1,11"
 locations_default(#20332,#10000,1,1,1,11)
 hasLocation(#20331,#20332)
 enclosing_stmt(#20331,#20328)
-exprContainers(#20331,#20001)
+expr_containers(#20331,#20001)
 #20333=*
 exprs(#20333,14,#20331,-1,"a?.b.c")
 #20334=@"loc,{#10000},1,1,1,6"
 locations_default(#20334,#10000,1,1,1,6)
 hasLocation(#20333,#20334)
 enclosing_stmt(#20333,#20328)
-exprContainers(#20333,#20001)
+expr_containers(#20333,#20001)
 #20335=*
 exprs(#20335,14,#20333,0,"a?.b")
 #20336=@"loc,{#10000},1,1,1,4"
 locations_default(#20336,#10000,1,1,1,4)
 hasLocation(#20335,#20336)
 enclosing_stmt(#20335,#20328)
-exprContainers(#20335,#20001)
+expr_containers(#20335,#20001)
 #20337=*
 exprs(#20337,79,#20335,0,"a")
 hasLocation(#20337,#20061)
 enclosing_stmt(#20337,#20328)
-exprContainers(#20337,#20001)
+expr_containers(#20337,#20001)
 literals("a","a",#20337)
 #20338=@"var;{a};{#20000}"
 variables(#20338,"a",#20000)
@@ -908,14 +908,14 @@ bind(#20337,#20338)
 exprs(#20339,0,#20335,1,"b")
 hasLocation(#20339,#20065)
 enclosing_stmt(#20339,#20328)
-exprContainers(#20339,#20001)
+expr_containers(#20339,#20001)
 literals("b","b",#20339)
 isOptionalChaining(#20335)
 #20340=*
 exprs(#20340,0,#20333,1,"c")
 hasLocation(#20340,#20069)
 enclosing_stmt(#20340,#20328)
-exprContainers(#20340,#20001)
+expr_containers(#20340,#20001)
 literals("c","c",#20340)
 #20341=*
 exprs(#20341,59,#20331,0,"++x")
@@ -923,12 +923,12 @@ exprs(#20341,59,#20331,0,"++x")
 locations_default(#20342,#10000,1,8,1,10)
 hasLocation(#20341,#20342)
 enclosing_stmt(#20341,#20328)
-exprContainers(#20341,#20001)
+expr_containers(#20341,#20001)
 #20343=*
 exprs(#20343,79,#20341,0,"x")
 hasLocation(#20343,#20075)
 enclosing_stmt(#20343,#20328)
-exprContainers(#20343,#20001)
+expr_containers(#20343,#20001)
 literals("x","x",#20343)
 #20344=@"var;{x};{#20000}"
 variables(#20344,"x",#20000)
@@ -937,7 +937,7 @@ bind(#20343,#20344)
 exprs(#20345,0,#20329,1,"d")
 hasLocation(#20345,#20081)
 enclosing_stmt(#20345,#20328)
-exprContainers(#20345,#20001)
+expr_containers(#20345,#20001)
 literals("d","d",#20345)
 #20346=*
 stmts(#20346,2,#20001,1,"a?.b[3].c?.(x).d;")
@@ -949,66 +949,66 @@ exprs(#20347,14,#20346,0,"a?.b[3].c?.(x).d")
 locations_default(#20348,#10000,3,1,3,16)
 hasLocation(#20347,#20348)
 enclosing_stmt(#20347,#20346)
-exprContainers(#20347,#20001)
+expr_containers(#20347,#20001)
 #20349=*
 exprs(#20349,13,#20347,0,"a?.b[3].c?.(x)")
 #20350=@"loc,{#10000},3,1,3,14"
 locations_default(#20350,#10000,3,1,3,14)
 hasLocation(#20349,#20350)
 enclosing_stmt(#20349,#20346)
-exprContainers(#20349,#20001)
+expr_containers(#20349,#20001)
 #20351=*
 exprs(#20351,14,#20349,-1,"a?.b[3].c")
 #20352=@"loc,{#10000},3,1,3,9"
 locations_default(#20352,#10000,3,1,3,9)
 hasLocation(#20351,#20352)
 enclosing_stmt(#20351,#20346)
-exprContainers(#20351,#20001)
+expr_containers(#20351,#20001)
 #20353=*
 exprs(#20353,15,#20351,0,"a?.b[3]")
 #20354=@"loc,{#10000},3,1,3,7"
 locations_default(#20354,#10000,3,1,3,7)
 hasLocation(#20353,#20354)
 enclosing_stmt(#20353,#20346)
-exprContainers(#20353,#20001)
+expr_containers(#20353,#20001)
 #20355=*
 exprs(#20355,14,#20353,0,"a?.b")
 #20356=@"loc,{#10000},3,1,3,4"
 locations_default(#20356,#10000,3,1,3,4)
 hasLocation(#20355,#20356)
 enclosing_stmt(#20355,#20346)
-exprContainers(#20355,#20001)
+expr_containers(#20355,#20001)
 #20357=*
 exprs(#20357,79,#20355,0,"a")
 hasLocation(#20357,#20085)
 enclosing_stmt(#20357,#20346)
-exprContainers(#20357,#20001)
+expr_containers(#20357,#20001)
 literals("a","a",#20357)
 bind(#20357,#20338)
 #20358=*
 exprs(#20358,0,#20355,1,"b")
 hasLocation(#20358,#20089)
 enclosing_stmt(#20358,#20346)
-exprContainers(#20358,#20001)
+expr_containers(#20358,#20001)
 literals("b","b",#20358)
 isOptionalChaining(#20355)
 #20359=*
 exprs(#20359,3,#20353,1,"3")
 hasLocation(#20359,#20093)
 enclosing_stmt(#20359,#20346)
-exprContainers(#20359,#20001)
+expr_containers(#20359,#20001)
 literals("3","3",#20359)
 #20360=*
 exprs(#20360,0,#20351,1,"c")
 hasLocation(#20360,#20099)
 enclosing_stmt(#20360,#20346)
-exprContainers(#20360,#20001)
+expr_containers(#20360,#20001)
 literals("c","c",#20360)
 #20361=*
 exprs(#20361,79,#20349,0,"x")
 hasLocation(#20361,#20105)
 enclosing_stmt(#20361,#20346)
-exprContainers(#20361,#20001)
+expr_containers(#20361,#20001)
 literals("x","x",#20361)
 bind(#20361,#20344)
 isOptionalChaining(#20349)
@@ -1016,7 +1016,7 @@ isOptionalChaining(#20349)
 exprs(#20362,0,#20347,1,"d")
 hasLocation(#20362,#20111)
 enclosing_stmt(#20362,#20346)
-exprContainers(#20362,#20001)
+expr_containers(#20362,#20001)
 literals("d","d",#20362)
 #20363=*
 stmts(#20363,2,#20001,2,"(a?.b).c;")
@@ -1028,40 +1028,40 @@ exprs(#20364,14,#20363,0,"(a?.b).c")
 locations_default(#20365,#10000,5,1,5,8)
 hasLocation(#20364,#20365)
 enclosing_stmt(#20364,#20363)
-exprContainers(#20364,#20001)
+expr_containers(#20364,#20001)
 #20366=*
 exprs(#20366,63,#20364,0,"(a?.b)")
 #20367=@"loc,{#10000},5,1,5,6"
 locations_default(#20367,#10000,5,1,5,6)
 hasLocation(#20366,#20367)
 enclosing_stmt(#20366,#20363)
-exprContainers(#20366,#20001)
+expr_containers(#20366,#20001)
 #20368=*
 exprs(#20368,14,#20366,0,"a?.b")
 #20369=@"loc,{#10000},5,2,5,5"
 locations_default(#20369,#10000,5,2,5,5)
 hasLocation(#20368,#20369)
 enclosing_stmt(#20368,#20363)
-exprContainers(#20368,#20001)
+expr_containers(#20368,#20001)
 #20370=*
 exprs(#20370,79,#20368,0,"a")
 hasLocation(#20370,#20117)
 enclosing_stmt(#20370,#20363)
-exprContainers(#20370,#20001)
+expr_containers(#20370,#20001)
 literals("a","a",#20370)
 bind(#20370,#20338)
 #20371=*
 exprs(#20371,0,#20368,1,"b")
 hasLocation(#20371,#20121)
 enclosing_stmt(#20371,#20363)
-exprContainers(#20371,#20001)
+expr_containers(#20371,#20001)
 literals("b","b",#20371)
 isOptionalChaining(#20368)
 #20372=*
 exprs(#20372,0,#20364,1,"c")
 hasLocation(#20372,#20127)
 enclosing_stmt(#20372,#20363)
-exprContainers(#20372,#20001)
+expr_containers(#20372,#20001)
 literals("c","c",#20372)
 #20373=*
 stmts(#20373,2,#20001,3,"(a?.b.c).d;")
@@ -1073,53 +1073,53 @@ exprs(#20374,14,#20373,0,"(a?.b.c).d")
 locations_default(#20375,#10000,7,1,7,10)
 hasLocation(#20374,#20375)
 enclosing_stmt(#20374,#20373)
-exprContainers(#20374,#20001)
+expr_containers(#20374,#20001)
 #20376=*
 exprs(#20376,63,#20374,0,"(a?.b.c)")
 #20377=@"loc,{#10000},7,1,7,8"
 locations_default(#20377,#10000,7,1,7,8)
 hasLocation(#20376,#20377)
 enclosing_stmt(#20376,#20373)
-exprContainers(#20376,#20001)
+expr_containers(#20376,#20001)
 #20378=*
 exprs(#20378,14,#20376,0,"a?.b.c")
 #20379=@"loc,{#10000},7,2,7,7"
 locations_default(#20379,#10000,7,2,7,7)
 hasLocation(#20378,#20379)
 enclosing_stmt(#20378,#20373)
-exprContainers(#20378,#20001)
+expr_containers(#20378,#20001)
 #20380=*
 exprs(#20380,14,#20378,0,"a?.b")
 #20381=@"loc,{#10000},7,2,7,5"
 locations_default(#20381,#10000,7,2,7,5)
 hasLocation(#20380,#20381)
 enclosing_stmt(#20380,#20373)
-exprContainers(#20380,#20001)
+expr_containers(#20380,#20001)
 #20382=*
 exprs(#20382,79,#20380,0,"a")
 hasLocation(#20382,#20133)
 enclosing_stmt(#20382,#20373)
-exprContainers(#20382,#20001)
+expr_containers(#20382,#20001)
 literals("a","a",#20382)
 bind(#20382,#20338)
 #20383=*
 exprs(#20383,0,#20380,1,"b")
 hasLocation(#20383,#20137)
 enclosing_stmt(#20383,#20373)
-exprContainers(#20383,#20001)
+expr_containers(#20383,#20001)
 literals("b","b",#20383)
 isOptionalChaining(#20380)
 #20384=*
 exprs(#20384,0,#20378,1,"c")
 hasLocation(#20384,#20141)
 enclosing_stmt(#20384,#20373)
-exprContainers(#20384,#20001)
+expr_containers(#20384,#20001)
 literals("c","c",#20384)
 #20385=*
 exprs(#20385,0,#20374,1,"d")
 hasLocation(#20385,#20147)
 enclosing_stmt(#20385,#20373)
-exprContainers(#20385,#20001)
+expr_containers(#20385,#20001)
 literals("d","d",#20385)
 #20386=*
 stmts(#20386,2,#20001,4,"a?.[b?.c?.d].e?.f;")
@@ -1131,26 +1131,26 @@ exprs(#20387,14,#20386,0,"a?.[b?.c?.d].e?.f")
 locations_default(#20388,#10000,9,1,9,17)
 hasLocation(#20387,#20388)
 enclosing_stmt(#20387,#20386)
-exprContainers(#20387,#20001)
+expr_containers(#20387,#20001)
 #20389=*
 exprs(#20389,14,#20387,0,"a?.[b?.c?.d].e")
 #20390=@"loc,{#10000},9,1,9,14"
 locations_default(#20390,#10000,9,1,9,14)
 hasLocation(#20389,#20390)
 enclosing_stmt(#20389,#20386)
-exprContainers(#20389,#20001)
+expr_containers(#20389,#20001)
 #20391=*
 exprs(#20391,15,#20389,0,"a?.[b?.c?.d]")
 #20392=@"loc,{#10000},9,1,9,12"
 locations_default(#20392,#10000,9,1,9,12)
 hasLocation(#20391,#20392)
 enclosing_stmt(#20391,#20386)
-exprContainers(#20391,#20001)
+expr_containers(#20391,#20001)
 #20393=*
 exprs(#20393,79,#20391,0,"a")
 hasLocation(#20393,#20151)
 enclosing_stmt(#20393,#20386)
-exprContainers(#20393,#20001)
+expr_containers(#20393,#20001)
 literals("a","a",#20393)
 bind(#20393,#20338)
 #20394=*
@@ -1159,19 +1159,19 @@ exprs(#20394,14,#20391,1,"b?.c?.d")
 locations_default(#20395,#10000,9,5,9,11)
 hasLocation(#20394,#20395)
 enclosing_stmt(#20394,#20386)
-exprContainers(#20394,#20001)
+expr_containers(#20394,#20001)
 #20396=*
 exprs(#20396,14,#20394,0,"b?.c")
 #20397=@"loc,{#10000},9,5,9,8"
 locations_default(#20397,#10000,9,5,9,8)
 hasLocation(#20396,#20397)
 enclosing_stmt(#20396,#20386)
-exprContainers(#20396,#20001)
+expr_containers(#20396,#20001)
 #20398=*
 exprs(#20398,79,#20396,0,"b")
 hasLocation(#20398,#20157)
 enclosing_stmt(#20398,#20386)
-exprContainers(#20398,#20001)
+expr_containers(#20398,#20001)
 literals("b","b",#20398)
 #20399=@"var;{b};{#20000}"
 variables(#20399,"b",#20000)
@@ -1180,14 +1180,14 @@ bind(#20398,#20399)
 exprs(#20400,0,#20396,1,"c")
 hasLocation(#20400,#20161)
 enclosing_stmt(#20400,#20386)
-exprContainers(#20400,#20001)
+expr_containers(#20400,#20001)
 literals("c","c",#20400)
 isOptionalChaining(#20396)
 #20401=*
 exprs(#20401,0,#20394,1,"d")
 hasLocation(#20401,#20165)
 enclosing_stmt(#20401,#20386)
-exprContainers(#20401,#20001)
+expr_containers(#20401,#20001)
 literals("d","d",#20401)
 isOptionalChaining(#20394)
 isOptionalChaining(#20391)
@@ -1195,13 +1195,13 @@ isOptionalChaining(#20391)
 exprs(#20402,0,#20389,1,"e")
 hasLocation(#20402,#20171)
 enclosing_stmt(#20402,#20386)
-exprContainers(#20402,#20001)
+expr_containers(#20402,#20001)
 literals("e","e",#20402)
 #20403=*
 exprs(#20403,0,#20387,1,"f")
 hasLocation(#20403,#20175)
 enclosing_stmt(#20403,#20386)
-exprContainers(#20403,#20001)
+expr_containers(#20403,#20001)
 literals("f","f",#20403)
 isOptionalChaining(#20387)
 #20404=*
@@ -1214,40 +1214,40 @@ exprs(#20405,14,#20404,0,"a?.()[b ... e?.().f")
 locations_default(#20406,#10000,11,1,11,28)
 hasLocation(#20405,#20406)
 enclosing_stmt(#20405,#20404)
-exprContainers(#20405,#20001)
+expr_containers(#20405,#20001)
 #20407=*
 exprs(#20407,13,#20405,0,"a?.()[b ... ].e?.()")
 #20408=@"loc,{#10000},11,1,11,26"
 locations_default(#20408,#10000,11,1,11,26)
 hasLocation(#20407,#20408)
 enclosing_stmt(#20407,#20404)
-exprContainers(#20407,#20001)
+expr_containers(#20407,#20001)
 #20409=*
 exprs(#20409,14,#20407,-1,"a?.()[b ... ().d].e")
 #20410=@"loc,{#10000},11,1,11,22"
 locations_default(#20410,#10000,11,1,11,22)
 hasLocation(#20409,#20410)
 enclosing_stmt(#20409,#20404)
-exprContainers(#20409,#20001)
+expr_containers(#20409,#20001)
 #20411=*
 exprs(#20411,15,#20409,0,"a?.()[b?.().c?.().d]")
 #20412=@"loc,{#10000},11,1,11,20"
 locations_default(#20412,#10000,11,1,11,20)
 hasLocation(#20411,#20412)
 enclosing_stmt(#20411,#20404)
-exprContainers(#20411,#20001)
+expr_containers(#20411,#20001)
 #20413=*
 exprs(#20413,13,#20411,0,"a?.()")
 #20414=@"loc,{#10000},11,1,11,5"
 locations_default(#20414,#10000,11,1,11,5)
 hasLocation(#20413,#20414)
 enclosing_stmt(#20413,#20404)
-exprContainers(#20413,#20001)
+expr_containers(#20413,#20001)
 #20415=*
 exprs(#20415,79,#20413,-1,"a")
 hasLocation(#20415,#20179)
 enclosing_stmt(#20415,#20404)
-exprContainers(#20415,#20001)
+expr_containers(#20415,#20001)
 literals("a","a",#20415)
 bind(#20415,#20338)
 isOptionalChaining(#20413)
@@ -1257,33 +1257,33 @@ exprs(#20416,14,#20411,1,"b?.().c?.().d")
 locations_default(#20417,#10000,11,7,11,19)
 hasLocation(#20416,#20417)
 enclosing_stmt(#20416,#20404)
-exprContainers(#20416,#20001)
+expr_containers(#20416,#20001)
 #20418=*
 exprs(#20418,13,#20416,0,"b?.().c?.()")
 #20419=@"loc,{#10000},11,7,11,17"
 locations_default(#20419,#10000,11,7,11,17)
 hasLocation(#20418,#20419)
 enclosing_stmt(#20418,#20404)
-exprContainers(#20418,#20001)
+expr_containers(#20418,#20001)
 #20420=*
 exprs(#20420,14,#20418,-1,"b?.().c")
 #20421=@"loc,{#10000},11,7,11,13"
 locations_default(#20421,#10000,11,7,11,13)
 hasLocation(#20420,#20421)
 enclosing_stmt(#20420,#20404)
-exprContainers(#20420,#20001)
+expr_containers(#20420,#20001)
 #20422=*
 exprs(#20422,13,#20420,0,"b?.()")
 #20423=@"loc,{#10000},11,7,11,11"
 locations_default(#20423,#10000,11,7,11,11)
 hasLocation(#20422,#20423)
 enclosing_stmt(#20422,#20404)
-exprContainers(#20422,#20001)
+expr_containers(#20422,#20001)
 #20424=*
 exprs(#20424,79,#20422,-1,"b")
 hasLocation(#20424,#20189)
 enclosing_stmt(#20424,#20404)
-exprContainers(#20424,#20001)
+expr_containers(#20424,#20001)
 literals("b","b",#20424)
 bind(#20424,#20399)
 isOptionalChaining(#20422)
@@ -1291,27 +1291,27 @@ isOptionalChaining(#20422)
 exprs(#20425,0,#20420,1,"c")
 hasLocation(#20425,#20199)
 enclosing_stmt(#20425,#20404)
-exprContainers(#20425,#20001)
+expr_containers(#20425,#20001)
 literals("c","c",#20425)
 isOptionalChaining(#20418)
 #20426=*
 exprs(#20426,0,#20416,1,"d")
 hasLocation(#20426,#20209)
 enclosing_stmt(#20426,#20404)
-exprContainers(#20426,#20001)
+expr_containers(#20426,#20001)
 literals("d","d",#20426)
 #20427=*
 exprs(#20427,0,#20409,1,"e")
 hasLocation(#20427,#20215)
 enclosing_stmt(#20427,#20404)
-exprContainers(#20427,#20001)
+expr_containers(#20427,#20001)
 literals("e","e",#20427)
 isOptionalChaining(#20407)
 #20428=*
 exprs(#20428,0,#20405,1,"f")
 hasLocation(#20428,#20225)
 enclosing_stmt(#20428,#20404)
-exprContainers(#20428,#20001)
+expr_containers(#20428,#20001)
 literals("f","f",#20428)
 #20429=*
 stmts(#20429,3,#20001,6,"if (a?. ... alse;\n}")
@@ -1325,19 +1325,19 @@ exprs(#20431,14,#20429,0,"a?.b")
 locations_default(#20432,#10000,13,5,13,8)
 hasLocation(#20431,#20432)
 enclosing_stmt(#20431,#20429)
-exprContainers(#20431,#20001)
+expr_containers(#20431,#20001)
 #20433=*
 exprs(#20433,79,#20431,0,"a")
 hasLocation(#20433,#20233)
 enclosing_stmt(#20433,#20429)
-exprContainers(#20433,#20001)
+expr_containers(#20433,#20001)
 literals("a","a",#20433)
 bind(#20433,#20338)
 #20434=*
 exprs(#20434,0,#20431,1,"b")
 hasLocation(#20434,#20237)
 enclosing_stmt(#20434,#20429)
-exprContainers(#20434,#20001)
+expr_containers(#20434,#20001)
 literals("b","b",#20434)
 isOptionalChaining(#20431)
 #20435=*
@@ -1356,7 +1356,7 @@ stmt_containers(#20437,#20001)
 exprs(#20439,2,#20437,0,"true")
 hasLocation(#20439,#20243)
 enclosing_stmt(#20439,#20437)
-exprContainers(#20439,#20001)
+expr_containers(#20439,#20001)
 literals("true","true",#20439)
 #20440=*
 stmts(#20440,1,#20429,2,"{\n    false;\n}")
@@ -1374,7 +1374,7 @@ stmt_containers(#20442,#20001)
 exprs(#20444,2,#20442,0,"false")
 hasLocation(#20444,#20253)
 enclosing_stmt(#20444,#20442)
-exprContainers(#20444,#20001)
+expr_containers(#20444,#20001)
 literals("false","false",#20444)
 #20445=*
 stmts(#20445,3,#20001,7,"if (!a? ... alse;\n}")
@@ -1388,26 +1388,26 @@ exprs(#20447,18,#20445,0,"!a?.b")
 locations_default(#20448,#10000,19,5,19,9)
 hasLocation(#20447,#20448)
 enclosing_stmt(#20447,#20445)
-exprContainers(#20447,#20001)
+expr_containers(#20447,#20001)
 #20449=*
 exprs(#20449,14,#20447,0,"a?.b")
 #20450=@"loc,{#10000},19,6,19,9"
 locations_default(#20450,#10000,19,6,19,9)
 hasLocation(#20449,#20450)
 enclosing_stmt(#20449,#20445)
-exprContainers(#20449,#20001)
+expr_containers(#20449,#20001)
 #20451=*
 exprs(#20451,79,#20449,0,"a")
 hasLocation(#20451,#20264)
 enclosing_stmt(#20451,#20445)
-exprContainers(#20451,#20001)
+expr_containers(#20451,#20001)
 literals("a","a",#20451)
 bind(#20451,#20338)
 #20452=*
 exprs(#20452,0,#20449,1,"b")
 hasLocation(#20452,#20268)
 enclosing_stmt(#20452,#20445)
-exprContainers(#20452,#20001)
+expr_containers(#20452,#20001)
 literals("b","b",#20452)
 isOptionalChaining(#20449)
 #20453=*
@@ -1426,7 +1426,7 @@ stmt_containers(#20455,#20001)
 exprs(#20457,2,#20455,0,"true")
 hasLocation(#20457,#20274)
 enclosing_stmt(#20457,#20455)
-exprContainers(#20457,#20001)
+expr_containers(#20457,#20001)
 literals("true","true",#20457)
 #20458=*
 stmts(#20458,1,#20445,2,"{\n    false;\n}")
@@ -1444,7 +1444,7 @@ stmt_containers(#20460,#20001)
 exprs(#20462,2,#20460,0,"false")
 hasLocation(#20462,#20284)
 enclosing_stmt(#20462,#20460)
-exprContainers(#20462,#20001)
+expr_containers(#20462,#20001)
 literals("false","false",#20462)
 #20463=*
 stmts(#20463,3,#20001,8,"if (a?. ... alse;\n}")
@@ -1458,26 +1458,26 @@ exprs(#20465,44,#20463,0,"a?.b && c?.d")
 locations_default(#20466,#10000,25,5,25,16)
 hasLocation(#20465,#20466)
 enclosing_stmt(#20465,#20463)
-exprContainers(#20465,#20001)
+expr_containers(#20465,#20001)
 #20467=*
 exprs(#20467,14,#20465,0,"a?.b")
 #20468=@"loc,{#10000},25,5,25,8"
 locations_default(#20468,#10000,25,5,25,8)
 hasLocation(#20467,#20468)
 enclosing_stmt(#20467,#20463)
-exprContainers(#20467,#20001)
+expr_containers(#20467,#20001)
 #20469=*
 exprs(#20469,79,#20467,0,"a")
 hasLocation(#20469,#20293)
 enclosing_stmt(#20469,#20463)
-exprContainers(#20469,#20001)
+expr_containers(#20469,#20001)
 literals("a","a",#20469)
 bind(#20469,#20338)
 #20470=*
 exprs(#20470,0,#20467,1,"b")
 hasLocation(#20470,#20297)
 enclosing_stmt(#20470,#20463)
-exprContainers(#20470,#20001)
+expr_containers(#20470,#20001)
 literals("b","b",#20470)
 isOptionalChaining(#20467)
 #20471=*
@@ -1486,12 +1486,12 @@ exprs(#20471,14,#20465,1,"c?.d")
 locations_default(#20472,#10000,25,13,25,16)
 hasLocation(#20471,#20472)
 enclosing_stmt(#20471,#20463)
-exprContainers(#20471,#20001)
+expr_containers(#20471,#20001)
 #20473=*
 exprs(#20473,79,#20471,0,"c")
 hasLocation(#20473,#20301)
 enclosing_stmt(#20473,#20463)
-exprContainers(#20473,#20001)
+expr_containers(#20473,#20001)
 literals("c","c",#20473)
 #20474=@"var;{c};{#20000}"
 variables(#20474,"c",#20000)
@@ -1500,7 +1500,7 @@ bind(#20473,#20474)
 exprs(#20475,0,#20471,1,"d")
 hasLocation(#20475,#20305)
 enclosing_stmt(#20475,#20463)
-exprContainers(#20475,#20001)
+expr_containers(#20475,#20001)
 literals("d","d",#20475)
 isOptionalChaining(#20471)
 #20476=*
@@ -1519,7 +1519,7 @@ stmt_containers(#20478,#20001)
 exprs(#20480,2,#20478,0,"true")
 hasLocation(#20480,#20311)
 enclosing_stmt(#20480,#20478)
-exprContainers(#20480,#20001)
+expr_containers(#20480,#20001)
 literals("true","true",#20480)
 #20481=*
 stmts(#20481,1,#20463,2,"{\n    false;\n}")
@@ -1537,7 +1537,7 @@ stmt_containers(#20483,#20001)
 exprs(#20485,2,#20483,0,"false")
 hasLocation(#20485,#20321)
 enclosing_stmt(#20485,#20483)
-exprContainers(#20485,#20001)
+expr_containers(#20485,#20001)
 literals("false","false",#20485)
 #20486=*
 entry_cfg_node(#20486,#20001)
--- a/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
@@ -166,7 +166,7 @@ stmt_containers(#20058,#20001)
 exprs(#20059,4,#20058,-1,"'settings'")
 hasLocation(#20059,#20017)
 enclosing_stmt(#20059,#20058)
-exprContainers(#20059,#20001)
+expr_containers(#20059,#20001)
 literals("settings","'settings'",#20059)
 #20060=*
 regexpterm(#20060,14,#20059,0,"settings")
@@ -178,18 +178,18 @@ regexpConstValue(#20060,"settings")
 exprs(#20062,83,#20058,0,"language")
 hasLocation(#20062,#20011)
 enclosing_stmt(#20062,#20058)
-exprContainers(#20062,#20001)
+expr_containers(#20062,#20001)
 #20063=*
 exprs(#20063,0,#20062,0,"language")
 hasLocation(#20063,#20011)
 enclosing_stmt(#20063,#20058)
-exprContainers(#20063,#20001)
+expr_containers(#20063,#20001)
 literals("language","language",#20063)
 #20064=*
 exprs(#20064,78,#20062,1,"language")
 hasLocation(#20064,#20011)
 enclosing_stmt(#20064,#20058)
-exprContainers(#20064,#20001)
+expr_containers(#20064,#20001)
 literals("language","language",#20064)
 decl(#20064,#20054)
 typedecl(#20064,#20055)
@@ -204,12 +204,12 @@ exprs(#20066,64,#20065,0,"strings ... uage}`)")
 locations_default(#20067,#10000,2,7,2,50)
 hasLocation(#20066,#20067)
 enclosing_stmt(#20066,#20065)
-exprContainers(#20066,#20001)
+expr_containers(#20066,#20001)
 #20068=*
 exprs(#20068,78,#20066,0,"strings")
 hasLocation(#20068,#20023)
 enclosing_stmt(#20068,#20065)
-exprContainers(#20068,#20001)
+expr_containers(#20068,#20001)
 literals("strings","strings",#20068)
 decl(#20068,#20057)
 #20069=*
@@ -218,32 +218,32 @@ exprs(#20069,92,#20066,1,"await i ... uage}`)")
 locations_default(#20070,#10000,2,17,2,50)
 hasLocation(#20069,#20070)
 enclosing_stmt(#20069,#20065)
-exprContainers(#20069,#20001)
+expr_containers(#20069,#20001)
 #20071=*
 exprs(#20071,99,#20069,0,"import( ... uage}`)")
 #20072=@"loc,{#10000},2,23,2,50"
 locations_default(#20072,#10000,2,23,2,50)
 hasLocation(#20071,#20072)
 enclosing_stmt(#20071,#20065)
-exprContainers(#20071,#20001)
+expr_containers(#20071,#20001)
 #20073=*
 exprs(#20073,71,#20071,0,"`./i18n/${language}`")
 #20074=@"loc,{#10000},2,30,2,49"
 locations_default(#20074,#10000,2,30,2,49)
 hasLocation(#20073,#20074)
 enclosing_stmt(#20073,#20065)
-exprContainers(#20073,#20001)
+expr_containers(#20073,#20001)
 #20075=*
 exprs(#20075,72,#20073,0,"./i18n/")
 hasLocation(#20075,#20035)
 enclosing_stmt(#20075,#20065)
-exprContainers(#20075,#20001)
+expr_containers(#20075,#20001)
 literals("./i18n/","./i18n/",#20075)
 #20076=*
 exprs(#20076,79,#20073,1,"language")
 hasLocation(#20076,#20039)
 enclosing_stmt(#20076,#20065)
-exprContainers(#20076,#20001)
+expr_containers(#20076,#20001)
 literals("language","language",#20076)
 bind(#20076,#20054)
 #20077=*
--- a/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
@@ -107,7 +107,7 @@ stmt_containers(#20035,#20001)
 #20037=*
 exprs(#20037,78,#20035,-1,"f")
 hasLocation(#20037,#20013)
-exprContainers(#20037,#20035)
+expr_containers(#20037,#20035)
 literals("f","f",#20037)
 decl(#20037,#20034)
 #20038=*
@@ -134,19 +134,19 @@ stmt_containers(#20042,#20035)
 exprs(#20044,69,#20042,0,"yield import(""foo"")")
 hasLocation(#20044,#20043)
 enclosing_stmt(#20044,#20042)
-exprContainers(#20044,#20035)
+expr_containers(#20044,#20035)
 #20045=*
 exprs(#20045,99,#20044,0,"import(""foo"")")
 #20046=@"loc,{#10000},2,9,2,21"
 locations_default(#20046,#10000,2,9,2,21)
 hasLocation(#20045,#20046)
 enclosing_stmt(#20045,#20042)
-exprContainers(#20045,#20035)
+expr_containers(#20045,#20035)
 #20047=*
 exprs(#20047,4,#20045,0,"""foo""")
 hasLocation(#20047,#20027)
 enclosing_stmt(#20047,#20042)
-exprContainers(#20047,#20035)
+expr_containers(#20047,#20035)
 literals("foo","""foo""",#20047)
 #20048=*
 regexpterm(#20048,14,#20047,0,"foo")