JS: Update TRAP files

javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap

@@ -89,75 +89,77 @@ hasLocation(#20001,#20030)
 variables(#20031,"x",#20000)
 #20032=@"var;{y};{#20000}"
 variables(#20032,"y",#20000)
-#20033=*
-stmts(#20033,23,#20001,0,"let [x,y] = [1,2]")
-hasLocation(#20033,#20003)
-stmt_containers(#20033,#20001)
+#20033=@"var;{this};{#20000}"
+variables(#20033,"this",#20000)
 #20034=*
-exprs(#20034,64,#20033,0,"[x,y] = [1,2]")
-#20035=@"loc,{#10000},1,5,1,17"
-locations_default(#20035,#10000,1,5,1,17)
-hasLocation(#20034,#20035)
-enclosing_stmt(#20034,#20033)
-expr_containers(#20034,#20001)
-#20036=*
-exprs(#20036,67,#20034,0,"[x,y]")
-#20037=@"loc,{#10000},1,5,1,9"
-locations_default(#20037,#10000,1,5,1,9)
-hasLocation(#20036,#20037)
-enclosing_stmt(#20036,#20033)
-expr_containers(#20036,#20001)
-#20038=*
-exprs(#20038,78,#20036,0,"x")
-hasLocation(#20038,#20009)
-enclosing_stmt(#20038,#20033)
-expr_containers(#20038,#20001)
-literals("x","x",#20038)
-decl(#20038,#20031)
+stmts(#20034,23,#20001,0,"let [x,y] = [1,2]")
+hasLocation(#20034,#20003)
+stmt_containers(#20034,#20001)
+#20035=*
+exprs(#20035,64,#20034,0,"[x,y] = [1,2]")
+#20036=@"loc,{#10000},1,5,1,17"
+locations_default(#20036,#10000,1,5,1,17)
+hasLocation(#20035,#20036)
+enclosing_stmt(#20035,#20034)
+expr_containers(#20035,#20001)
+#20037=*
+exprs(#20037,67,#20035,0,"[x,y]")
+#20038=@"loc,{#10000},1,5,1,9"
+locations_default(#20038,#10000,1,5,1,9)
+hasLocation(#20037,#20038)
+enclosing_stmt(#20037,#20034)
+expr_containers(#20037,#20001)
 #20039=*
-exprs(#20039,78,#20036,1,"y")
-hasLocation(#20039,#20013)
-enclosing_stmt(#20039,#20033)
+exprs(#20039,78,#20037,0,"x")
+hasLocation(#20039,#20009)
+enclosing_stmt(#20039,#20034)
 expr_containers(#20039,#20001)
-literals("y","y",#20039)
-decl(#20039,#20032)
-array_size(#20036,2)
+literals("x","x",#20039)
+decl(#20039,#20031)
 #20040=*
-exprs(#20040,7,#20034,1,"[1,2]")
-#20041=@"loc,{#10000},1,13,1,17"
-locations_default(#20041,#10000,1,13,1,17)
-hasLocation(#20040,#20041)
-enclosing_stmt(#20040,#20033)
+exprs(#20040,78,#20037,1,"y")
+hasLocation(#20040,#20013)
+enclosing_stmt(#20040,#20034)
 expr_containers(#20040,#20001)
-#20042=*
-exprs(#20042,3,#20040,0,"1")
-hasLocation(#20042,#20021)
-enclosing_stmt(#20042,#20033)
-expr_containers(#20042,#20001)
-literals("1","1",#20042)
+literals("y","y",#20040)
+decl(#20040,#20032)
+array_size(#20037,2)
+#20041=*
+exprs(#20041,7,#20035,1,"[1,2]")
+#20042=@"loc,{#10000},1,13,1,17"
+locations_default(#20042,#10000,1,13,1,17)
+hasLocation(#20041,#20042)
+enclosing_stmt(#20041,#20034)
+expr_containers(#20041,#20001)
 #20043=*
-exprs(#20043,3,#20040,1,"2")
-hasLocation(#20043,#20025)
-enclosing_stmt(#20043,#20033)
+exprs(#20043,3,#20041,0,"1")
+hasLocation(#20043,#20021)
+enclosing_stmt(#20043,#20034)
 expr_containers(#20043,#20001)
-literals("2","2",#20043)
-array_size(#20040,2)
+literals("1","1",#20043)
 #20044=*
-entry_cfg_node(#20044,#20001)
-#20045=@"loc,{#10000},1,1,1,0"
-locations_default(#20045,#10000,1,1,1,0)
-hasLocation(#20044,#20045)
-#20046=*
-exit_cfg_node(#20046,#20001)
-hasLocation(#20046,#20029)
-successor(#20033,#20040)
-successor(#20036,#20038)
-successor(#20039,#20034)
-successor(#20038,#20039)
-successor(#20040,#20042)
-successor(#20043,#20036)
-successor(#20042,#20043)
-successor(#20034,#20046)
-successor(#20044,#20033)
+exprs(#20044,3,#20041,1,"2")
+hasLocation(#20044,#20025)
+enclosing_stmt(#20044,#20034)
+expr_containers(#20044,#20001)
+literals("2","2",#20044)
+array_size(#20041,2)
+#20045=*
+entry_cfg_node(#20045,#20001)
+#20046=@"loc,{#10000},1,1,1,0"
+locations_default(#20046,#10000,1,1,1,0)
+hasLocation(#20045,#20046)
+#20047=*
+exit_cfg_node(#20047,#20001)
+hasLocation(#20047,#20029)
+successor(#20034,#20041)
+successor(#20037,#20039)
+successor(#20040,#20035)
+successor(#20039,#20040)
+successor(#20041,#20043)
+successor(#20044,#20037)
+successor(#20043,#20044)
+successor(#20035,#20047)
+successor(#20045,#20034)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap

@@ -82,94 +82,98 @@ locations_default(#20028,#10000,1,1,2,0)
 hasLocation(#20001,#20028)
 #20029=@"var;{foo};{#20000}"
 variables(#20029,"foo",#20000)
-#20030=*
-stmts(#20030,17,#20001,0,"functio ...  y}) {}")
-hasLocation(#20030,#20003)
-stmt_containers(#20030,#20001)
+#20030=@"var;{this};{#20000}"
+variables(#20030,"this",#20000)
 #20031=*
-exprs(#20031,78,#20030,-1,"foo")
-hasLocation(#20031,#20007)
-expr_containers(#20031,#20030)
-literals("foo","foo",#20031)
-decl(#20031,#20029)
+stmts(#20031,17,#20001,0,"functio ...  y}) {}")
+hasLocation(#20031,#20003)
+stmt_containers(#20031,#20001)
 #20032=*
-scopes(#20032,1)
-scopenodes(#20030,#20032)
-scopenesting(#20032,#20000)
-#20033=@"var;{x};{#20032}"
-variables(#20033,"x",#20032)
-#20034=@"var;{y};{#20032}"
-variables(#20034,"y",#20032)
-#20035=*
-exprs(#20035,68,#20030,0,"{x, y}")
-#20036=@"loc,{#10000},1,14,1,19"
-locations_default(#20036,#10000,1,14,1,19)
-hasLocation(#20035,#20036)
-expr_containers(#20035,#20030)
+exprs(#20032,78,#20031,-1,"foo")
+hasLocation(#20032,#20007)
+expr_containers(#20032,#20031)
+literals("foo","foo",#20032)
+decl(#20032,#20029)
+#20033=*
+scopes(#20033,1)
+scopenodes(#20031,#20033)
+scopenesting(#20033,#20000)
+#20034=@"var;{this};{#20033}"
+variables(#20034,"this",#20033)
+#20035=@"var;{x};{#20033}"
+variables(#20035,"x",#20033)
+#20036=@"var;{y};{#20033}"
+variables(#20036,"y",#20033)
 #20037=*
-properties(#20037,#20035,0,0,"x")
-hasLocation(#20037,#20013)
-#20038=*
-exprs(#20038,0,#20037,0,"x")
-hasLocation(#20038,#20013)
-expr_containers(#20038,#20030)
-literals("x","x",#20038)
+exprs(#20037,68,#20031,0,"{x, y}")
+#20038=@"loc,{#10000},1,14,1,19"
+locations_default(#20038,#10000,1,14,1,19)
+hasLocation(#20037,#20038)
+expr_containers(#20037,#20031)
 #20039=*
-exprs(#20039,78,#20037,1,"x")
+properties(#20039,#20037,0,0,"x")
 hasLocation(#20039,#20013)
-expr_containers(#20039,#20030)
-literals("x","x",#20039)
-decl(#20039,#20033)
 #20040=*
-properties(#20040,#20035,1,0,"y")
-hasLocation(#20040,#20017)
+exprs(#20040,0,#20039,0,"x")
+hasLocation(#20040,#20013)
+expr_containers(#20040,#20031)
+literals("x","x",#20040)
 #20041=*
-exprs(#20041,0,#20040,0,"y")
-hasLocation(#20041,#20017)
-expr_containers(#20041,#20030)
-literals("y","y",#20041)
+exprs(#20041,78,#20039,1,"x")
+hasLocation(#20041,#20013)
+expr_containers(#20041,#20031)
+literals("x","x",#20041)
+decl(#20041,#20035)
 #20042=*
-exprs(#20042,78,#20040,1,"y")
+properties(#20042,#20037,1,0,"y")
 hasLocation(#20042,#20017)
-expr_containers(#20042,#20030)
-literals("y","y",#20042)
-decl(#20042,#20034)
-#20043=@"var;{arguments};{#20032}"
-variables(#20043,"arguments",#20032)
-is_arguments_object(#20043)
+#20043=*
+exprs(#20043,0,#20042,0,"y")
+hasLocation(#20043,#20017)
+expr_containers(#20043,#20031)
+literals("y","y",#20043)
 #20044=*
-stmts(#20044,1,#20030,-2,"{}")
-#20045=@"loc,{#10000},1,22,1,23"
-locations_default(#20045,#10000,1,22,1,23)
-hasLocation(#20044,#20045)
-stmt_containers(#20044,#20030)
+exprs(#20044,78,#20042,1,"y")
+hasLocation(#20044,#20017)
+expr_containers(#20044,#20031)
+literals("y","y",#20044)
+decl(#20044,#20036)
+#20045=@"var;{arguments};{#20033}"
+variables(#20045,"arguments",#20033)
+is_arguments_object(#20045)
 #20046=*
-entry_cfg_node(#20046,#20001)
-#20047=@"loc,{#10000},1,1,1,0"
-locations_default(#20047,#10000,1,1,1,0)
+stmts(#20046,1,#20031,-2,"{}")
+#20047=@"loc,{#10000},1,22,1,23"
+locations_default(#20047,#10000,1,22,1,23)
 hasLocation(#20046,#20047)
+stmt_containers(#20046,#20031)
 #20048=*
-exit_cfg_node(#20048,#20001)
-hasLocation(#20048,#20027)
-successor(#20030,#20048)
-#20049=*
-entry_cfg_node(#20049,#20030)
-hasLocation(#20049,#20047)
+entry_cfg_node(#20048,#20001)
+#20049=@"loc,{#10000},1,1,1,0"
+locations_default(#20049,#10000,1,1,1,0)
+hasLocation(#20048,#20049)
 #20050=*
-exit_cfg_node(#20050,#20030)
-#20051=@"loc,{#10000},1,24,1,23"
-locations_default(#20051,#10000,1,24,1,23)
-hasLocation(#20050,#20051)
-successor(#20044,#20050)
-successor(#20035,#20038)
-successor(#20042,#20040)
-successor(#20041,#20042)
-successor(#20040,#20044)
-successor(#20039,#20037)
-successor(#20038,#20039)
-successor(#20037,#20041)
-successor(#20049,#20035)
-successor(#20031,#20030)
-successor(#20046,#20031)
+exit_cfg_node(#20050,#20001)
+hasLocation(#20050,#20027)
+successor(#20031,#20050)
+#20051=*
+entry_cfg_node(#20051,#20031)
+hasLocation(#20051,#20049)
+#20052=*
+exit_cfg_node(#20052,#20031)
+#20053=@"loc,{#10000},1,24,1,23"
+locations_default(#20053,#10000,1,24,1,23)
+hasLocation(#20052,#20053)
+successor(#20046,#20052)
+successor(#20037,#20040)
+successor(#20044,#20042)
+successor(#20043,#20044)
+successor(#20042,#20046)
+successor(#20041,#20039)
+successor(#20040,#20041)
+successor(#20039,#20043)
+successor(#20051,#20037)
+successor(#20032,#20031)
+successor(#20048,#20032)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/bom.ts.trap

@@ -28,26 +28,28 @@ toplevels(#20001,0)
 #20007=@"loc,{#10000},1,1,2,0"
 locations_default(#20007,#10000,1,1,2,0)
 hasLocation(#20001,#20007)
-#20008=*
-stmts(#20008,2,#20001,0,"42")
-hasLocation(#20008,#20003)
-stmt_containers(#20008,#20001)
+#20008=@"var;{this};{#20000}"
+variables(#20008,"this",#20000)
 #20009=*
-exprs(#20009,3,#20008,0,"42")
+stmts(#20009,2,#20001,0,"42")
 hasLocation(#20009,#20003)
-enclosing_stmt(#20009,#20008)
-expr_containers(#20009,#20001)
-literals("42","42",#20009)
+stmt_containers(#20009,#20001)
 #20010=*
-entry_cfg_node(#20010,#20001)
-#20011=@"loc,{#10000},1,1,1,0"
-locations_default(#20011,#10000,1,1,1,0)
-hasLocation(#20010,#20011)
-#20012=*
-exit_cfg_node(#20012,#20001)
-hasLocation(#20012,#20006)
-successor(#20008,#20009)
-successor(#20009,#20012)
-successor(#20010,#20008)
+exprs(#20010,3,#20009,0,"42")
+hasLocation(#20010,#20003)
+enclosing_stmt(#20010,#20009)
+expr_containers(#20010,#20001)
+literals("42","42",#20010)
+#20011=*
+entry_cfg_node(#20011,#20001)
+#20012=@"loc,{#10000},1,1,1,0"
+locations_default(#20012,#10000,1,1,1,0)
+hasLocation(#20011,#20012)
+#20013=*
+exit_cfg_node(#20013,#20001)
+hasLocation(#20013,#20006)
+successor(#20009,#20010)
+successor(#20010,#20013)
+successor(#20011,#20009)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/classes.ts.trap

@@ -101,144 +101,150 @@ hasLocation(#20001,#20034)
 variables(#20035,"C",#20000)
 #20036=@"local_type_name;{C};{#20000}"
 local_type_names(#20036,"C",#20000)
-#20037=*
-stmts(#20037,26,#20001,0,"abstrac ... F>\n  {}")
-#20038=@"loc,{#10000},1,1,2,4"
-locations_default(#20038,#10000,1,1,2,4)
-hasLocation(#20037,#20038)
-stmt_containers(#20037,#20001)
-is_abstract_class(#20037)
-#20039=*
-exprs(#20039,78,#20037,0,"C")
-hasLocation(#20039,#20011)
-enclosing_stmt(#20039,#20037)
-expr_containers(#20039,#20001)
-literals("C","C",#20039)
-decl(#20039,#20035)
-typedecl(#20039,#20036)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
+#20038=*
+stmts(#20038,26,#20001,0,"abstrac ... F>\n  {}")
+#20039=@"loc,{#10000},1,1,2,4"
+locations_default(#20039,#10000,1,1,2,4)
+hasLocation(#20038,#20039)
+stmt_containers(#20038,#20001)
+is_abstract_class(#20038)
 #20040=*
-scopes(#20040,10)
-scopenodes(#20037,#20040)
-scopenesting(#20040,#20000)
+exprs(#20040,78,#20038,0,"C")
+hasLocation(#20040,#20011)
+enclosing_stmt(#20040,#20038)
+expr_containers(#20040,#20001)
+literals("C","C",#20040)
+decl(#20040,#20035)
+typedecl(#20040,#20036)
 #20041=*
-typeexprs(#20041,14,#20037,-1,"E<F>")
-#20042=@"loc,{#10000},1,40,1,43"
-locations_default(#20042,#10000,1,40,1,43)
-hasLocation(#20041,#20042)
-enclosing_stmt(#20041,#20037)
-expr_containers(#20041,#20001)
+scopes(#20041,10)
+scopenodes(#20038,#20041)
+scopenesting(#20041,#20000)
+#20042=@"var;{this};{#20041}"
+variables(#20042,"this",#20041)
 #20043=*
-typeexprs(#20043,0,#20041,-1,"E")
-hasLocation(#20043,#20021)
-enclosing_stmt(#20043,#20037)
+typeexprs(#20043,14,#20038,-1,"E<F>")
+#20044=@"loc,{#10000},1,40,1,43"
+locations_default(#20044,#10000,1,40,1,43)
+hasLocation(#20043,#20044)
+enclosing_stmt(#20043,#20038)
 expr_containers(#20043,#20001)
-literals("E","E",#20043)
-#20044=*
-typeexprs(#20044,0,#20041,0,"F")
-hasLocation(#20044,#20025)
-enclosing_stmt(#20044,#20037)
-expr_containers(#20044,#20001)
-literals("F","F",#20044)
 #20045=*
-exprs(#20045,79,#20037,1,"D")
-hasLocation(#20045,#20015)
-enclosing_stmt(#20045,#20037)
+typeexprs(#20045,0,#20043,-1,"E")
+hasLocation(#20045,#20021)
+enclosing_stmt(#20045,#20038)
 expr_containers(#20045,#20001)
-literals("D","D",#20045)
-#20046=@"var;{D};{#20000}"
-variables(#20046,"D",#20000)
-bind(#20045,#20046)
+literals("E","E",#20045)
+#20046=*
+typeexprs(#20046,0,#20043,0,"F")
+hasLocation(#20046,#20025)
+enclosing_stmt(#20046,#20038)
+expr_containers(#20046,#20001)
+literals("F","F",#20046)
 #20047=*
-properties(#20047,#20037,2,0,"constru ... rgs); }")
-#20048=@"loc,{#10000},2,3,2,2"
-locations_default(#20048,#10000,2,3,2,2)
-hasLocation(#20047,#20048)
+exprs(#20047,79,#20038,1,"D")
+hasLocation(#20047,#20015)
+enclosing_stmt(#20047,#20038)
+expr_containers(#20047,#20001)
+literals("D","D",#20047)
+#20048=@"var;{D};{#20000}"
+variables(#20048,"D",#20000)
+bind(#20047,#20048)
 #20049=*
-exprs(#20049,0,#20047,0,"constructor")
-hasLocation(#20049,#20048)
-enclosing_stmt(#20049,#20037)
-expr_containers(#20049,#20001)
-literals("constructor","constructor",#20049)
-#20050=*
-exprs(#20050,9,#20047,1,"(...arg ... rgs); }")
-hasLocation(#20050,#20048)
-enclosing_stmt(#20050,#20037)
-expr_containers(#20050,#20001)
+properties(#20049,#20038,2,0,"constru ... rgs); }")
+#20050=@"loc,{#10000},2,3,2,2"
+locations_default(#20050,#10000,2,3,2,2)
+hasLocation(#20049,#20050)
 #20051=*
-scopes(#20051,1)
-scopenodes(#20050,#20051)
-scopenesting(#20051,#20040)
-#20052=@"var;{args};{#20051}"
-variables(#20052,"args",#20051)
+exprs(#20051,0,#20049,0,"constructor")
+hasLocation(#20051,#20050)
+enclosing_stmt(#20051,#20038)
+expr_containers(#20051,#20001)
+literals("constructor","constructor",#20051)
+#20052=*
+exprs(#20052,9,#20049,1,"(...arg ... rgs); }")
+hasLocation(#20052,#20050)
+enclosing_stmt(#20052,#20038)
+expr_containers(#20052,#20001)
 #20053=*
-exprs(#20053,78,#20050,0,"args")
-hasLocation(#20053,#20048)
-expr_containers(#20053,#20050)
-literals("args","args",#20053)
-decl(#20053,#20052)
-#20054=@"var;{arguments};{#20051}"
-variables(#20054,"arguments",#20051)
-is_arguments_object(#20054)
-has_rest_parameter(#20050)
-#20055=*
-stmts(#20055,1,#20050,-2,"{ super(...args); }")
-hasLocation(#20055,#20048)
-stmt_containers(#20055,#20050)
+scopes(#20053,1)
+scopenodes(#20052,#20053)
+scopenesting(#20053,#20041)
+#20054=@"var;{this};{#20053}"
+variables(#20054,"this",#20053)
+#20055=@"var;{args};{#20053}"
+variables(#20055,"args",#20053)
 #20056=*
-stmts(#20056,2,#20055,0,"super(...args);")
-hasLocation(#20056,#20048)
-stmt_containers(#20056,#20050)
-#20057=*
-exprs(#20057,13,#20056,0,"super(...args)")
-hasLocation(#20057,#20048)
-enclosing_stmt(#20057,#20056)
-expr_containers(#20057,#20050)
+exprs(#20056,78,#20052,0,"args")
+hasLocation(#20056,#20050)
+expr_containers(#20056,#20052)
+literals("args","args",#20056)
+decl(#20056,#20055)
+#20057=@"var;{arguments};{#20053}"
+variables(#20057,"arguments",#20053)
+is_arguments_object(#20057)
+has_rest_parameter(#20052)
 #20058=*
-exprs(#20058,81,#20057,-1,"super")
-hasLocation(#20058,#20048)
-enclosing_stmt(#20058,#20056)
-expr_containers(#20058,#20050)
+stmts(#20058,1,#20052,-2,"{ super(...args); }")
+hasLocation(#20058,#20050)
+stmt_containers(#20058,#20052)
 #20059=*
-exprs(#20059,66,#20057,0,"...args")
-hasLocation(#20059,#20048)
-enclosing_stmt(#20059,#20056)
-expr_containers(#20059,#20050)
+stmts(#20059,2,#20058,0,"super(...args);")
+hasLocation(#20059,#20050)
+stmt_containers(#20059,#20052)
 #20060=*
-exprs(#20060,79,#20059,0,"args")
-hasLocation(#20060,#20048)
-enclosing_stmt(#20060,#20056)
-expr_containers(#20060,#20050)
-literals("args","args",#20060)
-bind(#20060,#20052)
-is_method(#20047)
+exprs(#20060,13,#20059,0,"super(...args)")
+hasLocation(#20060,#20050)
+enclosing_stmt(#20060,#20059)
+expr_containers(#20060,#20052)
 #20061=*
-entry_cfg_node(#20061,#20001)
-#20062=@"loc,{#10000},1,1,1,0"
-locations_default(#20062,#10000,1,1,1,0)
-hasLocation(#20061,#20062)
+exprs(#20061,81,#20060,-1,"super")
+hasLocation(#20061,#20050)
+enclosing_stmt(#20061,#20059)
+expr_containers(#20061,#20052)
+#20062=*
+exprs(#20062,66,#20060,0,"...args")
+hasLocation(#20062,#20050)
+enclosing_stmt(#20062,#20059)
+expr_containers(#20062,#20052)
 #20063=*
-exit_cfg_node(#20063,#20001)
-hasLocation(#20063,#20033)
-successor(#20050,#20047)
+exprs(#20063,79,#20062,0,"args")
+hasLocation(#20063,#20050)
+enclosing_stmt(#20063,#20059)
+expr_containers(#20063,#20052)
+literals("args","args",#20063)
+bind(#20063,#20055)
+is_method(#20049)
 #20064=*
-entry_cfg_node(#20064,#20050)
-hasLocation(#20064,#20048)
-#20065=*
-exit_cfg_node(#20065,#20050)
-hasLocation(#20065,#20048)
+entry_cfg_node(#20064,#20001)
+#20065=@"loc,{#10000},1,1,1,0"
+locations_default(#20065,#10000,1,1,1,0)
+hasLocation(#20064,#20065)
+#20066=*
+exit_cfg_node(#20066,#20001)
+hasLocation(#20066,#20033)
+successor(#20052,#20049)
+#20067=*
+entry_cfg_node(#20067,#20052)
+hasLocation(#20067,#20050)
+#20068=*
+exit_cfg_node(#20068,#20052)
+hasLocation(#20068,#20050)
+successor(#20059,#20061)
+successor(#20063,#20062)
+successor(#20062,#20060)
+successor(#20061,#20063)
+successor(#20060,#20068)
+successor(#20058,#20059)
 successor(#20056,#20058)
-successor(#20060,#20059)
-successor(#20059,#20057)
-successor(#20058,#20060)
-successor(#20057,#20065)
-successor(#20055,#20056)
-successor(#20053,#20055)
-successor(#20064,#20053)
-successor(#20049,#20050)
-successor(#20047,#20037)
-successor(#20045,#20049)
-successor(#20039,#20045)
-successor(#20037,#20063)
-successor(#20061,#20039)
+successor(#20067,#20056)
+successor(#20051,#20052)
+successor(#20049,#20038)
+successor(#20047,#20051)
+successor(#20040,#20047)
+successor(#20038,#20066)
+successor(#20064,#20040)
 numlines(#10000,2,2,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/comments.ts.trap

@@ -81,47 +81,49 @@ toplevels(#20001,0)
 #20025=@"loc,{#10000},2,1,4,4"
 locations_default(#20025,#10000,2,1,4,4)
 hasLocation(#20001,#20025)
-#20026=*
-stmts(#20026,2,#20001,0,"a /* b */ + c")
-#20027=@"loc,{#10000},2,1,2,13"
-locations_default(#20027,#10000,2,1,2,13)
-hasLocation(#20026,#20027)
-stmt_containers(#20026,#20001)
-#20028=*
-exprs(#20028,34,#20026,0,"a /* b */ + c")
-hasLocation(#20028,#20027)
-enclosing_stmt(#20028,#20026)
-expr_containers(#20028,#20001)
+#20026=@"var;{this};{#20000}"
+variables(#20026,"this",#20000)
+#20027=*
+stmts(#20027,2,#20001,0,"a /* b */ + c")
+#20028=@"loc,{#10000},2,1,2,13"
+locations_default(#20028,#10000,2,1,2,13)
+hasLocation(#20027,#20028)
+stmt_containers(#20027,#20001)
 #20029=*
-exprs(#20029,79,#20028,0,"a")
-hasLocation(#20029,#20018)
-enclosing_stmt(#20029,#20026)
+exprs(#20029,34,#20027,0,"a /* b */ + c")
+hasLocation(#20029,#20028)
+enclosing_stmt(#20029,#20027)
 expr_containers(#20029,#20001)
-literals("a","a",#20029)
-#20030=@"var;{a};{#20000}"
-variables(#20030,"a",#20000)
-bind(#20029,#20030)
-#20031=*
-exprs(#20031,79,#20028,1,"c")
-hasLocation(#20031,#20022)
-enclosing_stmt(#20031,#20026)
-expr_containers(#20031,#20001)
-literals("c","c",#20031)
-#20032=@"var;{c};{#20000}"
-variables(#20032,"c",#20000)
-bind(#20031,#20032)
-#20033=*
-entry_cfg_node(#20033,#20001)
-#20034=@"loc,{#10000},2,1,2,0"
-locations_default(#20034,#10000,2,1,2,0)
-hasLocation(#20033,#20034)
-#20035=*
-exit_cfg_node(#20035,#20001)
-hasLocation(#20035,#20024)
-successor(#20026,#20029)
-successor(#20031,#20028)
-successor(#20029,#20031)
-successor(#20028,#20035)
-successor(#20033,#20026)
+#20030=*
+exprs(#20030,79,#20029,0,"a")
+hasLocation(#20030,#20018)
+enclosing_stmt(#20030,#20027)
+expr_containers(#20030,#20001)
+literals("a","a",#20030)
+#20031=@"var;{a};{#20000}"
+variables(#20031,"a",#20000)
+bind(#20030,#20031)
+#20032=*
+exprs(#20032,79,#20029,1,"c")
+hasLocation(#20032,#20022)
+enclosing_stmt(#20032,#20027)
+expr_containers(#20032,#20001)
+literals("c","c",#20032)
+#20033=@"var;{c};{#20000}"
+variables(#20033,"c",#20000)
+bind(#20032,#20033)
+#20034=*
+entry_cfg_node(#20034,#20001)
+#20035=@"loc,{#10000},2,1,2,0"
+locations_default(#20035,#10000,2,1,2,0)
+hasLocation(#20034,#20035)
+#20036=*
+exit_cfg_node(#20036,#20001)
+hasLocation(#20036,#20024)
+successor(#20027,#20030)
+successor(#20032,#20029)
+successor(#20030,#20032)
+successor(#20029,#20036)
+successor(#20034,#20027)
 numlines(#10000,4,1,4)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap

@@ -168,147 +168,155 @@ hasLocation(#20001,#20059)
 variables(#20060,"A",#20000)
 #20061=@"local_type_name;{A};{#20000}"
 local_type_names(#20061,"A",#20000)
-#20062=*
-stmts(#20062,26,#20001,0,"class A ... y) {}\n}")
-hasLocation(#20062,#20059)
-stmt_containers(#20062,#20001)
+#20062=@"var;{this};{#20000}"
+variables(#20062,"this",#20000)
 #20063=*
-exprs(#20063,78,#20062,0,"A")
-hasLocation(#20063,#20015)
-enclosing_stmt(#20063,#20062)
-expr_containers(#20063,#20001)
-literals("A","A",#20063)
-decl(#20063,#20060)
-typedecl(#20063,#20061)
+stmts(#20063,26,#20001,0,"class A ... y) {}\n}")
+hasLocation(#20063,#20059)
+stmt_containers(#20063,#20001)
 #20064=*
-scopes(#20064,10)
-scopenodes(#20062,#20064)
-scopenesting(#20064,#20000)
+exprs(#20064,78,#20063,0,"A")
+hasLocation(#20064,#20015)
+enclosing_stmt(#20064,#20063)
+expr_containers(#20064,#20001)
+literals("A","A",#20064)
+decl(#20064,#20060)
+typedecl(#20064,#20061)
 #20065=*
-properties(#20065,#20062,2,8,"y = 42;")
-#20066=@"loc,{#10000},2,3,2,9"
-locations_default(#20066,#10000,2,3,2,9)
-hasLocation(#20065,#20066)
+scopes(#20065,10)
+scopenodes(#20063,#20065)
+scopenesting(#20065,#20000)
+#20066=@"var;{this};{#20065}"
+variables(#20066,"this",#20065)
 #20067=*
-#20068=*
-exprs(#20068,0,#20065,0,"y")
-hasLocation(#20068,#20019)
-expr_containers(#20068,#20067)
-literals("y","y",#20068)
+properties(#20067,#20063,2,8,"y = 42;")
+#20068=@"loc,{#10000},2,3,2,9"
+locations_default(#20068,#10000,2,3,2,9)
+hasLocation(#20067,#20068)
 #20069=*
-exprs(#20069,3,#20065,1,"42")
-hasLocation(#20069,#20023)
-expr_containers(#20069,#20067)
-literals("42","42",#20069)
 #20070=*
-properties(#20070,#20062,3,0,"constru ... tring);")
-#20071=@"loc,{#10000},3,3,3,24"
-locations_default(#20071,#10000,3,3,3,24)
-hasLocation(#20070,#20071)
+exprs(#20070,0,#20067,0,"y")
+hasLocation(#20070,#20019)
+expr_containers(#20070,#20069)
+literals("y","y",#20070)
+#20071=*
+exprs(#20071,3,#20067,1,"42")
+hasLocation(#20071,#20023)
+expr_containers(#20071,#20069)
+literals("42","42",#20071)
 #20072=*
-exprs(#20072,0,#20070,0,"constru ... tring);")
-hasLocation(#20072,#20071)
-enclosing_stmt(#20072,#20062)
-expr_containers(#20072,#20001)
-literals("constructor","constructor",#20072)
-exprs(#20067,9,#20070,1,"constru ... tring);")
-hasLocation(#20067,#20071)
-enclosing_stmt(#20067,#20062)
-expr_containers(#20067,#20001)
-#20073=*
-scopes(#20073,1)
-scopenodes(#20067,#20073)
-scopenesting(#20073,#20064)
-#20074=@"var;{x};{#20073}"
-variables(#20074,"x",#20073)
+properties(#20072,#20063,3,0,"constru ... tring);")
+#20073=@"loc,{#10000},3,3,3,24"
+locations_default(#20073,#10000,3,3,3,24)
+hasLocation(#20072,#20073)
+#20074=*
+exprs(#20074,0,#20072,0,"constru ... tring);")
+hasLocation(#20074,#20073)
+enclosing_stmt(#20074,#20063)
+expr_containers(#20074,#20001)
+literals("constructor","constructor",#20074)
+exprs(#20069,9,#20072,1,"constru ... tring);")
+hasLocation(#20069,#20073)
+enclosing_stmt(#20069,#20063)
+expr_containers(#20069,#20001)
 #20075=*
-exprs(#20075,78,#20067,0,"x")
-hasLocation(#20075,#20031)
-expr_containers(#20075,#20067)
-literals("x","x",#20075)
-decl(#20075,#20074)
-#20076=@"var;{arguments};{#20073}"
-variables(#20076,"arguments",#20073)
-is_arguments_object(#20076)
-#20077=*
-typeexprs(#20077,2,#20067,-6,"string")
-hasLocation(#20077,#20035)
-expr_containers(#20077,#20067)
-literals("string","string",#20077)
-is_method(#20070)
+scopes(#20075,1)
+scopenodes(#20069,#20075)
+scopenesting(#20075,#20065)
+#20076=@"var;{this};{#20075}"
+variables(#20076,"this",#20075)
+#20077=@"var;{x};{#20075}"
+variables(#20077,"x",#20075)
 #20078=*
-properties(#20078,#20062,4,0,"constru ... any) {}")
-#20079=@"loc,{#10000},4,3,4,23"
-locations_default(#20079,#10000,4,3,4,23)
-hasLocation(#20078,#20079)
+exprs(#20078,78,#20069,0,"x")
+hasLocation(#20078,#20031)
+expr_containers(#20078,#20069)
+literals("x","x",#20078)
+decl(#20078,#20077)
+#20079=@"var;{arguments};{#20075}"
+variables(#20079,"arguments",#20075)
+is_arguments_object(#20079)
 #20080=*
-exprs(#20080,0,#20078,0,"constru ... any) {}")
-hasLocation(#20080,#20079)
-enclosing_stmt(#20080,#20062)
-expr_containers(#20080,#20001)
-literals("constructor","constructor",#20080)
+typeexprs(#20080,2,#20069,-6,"string")
+hasLocation(#20080,#20035)
+expr_containers(#20080,#20069)
+literals("string","string",#20080)
+is_method(#20072)
 #20081=*
-exprs(#20081,9,#20078,1,"constru ... any) {}")
-hasLocation(#20081,#20079)
-enclosing_stmt(#20081,#20062)
-expr_containers(#20081,#20001)
-#20082=*
-scopes(#20082,1)
-scopenodes(#20081,#20082)
-scopenesting(#20082,#20064)
-#20083=@"var;{x};{#20082}"
-variables(#20083,"x",#20082)
+properties(#20081,#20063,4,0,"constru ... any) {}")
+#20082=@"loc,{#10000},4,3,4,23"
+locations_default(#20082,#10000,4,3,4,23)
+hasLocation(#20081,#20082)
+#20083=*
+exprs(#20083,0,#20081,0,"constru ... any) {}")
+hasLocation(#20083,#20082)
+enclosing_stmt(#20083,#20063)
+expr_containers(#20083,#20001)
+literals("constructor","constructor",#20083)
 #20084=*
-exprs(#20084,78,#20081,0,"x")
-hasLocation(#20084,#20045)
-expr_containers(#20084,#20081)
-literals("x","x",#20084)
-decl(#20084,#20083)
-#20085=@"var;{arguments};{#20082}"
-variables(#20085,"arguments",#20082)
-is_arguments_object(#20085)
-#20086=*
-typeexprs(#20086,2,#20081,-6,"any")
-hasLocation(#20086,#20049)
-expr_containers(#20086,#20081)
-literals("any","any",#20086)
-#20087=*
-stmts(#20087,1,#20081,-2,"{}")
-#20088=@"loc,{#10000},4,22,4,23"
-locations_default(#20088,#10000,4,22,4,23)
-hasLocation(#20087,#20088)
-stmt_containers(#20087,#20081)
-is_method(#20078)
-#20089=*
-entry_cfg_node(#20089,#20001)
-#20090=@"loc,{#10000},1,1,1,0"
-locations_default(#20090,#10000,1,1,1,0)
-hasLocation(#20089,#20090)
+exprs(#20084,9,#20081,1,"constru ... any) {}")
+hasLocation(#20084,#20082)
+enclosing_stmt(#20084,#20063)
+expr_containers(#20084,#20001)
+#20085=*
+scopes(#20085,1)
+scopenodes(#20084,#20085)
+scopenesting(#20085,#20065)
+#20086=@"var;{this};{#20085}"
+variables(#20086,"this",#20085)
+#20087=@"var;{x};{#20085}"
+variables(#20087,"x",#20085)
+#20088=*
+exprs(#20088,78,#20084,0,"x")
+hasLocation(#20088,#20045)
+expr_containers(#20088,#20084)
+literals("x","x",#20088)
+decl(#20088,#20087)
+#20089=@"var;{arguments};{#20085}"
+variables(#20089,"arguments",#20085)
+is_arguments_object(#20089)
+#20090=*
+typeexprs(#20090,2,#20084,-6,"any")
+hasLocation(#20090,#20049)
+expr_containers(#20090,#20084)
+literals("any","any",#20090)
 #20091=*
-exit_cfg_node(#20091,#20001)
-hasLocation(#20091,#20058)
-successor(#20069,#20065)
-successor(#20068,#20069)
-successor(#20081,#20078)
-#20092=*
-entry_cfg_node(#20092,#20081)
-#20093=@"loc,{#10000},4,3,4,2"
-locations_default(#20093,#10000,4,3,4,2)
-hasLocation(#20092,#20093)
-successor(#20065,#20087)
-#20094=*
-exit_cfg_node(#20094,#20081)
-#20095=@"loc,{#10000},4,24,4,23"
-locations_default(#20095,#10000,4,24,4,23)
-hasLocation(#20094,#20095)
-successor(#20087,#20094)
-successor(#20084,#20068)
-successor(#20092,#20084)
-successor(#20080,#20081)
-successor(#20078,#20062)
-successor(#20070,#20080)
-successor(#20063,#20070)
-successor(#20062,#20091)
-successor(#20089,#20063)
+stmts(#20091,1,#20084,-2,"{}")
+#20092=@"loc,{#10000},4,22,4,23"
+locations_default(#20092,#10000,4,22,4,23)
+hasLocation(#20091,#20092)
+stmt_containers(#20091,#20084)
+is_method(#20081)
+#20093=*
+entry_cfg_node(#20093,#20001)
+#20094=@"loc,{#10000},1,1,1,0"
+locations_default(#20094,#10000,1,1,1,0)
+hasLocation(#20093,#20094)
+#20095=*
+exit_cfg_node(#20095,#20001)
+hasLocation(#20095,#20058)
+successor(#20071,#20067)
+successor(#20070,#20071)
+successor(#20084,#20081)
+#20096=*
+entry_cfg_node(#20096,#20084)
+#20097=@"loc,{#10000},4,3,4,2"
+locations_default(#20097,#10000,4,3,4,2)
+hasLocation(#20096,#20097)
+successor(#20067,#20091)
+#20098=*
+exit_cfg_node(#20098,#20084)
+#20099=@"loc,{#10000},4,24,4,23"
+locations_default(#20099,#10000,4,24,4,23)
+hasLocation(#20098,#20099)
+successor(#20091,#20098)
+successor(#20088,#20070)
+successor(#20096,#20088)
+successor(#20083,#20084)
+successor(#20081,#20063)
+successor(#20072,#20083)
+successor(#20064,#20072)
+successor(#20063,#20095)
+successor(#20093,#20064)
 numlines(#10000,5,5,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/declareClass.ts.trap

@@ -54,60 +54,66 @@ hasLocation(#20001,#20016)
 variables(#20017,"C",#20000)
 #20018=@"local_type_name;{C};{#20000}"
 local_type_names(#20018,"C",#20000)
-#20019=*
-stmts(#20019,26,#20001,0,"declare class C {}")
-hasLocation(#20019,#20003)
-stmt_containers(#20019,#20001)
-has_declare_keyword(#20019)
+#20019=@"var;{this};{#20000}"
+variables(#20019,"this",#20000)
 #20020=*
-exprs(#20020,78,#20019,0,"C")
-hasLocation(#20020,#20009)
-enclosing_stmt(#20020,#20019)
-expr_containers(#20020,#20001)
-literals("C","C",#20020)
-decl(#20020,#20017)
-typedecl(#20020,#20018)
+stmts(#20020,26,#20001,0,"declare class C {}")
+hasLocation(#20020,#20003)
+stmt_containers(#20020,#20001)
+has_declare_keyword(#20020)
 #20021=*
-scopes(#20021,10)
-scopenodes(#20019,#20021)
-scopenesting(#20021,#20000)
+exprs(#20021,78,#20020,0,"C")
+hasLocation(#20021,#20009)
+enclosing_stmt(#20021,#20020)
+expr_containers(#20021,#20001)
+literals("C","C",#20021)
+decl(#20021,#20017)
+typedecl(#20021,#20018)
 #20022=*
-properties(#20022,#20019,2,0,"constructor() {}")
-#20023=@"loc,{#10000},1,17,1,16"
-locations_default(#20023,#10000,1,17,1,16)
-hasLocation(#20022,#20023)
+scopes(#20022,10)
+scopenodes(#20020,#20022)
+scopenesting(#20022,#20000)
+#20023=@"var;{this};{#20022}"
+variables(#20023,"this",#20022)
 #20024=*
-exprs(#20024,0,#20022,0,"constructor")
-hasLocation(#20024,#20023)
-enclosing_stmt(#20024,#20019)
-expr_containers(#20024,#20001)
-literals("constructor","constructor",#20024)
-#20025=*
-exprs(#20025,9,#20022,1,"() {}")
-hasLocation(#20025,#20023)
-enclosing_stmt(#20025,#20019)
-expr_containers(#20025,#20001)
+properties(#20024,#20020,2,0,"constructor() {}")
+#20025=@"loc,{#10000},1,17,1,16"
+locations_default(#20025,#10000,1,17,1,16)
+hasLocation(#20024,#20025)
 #20026=*
-scopes(#20026,1)
-scopenodes(#20025,#20026)
-scopenesting(#20026,#20021)
-#20027=@"var;{arguments};{#20026}"
-variables(#20027,"arguments",#20026)
-is_arguments_object(#20027)
+exprs(#20026,0,#20024,0,"constructor")
+hasLocation(#20026,#20025)
+enclosing_stmt(#20026,#20020)
+expr_containers(#20026,#20001)
+literals("constructor","constructor",#20026)
+#20027=*
+exprs(#20027,9,#20024,1,"() {}")
+hasLocation(#20027,#20025)
+enclosing_stmt(#20027,#20020)
+expr_containers(#20027,#20001)
 #20028=*
-stmts(#20028,1,#20025,-2,"{}")
-hasLocation(#20028,#20023)
-stmt_containers(#20028,#20025)
-is_method(#20022)
-#20029=*
-entry_cfg_node(#20029,#20001)
-#20030=@"loc,{#10000},1,1,1,0"
-locations_default(#20030,#10000,1,1,1,0)
-hasLocation(#20029,#20030)
+scopes(#20028,1)
+scopenodes(#20027,#20028)
+scopenesting(#20028,#20022)
+#20029=@"var;{this};{#20028}"
+variables(#20029,"this",#20028)
+#20030=@"var;{arguments};{#20028}"
+variables(#20030,"arguments",#20028)
+is_arguments_object(#20030)
 #20031=*
-exit_cfg_node(#20031,#20001)
-hasLocation(#20031,#20015)
-successor(#20019,#20031)
-successor(#20029,#20019)
+stmts(#20031,1,#20027,-2,"{}")
+hasLocation(#20031,#20025)
+stmt_containers(#20031,#20027)
+is_method(#20024)
+#20032=*
+entry_cfg_node(#20032,#20001)
+#20033=@"loc,{#10000},1,1,1,0"
+locations_default(#20033,#10000,1,1,1,0)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20001)
+hasLocation(#20034,#20015)
+successor(#20020,#20034)
+successor(#20032,#20020)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/decorators.ts.trap

@@ -321,340 +321,355 @@ variables(#20115,"Class2",#20112)
 local_type_names(#20116,"Class",#20112)
 #20117=@"local_type_name;{Class2};{#20112}"
 local_type_names(#20117,"Class2",#20112)
-#20118=*
-stmts(#20118,26,#20001,0,"class C ... mber;\n}")
-#20119=@"loc,{#10000},2,1,8,1"
-locations_default(#20119,#10000,2,1,8,1)
-hasLocation(#20118,#20119)
-stmt_containers(#20118,#20001)
-#20120=*
-exprs(#20120,94,#20118,-2,"@classDecorator")
-hasLocation(#20120,#20003)
-enclosing_stmt(#20120,#20118)
-expr_containers(#20120,#20001)
+#20118=@"var;{this};{#20112}"
+variables(#20118,"this",#20112)
+#20119=*
+stmts(#20119,26,#20001,0,"class C ... mber;\n}")
+#20120=@"loc,{#10000},2,1,8,1"
+locations_default(#20120,#10000,2,1,8,1)
+hasLocation(#20119,#20120)
+stmt_containers(#20119,#20001)
 #20121=*
-exprs(#20121,79,#20120,0,"classDecorator")
-hasLocation(#20121,#20033)
-enclosing_stmt(#20121,#20118)
+exprs(#20121,94,#20119,-2,"@classDecorator")
+hasLocation(#20121,#20003)
+enclosing_stmt(#20121,#20119)
 expr_containers(#20121,#20001)
-literals("classDecorator","classDecorator",#20121)
-#20122=@"var;{classDecorator};{#20000}"
-variables(#20122,"classDecorator",#20000)
-bind(#20121,#20122)
-#20123=*
-exprs(#20123,78,#20118,0,"Class")
-hasLocation(#20123,#20037)
-enclosing_stmt(#20123,#20118)
-expr_containers(#20123,#20001)
-literals("Class","Class",#20123)
-decl(#20123,#20113)
-typedecl(#20123,#20116)
+#20122=*
+exprs(#20122,79,#20121,0,"classDecorator")
+hasLocation(#20122,#20033)
+enclosing_stmt(#20122,#20119)
+expr_containers(#20122,#20001)
+literals("classDecorator","classDecorator",#20122)
+#20123=@"var;{classDecorator};{#20000}"
+variables(#20123,"classDecorator",#20000)
+bind(#20122,#20123)
 #20124=*
-scopes(#20124,10)
-scopenodes(#20118,#20124)
-scopenesting(#20124,#20112)
+exprs(#20124,78,#20119,0,"Class")
+hasLocation(#20124,#20037)
+enclosing_stmt(#20124,#20119)
+expr_containers(#20124,#20001)
+literals("Class","Class",#20124)
+decl(#20124,#20113)
+typedecl(#20124,#20116)
 #20125=*
-properties(#20125,#20118,2,0,"method( ... field }")
-#20126=@"loc,{#10000},4,3,4,40"
-locations_default(#20126,#10000,4,3,4,40)
-hasLocation(#20125,#20126)
+scopes(#20125,10)
+scopenodes(#20119,#20125)
+scopenesting(#20125,#20112)
+#20126=@"var;{this};{#20125}"
+variables(#20126,"this",#20125)
 #20127=*
-exprs(#20127,94,#20125,-1,"@methodDecorator")
-#20128=@"loc,{#10000},3,3,3,18"
-locations_default(#20128,#10000,3,3,3,18)
+properties(#20127,#20119,2,0,"method( ... field }")
+#20128=@"loc,{#10000},4,3,4,40"
+locations_default(#20128,#10000,4,3,4,40)
 hasLocation(#20127,#20128)
-enclosing_stmt(#20127,#20118)
-expr_containers(#20127,#20001)
 #20129=*
-exprs(#20129,79,#20127,0,"methodDecorator")
-hasLocation(#20129,#20043)
-enclosing_stmt(#20129,#20118)
+exprs(#20129,94,#20127,-1,"@methodDecorator")
+#20130=@"loc,{#10000},3,3,3,18"
+locations_default(#20130,#10000,3,3,3,18)
+hasLocation(#20129,#20130)
+enclosing_stmt(#20129,#20119)
 expr_containers(#20129,#20001)
-literals("methodDecorator","methodDecorator",#20129)
-#20130=@"var;{methodDecorator};{#20000}"
-variables(#20130,"methodDecorator",#20000)
-bind(#20129,#20130)
 #20131=*
-exprs(#20131,0,#20125,0,"method")
-hasLocation(#20131,#20045)
-enclosing_stmt(#20131,#20118)
+exprs(#20131,79,#20129,0,"methodDecorator")
+hasLocation(#20131,#20043)
+enclosing_stmt(#20131,#20119)
 expr_containers(#20131,#20001)
-literals("method","method",#20131)
-#20132=*
-exprs(#20132,9,#20125,1,"method( ... field }")
-hasLocation(#20132,#20126)
-enclosing_stmt(#20132,#20118)
-expr_containers(#20132,#20001)
+literals("methodDecorator","methodDecorator",#20131)
+#20132=@"var;{methodDecorator};{#20000}"
+variables(#20132,"methodDecorator",#20000)
+bind(#20131,#20132)
 #20133=*
-scopes(#20133,1)
-scopenodes(#20132,#20133)
-scopenesting(#20133,#20124)
-#20134=@"var;{arguments};{#20133}"
-variables(#20134,"arguments",#20133)
-is_arguments_object(#20134)
+exprs(#20133,0,#20127,0,"method")
+hasLocation(#20133,#20045)
+enclosing_stmt(#20133,#20119)
+expr_containers(#20133,#20001)
+literals("method","method",#20133)
+#20134=*
+exprs(#20134,9,#20127,1,"method( ... field }")
+hasLocation(#20134,#20128)
+enclosing_stmt(#20134,#20119)
+expr_containers(#20134,#20001)
 #20135=*
-typeexprs(#20135,2,#20132,-3,"number")
-hasLocation(#20135,#20053)
-expr_containers(#20135,#20132)
-literals("number","number",#20135)
-#20136=*
-stmts(#20136,1,#20132,-2,"{ retur ... field }")
-#20137=@"loc,{#10000},4,20,4,40"
-locations_default(#20137,#10000,4,20,4,40)
-hasLocation(#20136,#20137)
-stmt_containers(#20136,#20132)
+scopes(#20135,1)
+scopenodes(#20134,#20135)
+scopenesting(#20135,#20125)
+#20136=@"var;{this};{#20135}"
+variables(#20136,"this",#20135)
+#20137=@"var;{arguments};{#20135}"
+variables(#20137,"arguments",#20135)
+is_arguments_object(#20137)
 #20138=*
-stmts(#20138,9,#20136,0,"return this.field")
-#20139=@"loc,{#10000},4,22,4,38"
-locations_default(#20139,#10000,4,22,4,38)
-hasLocation(#20138,#20139)
-stmt_containers(#20138,#20132)
-#20140=*
-exprs(#20140,14,#20138,0,"this.field")
-#20141=@"loc,{#10000},4,29,4,38"
-locations_default(#20141,#10000,4,29,4,38)
-hasLocation(#20140,#20141)
-enclosing_stmt(#20140,#20138)
-expr_containers(#20140,#20132)
-#20142=*
-exprs(#20142,6,#20140,0,"this")
-hasLocation(#20142,#20059)
-enclosing_stmt(#20142,#20138)
-expr_containers(#20142,#20132)
+typeexprs(#20138,2,#20134,-3,"number")
+hasLocation(#20138,#20053)
+expr_containers(#20138,#20134)
+literals("number","number",#20138)
+#20139=*
+stmts(#20139,1,#20134,-2,"{ retur ... field }")
+#20140=@"loc,{#10000},4,20,4,40"
+locations_default(#20140,#10000,4,20,4,40)
+hasLocation(#20139,#20140)
+stmt_containers(#20139,#20134)
+#20141=*
+stmts(#20141,9,#20139,0,"return this.field")
+#20142=@"loc,{#10000},4,22,4,38"
+locations_default(#20142,#10000,4,22,4,38)
+hasLocation(#20141,#20142)
+stmt_containers(#20141,#20134)
 #20143=*
-exprs(#20143,0,#20140,1,"field")
-hasLocation(#20143,#20063)
-enclosing_stmt(#20143,#20138)
-expr_containers(#20143,#20132)
-literals("field","field",#20143)
-is_method(#20125)
-#20144=*
-properties(#20144,#20118,3,8,"field: number;")
-#20145=@"loc,{#10000},7,3,7,16"
-locations_default(#20145,#10000,7,3,7,16)
-hasLocation(#20144,#20145)
+exprs(#20143,14,#20141,0,"this.field")
+#20144=@"loc,{#10000},4,29,4,38"
+locations_default(#20144,#10000,4,29,4,38)
+hasLocation(#20143,#20144)
+enclosing_stmt(#20143,#20141)
+expr_containers(#20143,#20134)
+#20145=*
+exprs(#20145,6,#20143,0,"this")
+hasLocation(#20145,#20059)
+enclosing_stmt(#20145,#20141)
+expr_containers(#20145,#20134)
+bind(#20145,#20136)
 #20146=*
-exprs(#20146,94,#20144,-1,"@fieldDecorator")
-#20147=@"loc,{#10000},6,3,6,17"
-locations_default(#20147,#10000,6,3,6,17)
-hasLocation(#20146,#20147)
-enclosing_stmt(#20146,#20118)
-expr_containers(#20146,#20001)
-#20148=*
-exprs(#20148,79,#20146,0,"fieldDecorator")
-hasLocation(#20148,#20069)
-enclosing_stmt(#20148,#20118)
-expr_containers(#20148,#20001)
-literals("fieldDecorator","fieldDecorator",#20148)
-#20149=@"var;{fieldDecorator};{#20000}"
-variables(#20149,"fieldDecorator",#20000)
-bind(#20148,#20149)
-#20150=*
+exprs(#20146,0,#20143,1,"field")
+hasLocation(#20146,#20063)
+enclosing_stmt(#20146,#20141)
+expr_containers(#20146,#20134)
+literals("field","field",#20146)
+is_method(#20127)
+#20147=*
+properties(#20147,#20119,3,8,"field: number;")
+#20148=@"loc,{#10000},7,3,7,16"
+locations_default(#20148,#10000,7,3,7,16)
+hasLocation(#20147,#20148)
+#20149=*
+exprs(#20149,94,#20147,-1,"@fieldDecorator")
+#20150=@"loc,{#10000},6,3,6,17"
+locations_default(#20150,#10000,6,3,6,17)
+hasLocation(#20149,#20150)
+enclosing_stmt(#20149,#20119)
+expr_containers(#20149,#20001)
 #20151=*
-exprs(#20151,0,#20144,0,"field")
-hasLocation(#20151,#20071)
-expr_containers(#20151,#20150)
-literals("field","field",#20151)
-#20152=*
-typeexprs(#20152,2,#20144,2,"number")
-hasLocation(#20152,#20075)
-enclosing_stmt(#20152,#20118)
-expr_containers(#20152,#20001)
-literals("number","number",#20152)
+exprs(#20151,79,#20149,0,"fieldDecorator")
+hasLocation(#20151,#20069)
+enclosing_stmt(#20151,#20119)
+expr_containers(#20151,#20001)
+literals("fieldDecorator","fieldDecorator",#20151)
+#20152=@"var;{fieldDecorator};{#20000}"
+variables(#20152,"fieldDecorator",#20000)
+bind(#20151,#20152)
 #20153=*
-properties(#20153,#20118,4,0,"constructor() {}")
-#20154=@"loc,{#10000},2,13,2,12"
-locations_default(#20154,#10000,2,13,2,12)
-hasLocation(#20153,#20154)
+#20154=*
+exprs(#20154,0,#20147,0,"field")
+hasLocation(#20154,#20071)
+expr_containers(#20154,#20153)
+literals("field","field",#20154)
 #20155=*
-exprs(#20155,0,#20153,0,"constructor")
-hasLocation(#20155,#20154)
-enclosing_stmt(#20155,#20118)
+typeexprs(#20155,2,#20147,2,"number")
+hasLocation(#20155,#20075)
+enclosing_stmt(#20155,#20119)
 expr_containers(#20155,#20001)
-literals("constructor","constructor",#20155)
-exprs(#20150,9,#20153,1,"() {}")
-hasLocation(#20150,#20154)
-enclosing_stmt(#20150,#20118)
-expr_containers(#20150,#20001)
+literals("number","number",#20155)
 #20156=*
-scopes(#20156,1)
-scopenodes(#20150,#20156)
-scopenesting(#20156,#20124)
-#20157=@"var;{arguments};{#20156}"
-variables(#20157,"arguments",#20156)
-is_arguments_object(#20157)
+properties(#20156,#20119,4,0,"constructor() {}")
+#20157=@"loc,{#10000},2,13,2,12"
+locations_default(#20157,#10000,2,13,2,12)
+hasLocation(#20156,#20157)
 #20158=*
-stmts(#20158,1,#20150,-2,"{}")
-hasLocation(#20158,#20154)
-stmt_containers(#20158,#20150)
-is_method(#20153)
+exprs(#20158,0,#20156,0,"constructor")
+hasLocation(#20158,#20157)
+enclosing_stmt(#20158,#20119)
+expr_containers(#20158,#20001)
+literals("constructor","constructor",#20158)
+exprs(#20153,9,#20156,1,"() {}")
+hasLocation(#20153,#20157)
+enclosing_stmt(#20153,#20119)
+expr_containers(#20153,#20001)
 #20159=*
-stmts(#20159,17,#20001,1,"@functi ... un() {}")
-#20160=@"loc,{#10000},10,1,11,17"
-locations_default(#20160,#10000,10,1,11,17)
-hasLocation(#20159,#20160)
-stmt_containers(#20159,#20001)
-#20161=*
-exprs(#20161,78,#20159,-1,"fun")
-hasLocation(#20161,#20086)
-expr_containers(#20161,#20159)
-literals("fun","fun",#20161)
-decl(#20161,#20114)
+scopes(#20159,1)
+scopenodes(#20153,#20159)
+scopenesting(#20159,#20125)
+#20160=@"var;{this};{#20159}"
+variables(#20160,"this",#20159)
+#20161=@"var;{arguments};{#20159}"
+variables(#20161,"arguments",#20159)
+is_arguments_object(#20161)
 #20162=*
-scopes(#20162,1)
-scopenodes(#20159,#20162)
-scopenesting(#20162,#20112)
-#20163=@"var;{arguments};{#20162}"
-variables(#20163,"arguments",#20162)
-is_arguments_object(#20163)
-#20164=*
-stmts(#20164,1,#20159,-2,"{}")
-#20165=@"loc,{#10000},11,16,11,17"
-locations_default(#20165,#10000,11,16,11,17)
-hasLocation(#20164,#20165)
-stmt_containers(#20164,#20159)
+stmts(#20162,1,#20153,-2,"{}")
+hasLocation(#20162,#20157)
+stmt_containers(#20162,#20153)
+is_method(#20156)
+#20163=*
+stmts(#20163,17,#20001,1,"@functi ... un() {}")
+#20164=@"loc,{#10000},10,1,11,17"
+locations_default(#20164,#10000,10,1,11,17)
+hasLocation(#20163,#20164)
+stmt_containers(#20163,#20001)
+#20165=*
+exprs(#20165,78,#20163,-1,"fun")
+hasLocation(#20165,#20086)
+expr_containers(#20165,#20163)
+literals("fun","fun",#20165)
+decl(#20165,#20114)
 #20166=*
-stmts(#20166,30,#20001,2,"export  ... ass2 {}")
-hasLocation(#20166,#20029)
-stmt_containers(#20166,#20001)
-#20167=*
-stmts(#20167,26,#20166,-1,"class Class2 {}")
-#20168=@"loc,{#10000},14,8,14,22"
-locations_default(#20168,#10000,14,8,14,22)
-hasLocation(#20167,#20168)
-stmt_containers(#20167,#20001)
+scopes(#20166,1)
+scopenodes(#20163,#20166)
+scopenesting(#20166,#20112)
+#20167=@"var;{this};{#20166}"
+variables(#20167,"this",#20166)
+#20168=@"var;{arguments};{#20166}"
+variables(#20168,"arguments",#20166)
+is_arguments_object(#20168)
 #20169=*
-exprs(#20169,94,#20167,-2,"@classDecorator2")
-hasLocation(#20169,#20027)
-enclosing_stmt(#20169,#20167)
-expr_containers(#20169,#20001)
-#20170=*
-exprs(#20170,79,#20169,0,"classDecorator2")
-hasLocation(#20170,#20098)
-enclosing_stmt(#20170,#20167)
-expr_containers(#20170,#20001)
-literals("classDecorator2","classDecorator2",#20170)
-#20171=@"var;{classDecorator2};{#20000}"
-variables(#20171,"classDecorator2",#20000)
-bind(#20170,#20171)
+stmts(#20169,1,#20163,-2,"{}")
+#20170=@"loc,{#10000},11,16,11,17"
+locations_default(#20170,#10000,11,16,11,17)
+hasLocation(#20169,#20170)
+stmt_containers(#20169,#20163)
+#20171=*
+stmts(#20171,30,#20001,2,"export  ... ass2 {}")
+hasLocation(#20171,#20029)
+stmt_containers(#20171,#20001)
 #20172=*
-exprs(#20172,78,#20167,0,"Class2")
-hasLocation(#20172,#20104)
-enclosing_stmt(#20172,#20167)
-expr_containers(#20172,#20001)
-literals("Class2","Class2",#20172)
-decl(#20172,#20115)
-typedecl(#20172,#20117)
-#20173=*
-scopes(#20173,10)
-scopenodes(#20167,#20173)
-scopenesting(#20173,#20112)
+stmts(#20172,26,#20171,-1,"class Class2 {}")
+#20173=@"loc,{#10000},14,8,14,22"
+locations_default(#20173,#10000,14,8,14,22)
+hasLocation(#20172,#20173)
+stmt_containers(#20172,#20001)
 #20174=*
-properties(#20174,#20167,2,0,"constructor() {}")
-#20175=@"loc,{#10000},14,21,14,20"
-locations_default(#20175,#10000,14,21,14,20)
-hasLocation(#20174,#20175)
-#20176=*
-exprs(#20176,0,#20174,0,"constructor")
-hasLocation(#20176,#20175)
-enclosing_stmt(#20176,#20167)
-expr_containers(#20176,#20001)
-literals("constructor","constructor",#20176)
+exprs(#20174,94,#20172,-2,"@classDecorator2")
+hasLocation(#20174,#20027)
+enclosing_stmt(#20174,#20172)
+expr_containers(#20174,#20001)
+#20175=*
+exprs(#20175,79,#20174,0,"classDecorator2")
+hasLocation(#20175,#20098)
+enclosing_stmt(#20175,#20172)
+expr_containers(#20175,#20001)
+literals("classDecorator2","classDecorator2",#20175)
+#20176=@"var;{classDecorator2};{#20000}"
+variables(#20176,"classDecorator2",#20000)
+bind(#20175,#20176)
 #20177=*
-exprs(#20177,9,#20174,1,"() {}")
-hasLocation(#20177,#20175)
-enclosing_stmt(#20177,#20167)
+exprs(#20177,78,#20172,0,"Class2")
+hasLocation(#20177,#20104)
+enclosing_stmt(#20177,#20172)
 expr_containers(#20177,#20001)
+literals("Class2","Class2",#20177)
+decl(#20177,#20115)
+typedecl(#20177,#20117)
 #20178=*
-scopes(#20178,1)
-scopenodes(#20177,#20178)
-scopenesting(#20178,#20173)
-#20179=@"var;{arguments};{#20178}"
-variables(#20179,"arguments",#20178)
-is_arguments_object(#20179)
+scopes(#20178,10)
+scopenodes(#20172,#20178)
+scopenesting(#20178,#20112)
+#20179=@"var;{this};{#20178}"
+variables(#20179,"this",#20178)
 #20180=*
-stmts(#20180,1,#20177,-2,"{}")
-hasLocation(#20180,#20175)
-stmt_containers(#20180,#20177)
-is_method(#20174)
-#20181=*
-entry_cfg_node(#20181,#20001)
-#20182=@"loc,{#10000},1,1,1,0"
-locations_default(#20182,#10000,1,1,1,0)
-hasLocation(#20181,#20182)
+properties(#20180,#20172,2,0,"constructor() {}")
+#20181=@"loc,{#10000},14,21,14,20"
+locations_default(#20181,#10000,14,21,14,20)
+hasLocation(#20180,#20181)
+#20182=*
+exprs(#20182,0,#20180,0,"constructor")
+hasLocation(#20182,#20181)
+enclosing_stmt(#20182,#20172)
+expr_containers(#20182,#20001)
+literals("constructor","constructor",#20182)
 #20183=*
-exit_cfg_node(#20183,#20001)
-hasLocation(#20183,#20110)
-successor(#20166,#20172)
-successor(#20177,#20174)
+exprs(#20183,9,#20180,1,"() {}")
+hasLocation(#20183,#20181)
+enclosing_stmt(#20183,#20172)
+expr_containers(#20183,#20001)
 #20184=*
-entry_cfg_node(#20184,#20177)
-hasLocation(#20184,#20175)
-#20185=*
-exit_cfg_node(#20185,#20177)
-hasLocation(#20185,#20175)
-successor(#20180,#20185)
-successor(#20184,#20180)
-successor(#20176,#20177)
-successor(#20174,#20167)
-successor(#20172,#20176)
-successor(#20170,#20169)
-successor(#20169,#20183)
-successor(#20167,#20170)
-successor(#20159,#20166)
-#20186=*
-entry_cfg_node(#20186,#20159)
-#20187=@"loc,{#10000},10,1,10,0"
-locations_default(#20187,#10000,10,1,10,0)
-hasLocation(#20186,#20187)
+scopes(#20184,1)
+scopenodes(#20183,#20184)
+scopenesting(#20184,#20178)
+#20185=@"var;{this};{#20184}"
+variables(#20185,"this",#20184)
+#20186=@"var;{arguments};{#20184}"
+variables(#20186,"arguments",#20184)
+is_arguments_object(#20186)
+#20187=*
+stmts(#20187,1,#20183,-2,"{}")
+hasLocation(#20187,#20181)
+stmt_containers(#20187,#20183)
+is_method(#20180)
 #20188=*
-exit_cfg_node(#20188,#20159)
-#20189=@"loc,{#10000},11,18,11,17"
-locations_default(#20189,#10000,11,18,11,17)
+entry_cfg_node(#20188,#20001)
+#20189=@"loc,{#10000},1,1,1,0"
+locations_default(#20189,#10000,1,1,1,0)
 hasLocation(#20188,#20189)
-successor(#20164,#20188)
-successor(#20186,#20164)
-successor(#20151,#20144)
-successor(#20150,#20153)
 #20190=*
-entry_cfg_node(#20190,#20150)
-hasLocation(#20190,#20154)
-successor(#20144,#20158)
+exit_cfg_node(#20190,#20001)
+hasLocation(#20190,#20110)
+successor(#20171,#20177)
+successor(#20183,#20180)
 #20191=*
-exit_cfg_node(#20191,#20150)
-hasLocation(#20191,#20154)
-successor(#20158,#20191)
-successor(#20190,#20151)
-successor(#20155,#20150)
-successor(#20153,#20118)
-successor(#20132,#20125)
+entry_cfg_node(#20191,#20183)
+hasLocation(#20191,#20181)
 #20192=*
-entry_cfg_node(#20192,#20132)
-#20193=@"loc,{#10000},4,3,4,2"
-locations_default(#20193,#10000,4,3,4,2)
-hasLocation(#20192,#20193)
-#20194=*
-exit_cfg_node(#20194,#20132)
-#20195=@"loc,{#10000},4,41,4,40"
-locations_default(#20195,#10000,4,41,4,40)
-hasLocation(#20194,#20195)
-successor(#20143,#20140)
-successor(#20142,#20143)
-successor(#20140,#20138)
-successor(#20138,#20194)
-successor(#20136,#20142)
-successor(#20192,#20136)
-successor(#20131,#20132)
-successor(#20125,#20155)
-successor(#20123,#20131)
-successor(#20121,#20120)
-successor(#20120,#20159)
-successor(#20148,#20146)
-successor(#20146,#20121)
-successor(#20129,#20127)
-successor(#20127,#20148)
-successor(#20118,#20129)
-successor(#20161,#20123)
-successor(#20181,#20161)
+exit_cfg_node(#20192,#20183)
+hasLocation(#20192,#20181)
+successor(#20187,#20192)
+successor(#20191,#20187)
+successor(#20182,#20183)
+successor(#20180,#20172)
+successor(#20177,#20182)
+successor(#20175,#20174)
+successor(#20174,#20190)
+successor(#20172,#20175)
+successor(#20163,#20171)
+#20193=*
+entry_cfg_node(#20193,#20163)
+#20194=@"loc,{#10000},10,1,10,0"
+locations_default(#20194,#10000,10,1,10,0)
+hasLocation(#20193,#20194)
+#20195=*
+exit_cfg_node(#20195,#20163)
+#20196=@"loc,{#10000},11,18,11,17"
+locations_default(#20196,#10000,11,18,11,17)
+hasLocation(#20195,#20196)
+successor(#20169,#20195)
+successor(#20193,#20169)
+successor(#20154,#20147)
+successor(#20153,#20156)
+#20197=*
+entry_cfg_node(#20197,#20153)
+hasLocation(#20197,#20157)
+successor(#20147,#20162)
+#20198=*
+exit_cfg_node(#20198,#20153)
+hasLocation(#20198,#20157)
+successor(#20162,#20198)
+successor(#20197,#20154)
+successor(#20158,#20153)
+successor(#20156,#20119)
+successor(#20134,#20127)
+#20199=*
+entry_cfg_node(#20199,#20134)
+#20200=@"loc,{#10000},4,3,4,2"
+locations_default(#20200,#10000,4,3,4,2)
+hasLocation(#20199,#20200)
+#20201=*
+exit_cfg_node(#20201,#20134)
+#20202=@"loc,{#10000},4,41,4,40"
+locations_default(#20202,#10000,4,41,4,40)
+hasLocation(#20201,#20202)
+successor(#20146,#20143)
+successor(#20145,#20146)
+successor(#20143,#20141)
+successor(#20141,#20201)
+successor(#20139,#20145)
+successor(#20199,#20139)
+successor(#20133,#20134)
+successor(#20127,#20158)
+successor(#20124,#20133)
+successor(#20122,#20121)
+successor(#20121,#20163)
+successor(#20151,#20149)
+successor(#20149,#20122)
+successor(#20131,#20129)
+successor(#20129,#20151)
+successor(#20119,#20131)
+successor(#20165,#20124)
+successor(#20188,#20165)
 numlines(#10000,14,11,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/dynamic-type.ts.trap

@@ -82,58 +82,60 @@ locations_default(#20028,#10000,1,1,2,0)
 hasLocation(#20001,#20028)
 #20029=@"local_type_name;{Foo};{#20000}"
 local_type_names(#20029,"Foo",#20000)
-#20030=*
-stmts(#20030,34,#20001,0,"interfa ... .Bar {}")
-hasLocation(#20030,#20003)
-stmt_containers(#20030,#20001)
+#20030=@"var;{this};{#20000}"
+variables(#20030,"this",#20000)
 #20031=*
-typeexprs(#20031,13,#20030,-1,"import(""foo"").Bar")
-#20032=@"loc,{#10000},1,23,1,39"
-locations_default(#20032,#10000,1,23,1,39)
-hasLocation(#20031,#20032)
-enclosing_stmt(#20031,#20030)
-expr_containers(#20031,#20001)
-#20033=*
-typeexprs(#20033,31,#20031,0,"import(""foo"")")
-#20034=@"loc,{#10000},1,23,1,35"
-locations_default(#20034,#10000,1,23,1,35)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20030)
-expr_containers(#20033,#20001)
-#20035=*
-exprs(#20035,4,#20033,0,"""foo""")
-hasLocation(#20035,#20015)
-enclosing_stmt(#20035,#20030)
-expr_containers(#20035,#20001)
-literals("foo","""foo""",#20035)
+stmts(#20031,34,#20001,0,"interfa ... .Bar {}")
+hasLocation(#20031,#20003)
+stmt_containers(#20031,#20001)
+#20032=*
+typeexprs(#20032,13,#20031,-1,"import(""foo"").Bar")
+#20033=@"loc,{#10000},1,23,1,39"
+locations_default(#20033,#10000,1,23,1,39)
+hasLocation(#20032,#20033)
+enclosing_stmt(#20032,#20031)
+expr_containers(#20032,#20001)
+#20034=*
+typeexprs(#20034,31,#20032,0,"import(""foo"")")
+#20035=@"loc,{#10000},1,23,1,35"
+locations_default(#20035,#10000,1,23,1,35)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20031)
+expr_containers(#20034,#20001)
 #20036=*
-regexpterm(#20036,14,#20035,0,"foo")
-#20037=@"loc,{#10000},1,31,1,33"
-locations_default(#20037,#10000,1,31,1,33)
-hasLocation(#20036,#20037)
-regexp_const_value(#20036,"foo")
-#20038=*
-typeexprs(#20038,15,#20031,1,"Bar")
-hasLocation(#20038,#20021)
-enclosing_stmt(#20038,#20030)
-expr_containers(#20038,#20001)
-literals("Bar","Bar",#20038)
+exprs(#20036,4,#20034,0,"""foo""")
+hasLocation(#20036,#20015)
+enclosing_stmt(#20036,#20031)
+expr_containers(#20036,#20001)
+literals("foo","""foo""",#20036)
+#20037=*
+regexpterm(#20037,14,#20036,0,"foo")
+#20038=@"loc,{#10000},1,31,1,33"
+locations_default(#20038,#10000,1,31,1,33)
+hasLocation(#20037,#20038)
+regexp_const_value(#20037,"foo")
 #20039=*
-typeexprs(#20039,1,#20030,0,"Foo")
-hasLocation(#20039,#20007)
-enclosing_stmt(#20039,#20030)
+typeexprs(#20039,15,#20032,1,"Bar")
+hasLocation(#20039,#20021)
+enclosing_stmt(#20039,#20031)
 expr_containers(#20039,#20001)
-literals("Foo","Foo",#20039)
-typedecl(#20039,#20029)
+literals("Bar","Bar",#20039)
 #20040=*
-entry_cfg_node(#20040,#20001)
-#20041=@"loc,{#10000},1,1,1,0"
-locations_default(#20041,#10000,1,1,1,0)
-hasLocation(#20040,#20041)
-#20042=*
-exit_cfg_node(#20042,#20001)
-hasLocation(#20042,#20027)
-successor(#20030,#20042)
-successor(#20040,#20030)
+typeexprs(#20040,1,#20031,0,"Foo")
+hasLocation(#20040,#20007)
+enclosing_stmt(#20040,#20031)
+expr_containers(#20040,#20001)
+literals("Foo","Foo",#20040)
+typedecl(#20040,#20029)
+#20041=*
+entry_cfg_node(#20041,#20001)
+#20042=@"loc,{#10000},1,1,1,0"
+locations_default(#20042,#10000,1,1,1,0)
+hasLocation(#20041,#20042)
+#20043=*
+exit_cfg_node(#20043,#20001)
+hasLocation(#20043,#20027)
+successor(#20031,#20043)
+successor(#20041,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/export.ts.trap

@@ -163,164 +163,172 @@ variables(#20057,"C",#20055)
 variables(#20058,"f",#20055)
 #20059=@"local_type_name;{C};{#20055}"
 local_type_names(#20059,"C",#20055)
-#20060=*
-stmts(#20060,30,#20001,0,"export  ... o = 42;")
-hasLocation(#20060,#20003)
-stmt_containers(#20060,#20001)
+#20060=@"var;{this};{#20055}"
+variables(#20060,"this",#20055)
 #20061=*
-stmts(#20061,22,#20060,-1,"const foo = 42;")
-#20062=@"loc,{#10000},1,8,1,22"
-locations_default(#20062,#10000,1,8,1,22)
-hasLocation(#20061,#20062)
+stmts(#20061,30,#20001,0,"export  ... o = 42;")
+hasLocation(#20061,#20003)
 stmt_containers(#20061,#20001)
-#20063=*
-exprs(#20063,64,#20061,0,"foo = 42")
-#20064=@"loc,{#10000},1,14,1,21"
-locations_default(#20064,#10000,1,14,1,21)
-hasLocation(#20063,#20064)
-enclosing_stmt(#20063,#20061)
-expr_containers(#20063,#20001)
-#20065=*
-exprs(#20065,78,#20063,0,"foo")
-hasLocation(#20065,#20017)
-enclosing_stmt(#20065,#20061)
-expr_containers(#20065,#20001)
-literals("foo","foo",#20065)
-decl(#20065,#20056)
+#20062=*
+stmts(#20062,22,#20061,-1,"const foo = 42;")
+#20063=@"loc,{#10000},1,8,1,22"
+locations_default(#20063,#10000,1,8,1,22)
+hasLocation(#20062,#20063)
+stmt_containers(#20062,#20001)
+#20064=*
+exprs(#20064,64,#20062,0,"foo = 42")
+#20065=@"loc,{#10000},1,14,1,21"
+locations_default(#20065,#10000,1,14,1,21)
+hasLocation(#20064,#20065)
+enclosing_stmt(#20064,#20062)
+expr_containers(#20064,#20001)
 #20066=*
-exprs(#20066,3,#20063,1,"42")
-hasLocation(#20066,#20021)
-enclosing_stmt(#20066,#20061)
+exprs(#20066,78,#20064,0,"foo")
+hasLocation(#20066,#20017)
+enclosing_stmt(#20066,#20062)
 expr_containers(#20066,#20001)
-literals("42","42",#20066)
+literals("foo","foo",#20066)
+decl(#20066,#20056)
 #20067=*
-stmts(#20067,30,#20001,1,"export class C {}")
-hasLocation(#20067,#20007)
-stmt_containers(#20067,#20001)
+exprs(#20067,3,#20064,1,"42")
+hasLocation(#20067,#20021)
+enclosing_stmt(#20067,#20062)
+expr_containers(#20067,#20001)
+literals("42","42",#20067)
 #20068=*
-stmts(#20068,26,#20067,-1,"class C {}")
-#20069=@"loc,{#10000},3,8,3,17"
-locations_default(#20069,#10000,3,8,3,17)
-hasLocation(#20068,#20069)
+stmts(#20068,30,#20001,1,"export class C {}")
+hasLocation(#20068,#20007)
 stmt_containers(#20068,#20001)
-#20070=*
-exprs(#20070,78,#20068,0,"C")
-hasLocation(#20070,#20029)
-enclosing_stmt(#20070,#20068)
-expr_containers(#20070,#20001)
-literals("C","C",#20070)
-decl(#20070,#20057)
-typedecl(#20070,#20059)
+#20069=*
+stmts(#20069,26,#20068,-1,"class C {}")
+#20070=@"loc,{#10000},3,8,3,17"
+locations_default(#20070,#10000,3,8,3,17)
+hasLocation(#20069,#20070)
+stmt_containers(#20069,#20001)
 #20071=*
-scopes(#20071,10)
-scopenodes(#20068,#20071)
-scopenesting(#20071,#20055)
+exprs(#20071,78,#20069,0,"C")
+hasLocation(#20071,#20029)
+enclosing_stmt(#20071,#20069)
+expr_containers(#20071,#20001)
+literals("C","C",#20071)
+decl(#20071,#20057)
+typedecl(#20071,#20059)
 #20072=*
-properties(#20072,#20068,2,0,"constructor() {}")
-#20073=@"loc,{#10000},3,16,3,15"
-locations_default(#20073,#10000,3,16,3,15)
-hasLocation(#20072,#20073)
+scopes(#20072,10)
+scopenodes(#20069,#20072)
+scopenesting(#20072,#20055)
+#20073=@"var;{this};{#20072}"
+variables(#20073,"this",#20072)
 #20074=*
-exprs(#20074,0,#20072,0,"constructor")
-hasLocation(#20074,#20073)
-enclosing_stmt(#20074,#20068)
-expr_containers(#20074,#20001)
-literals("constructor","constructor",#20074)
-#20075=*
-exprs(#20075,9,#20072,1,"() {}")
-hasLocation(#20075,#20073)
-enclosing_stmt(#20075,#20068)
-expr_containers(#20075,#20001)
+properties(#20074,#20069,2,0,"constructor() {}")
+#20075=@"loc,{#10000},3,16,3,15"
+locations_default(#20075,#10000,3,16,3,15)
+hasLocation(#20074,#20075)
 #20076=*
-scopes(#20076,1)
-scopenodes(#20075,#20076)
-scopenesting(#20076,#20071)
-#20077=@"var;{arguments};{#20076}"
-variables(#20077,"arguments",#20076)
-is_arguments_object(#20077)
+exprs(#20076,0,#20074,0,"constructor")
+hasLocation(#20076,#20075)
+enclosing_stmt(#20076,#20069)
+expr_containers(#20076,#20001)
+literals("constructor","constructor",#20076)
+#20077=*
+exprs(#20077,9,#20074,1,"() {}")
+hasLocation(#20077,#20075)
+enclosing_stmt(#20077,#20069)
+expr_containers(#20077,#20001)
 #20078=*
-stmts(#20078,1,#20075,-2,"{}")
-hasLocation(#20078,#20073)
-stmt_containers(#20078,#20075)
-is_method(#20072)
-#20079=*
-stmts(#20079,29,#20001,2,"export  ...  f() {}")
-#20080=@"loc,{#10000},5,1,5,30"
-locations_default(#20080,#10000,5,1,5,30)
-hasLocation(#20079,#20080)
-stmt_containers(#20079,#20001)
+scopes(#20078,1)
+scopenodes(#20077,#20078)
+scopenesting(#20078,#20072)
+#20079=@"var;{this};{#20078}"
+variables(#20079,"this",#20078)
+#20080=@"var;{arguments};{#20078}"
+variables(#20080,"arguments",#20078)
+is_arguments_object(#20080)
 #20081=*
-stmts(#20081,17,#20079,0,"function f() {}")
-#20082=@"loc,{#10000},5,16,5,30"
-locations_default(#20082,#10000,5,16,5,30)
-hasLocation(#20081,#20082)
-stmt_containers(#20081,#20001)
-#20083=*
-exprs(#20083,78,#20081,-1,"f")
-hasLocation(#20083,#20041)
-expr_containers(#20083,#20081)
-literals("f","f",#20083)
-decl(#20083,#20058)
+stmts(#20081,1,#20077,-2,"{}")
+hasLocation(#20081,#20075)
+stmt_containers(#20081,#20077)
+is_method(#20074)
+#20082=*
+stmts(#20082,29,#20001,2,"export  ...  f() {}")
+#20083=@"loc,{#10000},5,1,5,30"
+locations_default(#20083,#10000,5,1,5,30)
+hasLocation(#20082,#20083)
+stmt_containers(#20082,#20001)
 #20084=*
-scopes(#20084,1)
-scopenodes(#20081,#20084)
-scopenesting(#20084,#20055)
-#20085=@"var;{arguments};{#20084}"
-variables(#20085,"arguments",#20084)
-is_arguments_object(#20085)
+stmts(#20084,17,#20082,0,"function f() {}")
+#20085=@"loc,{#10000},5,16,5,30"
+locations_default(#20085,#10000,5,16,5,30)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20001)
 #20086=*
-stmts(#20086,1,#20081,-2,"{}")
-#20087=@"loc,{#10000},5,29,5,30"
-locations_default(#20087,#10000,5,29,5,30)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20081)
-#20088=*
-stmts(#20088,0,#20001,3,";")
-hasLocation(#20088,#20051)
-stmt_containers(#20088,#20001)
-#20089=*
-entry_cfg_node(#20089,#20001)
-#20090=@"loc,{#10000},1,1,1,0"
-locations_default(#20090,#10000,1,1,1,0)
-hasLocation(#20089,#20090)
-#20091=*
-exit_cfg_node(#20091,#20001)
-hasLocation(#20091,#20053)
-successor(#20088,#20091)
-successor(#20079,#20081)
-successor(#20081,#20088)
+exprs(#20086,78,#20084,-1,"f")
+hasLocation(#20086,#20041)
+expr_containers(#20086,#20084)
+literals("f","f",#20086)
+decl(#20086,#20058)
+#20087=*
+scopes(#20087,1)
+scopenodes(#20084,#20087)
+scopenesting(#20087,#20055)
+#20088=@"var;{this};{#20087}"
+variables(#20088,"this",#20087)
+#20089=@"var;{arguments};{#20087}"
+variables(#20089,"arguments",#20087)
+is_arguments_object(#20089)
+#20090=*
+stmts(#20090,1,#20084,-2,"{}")
+#20091=@"loc,{#10000},5,29,5,30"
+locations_default(#20091,#10000,5,29,5,30)
+hasLocation(#20090,#20091)
+stmt_containers(#20090,#20084)
 #20092=*
-entry_cfg_node(#20092,#20081)
-#20093=@"loc,{#10000},5,16,5,15"
-locations_default(#20093,#10000,5,16,5,15)
-hasLocation(#20092,#20093)
-#20094=*
-exit_cfg_node(#20094,#20081)
-#20095=@"loc,{#10000},5,31,5,30"
-locations_default(#20095,#10000,5,31,5,30)
-hasLocation(#20094,#20095)
-successor(#20086,#20094)
-successor(#20092,#20086)
-successor(#20067,#20070)
-successor(#20075,#20072)
+stmts(#20092,0,#20001,3,";")
+hasLocation(#20092,#20051)
+stmt_containers(#20092,#20001)
+#20093=*
+entry_cfg_node(#20093,#20001)
+#20094=@"loc,{#10000},1,1,1,0"
+locations_default(#20094,#10000,1,1,1,0)
+hasLocation(#20093,#20094)
+#20095=*
+exit_cfg_node(#20095,#20001)
+hasLocation(#20095,#20053)
+successor(#20092,#20095)
+successor(#20082,#20084)
+successor(#20084,#20092)
 #20096=*
-entry_cfg_node(#20096,#20075)
-hasLocation(#20096,#20073)
-#20097=*
-exit_cfg_node(#20097,#20075)
-hasLocation(#20097,#20073)
-successor(#20078,#20097)
-successor(#20096,#20078)
-successor(#20074,#20075)
-successor(#20072,#20068)
-successor(#20070,#20074)
-successor(#20068,#20079)
-successor(#20060,#20061)
-successor(#20061,#20065)
-successor(#20066,#20063)
-successor(#20065,#20066)
-successor(#20063,#20067)
-successor(#20083,#20060)
-successor(#20089,#20083)
+entry_cfg_node(#20096,#20084)
+#20097=@"loc,{#10000},5,16,5,15"
+locations_default(#20097,#10000,5,16,5,15)
+hasLocation(#20096,#20097)
+#20098=*
+exit_cfg_node(#20098,#20084)
+#20099=@"loc,{#10000},5,31,5,30"
+locations_default(#20099,#10000,5,31,5,30)
+hasLocation(#20098,#20099)
+successor(#20090,#20098)
+successor(#20096,#20090)
+successor(#20068,#20071)
+successor(#20077,#20074)
+#20100=*
+entry_cfg_node(#20100,#20077)
+hasLocation(#20100,#20075)
+#20101=*
+exit_cfg_node(#20101,#20077)
+hasLocation(#20101,#20075)
+successor(#20081,#20101)
+successor(#20100,#20081)
+successor(#20076,#20077)
+successor(#20074,#20069)
+successor(#20071,#20076)
+successor(#20069,#20082)
+successor(#20061,#20062)
+successor(#20062,#20066)
+successor(#20067,#20064)
+successor(#20066,#20067)
+successor(#20064,#20068)
+successor(#20086,#20061)
+successor(#20093,#20086)
 numlines(#10000,5,3,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/export2.ts.trap

@@ -51,26 +51,28 @@ scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20016=*
-stmts(#20016,29,#20001,0,"export default 42;")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20015}"
+variables(#20016,"this",#20015)
 #20017=*
-exprs(#20017,3,#20016,0,"42")
-hasLocation(#20017,#20009)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
-literals("42","42",#20017)
+stmts(#20017,29,#20001,0,"export default 42;")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
 #20018=*
-entry_cfg_node(#20018,#20001)
-#20019=@"loc,{#10000},1,1,1,0"
-locations_default(#20019,#10000,1,1,1,0)
-hasLocation(#20018,#20019)
-#20020=*
-exit_cfg_node(#20020,#20001)
-hasLocation(#20020,#20013)
-successor(#20016,#20017)
-successor(#20017,#20020)
-successor(#20018,#20016)
+exprs(#20018,3,#20017,0,"42")
+hasLocation(#20018,#20009)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+literals("42","42",#20018)
+#20019=*
+entry_cfg_node(#20019,#20001)
+#20020=@"loc,{#10000},1,1,1,0"
+locations_default(#20020,#10000,1,1,1,0)
+hasLocation(#20019,#20020)
+#20021=*
+exit_cfg_node(#20021,#20001)
+hasLocation(#20021,#20013)
+successor(#20017,#20018)
+successor(#20018,#20021)
+successor(#20019,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap

@@ -99,51 +99,55 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20034=@"var;{foo};{#20033}"
 variables(#20034,"foo",#20033)
-#20035=*
-stmts(#20035,30,#20001,0,"export  ...  foo();")
-hasLocation(#20035,#20003)
-stmt_containers(#20035,#20001)
+#20035=@"var;{this};{#20033}"
+variables(#20035,"this",#20033)
 #20036=*
-stmts(#20036,17,#20035,-1,"declare ...  foo();")
-#20037=@"loc,{#10000},1,8,1,30"
-locations_default(#20037,#10000,1,8,1,30)
-hasLocation(#20036,#20037)
+stmts(#20036,30,#20001,0,"export  ...  foo();")
+hasLocation(#20036,#20003)
 stmt_containers(#20036,#20001)
-has_declare_keyword(#20036)
-#20038=*
-exprs(#20038,78,#20036,-1,"foo")
-hasLocation(#20038,#20013)
-expr_containers(#20038,#20036)
-literals("foo","foo",#20038)
-decl(#20038,#20034)
+#20037=*
+stmts(#20037,17,#20036,-1,"declare ...  foo();")
+#20038=@"loc,{#10000},1,8,1,30"
+locations_default(#20038,#10000,1,8,1,30)
+hasLocation(#20037,#20038)
+stmt_containers(#20037,#20001)
+has_declare_keyword(#20037)
 #20039=*
-scopes(#20039,1)
-scopenodes(#20036,#20039)
-scopenesting(#20039,#20033)
-#20040=@"var;{arguments};{#20039}"
-variables(#20040,"arguments",#20039)
-is_arguments_object(#20040)
-#20041=*
-stmts(#20041,38,#20001,1,"export  ... ce bar;")
-hasLocation(#20041,#20005)
-stmt_containers(#20041,#20001)
-#20042=*
-exprs(#20042,0,#20041,0,"bar")
-hasLocation(#20042,#20027)
-enclosing_stmt(#20042,#20041)
-expr_containers(#20042,#20001)
-literals("bar","bar",#20042)
+exprs(#20039,78,#20037,-1,"foo")
+hasLocation(#20039,#20013)
+expr_containers(#20039,#20037)
+literals("foo","foo",#20039)
+decl(#20039,#20034)
+#20040=*
+scopes(#20040,1)
+scopenodes(#20037,#20040)
+scopenesting(#20040,#20033)
+#20041=@"var;{this};{#20040}"
+variables(#20041,"this",#20040)
+#20042=@"var;{arguments};{#20040}"
+variables(#20042,"arguments",#20040)
+is_arguments_object(#20042)
 #20043=*
-entry_cfg_node(#20043,#20001)
-#20044=@"loc,{#10000},1,1,1,0"
-locations_default(#20044,#10000,1,1,1,0)
-hasLocation(#20043,#20044)
+stmts(#20043,38,#20001,1,"export  ... ce bar;")
+hasLocation(#20043,#20005)
+stmt_containers(#20043,#20001)
+#20044=*
+exprs(#20044,0,#20043,0,"bar")
+hasLocation(#20044,#20027)
+enclosing_stmt(#20044,#20043)
+expr_containers(#20044,#20001)
+literals("bar","bar",#20044)
 #20045=*
-exit_cfg_node(#20045,#20001)
-hasLocation(#20045,#20031)
-successor(#20041,#20045)
-successor(#20035,#20036)
-successor(#20036,#20041)
-successor(#20043,#20035)
+entry_cfg_node(#20045,#20001)
+#20046=@"loc,{#10000},1,1,1,0"
+locations_default(#20046,#10000,1,1,1,0)
+hasLocation(#20045,#20046)
+#20047=*
+exit_cfg_node(#20047,#20001)
+hasLocation(#20047,#20031)
+successor(#20043,#20047)
+successor(#20036,#20037)
+successor(#20037,#20043)
+successor(#20045,#20036)
 numlines(#10000,2,2,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/exportassign.ts.trap

@@ -51,26 +51,28 @@ scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20016=*
-stmts(#20016,33,#20001,0,"export = 42;")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20015}"
+variables(#20016,"this",#20015)
 #20017=*
-exprs(#20017,3,#20016,0,"42")
-hasLocation(#20017,#20009)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
-literals("42","42",#20017)
+stmts(#20017,33,#20001,0,"export = 42;")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
 #20018=*
-entry_cfg_node(#20018,#20001)
-#20019=@"loc,{#10000},1,1,1,0"
-locations_default(#20019,#10000,1,1,1,0)
-hasLocation(#20018,#20019)
-#20020=*
-exit_cfg_node(#20020,#20001)
-hasLocation(#20020,#20013)
-successor(#20016,#20017)
-successor(#20017,#20020)
-successor(#20018,#20016)
+exprs(#20018,3,#20017,0,"42")
+hasLocation(#20018,#20009)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+literals("42","42",#20018)
+#20019=*
+entry_cfg_node(#20019,#20001)
+#20020=@"loc,{#10000},1,1,1,0"
+locations_default(#20020,#10000,1,1,1,0)
+hasLocation(#20019,#20020)
+#20021=*
+exit_cfg_node(#20021,#20001)
+hasLocation(#20021,#20013)
+successor(#20017,#20018)
+successor(#20018,#20021)
+successor(#20019,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/exportclass.ts.trap

@@ -51,64 +51,74 @@ scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20016=*
-stmts(#20016,30,#20001,0,"export class {}")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20015}"
+variables(#20016,"this",#20015)
 #20017=*
-stmts(#20017,26,#20016,-1,"class {}")
-#20018=@"loc,{#10000},1,8,1,15"
-locations_default(#20018,#10000,1,8,1,15)
-hasLocation(#20017,#20018)
+stmts(#20017,30,#20001,0,"export class {}")
+hasLocation(#20017,#20003)
 stmt_containers(#20017,#20001)
-#20019=*
-properties(#20019,#20017,2,0,"constructor() {}")
-#20020=@"loc,{#10000},1,6,1,5"
-locations_default(#20020,#10000,1,6,1,5)
-hasLocation(#20019,#20020)
-#20021=*
-exprs(#20021,0,#20019,0,"constructor")
-hasLocation(#20021,#20020)
-enclosing_stmt(#20021,#20017)
-expr_containers(#20021,#20001)
-literals("constructor","constructor",#20021)
+#20018=*
+stmts(#20018,26,#20017,-1,"class {}")
+#20019=@"loc,{#10000},1,8,1,15"
+locations_default(#20019,#10000,1,8,1,15)
+hasLocation(#20018,#20019)
+stmt_containers(#20018,#20001)
+#20020=*
+scopes(#20020,10)
+scopenodes(#20018,#20020)
+scopenesting(#20020,#20015)
+#20021=@"var;{this};{#20020}"
+variables(#20021,"this",#20020)
 #20022=*
-exprs(#20022,9,#20019,1,"() {}")
-hasLocation(#20022,#20020)
-enclosing_stmt(#20022,#20017)
-expr_containers(#20022,#20001)
-#20023=*
-scopes(#20023,1)
-scopenodes(#20022,#20023)
-scopenesting(#20023,#20015)
-#20024=@"var;{arguments};{#20023}"
-variables(#20024,"arguments",#20023)
-is_arguments_object(#20024)
+properties(#20022,#20018,2,0,"constructor() {}")
+#20023=@"loc,{#10000},1,6,1,5"
+locations_default(#20023,#10000,1,6,1,5)
+hasLocation(#20022,#20023)
+#20024=*
+exprs(#20024,0,#20022,0,"constructor")
+hasLocation(#20024,#20023)
+enclosing_stmt(#20024,#20018)
+expr_containers(#20024,#20001)
+literals("constructor","constructor",#20024)
 #20025=*
-stmts(#20025,1,#20022,-2,"{}")
-hasLocation(#20025,#20020)
-stmt_containers(#20025,#20022)
-is_method(#20019)
+exprs(#20025,9,#20022,1,"() {}")
+hasLocation(#20025,#20023)
+enclosing_stmt(#20025,#20018)
+expr_containers(#20025,#20001)
 #20026=*
-entry_cfg_node(#20026,#20001)
-#20027=@"loc,{#10000},1,1,1,0"
-locations_default(#20027,#10000,1,1,1,0)
-hasLocation(#20026,#20027)
-#20028=*
-exit_cfg_node(#20028,#20001)
-hasLocation(#20028,#20013)
-successor(#20022,#20019)
+scopes(#20026,1)
+scopenodes(#20025,#20026)
+scopenesting(#20026,#20020)
+#20027=@"var;{this};{#20026}"
+variables(#20027,"this",#20026)
+#20028=@"var;{arguments};{#20026}"
+variables(#20028,"arguments",#20026)
+is_arguments_object(#20028)
 #20029=*
-entry_cfg_node(#20029,#20022)
-hasLocation(#20029,#20020)
+stmts(#20029,1,#20025,-2,"{}")
+hasLocation(#20029,#20023)
+stmt_containers(#20029,#20025)
+is_method(#20022)
 #20030=*
-exit_cfg_node(#20030,#20022)
-hasLocation(#20030,#20020)
-successor(#20025,#20030)
-successor(#20029,#20025)
-successor(#20021,#20022)
-successor(#20019,#20017)
-successor(#20017,#20028)
-successor(#20026,#20016)
+entry_cfg_node(#20030,#20001)
+#20031=@"loc,{#10000},1,1,1,0"
+locations_default(#20031,#10000,1,1,1,0)
+hasLocation(#20030,#20031)
+#20032=*
+exit_cfg_node(#20032,#20001)
+hasLocation(#20032,#20013)
+successor(#20025,#20022)
+#20033=*
+entry_cfg_node(#20033,#20025)
+hasLocation(#20033,#20023)
+#20034=*
+exit_cfg_node(#20034,#20025)
+hasLocation(#20034,#20023)
+successor(#20029,#20034)
+successor(#20033,#20029)
+successor(#20024,#20025)
+successor(#20022,#20018)
+successor(#20018,#20032)
+successor(#20030,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/exprs.ts.trap

@@ -171,178 +171,182 @@ locations_default(#20061,#10000,1,1,5,1)
 hasLocation(#20001,#20061)
 #20062=@"var;{f};{#20000}"
 variables(#20062,"f",#20000)
-#20063=*
-stmts(#20063,17,#20001,0,"functio ...  = z;\n}")
-hasLocation(#20063,#20061)
-stmt_containers(#20063,#20001)
+#20063=@"var;{this};{#20000}"
+variables(#20063,"this",#20000)
 #20064=*
-exprs(#20064,78,#20063,-1,"f")
-hasLocation(#20064,#20015)
-expr_containers(#20064,#20063)
-literals("f","f",#20064)
-decl(#20064,#20062)
+stmts(#20064,17,#20001,0,"functio ...  = z;\n}")
+hasLocation(#20064,#20061)
+stmt_containers(#20064,#20001)
 #20065=*
-scopes(#20065,1)
-scopenodes(#20063,#20065)
-scopenesting(#20065,#20000)
-#20066=@"var;{z};{#20065}"
-variables(#20066,"z",#20065)
-#20067=*
-exprs(#20067,78,#20063,0,"z")
-hasLocation(#20067,#20019)
-expr_containers(#20067,#20063)
-literals("z","z",#20067)
-decl(#20067,#20066)
-#20068=@"var;{arguments};{#20065}"
-variables(#20068,"arguments",#20065)
-is_arguments_object(#20068)
+exprs(#20065,78,#20064,-1,"f")
+hasLocation(#20065,#20015)
+expr_containers(#20065,#20064)
+literals("f","f",#20065)
+decl(#20065,#20062)
+#20066=*
+scopes(#20066,1)
+scopenodes(#20064,#20066)
+scopenesting(#20066,#20000)
+#20067=@"var;{this};{#20066}"
+variables(#20067,"this",#20066)
+#20068=@"var;{z};{#20066}"
+variables(#20068,"z",#20066)
 #20069=*
-stmts(#20069,1,#20063,-2,"{\n  let ...  = z;\n}")
-#20070=@"loc,{#10000},1,15,5,1"
-locations_default(#20070,#10000,1,15,5,1)
-hasLocation(#20069,#20070)
-stmt_containers(#20069,#20063)
+exprs(#20069,78,#20064,0,"z")
+hasLocation(#20069,#20019)
+expr_containers(#20069,#20064)
+literals("z","z",#20069)
+decl(#20069,#20068)
+#20070=@"var;{arguments};{#20066}"
+variables(#20070,"arguments",#20066)
+is_arguments_object(#20070)
 #20071=*
-scopes(#20071,4)
-scopenodes(#20069,#20071)
-scopenesting(#20071,#20065)
-#20072=@"var;{x};{#20071}"
-variables(#20072,"x",#20071)
-#20073=@"var;{y};{#20071}"
-variables(#20073,"y",#20071)
-#20074=*
-stmts(#20074,23,#20069,0,"let x, y;")
-#20075=@"loc,{#10000},2,3,2,11"
-locations_default(#20075,#10000,2,3,2,11)
-hasLocation(#20074,#20075)
-stmt_containers(#20074,#20063)
+stmts(#20071,1,#20064,-2,"{\n  let ...  = z;\n}")
+#20072=@"loc,{#10000},1,15,5,1"
+locations_default(#20072,#10000,1,15,5,1)
+hasLocation(#20071,#20072)
+stmt_containers(#20071,#20064)
+#20073=*
+scopes(#20073,4)
+scopenodes(#20071,#20073)
+scopenesting(#20073,#20066)
+#20074=@"var;{x};{#20073}"
+variables(#20074,"x",#20073)
+#20075=@"var;{y};{#20073}"
+variables(#20075,"y",#20073)
 #20076=*
-exprs(#20076,64,#20074,0,"x")
-hasLocation(#20076,#20027)
-enclosing_stmt(#20076,#20074)
-expr_containers(#20076,#20063)
-#20077=*
-exprs(#20077,78,#20076,0,"x")
-hasLocation(#20077,#20027)
-enclosing_stmt(#20077,#20074)
-expr_containers(#20077,#20063)
-literals("x","x",#20077)
-decl(#20077,#20072)
+stmts(#20076,23,#20071,0,"let x, y;")
+#20077=@"loc,{#10000},2,3,2,11"
+locations_default(#20077,#10000,2,3,2,11)
+hasLocation(#20076,#20077)
+stmt_containers(#20076,#20064)
 #20078=*
-exprs(#20078,64,#20074,1,"y")
-hasLocation(#20078,#20031)
-enclosing_stmt(#20078,#20074)
-expr_containers(#20078,#20063)
+exprs(#20078,64,#20076,0,"x")
+hasLocation(#20078,#20027)
+enclosing_stmt(#20078,#20076)
+expr_containers(#20078,#20064)
 #20079=*
-exprs(#20079,78,#20078,0,"y")
-hasLocation(#20079,#20031)
-enclosing_stmt(#20079,#20074)
-expr_containers(#20079,#20063)
-literals("y","y",#20079)
-decl(#20079,#20073)
+exprs(#20079,78,#20078,0,"x")
+hasLocation(#20079,#20027)
+enclosing_stmt(#20079,#20076)
+expr_containers(#20079,#20064)
+literals("x","x",#20079)
+decl(#20079,#20074)
 #20080=*
-stmts(#20080,2,#20069,1,"x, y;")
-#20081=@"loc,{#10000},3,3,3,7"
-locations_default(#20081,#10000,3,3,3,7)
-hasLocation(#20080,#20081)
-stmt_containers(#20080,#20063)
+exprs(#20080,64,#20076,1,"y")
+hasLocation(#20080,#20031)
+enclosing_stmt(#20080,#20076)
+expr_containers(#20080,#20064)
+#20081=*
+exprs(#20081,78,#20080,0,"y")
+hasLocation(#20081,#20031)
+enclosing_stmt(#20081,#20076)
+expr_containers(#20081,#20064)
+literals("y","y",#20081)
+decl(#20081,#20075)
 #20082=*
-exprs(#20082,10,#20080,0,"x, y")
-#20083=@"loc,{#10000},3,3,3,6"
-locations_default(#20083,#10000,3,3,3,6)
+stmts(#20082,2,#20071,1,"x, y;")
+#20083=@"loc,{#10000},3,3,3,7"
+locations_default(#20083,#10000,3,3,3,7)
 hasLocation(#20082,#20083)
-enclosing_stmt(#20082,#20080)
-expr_containers(#20082,#20063)
+stmt_containers(#20082,#20064)
 #20084=*
-exprs(#20084,79,#20082,0,"x")
-hasLocation(#20084,#20035)
-enclosing_stmt(#20084,#20080)
-expr_containers(#20084,#20063)
-literals("x","x",#20084)
-bind(#20084,#20072)
-#20085=*
-exprs(#20085,79,#20082,1,"y")
-hasLocation(#20085,#20039)
-enclosing_stmt(#20085,#20080)
-expr_containers(#20085,#20063)
-literals("y","y",#20085)
-bind(#20085,#20073)
+exprs(#20084,10,#20082,0,"x, y")
+#20085=@"loc,{#10000},3,3,3,6"
+locations_default(#20085,#10000,3,3,3,6)
+hasLocation(#20084,#20085)
+enclosing_stmt(#20084,#20082)
+expr_containers(#20084,#20064)
 #20086=*
-stmts(#20086,2,#20069,2,"[x, y] = z;")
-#20087=@"loc,{#10000},4,3,4,13"
-locations_default(#20087,#10000,4,3,4,13)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20063)
+exprs(#20086,79,#20084,0,"x")
+hasLocation(#20086,#20035)
+enclosing_stmt(#20086,#20082)
+expr_containers(#20086,#20064)
+literals("x","x",#20086)
+bind(#20086,#20074)
+#20087=*
+exprs(#20087,79,#20084,1,"y")
+hasLocation(#20087,#20039)
+enclosing_stmt(#20087,#20082)
+expr_containers(#20087,#20064)
+literals("y","y",#20087)
+bind(#20087,#20075)
 #20088=*
-exprs(#20088,47,#20086,0,"[x, y] = z")
-#20089=@"loc,{#10000},4,3,4,12"
-locations_default(#20089,#10000,4,3,4,12)
+stmts(#20088,2,#20071,2,"[x, y] = z;")
+#20089=@"loc,{#10000},4,3,4,13"
+locations_default(#20089,#10000,4,3,4,13)
 hasLocation(#20088,#20089)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20063)
+stmt_containers(#20088,#20064)
 #20090=*
-exprs(#20090,67,#20088,0,"[x, y]")
-#20091=@"loc,{#10000},4,3,4,8"
-locations_default(#20091,#10000,4,3,4,8)
+exprs(#20090,47,#20088,0,"[x, y] = z")
+#20091=@"loc,{#10000},4,3,4,12"
+locations_default(#20091,#10000,4,3,4,12)
 hasLocation(#20090,#20091)
-enclosing_stmt(#20090,#20086)
-expr_containers(#20090,#20063)
+enclosing_stmt(#20090,#20088)
+expr_containers(#20090,#20064)
 #20092=*
-exprs(#20092,79,#20090,0,"x")
-hasLocation(#20092,#20045)
-enclosing_stmt(#20092,#20086)
-expr_containers(#20092,#20063)
-literals("x","x",#20092)
-bind(#20092,#20072)
-#20093=*
-exprs(#20093,79,#20090,1,"y")
-hasLocation(#20093,#20049)
-enclosing_stmt(#20093,#20086)
-expr_containers(#20093,#20063)
-literals("y","y",#20093)
-bind(#20093,#20073)
-array_size(#20090,2)
+exprs(#20092,67,#20090,0,"[x, y]")
+#20093=@"loc,{#10000},4,3,4,8"
+locations_default(#20093,#10000,4,3,4,8)
+hasLocation(#20092,#20093)
+enclosing_stmt(#20092,#20088)
+expr_containers(#20092,#20064)
 #20094=*
-exprs(#20094,79,#20088,1,"z")
-hasLocation(#20094,#20055)
-enclosing_stmt(#20094,#20086)
-expr_containers(#20094,#20063)
-literals("z","z",#20094)
-bind(#20094,#20066)
+exprs(#20094,79,#20092,0,"x")
+hasLocation(#20094,#20045)
+enclosing_stmt(#20094,#20088)
+expr_containers(#20094,#20064)
+literals("x","x",#20094)
+bind(#20094,#20074)
 #20095=*
-entry_cfg_node(#20095,#20001)
-#20096=@"loc,{#10000},1,1,1,0"
-locations_default(#20096,#10000,1,1,1,0)
-hasLocation(#20095,#20096)
+exprs(#20095,79,#20092,1,"y")
+hasLocation(#20095,#20049)
+enclosing_stmt(#20095,#20088)
+expr_containers(#20095,#20064)
+literals("y","y",#20095)
+bind(#20095,#20075)
+array_size(#20092,2)
+#20096=*
+exprs(#20096,79,#20090,1,"z")
+hasLocation(#20096,#20055)
+enclosing_stmt(#20096,#20088)
+expr_containers(#20096,#20064)
+literals("z","z",#20096)
+bind(#20096,#20068)
 #20097=*
-exit_cfg_node(#20097,#20001)
-hasLocation(#20097,#20060)
-successor(#20063,#20097)
-#20098=*
-entry_cfg_node(#20098,#20063)
-hasLocation(#20098,#20096)
+entry_cfg_node(#20097,#20001)
+#20098=@"loc,{#10000},1,1,1,0"
+locations_default(#20098,#10000,1,1,1,0)
+hasLocation(#20097,#20098)
 #20099=*
-exit_cfg_node(#20099,#20063)
+exit_cfg_node(#20099,#20001)
 hasLocation(#20099,#20060)
-successor(#20086,#20094)
-successor(#20090,#20092)
-successor(#20093,#20088)
-successor(#20092,#20093)
-successor(#20094,#20090)
-successor(#20088,#20099)
-successor(#20080,#20082)
+successor(#20064,#20099)
+#20100=*
+entry_cfg_node(#20100,#20064)
+hasLocation(#20100,#20098)
+#20101=*
+exit_cfg_node(#20101,#20064)
+hasLocation(#20101,#20060)
+successor(#20088,#20096)
+successor(#20092,#20094)
+successor(#20095,#20090)
+successor(#20094,#20095)
+successor(#20096,#20092)
+successor(#20090,#20101)
 successor(#20082,#20084)
-successor(#20085,#20086)
-successor(#20084,#20085)
-successor(#20074,#20077)
-successor(#20079,#20078)
-successor(#20078,#20080)
-successor(#20077,#20076)
+successor(#20084,#20086)
+successor(#20087,#20088)
+successor(#20086,#20087)
 successor(#20076,#20079)
-successor(#20069,#20074)
-successor(#20067,#20069)
-successor(#20098,#20067)
-successor(#20064,#20063)
-successor(#20095,#20064)
+successor(#20081,#20080)
+successor(#20080,#20082)
+successor(#20079,#20078)
+successor(#20078,#20081)
+successor(#20071,#20076)
+successor(#20069,#20071)
+successor(#20100,#20069)
+successor(#20065,#20064)
+successor(#20097,#20065)
 numlines(#10000,5,5,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap

@@ -228,149 +228,153 @@ toplevels(#20001,0)
 #20081=@"loc,{#10000},1,1,10,0"
 locations_default(#20081,#10000,1,1,10,0)
 hasLocation(#20001,#20081)
-#20082=*
-stmts(#20082,37,#20001,0,"declare ...  = M;\n}")
-#20083=@"loc,{#10000},1,1,9,1"
-locations_default(#20083,#10000,1,1,9,1)
-hasLocation(#20082,#20083)
-stmt_containers(#20082,#20001)
-has_declare_keyword(#20082)
-#20084=*
-exprs(#20084,4,#20082,-1,"""X""")
-hasLocation(#20084,#20025)
-enclosing_stmt(#20084,#20082)
-expr_containers(#20084,#20001)
-literals("X","""X""",#20084)
+#20082=@"var;{this};{#20000}"
+variables(#20082,"this",#20000)
+#20083=*
+stmts(#20083,37,#20001,0,"declare ...  = M;\n}")
+#20084=@"loc,{#10000},1,1,9,1"
+locations_default(#20084,#10000,1,1,9,1)
+hasLocation(#20083,#20084)
+stmt_containers(#20083,#20001)
+has_declare_keyword(#20083)
 #20085=*
-regexpterm(#20085,14,#20084,0,"X")
-#20086=@"loc,{#10000},1,17,1,17"
-locations_default(#20086,#10000,1,17,1,17)
-hasLocation(#20085,#20086)
-regexp_const_value(#20085,"X")
-#20087=*
-scopes(#20087,15)
-scopenodes(#20082,#20087)
-scopenesting(#20087,#20000)
-#20088=@"local_namespace_name;{M};{#20087}"
-local_namespace_names(#20088,"M",#20087)
-#20089=@"local_type_name;{M};{#20087}"
-local_type_names(#20089,"M",#20087)
-#20090=*
-stmts(#20090,31,#20082,0,"module  ...  {}\n  }")
-#20091=@"loc,{#10000},2,3,4,3"
-locations_default(#20091,#10000,2,3,4,3)
-hasLocation(#20090,#20091)
-stmt_containers(#20090,#20082)
-#20092=*
-exprs(#20092,78,#20090,-1,"M")
-hasLocation(#20092,#20031)
-enclosing_stmt(#20092,#20090)
-expr_containers(#20092,#20082)
-literals("M","M",#20092)
-namespacedecl(#20092,#20088)
+exprs(#20085,4,#20083,-1,"""X""")
+hasLocation(#20085,#20025)
+enclosing_stmt(#20085,#20083)
+expr_containers(#20085,#20001)
+literals("X","""X""",#20085)
+#20086=*
+regexpterm(#20086,14,#20085,0,"X")
+#20087=@"loc,{#10000},1,17,1,17"
+locations_default(#20087,#10000,1,17,1,17)
+hasLocation(#20086,#20087)
+regexp_const_value(#20086,"X")
+#20088=*
+scopes(#20088,15)
+scopenodes(#20083,#20088)
+scopenesting(#20088,#20000)
+#20089=@"local_namespace_name;{M};{#20088}"
+local_namespace_names(#20089,"M",#20088)
+#20090=@"local_type_name;{M};{#20088}"
+local_type_names(#20090,"M",#20088)
+#20091=*
+stmts(#20091,31,#20083,0,"module  ...  {}\n  }")
+#20092=@"loc,{#10000},2,3,4,3"
+locations_default(#20092,#10000,2,3,4,3)
+hasLocation(#20091,#20092)
+stmt_containers(#20091,#20083)
 #20093=*
-scopes(#20093,9)
-scopenodes(#20090,#20093)
-scopenesting(#20093,#20087)
-#20094=@"local_type_name;{I};{#20093}"
-local_type_names(#20094,"I",#20093)
-#20095=*
-stmts(#20095,30,#20090,0,"export  ... ce I {}")
-#20096=@"loc,{#10000},3,5,3,25"
-locations_default(#20096,#10000,3,5,3,25)
-hasLocation(#20095,#20096)
-stmt_containers(#20095,#20090)
-#20097=*
-stmts(#20097,34,#20095,-1,"interface I {}")
-#20098=@"loc,{#10000},3,12,3,25"
-locations_default(#20098,#10000,3,12,3,25)
-hasLocation(#20097,#20098)
-stmt_containers(#20097,#20090)
-#20099=*
-typeexprs(#20099,1,#20097,0,"I")
-hasLocation(#20099,#20039)
-enclosing_stmt(#20099,#20097)
-expr_containers(#20099,#20090)
-literals("I","I",#20099)
-typedecl(#20099,#20094)
+exprs(#20093,78,#20091,-1,"M")
+hasLocation(#20093,#20031)
+enclosing_stmt(#20093,#20091)
+expr_containers(#20093,#20083)
+literals("M","M",#20093)
+namespacedecl(#20093,#20089)
+#20094=*
+scopes(#20094,9)
+scopenodes(#20091,#20094)
+scopenesting(#20094,#20088)
+#20095=@"local_type_name;{I};{#20094}"
+local_type_names(#20095,"I",#20094)
+#20096=*
+stmts(#20096,30,#20091,0,"export  ... ce I {}")
+#20097=@"loc,{#10000},3,5,3,25"
+locations_default(#20097,#10000,3,5,3,25)
+hasLocation(#20096,#20097)
+stmt_containers(#20096,#20091)
+#20098=*
+stmts(#20098,34,#20096,-1,"interface I {}")
+#20099=@"loc,{#10000},3,12,3,25"
+locations_default(#20099,#10000,3,12,3,25)
+hasLocation(#20098,#20099)
+stmt_containers(#20098,#20091)
 #20100=*
-stmts(#20100,34,#20082,1,"interfa ... .I;\n  }")
-#20101=@"loc,{#10000},5,3,7,3"
-locations_default(#20101,#10000,5,3,7,3)
-hasLocation(#20100,#20101)
-stmt_containers(#20100,#20082)
-#20102=*
-typeexprs(#20102,1,#20100,0,"M")
-hasLocation(#20102,#20049)
-enclosing_stmt(#20102,#20100)
-expr_containers(#20102,#20082)
-literals("M","M",#20102)
-typedecl(#20102,#20089)
+typeexprs(#20100,1,#20098,0,"I")
+hasLocation(#20100,#20039)
+enclosing_stmt(#20100,#20098)
+expr_containers(#20100,#20091)
+literals("I","I",#20100)
+typedecl(#20100,#20095)
+#20101=*
+stmts(#20101,34,#20083,1,"interfa ... .I;\n  }")
+#20102=@"loc,{#10000},5,3,7,3"
+locations_default(#20102,#10000,5,3,7,3)
+hasLocation(#20101,#20102)
+stmt_containers(#20101,#20083)
 #20103=*
-properties(#20103,#20100,2,0,"method(): M.I;")
-#20104=@"loc,{#10000},6,5,6,18"
-locations_default(#20104,#10000,6,5,6,18)
-hasLocation(#20103,#20104)
-#20105=*
-exprs(#20105,0,#20103,0,"method")
-hasLocation(#20105,#20053)
-enclosing_stmt(#20105,#20100)
-expr_containers(#20105,#20082)
-literals("method","method",#20105)
+typeexprs(#20103,1,#20101,0,"M")
+hasLocation(#20103,#20049)
+enclosing_stmt(#20103,#20101)
+expr_containers(#20103,#20083)
+literals("M","M",#20103)
+typedecl(#20103,#20090)
+#20104=*
+properties(#20104,#20101,2,0,"method(): M.I;")
+#20105=@"loc,{#10000},6,5,6,18"
+locations_default(#20105,#10000,6,5,6,18)
+hasLocation(#20104,#20105)
 #20106=*
-exprs(#20106,9,#20103,1,"method(): M.I;")
-hasLocation(#20106,#20104)
-enclosing_stmt(#20106,#20100)
-expr_containers(#20106,#20082)
+exprs(#20106,0,#20104,0,"method")
+hasLocation(#20106,#20053)
+enclosing_stmt(#20106,#20101)
+expr_containers(#20106,#20083)
+literals("method","method",#20106)
 #20107=*
-scopes(#20107,1)
-scopenodes(#20106,#20107)
-scopenesting(#20107,#20087)
-#20108=@"var;{arguments};{#20107}"
-variables(#20108,"arguments",#20107)
-is_arguments_object(#20108)
-#20109=*
-typeexprs(#20109,13,#20106,-3,"M.I")
-#20110=@"loc,{#10000},6,15,6,17"
-locations_default(#20110,#10000,6,15,6,17)
-hasLocation(#20109,#20110)
-expr_containers(#20109,#20106)
+exprs(#20107,9,#20104,1,"method(): M.I;")
+hasLocation(#20107,#20105)
+enclosing_stmt(#20107,#20101)
+expr_containers(#20107,#20083)
+#20108=*
+scopes(#20108,1)
+scopenodes(#20107,#20108)
+scopenesting(#20108,#20088)
+#20109=@"var;{this};{#20108}"
+variables(#20109,"this",#20108)
+#20110=@"var;{arguments};{#20108}"
+variables(#20110,"arguments",#20108)
+is_arguments_object(#20110)
 #20111=*
-typeexprs(#20111,25,#20109,0,"M")
-hasLocation(#20111,#20061)
-expr_containers(#20111,#20106)
-literals("M","M",#20111)
-namespacebind(#20111,#20088)
-#20112=*
-typeexprs(#20112,15,#20109,1,"I")
-hasLocation(#20112,#20065)
-expr_containers(#20112,#20106)
-literals("I","I",#20112)
-is_method(#20103)
-is_abstract_member(#20103)
+typeexprs(#20111,13,#20107,-3,"M.I")
+#20112=@"loc,{#10000},6,15,6,17"
+locations_default(#20112,#10000,6,15,6,17)
+hasLocation(#20111,#20112)
+expr_containers(#20111,#20107)
 #20113=*
-stmts(#20113,33,#20082,2,"export = M;")
-#20114=@"loc,{#10000},8,3,8,13"
-locations_default(#20114,#10000,8,3,8,13)
-hasLocation(#20113,#20114)
-stmt_containers(#20113,#20082)
+typeexprs(#20113,25,#20111,0,"M")
+hasLocation(#20113,#20061)
+expr_containers(#20113,#20107)
+literals("M","M",#20113)
+namespacebind(#20113,#20089)
+#20114=*
+typeexprs(#20114,15,#20111,1,"I")
+hasLocation(#20114,#20065)
+expr_containers(#20114,#20107)
+literals("I","I",#20114)
+is_method(#20104)
+is_abstract_member(#20104)
 #20115=*
-exprs(#20115,103,#20113,0,"M")
-hasLocation(#20115,#20075)
-enclosing_stmt(#20115,#20113)
-expr_containers(#20115,#20082)
-literals("M","M",#20115)
-typebind(#20115,#20089)
-namespacebind(#20115,#20088)
-#20116=*
-entry_cfg_node(#20116,#20001)
-#20117=@"loc,{#10000},1,1,1,0"
-locations_default(#20117,#10000,1,1,1,0)
-hasLocation(#20116,#20117)
+stmts(#20115,33,#20083,2,"export = M;")
+#20116=@"loc,{#10000},8,3,8,13"
+locations_default(#20116,#10000,8,3,8,13)
+hasLocation(#20115,#20116)
+stmt_containers(#20115,#20083)
+#20117=*
+exprs(#20117,103,#20115,0,"M")
+hasLocation(#20117,#20075)
+enclosing_stmt(#20117,#20115)
+expr_containers(#20117,#20083)
+literals("M","M",#20117)
+typebind(#20117,#20090)
+namespacebind(#20117,#20089)
 #20118=*
-exit_cfg_node(#20118,#20001)
-hasLocation(#20118,#20080)
-successor(#20082,#20118)
-successor(#20116,#20082)
+entry_cfg_node(#20118,#20001)
+#20119=@"loc,{#10000},1,1,1,0"
+locations_default(#20119,#10000,1,1,1,0)
+hasLocation(#20118,#20119)
+#20120=*
+exit_cfg_node(#20120,#20001)
+hasLocation(#20120,#20080)
+successor(#20083,#20120)
+successor(#20118,#20083)
 numlines(#10000,9,9,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/hello.ts.trap

@@ -170,162 +170,166 @@ locations_default(#20061,#10000,1,1,6,0)
 hasLocation(#20001,#20061)
 #20062=@"var;{greeter};{#20000}"
 variables(#20062,"greeter",#20000)
-#20063=*
-stmts(#20063,17,#20001,0,"functio ...  ""!"";\n}")
-#20064=@"loc,{#10000},1,1,3,1"
-locations_default(#20064,#10000,1,1,3,1)
-hasLocation(#20063,#20064)
-stmt_containers(#20063,#20001)
-#20065=*
-exprs(#20065,78,#20063,-1,"greeter")
-hasLocation(#20065,#20015)
-expr_containers(#20065,#20063)
-literals("greeter","greeter",#20065)
-decl(#20065,#20062)
+#20063=@"var;{this};{#20000}"
+variables(#20063,"this",#20000)
+#20064=*
+stmts(#20064,17,#20001,0,"functio ...  ""!"";\n}")
+#20065=@"loc,{#10000},1,1,3,1"
+locations_default(#20065,#10000,1,1,3,1)
+hasLocation(#20064,#20065)
+stmt_containers(#20064,#20001)
 #20066=*
-scopes(#20066,1)
-scopenodes(#20063,#20066)
-scopenesting(#20066,#20000)
-#20067=@"var;{person};{#20066}"
-variables(#20067,"person",#20066)
-#20068=*
-exprs(#20068,78,#20063,0,"person")
-hasLocation(#20068,#20019)
-expr_containers(#20068,#20063)
-literals("person","person",#20068)
-decl(#20068,#20067)
-#20069=@"var;{arguments};{#20066}"
-variables(#20069,"arguments",#20066)
-is_arguments_object(#20069)
+exprs(#20066,78,#20064,-1,"greeter")
+hasLocation(#20066,#20015)
+expr_containers(#20066,#20064)
+literals("greeter","greeter",#20066)
+decl(#20066,#20062)
+#20067=*
+scopes(#20067,1)
+scopenodes(#20064,#20067)
+scopenesting(#20067,#20000)
+#20068=@"var;{this};{#20067}"
+variables(#20068,"this",#20067)
+#20069=@"var;{person};{#20067}"
+variables(#20069,"person",#20067)
 #20070=*
-typeexprs(#20070,2,#20063,-6,"string")
-hasLocation(#20070,#20023)
-expr_containers(#20070,#20063)
-literals("string","string",#20070)
-#20071=*
-stmts(#20071,1,#20063,-2,"{\n    r ...  ""!"";\n}")
-#20072=@"loc,{#10000},1,34,3,1"
-locations_default(#20072,#10000,1,34,3,1)
-hasLocation(#20071,#20072)
-stmt_containers(#20071,#20063)
+exprs(#20070,78,#20064,0,"person")
+hasLocation(#20070,#20019)
+expr_containers(#20070,#20064)
+literals("person","person",#20070)
+decl(#20070,#20069)
+#20071=@"var;{arguments};{#20067}"
+variables(#20071,"arguments",#20067)
+is_arguments_object(#20071)
+#20072=*
+typeexprs(#20072,2,#20064,-6,"string")
+hasLocation(#20072,#20023)
+expr_containers(#20072,#20064)
+literals("string","string",#20072)
 #20073=*
-stmts(#20073,9,#20071,0,"return  ...  + ""!"";")
-#20074=@"loc,{#10000},2,5,2,36"
-locations_default(#20074,#10000,2,5,2,36)
+stmts(#20073,1,#20064,-2,"{\n    r ...  ""!"";\n}")
+#20074=@"loc,{#10000},1,34,3,1"
+locations_default(#20074,#10000,1,34,3,1)
 hasLocation(#20073,#20074)
-stmt_containers(#20073,#20063)
+stmt_containers(#20073,#20064)
 #20075=*
-exprs(#20075,34,#20073,0,"""Hello, ... n + ""!""")
-#20076=@"loc,{#10000},2,12,2,35"
-locations_default(#20076,#10000,2,12,2,35)
+stmts(#20075,9,#20073,0,"return  ...  + ""!"";")
+#20076=@"loc,{#10000},2,5,2,36"
+locations_default(#20076,#10000,2,5,2,36)
 hasLocation(#20075,#20076)
-enclosing_stmt(#20075,#20073)
-expr_containers(#20075,#20063)
+stmt_containers(#20075,#20064)
 #20077=*
-exprs(#20077,34,#20075,0,"""Hello, "" + person")
-#20078=@"loc,{#10000},2,12,2,29"
-locations_default(#20078,#10000,2,12,2,29)
+exprs(#20077,34,#20075,0,"""Hello, ... n + ""!""")
+#20078=@"loc,{#10000},2,12,2,35"
+locations_default(#20078,#10000,2,12,2,35)
 hasLocation(#20077,#20078)
-enclosing_stmt(#20077,#20073)
-expr_containers(#20077,#20063)
+enclosing_stmt(#20077,#20075)
+expr_containers(#20077,#20064)
 #20079=*
-exprs(#20079,4,#20077,0,"""Hello, """)
-hasLocation(#20079,#20031)
-enclosing_stmt(#20079,#20073)
-expr_containers(#20079,#20063)
-literals("Hello, ","""Hello, """,#20079)
-#20080=*
-exprs(#20080,79,#20077,1,"person")
-hasLocation(#20080,#20035)
-enclosing_stmt(#20080,#20073)
-expr_containers(#20080,#20063)
-literals("person","person",#20080)
-bind(#20080,#20067)
+exprs(#20079,34,#20077,0,"""Hello, "" + person")
+#20080=@"loc,{#10000},2,12,2,29"
+locations_default(#20080,#10000,2,12,2,29)
+hasLocation(#20079,#20080)
+enclosing_stmt(#20079,#20075)
+expr_containers(#20079,#20064)
 #20081=*
-exprs(#20081,4,#20075,1,"""!""")
-hasLocation(#20081,#20039)
-enclosing_stmt(#20081,#20073)
-expr_containers(#20081,#20063)
-literals("!","""!""",#20081)
+exprs(#20081,4,#20079,0,"""Hello, """)
+hasLocation(#20081,#20031)
+enclosing_stmt(#20081,#20075)
+expr_containers(#20081,#20064)
+literals("Hello, ","""Hello, """,#20081)
 #20082=*
-stmts(#20082,2,#20001,1,"alert(g ... rld""));")
-hasLocation(#20082,#20011)
-stmt_containers(#20082,#20001)
+exprs(#20082,79,#20079,1,"person")
+hasLocation(#20082,#20035)
+enclosing_stmt(#20082,#20075)
+expr_containers(#20082,#20064)
+literals("person","person",#20082)
+bind(#20082,#20069)
 #20083=*
-exprs(#20083,13,#20082,0,"alert(g ... orld""))")
-#20084=@"loc,{#10000},5,1,5,23"
-locations_default(#20084,#10000,5,1,5,23)
-hasLocation(#20083,#20084)
-enclosing_stmt(#20083,#20082)
-expr_containers(#20083,#20001)
+exprs(#20083,4,#20077,1,"""!""")
+hasLocation(#20083,#20039)
+enclosing_stmt(#20083,#20075)
+expr_containers(#20083,#20064)
+literals("!","""!""",#20083)
+#20084=*
+stmts(#20084,2,#20001,1,"alert(g ... rld""));")
+hasLocation(#20084,#20011)
+stmt_containers(#20084,#20001)
 #20085=*
-exprs(#20085,79,#20083,-1,"alert")
-hasLocation(#20085,#20044)
-enclosing_stmt(#20085,#20082)
+exprs(#20085,13,#20084,0,"alert(g ... orld""))")
+#20086=@"loc,{#10000},5,1,5,23"
+locations_default(#20086,#10000,5,1,5,23)
+hasLocation(#20085,#20086)
+enclosing_stmt(#20085,#20084)
 expr_containers(#20085,#20001)
-literals("alert","alert",#20085)
-#20086=@"var;{alert};{#20000}"
-variables(#20086,"alert",#20000)
-bind(#20085,#20086)
 #20087=*
-exprs(#20087,13,#20083,0,"greeter(""world"")")
-#20088=@"loc,{#10000},5,7,5,22"
-locations_default(#20088,#10000,5,7,5,22)
-hasLocation(#20087,#20088)
-enclosing_stmt(#20087,#20082)
+exprs(#20087,79,#20085,-1,"alert")
+hasLocation(#20087,#20044)
+enclosing_stmt(#20087,#20084)
 expr_containers(#20087,#20001)
+literals("alert","alert",#20087)
+#20088=@"var;{alert};{#20000}"
+variables(#20088,"alert",#20000)
+bind(#20087,#20088)
 #20089=*
-exprs(#20089,79,#20087,-1,"greeter")
-hasLocation(#20089,#20048)
-enclosing_stmt(#20089,#20082)
+exprs(#20089,13,#20085,0,"greeter(""world"")")
+#20090=@"loc,{#10000},5,7,5,22"
+locations_default(#20090,#10000,5,7,5,22)
+hasLocation(#20089,#20090)
+enclosing_stmt(#20089,#20084)
 expr_containers(#20089,#20001)
-literals("greeter","greeter",#20089)
-bind(#20089,#20062)
-#20090=*
-exprs(#20090,4,#20087,0,"""world""")
-hasLocation(#20090,#20052)
-enclosing_stmt(#20090,#20082)
-expr_containers(#20090,#20001)
-literals("world","""world""",#20090)
 #20091=*
-regexpterm(#20091,14,#20090,0,"world")
-#20092=@"loc,{#10000},5,16,5,20"
-locations_default(#20092,#10000,5,16,5,20)
-hasLocation(#20091,#20092)
-regexp_const_value(#20091,"world")
+exprs(#20091,79,#20089,-1,"greeter")
+hasLocation(#20091,#20048)
+enclosing_stmt(#20091,#20084)
+expr_containers(#20091,#20001)
+literals("greeter","greeter",#20091)
+bind(#20091,#20062)
+#20092=*
+exprs(#20092,4,#20089,0,"""world""")
+hasLocation(#20092,#20052)
+enclosing_stmt(#20092,#20084)
+expr_containers(#20092,#20001)
+literals("world","""world""",#20092)
 #20093=*
-entry_cfg_node(#20093,#20001)
-#20094=@"loc,{#10000},1,1,1,0"
-locations_default(#20094,#10000,1,1,1,0)
+regexpterm(#20093,14,#20092,0,"world")
+#20094=@"loc,{#10000},5,16,5,20"
+locations_default(#20094,#10000,5,16,5,20)
 hasLocation(#20093,#20094)
+regexp_const_value(#20093,"world")
 #20095=*
-exit_cfg_node(#20095,#20001)
-hasLocation(#20095,#20060)
-successor(#20082,#20085)
-successor(#20090,#20087)
-successor(#20089,#20090)
-successor(#20087,#20083)
-successor(#20085,#20089)
-successor(#20083,#20095)
-successor(#20063,#20082)
-#20096=*
-entry_cfg_node(#20096,#20063)
-hasLocation(#20096,#20094)
+entry_cfg_node(#20095,#20001)
+#20096=@"loc,{#10000},1,1,1,0"
+locations_default(#20096,#10000,1,1,1,0)
+hasLocation(#20095,#20096)
 #20097=*
-exit_cfg_node(#20097,#20063)
-#20098=@"loc,{#10000},3,2,3,1"
-locations_default(#20098,#10000,3,2,3,1)
-hasLocation(#20097,#20098)
-successor(#20081,#20075)
-successor(#20080,#20077)
-successor(#20079,#20080)
-successor(#20077,#20081)
-successor(#20075,#20073)
-successor(#20073,#20097)
-successor(#20071,#20079)
-successor(#20068,#20071)
-successor(#20096,#20068)
-successor(#20065,#20063)
-successor(#20093,#20065)
+exit_cfg_node(#20097,#20001)
+hasLocation(#20097,#20060)
+successor(#20084,#20087)
+successor(#20092,#20089)
+successor(#20091,#20092)
+successor(#20089,#20085)
+successor(#20087,#20091)
+successor(#20085,#20097)
+successor(#20064,#20084)
+#20098=*
+entry_cfg_node(#20098,#20064)
+hasLocation(#20098,#20096)
+#20099=*
+exit_cfg_node(#20099,#20064)
+#20100=@"loc,{#10000},3,2,3,1"
+locations_default(#20100,#10000,3,2,3,1)
+hasLocation(#20099,#20100)
+successor(#20083,#20077)
+successor(#20082,#20079)
+successor(#20081,#20082)
+successor(#20079,#20083)
+successor(#20077,#20075)
+successor(#20075,#20099)
+successor(#20073,#20081)
+successor(#20070,#20073)
+successor(#20098,#20070)
+successor(#20066,#20064)
+successor(#20095,#20066)
 numlines(#10000,5,4,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/importExport.ts.trap

@@ -136,94 +136,96 @@ local_type_names(#20044,"Something",#20041)
 local_type_names(#20045,"importExport",#20041)
 local_namespace_names(#20046,"Something",#20041)
 local_namespace_names(#20047,"importExport",#20041)
-#20048=*
-stmts(#20048,27,#20001,0,"import  ... where';")
-hasLocation(#20048,#20003)
-stmt_containers(#20048,#20001)
+#20048=@"var;{this};{#20041}"
+variables(#20048,"this",#20041)
 #20049=*
-exprs(#20049,4,#20048,-1,"'somewhere'")
-hasLocation(#20049,#20019)
-enclosing_stmt(#20049,#20048)
-expr_containers(#20049,#20001)
-literals("somewhere","'somewhere'",#20049)
+stmts(#20049,27,#20001,0,"import  ... where';")
+hasLocation(#20049,#20003)
+stmt_containers(#20049,#20001)
 #20050=*
-regexpterm(#20050,14,#20049,0,"somewhere")
-#20051=@"loc,{#10000},1,29,1,37"
-locations_default(#20051,#10000,1,29,1,37)
-hasLocation(#20050,#20051)
-regexp_const_value(#20050,"somewhere")
-#20052=*
-exprs(#20052,85,#20048,0,"* as Something")
-#20053=@"loc,{#10000},1,8,1,21"
-locations_default(#20053,#10000,1,8,1,21)
-hasLocation(#20052,#20053)
-enclosing_stmt(#20052,#20048)
-expr_containers(#20052,#20001)
-#20054=*
-exprs(#20054,78,#20052,1,"Something")
-hasLocation(#20054,#20015)
-enclosing_stmt(#20054,#20048)
-expr_containers(#20054,#20001)
-literals("Something","Something",#20054)
-decl(#20054,#20042)
-typedecl(#20054,#20044)
-namespacedecl(#20054,#20046)
+exprs(#20050,4,#20049,-1,"'somewhere'")
+hasLocation(#20050,#20019)
+enclosing_stmt(#20050,#20049)
+expr_containers(#20050,#20001)
+literals("somewhere","'somewhere'",#20050)
+#20051=*
+regexpterm(#20051,14,#20050,0,"somewhere")
+#20052=@"loc,{#10000},1,29,1,37"
+locations_default(#20052,#10000,1,29,1,37)
+hasLocation(#20051,#20052)
+regexp_const_value(#20051,"somewhere")
+#20053=*
+exprs(#20053,85,#20049,0,"* as Something")
+#20054=@"loc,{#10000},1,8,1,21"
+locations_default(#20054,#10000,1,8,1,21)
+hasLocation(#20053,#20054)
+enclosing_stmt(#20053,#20049)
+expr_containers(#20053,#20001)
 #20055=*
-stmts(#20055,30,#20001,1,"export  ... thingy;")
-hasLocation(#20055,#20007)
-stmt_containers(#20055,#20001)
+exprs(#20055,78,#20053,1,"Something")
+hasLocation(#20055,#20015)
+enclosing_stmt(#20055,#20049)
+expr_containers(#20055,#20001)
+literals("Something","Something",#20055)
+decl(#20055,#20042)
+typedecl(#20055,#20044)
+namespacedecl(#20055,#20046)
 #20056=*
-stmts(#20056,32,#20055,-1,"import  ... thingy;")
-#20057=@"loc,{#10000},3,8,3,46"
-locations_default(#20057,#10000,3,8,3,46)
-hasLocation(#20056,#20057)
+stmts(#20056,30,#20001,1,"export  ... thingy;")
+hasLocation(#20056,#20007)
 stmt_containers(#20056,#20001)
-#20058=*
-exprs(#20058,78,#20056,0,"importExport")
-hasLocation(#20058,#20027)
-enclosing_stmt(#20058,#20056)
-expr_containers(#20058,#20001)
-literals("importExport","importExport",#20058)
-decl(#20058,#20043)
-typedecl(#20058,#20045)
-namespacedecl(#20058,#20047)
+#20057=*
+stmts(#20057,32,#20056,-1,"import  ... thingy;")
+#20058=@"loc,{#10000},3,8,3,46"
+locations_default(#20058,#10000,3,8,3,46)
+hasLocation(#20057,#20058)
+stmt_containers(#20057,#20001)
 #20059=*
-exprs(#20059,14,#20056,1,"Something.thingy")
-#20060=@"loc,{#10000},3,30,3,45"
-locations_default(#20060,#10000,3,30,3,45)
-hasLocation(#20059,#20060)
-enclosing_stmt(#20059,#20056)
+exprs(#20059,78,#20057,0,"importExport")
+hasLocation(#20059,#20027)
+enclosing_stmt(#20059,#20057)
 expr_containers(#20059,#20001)
-#20061=*
-exprs(#20061,103,#20059,0,"Something")
-hasLocation(#20061,#20031)
-enclosing_stmt(#20061,#20056)
-expr_containers(#20061,#20001)
-literals("Something","Something",#20061)
-namespacebind(#20061,#20046)
-bind(#20061,#20042)
+literals("importExport","importExport",#20059)
+decl(#20059,#20043)
+typedecl(#20059,#20045)
+namespacedecl(#20059,#20047)
+#20060=*
+exprs(#20060,14,#20057,1,"Something.thingy")
+#20061=@"loc,{#10000},3,30,3,45"
+locations_default(#20061,#10000,3,30,3,45)
+hasLocation(#20060,#20061)
+enclosing_stmt(#20060,#20057)
+expr_containers(#20060,#20001)
 #20062=*
-exprs(#20062,0,#20059,1,"thingy")
-hasLocation(#20062,#20035)
-enclosing_stmt(#20062,#20056)
+exprs(#20062,103,#20060,0,"Something")
+hasLocation(#20062,#20031)
+enclosing_stmt(#20062,#20057)
 expr_containers(#20062,#20001)
-literals("thingy","thingy",#20062)
+literals("Something","Something",#20062)
+namespacebind(#20062,#20046)
+bind(#20062,#20042)
 #20063=*
-entry_cfg_node(#20063,#20001)
-#20064=@"loc,{#10000},1,1,1,0"
-locations_default(#20064,#10000,1,1,1,0)
-hasLocation(#20063,#20064)
-#20065=*
-exit_cfg_node(#20065,#20001)
-hasLocation(#20065,#20039)
-successor(#20055,#20058)
-successor(#20062,#20059)
-successor(#20061,#20062)
-successor(#20059,#20056)
-successor(#20058,#20061)
-successor(#20056,#20065)
-successor(#20048,#20055)
-successor(#20052,#20048)
-successor(#20063,#20052)
+exprs(#20063,0,#20060,1,"thingy")
+hasLocation(#20063,#20035)
+enclosing_stmt(#20063,#20057)
+expr_containers(#20063,#20001)
+literals("thingy","thingy",#20063)
+#20064=*
+entry_cfg_node(#20064,#20001)
+#20065=@"loc,{#10000},1,1,1,0"
+locations_default(#20065,#10000,1,1,1,0)
+hasLocation(#20064,#20065)
+#20066=*
+exit_cfg_node(#20066,#20001)
+hasLocation(#20066,#20039)
+successor(#20056,#20059)
+successor(#20063,#20060)
+successor(#20062,#20063)
+successor(#20060,#20057)
+successor(#20059,#20062)
+successor(#20057,#20066)
+successor(#20049,#20056)
+successor(#20053,#20049)
+successor(#20064,#20053)
 numlines(#10000,3,2,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/importNonStrings.ts.trap

@@ -163,95 +163,97 @@ local_type_names(#20059,"X",#20000)
 local_type_names(#20060,"Y",#20000)
 #20061=@"local_type_name;{Z};{#20000}"
 local_type_names(#20061,"Z",#20000)
-#20062=*
-stmts(#20062,35,#20001,0,"type X = import(3);")
-hasLocation(#20062,#20003)
-stmt_containers(#20062,#20001)
+#20062=@"var;{this};{#20000}"
+variables(#20062,"this",#20000)
 #20063=*
-typeexprs(#20063,1,#20062,0,"X")
-hasLocation(#20063,#20011)
-enclosing_stmt(#20063,#20062)
-expr_containers(#20063,#20001)
-literals("X","X",#20063)
-typedecl(#20063,#20059)
+stmts(#20063,35,#20001,0,"type X = import(3);")
+hasLocation(#20063,#20003)
+stmt_containers(#20063,#20001)
 #20064=*
-typeexprs(#20064,30,#20062,1,"import(3)")
-#20065=@"loc,{#10000},1,10,1,18"
-locations_default(#20065,#10000,1,10,1,18)
-hasLocation(#20064,#20065)
-enclosing_stmt(#20064,#20062)
+typeexprs(#20064,1,#20063,0,"X")
+hasLocation(#20064,#20011)
+enclosing_stmt(#20064,#20063)
 expr_containers(#20064,#20001)
-#20066=*
-typeexprs(#20066,4,#20064,0,"3")
-hasLocation(#20066,#20019)
-enclosing_stmt(#20066,#20062)
-expr_containers(#20066,#20001)
-literals("3","3",#20066)
+literals("X","X",#20064)
+typedecl(#20064,#20059)
+#20065=*
+typeexprs(#20065,30,#20063,1,"import(3)")
+#20066=@"loc,{#10000},1,10,1,18"
+locations_default(#20066,#10000,1,10,1,18)
+hasLocation(#20065,#20066)
+enclosing_stmt(#20065,#20063)
+expr_containers(#20065,#20001)
 #20067=*
-stmts(#20067,35,#20001,1,"type Y  ... `Foo`);")
-hasLocation(#20067,#20005)
-stmt_containers(#20067,#20001)
+typeexprs(#20067,4,#20065,0,"3")
+hasLocation(#20067,#20019)
+enclosing_stmt(#20067,#20063)
+expr_containers(#20067,#20001)
+literals("3","3",#20067)
 #20068=*
-typeexprs(#20068,1,#20067,0,"Y")
-hasLocation(#20068,#20027)
-enclosing_stmt(#20068,#20067)
-expr_containers(#20068,#20001)
-literals("Y","Y",#20068)
-typedecl(#20068,#20060)
+stmts(#20068,35,#20001,1,"type Y  ... `Foo`);")
+hasLocation(#20068,#20005)
+stmt_containers(#20068,#20001)
 #20069=*
-typeexprs(#20069,30,#20067,1,"import(`Foo`)")
-#20070=@"loc,{#10000},2,10,2,22"
-locations_default(#20070,#10000,2,10,2,22)
-hasLocation(#20069,#20070)
-enclosing_stmt(#20069,#20067)
+typeexprs(#20069,1,#20068,0,"Y")
+hasLocation(#20069,#20027)
+enclosing_stmt(#20069,#20068)
 expr_containers(#20069,#20001)
-#20071=*
-typeexprs(#20071,37,#20069,0,"`Foo`")
-hasLocation(#20071,#20035)
-enclosing_stmt(#20071,#20067)
-expr_containers(#20071,#20001)
+literals("Y","Y",#20069)
+typedecl(#20069,#20060)
+#20070=*
+typeexprs(#20070,30,#20068,1,"import(`Foo`)")
+#20071=@"loc,{#10000},2,10,2,22"
+locations_default(#20071,#10000,2,10,2,22)
+hasLocation(#20070,#20071)
+enclosing_stmt(#20070,#20068)
+expr_containers(#20070,#20001)
 #20072=*
-typeexprs(#20072,3,#20071,0,"`Foo`")
+typeexprs(#20072,37,#20070,0,"`Foo`")
 hasLocation(#20072,#20035)
-enclosing_stmt(#20072,#20067)
+enclosing_stmt(#20072,#20068)
 expr_containers(#20072,#20001)
-literals("Foo","Foo",#20072)
 #20073=*
-stmts(#20073,35,#20001,2,"type Z = import(Y);")
-hasLocation(#20073,#20007)
-stmt_containers(#20073,#20001)
+typeexprs(#20073,3,#20072,0,"`Foo`")
+hasLocation(#20073,#20035)
+enclosing_stmt(#20073,#20068)
+expr_containers(#20073,#20001)
+literals("Foo","Foo",#20073)
 #20074=*
-typeexprs(#20074,1,#20073,0,"Z")
-hasLocation(#20074,#20043)
-enclosing_stmt(#20074,#20073)
-expr_containers(#20074,#20001)
-literals("Z","Z",#20074)
-typedecl(#20074,#20061)
+stmts(#20074,35,#20001,2,"type Z = import(Y);")
+hasLocation(#20074,#20007)
+stmt_containers(#20074,#20001)
 #20075=*
-typeexprs(#20075,30,#20073,1,"import(Y)")
-#20076=@"loc,{#10000},3,10,3,18"
-locations_default(#20076,#10000,3,10,3,18)
-hasLocation(#20075,#20076)
-enclosing_stmt(#20075,#20073)
+typeexprs(#20075,1,#20074,0,"Z")
+hasLocation(#20075,#20043)
+enclosing_stmt(#20075,#20074)
 expr_containers(#20075,#20001)
-#20077=*
-typeexprs(#20077,0,#20075,0,"Y")
-hasLocation(#20077,#20051)
-enclosing_stmt(#20077,#20073)
-expr_containers(#20077,#20001)
-literals("Y","Y",#20077)
-typebind(#20077,#20060)
+literals("Z","Z",#20075)
+typedecl(#20075,#20061)
+#20076=*
+typeexprs(#20076,30,#20074,1,"import(Y)")
+#20077=@"loc,{#10000},3,10,3,18"
+locations_default(#20077,#10000,3,10,3,18)
+hasLocation(#20076,#20077)
+enclosing_stmt(#20076,#20074)
+expr_containers(#20076,#20001)
 #20078=*
-entry_cfg_node(#20078,#20001)
-#20079=@"loc,{#10000},1,1,1,0"
-locations_default(#20079,#10000,1,1,1,0)
-hasLocation(#20078,#20079)
-#20080=*
-exit_cfg_node(#20080,#20001)
-hasLocation(#20080,#20057)
-successor(#20073,#20080)
-successor(#20067,#20073)
-successor(#20062,#20067)
-successor(#20078,#20062)
+typeexprs(#20078,0,#20076,0,"Y")
+hasLocation(#20078,#20051)
+enclosing_stmt(#20078,#20074)
+expr_containers(#20078,#20001)
+literals("Y","Y",#20078)
+typebind(#20078,#20060)
+#20079=*
+entry_cfg_node(#20079,#20001)
+#20080=@"loc,{#10000},1,1,1,0"
+locations_default(#20080,#10000,1,1,1,0)
+hasLocation(#20079,#20080)
+#20081=*
+exit_cfg_node(#20081,#20001)
+hasLocation(#20081,#20057)
+successor(#20074,#20081)
+successor(#20068,#20074)
+successor(#20063,#20068)
+successor(#20079,#20063)
 numlines(#10000,3,3,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/importassign.ts.trap

@@ -80,60 +80,62 @@ local_namespace_names(#20026,"x",#20023)
 variables(#20024,"x",#20023)
 local_type_names(#20025,"x",#20023)
 local_namespace_names(#20026,"x",#20023)
-#20027=*
-stmts(#20027,32,#20001,0,"import  ... sign"");")
-hasLocation(#20027,#20003)
-stmt_containers(#20027,#20001)
+#20027=@"var;{this};{#20023}"
+variables(#20027,"this",#20023)
 #20028=*
-exprs(#20028,78,#20027,0,"x")
-hasLocation(#20028,#20007)
-enclosing_stmt(#20028,#20027)
-expr_containers(#20028,#20001)
-literals("x","x",#20028)
-decl(#20028,#20024)
-typedecl(#20028,#20025)
-namespacedecl(#20028,#20026)
+stmts(#20028,32,#20001,0,"import  ... sign"");")
+hasLocation(#20028,#20003)
+stmt_containers(#20028,#20001)
 #20029=*
-exprs(#20029,98,#20027,1,"require ... ssign"")")
-#20030=@"loc,{#10000},1,12,1,36"
-locations_default(#20030,#10000,1,12,1,36)
-hasLocation(#20029,#20030)
-enclosing_stmt(#20029,#20027)
+exprs(#20029,78,#20028,0,"x")
+hasLocation(#20029,#20007)
+enclosing_stmt(#20029,#20028)
 expr_containers(#20029,#20001)
-#20031=*
-exprs(#20031,4,#20029,0,"""./exportassign""")
-hasLocation(#20031,#20015)
-enclosing_stmt(#20031,#20027)
-expr_containers(#20031,#20001)
-literals("./exportassign","""./exportassign""",#20031)
+literals("x","x",#20029)
+decl(#20029,#20024)
+typedecl(#20029,#20025)
+namespacedecl(#20029,#20026)
+#20030=*
+exprs(#20030,98,#20028,1,"require ... ssign"")")
+#20031=@"loc,{#10000},1,12,1,36"
+locations_default(#20031,#10000,1,12,1,36)
+hasLocation(#20030,#20031)
+enclosing_stmt(#20030,#20028)
+expr_containers(#20030,#20001)
 #20032=*
-regexpterm(#20032,1,#20031,0,"./exportassign")
-#20033=@"loc,{#10000},1,21,1,34"
-locations_default(#20033,#10000,1,21,1,34)
-hasLocation(#20032,#20033)
-#20034=*
-regexpterm(#20034,12,#20032,0,".")
-#20035=@"loc,{#10000},1,21,1,21"
-locations_default(#20035,#10000,1,21,1,21)
-hasLocation(#20034,#20035)
-#20036=*
-regexpterm(#20036,14,#20032,1,"/exportassign")
-#20037=@"loc,{#10000},1,22,1,34"
-locations_default(#20037,#10000,1,22,1,34)
-hasLocation(#20036,#20037)
-regexp_const_value(#20036,"/exportassign")
-#20038=*
-entry_cfg_node(#20038,#20001)
-#20039=@"loc,{#10000},1,1,1,0"
-locations_default(#20039,#10000,1,1,1,0)
-hasLocation(#20038,#20039)
-#20040=*
-exit_cfg_node(#20040,#20001)
-hasLocation(#20040,#20021)
-successor(#20031,#20029)
-successor(#20029,#20027)
-successor(#20028,#20031)
-successor(#20027,#20040)
-successor(#20038,#20028)
+exprs(#20032,4,#20030,0,"""./exportassign""")
+hasLocation(#20032,#20015)
+enclosing_stmt(#20032,#20028)
+expr_containers(#20032,#20001)
+literals("./exportassign","""./exportassign""",#20032)
+#20033=*
+regexpterm(#20033,1,#20032,0,"./exportassign")
+#20034=@"loc,{#10000},1,21,1,34"
+locations_default(#20034,#10000,1,21,1,34)
+hasLocation(#20033,#20034)
+#20035=*
+regexpterm(#20035,12,#20033,0,".")
+#20036=@"loc,{#10000},1,21,1,21"
+locations_default(#20036,#10000,1,21,1,21)
+hasLocation(#20035,#20036)
+#20037=*
+regexpterm(#20037,14,#20033,1,"/exportassign")
+#20038=@"loc,{#10000},1,22,1,34"
+locations_default(#20038,#10000,1,22,1,34)
+hasLocation(#20037,#20038)
+regexp_const_value(#20037,"/exportassign")
+#20039=*
+entry_cfg_node(#20039,#20001)
+#20040=@"loc,{#10000},1,1,1,0"
+locations_default(#20040,#10000,1,1,1,0)
+hasLocation(#20039,#20040)
+#20041=*
+exit_cfg_node(#20041,#20001)
+hasLocation(#20041,#20021)
+successor(#20032,#20030)
+successor(#20030,#20028)
+successor(#20029,#20032)
+successor(#20028,#20041)
+successor(#20039,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/interfaces.ts.trap

@@ -261,181 +261,189 @@ hasLocation(#20001,#20092)
 local_namespace_names(#20093,"Foo",#20000)
 #20094=@"local_type_name;{MyInterface};{#20000}"
 local_type_names(#20094,"MyInterface",#20000)
-#20095=*
-stmts(#20095,34,#20001,0,"interfa ... mber;\n}")
-#20096=@"loc,{#10000},1,1,5,1"
-locations_default(#20096,#10000,1,1,5,1)
-hasLocation(#20095,#20096)
-stmt_containers(#20095,#20001)
-#20097=*
-typeexprs(#20097,1,#20095,0,"MyInterface")
-hasLocation(#20097,#20027)
-enclosing_stmt(#20097,#20095)
-expr_containers(#20097,#20001)
-literals("MyInterface","MyInterface",#20097)
-typedecl(#20097,#20094)
+#20095=@"var;{this};{#20000}"
+variables(#20095,"this",#20000)
+#20096=*
+stmts(#20096,34,#20001,0,"interfa ... mber;\n}")
+#20097=@"loc,{#10000},1,1,5,1"
+locations_default(#20097,#10000,1,1,5,1)
+hasLocation(#20096,#20097)
+stmt_containers(#20096,#20001)
 #20098=*
-properties(#20098,#20095,2,0,"foo();")
-#20099=@"loc,{#10000},2,3,2,8"
-locations_default(#20099,#10000,2,3,2,8)
-hasLocation(#20098,#20099)
-#20100=*
-exprs(#20100,0,#20098,0,"foo")
-hasLocation(#20100,#20031)
-enclosing_stmt(#20100,#20095)
-expr_containers(#20100,#20001)
-literals("foo","foo",#20100)
+typeexprs(#20098,1,#20096,0,"MyInterface")
+hasLocation(#20098,#20027)
+enclosing_stmt(#20098,#20096)
+expr_containers(#20098,#20001)
+literals("MyInterface","MyInterface",#20098)
+typedecl(#20098,#20094)
+#20099=*
+properties(#20099,#20096,2,0,"foo();")
+#20100=@"loc,{#10000},2,3,2,8"
+locations_default(#20100,#10000,2,3,2,8)
+hasLocation(#20099,#20100)
 #20101=*
-exprs(#20101,9,#20098,1,"foo();")
-hasLocation(#20101,#20099)
-enclosing_stmt(#20101,#20095)
+exprs(#20101,0,#20099,0,"foo")
+hasLocation(#20101,#20031)
+enclosing_stmt(#20101,#20096)
 expr_containers(#20101,#20001)
+literals("foo","foo",#20101)
 #20102=*
-scopes(#20102,1)
-scopenodes(#20101,#20102)
-scopenesting(#20102,#20000)
-#20103=@"var;{arguments};{#20102}"
-variables(#20103,"arguments",#20102)
-is_arguments_object(#20103)
-is_method(#20098)
-is_abstract_member(#20098)
-#20104=*
-properties(#20104,#20095,3,0,"bar(x:  ... string;")
-#20105=@"loc,{#10000},3,3,3,25"
-locations_default(#20105,#10000,3,3,3,25)
-hasLocation(#20104,#20105)
+exprs(#20102,9,#20099,1,"foo();")
+hasLocation(#20102,#20100)
+enclosing_stmt(#20102,#20096)
+expr_containers(#20102,#20001)
+#20103=*
+scopes(#20103,1)
+scopenodes(#20102,#20103)
+scopenesting(#20103,#20000)
+#20104=@"var;{this};{#20103}"
+variables(#20104,"this",#20103)
+#20105=@"var;{arguments};{#20103}"
+variables(#20105,"arguments",#20103)
+is_arguments_object(#20105)
+is_method(#20099)
+is_abstract_member(#20099)
 #20106=*
-exprs(#20106,0,#20104,0,"bar")
-hasLocation(#20106,#20039)
-enclosing_stmt(#20106,#20095)
-expr_containers(#20106,#20001)
-literals("bar","bar",#20106)
-#20107=*
-exprs(#20107,9,#20104,1,"bar(x:  ... string;")
-hasLocation(#20107,#20105)
-enclosing_stmt(#20107,#20095)
-expr_containers(#20107,#20001)
+properties(#20106,#20096,3,0,"bar(x:  ... string;")
+#20107=@"loc,{#10000},3,3,3,25"
+locations_default(#20107,#10000,3,3,3,25)
+hasLocation(#20106,#20107)
 #20108=*
-scopes(#20108,1)
-scopenodes(#20107,#20108)
-scopenesting(#20108,#20000)
-#20109=@"var;{x};{#20108}"
-variables(#20109,"x",#20108)
+exprs(#20108,0,#20106,0,"bar")
+hasLocation(#20108,#20039)
+enclosing_stmt(#20108,#20096)
+expr_containers(#20108,#20001)
+literals("bar","bar",#20108)
+#20109=*
+exprs(#20109,9,#20106,1,"bar(x:  ... string;")
+hasLocation(#20109,#20107)
+enclosing_stmt(#20109,#20096)
+expr_containers(#20109,#20001)
 #20110=*
-exprs(#20110,78,#20107,0,"x")
-hasLocation(#20110,#20043)
-expr_containers(#20110,#20107)
-literals("x","x",#20110)
-decl(#20110,#20109)
-#20111=@"var;{arguments};{#20108}"
-variables(#20111,"arguments",#20108)
-is_arguments_object(#20111)
-#20112=*
-typeexprs(#20112,2,#20107,-3,"string")
-hasLocation(#20112,#20053)
-expr_containers(#20112,#20107)
-literals("string","string",#20112)
+scopes(#20110,1)
+scopenodes(#20109,#20110)
+scopenesting(#20110,#20000)
+#20111=@"var;{this};{#20110}"
+variables(#20111,"this",#20110)
+#20112=@"var;{x};{#20110}"
+variables(#20112,"x",#20110)
 #20113=*
-typeexprs(#20113,2,#20107,-6,"number")
-hasLocation(#20113,#20047)
-expr_containers(#20113,#20107)
-literals("number","number",#20113)
-is_method(#20104)
-is_abstract_member(#20104)
-#20114=*
-properties(#20114,#20095,4,8,"field: number;")
-#20115=@"loc,{#10000},4,3,4,16"
-locations_default(#20115,#10000,4,3,4,16)
-hasLocation(#20114,#20115)
+exprs(#20113,78,#20109,0,"x")
+hasLocation(#20113,#20043)
+expr_containers(#20113,#20109)
+literals("x","x",#20113)
+decl(#20113,#20112)
+#20114=@"var;{arguments};{#20110}"
+variables(#20114,"arguments",#20110)
+is_arguments_object(#20114)
+#20115=*
+typeexprs(#20115,2,#20109,-3,"string")
+hasLocation(#20115,#20053)
+expr_containers(#20115,#20109)
+literals("string","string",#20115)
 #20116=*
-exprs(#20116,0,#20114,0,"field")
-hasLocation(#20116,#20057)
-enclosing_stmt(#20116,#20095)
-expr_containers(#20116,#20001)
-literals("field","field",#20116)
-is_abstract_member(#20114)
+typeexprs(#20116,2,#20109,-6,"number")
+hasLocation(#20116,#20047)
+expr_containers(#20116,#20109)
+literals("number","number",#20116)
+is_method(#20106)
+is_abstract_member(#20106)
 #20117=*
-typeexprs(#20117,2,#20114,2,"number")
-hasLocation(#20117,#20061)
-enclosing_stmt(#20117,#20095)
-expr_containers(#20117,#20001)
-literals("number","number",#20117)
-#20118=*
-stmts(#20118,31,#20001,1,"namespa ... ;\n  }\n}")
-#20119=@"loc,{#10000},7,1,11,1"
-locations_default(#20119,#10000,7,1,11,1)
-hasLocation(#20118,#20119)
-stmt_containers(#20118,#20001)
+properties(#20117,#20096,4,8,"field: number;")
+#20118=@"loc,{#10000},4,3,4,16"
+locations_default(#20118,#10000,4,3,4,16)
+hasLocation(#20117,#20118)
+#20119=*
+exprs(#20119,0,#20117,0,"field")
+hasLocation(#20119,#20057)
+enclosing_stmt(#20119,#20096)
+expr_containers(#20119,#20001)
+literals("field","field",#20119)
+is_abstract_member(#20117)
 #20120=*
-exprs(#20120,78,#20118,-1,"Foo")
-hasLocation(#20120,#20068)
-enclosing_stmt(#20120,#20118)
+typeexprs(#20120,2,#20117,2,"number")
+hasLocation(#20120,#20061)
+enclosing_stmt(#20120,#20096)
 expr_containers(#20120,#20001)
-literals("Foo","Foo",#20120)
-namespacedecl(#20120,#20093)
+literals("number","number",#20120)
 #20121=*
-scopes(#20121,9)
-scopenodes(#20118,#20121)
-scopenesting(#20121,#20000)
-#20122=@"local_type_name;{I};{#20121}"
-local_type_names(#20122,"I",#20121)
+stmts(#20121,31,#20001,1,"namespa ... ;\n  }\n}")
+#20122=@"loc,{#10000},7,1,11,1"
+locations_default(#20122,#10000,7,1,11,1)
+hasLocation(#20121,#20122)
+stmt_containers(#20121,#20001)
 #20123=*
-stmts(#20123,30,#20118,0,"export  ... ();\n  }")
-#20124=@"loc,{#10000},8,3,10,3"
-locations_default(#20124,#10000,8,3,10,3)
-hasLocation(#20123,#20124)
-stmt_containers(#20123,#20118)
-#20125=*
-stmts(#20125,34,#20123,-1,"interfa ... ();\n  }")
-#20126=@"loc,{#10000},8,10,10,3"
-locations_default(#20126,#10000,8,10,10,3)
-hasLocation(#20125,#20126)
-stmt_containers(#20125,#20118)
-#20127=*
-typeexprs(#20127,1,#20125,0,"I")
-hasLocation(#20127,#20076)
-enclosing_stmt(#20127,#20125)
-expr_containers(#20127,#20118)
-literals("I","I",#20127)
-typedecl(#20127,#20122)
+exprs(#20123,78,#20121,-1,"Foo")
+hasLocation(#20123,#20068)
+enclosing_stmt(#20123,#20121)
+expr_containers(#20123,#20001)
+literals("Foo","Foo",#20123)
+namespacedecl(#20123,#20093)
+#20124=*
+scopes(#20124,9)
+scopenodes(#20121,#20124)
+scopenesting(#20124,#20000)
+#20125=@"local_type_name;{I};{#20124}"
+local_type_names(#20125,"I",#20124)
+#20126=*
+stmts(#20126,30,#20121,0,"export  ... ();\n  }")
+#20127=@"loc,{#10000},8,3,10,3"
+locations_default(#20127,#10000,8,3,10,3)
+hasLocation(#20126,#20127)
+stmt_containers(#20126,#20121)
 #20128=*
-properties(#20128,#20125,2,0,"bar();")
-#20129=@"loc,{#10000},9,5,9,10"
-locations_default(#20129,#10000,9,5,9,10)
+stmts(#20128,34,#20126,-1,"interfa ... ();\n  }")
+#20129=@"loc,{#10000},8,10,10,3"
+locations_default(#20129,#10000,8,10,10,3)
 hasLocation(#20128,#20129)
+stmt_containers(#20128,#20121)
 #20130=*
-exprs(#20130,0,#20128,0,"bar")
-hasLocation(#20130,#20080)
-enclosing_stmt(#20130,#20125)
-expr_containers(#20130,#20118)
-literals("bar","bar",#20130)
+typeexprs(#20130,1,#20128,0,"I")
+hasLocation(#20130,#20076)
+enclosing_stmt(#20130,#20128)
+expr_containers(#20130,#20121)
+literals("I","I",#20130)
+typedecl(#20130,#20125)
 #20131=*
-exprs(#20131,9,#20128,1,"bar();")
-hasLocation(#20131,#20129)
-enclosing_stmt(#20131,#20125)
-expr_containers(#20131,#20118)
-#20132=*
-scopes(#20132,1)
-scopenodes(#20131,#20132)
-scopenesting(#20132,#20121)
-#20133=@"var;{arguments};{#20132}"
-variables(#20133,"arguments",#20132)
-is_arguments_object(#20133)
-is_method(#20128)
-is_abstract_member(#20128)
+properties(#20131,#20128,2,0,"bar();")
+#20132=@"loc,{#10000},9,5,9,10"
+locations_default(#20132,#10000,9,5,9,10)
+hasLocation(#20131,#20132)
+#20133=*
+exprs(#20133,0,#20131,0,"bar")
+hasLocation(#20133,#20080)
+enclosing_stmt(#20133,#20128)
+expr_containers(#20133,#20121)
+literals("bar","bar",#20133)
 #20134=*
-entry_cfg_node(#20134,#20001)
-#20135=@"loc,{#10000},1,1,1,0"
-locations_default(#20135,#10000,1,1,1,0)
-hasLocation(#20134,#20135)
-#20136=*
-exit_cfg_node(#20136,#20001)
-hasLocation(#20136,#20091)
-successor(#20120,#20118)
-successor(#20123,#20125)
-successor(#20125,#20136)
-successor(#20118,#20123)
-successor(#20095,#20120)
-successor(#20134,#20095)
+exprs(#20134,9,#20131,1,"bar();")
+hasLocation(#20134,#20132)
+enclosing_stmt(#20134,#20128)
+expr_containers(#20134,#20121)
+#20135=*
+scopes(#20135,1)
+scopenodes(#20134,#20135)
+scopenesting(#20135,#20124)
+#20136=@"var;{this};{#20135}"
+variables(#20136,"this",#20135)
+#20137=@"var;{arguments};{#20135}"
+variables(#20137,"arguments",#20135)
+is_arguments_object(#20137)
+is_method(#20131)
+is_abstract_member(#20131)
+#20138=*
+entry_cfg_node(#20138,#20001)
+#20139=@"loc,{#10000},1,1,1,0"
+locations_default(#20139,#10000,1,1,1,0)
+hasLocation(#20138,#20139)
+#20140=*
+exit_cfg_node(#20140,#20001)
+hasLocation(#20140,#20091)
+successor(#20123,#20121)
+successor(#20126,#20128)
+successor(#20128,#20140)
+successor(#20121,#20126)
+successor(#20096,#20123)
+successor(#20138,#20096)
 numlines(#10000,11,10,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/invalidExtends.ts.trap

@@ -327,125 +327,127 @@ locations_default(#20124,#10000,1,1,7,0)
 hasLocation(#20001,#20124)
 #20125=@"local_type_name;{Invalid};{#20000}"
 local_type_names(#20125,"Invalid",#20000)
-#20126=*
-stmts(#20126,34,#20001,0,"interfa ... bar) {}")
-hasLocation(#20126,#20003)
-stmt_containers(#20126,#20001)
+#20126=@"var;{this};{#20000}"
+variables(#20126,"this",#20000)
 #20127=*
-typeexprs(#20127,1,#20126,0,"Invalid")
-hasLocation(#20127,#20017)
-enclosing_stmt(#20127,#20126)
-expr_containers(#20127,#20001)
-literals("Invalid","Invalid",#20127)
-typedecl(#20127,#20125)
+stmts(#20127,34,#20001,0,"interfa ... bar) {}")
+hasLocation(#20127,#20003)
+stmt_containers(#20127,#20001)
 #20128=*
-stmts(#20128,34,#20001,1,"interfa ... .bar {}")
-hasLocation(#20128,#20005)
-stmt_containers(#20128,#20001)
+typeexprs(#20128,1,#20127,0,"Invalid")
+hasLocation(#20128,#20017)
+enclosing_stmt(#20128,#20127)
+expr_containers(#20128,#20001)
+literals("Invalid","Invalid",#20128)
+typedecl(#20128,#20125)
 #20129=*
-typeexprs(#20129,1,#20128,0,"Invalid")
-hasLocation(#20129,#20037)
-enclosing_stmt(#20129,#20128)
-expr_containers(#20129,#20001)
-literals("Invalid","Invalid",#20129)
-typedecl(#20129,#20125)
+stmts(#20129,34,#20001,1,"interfa ... .bar {}")
+hasLocation(#20129,#20005)
+stmt_containers(#20129,#20001)
 #20130=*
-stmts(#20130,34,#20001,2,"interfa ... bar] {}")
-hasLocation(#20130,#20007)
-stmt_containers(#20130,#20001)
+typeexprs(#20130,1,#20129,0,"Invalid")
+hasLocation(#20130,#20037)
+enclosing_stmt(#20130,#20129)
+expr_containers(#20130,#20001)
+literals("Invalid","Invalid",#20130)
+typedecl(#20130,#20125)
 #20131=*
-typeexprs(#20131,13,#20130,-1,"foo[bar]")
-#20132=@"loc,{#10000},3,27,3,34"
-locations_default(#20132,#10000,3,27,3,34)
-hasLocation(#20131,#20132)
-enclosing_stmt(#20131,#20130)
-expr_containers(#20131,#20001)
-#20133=*
-typeexprs(#20133,25,#20131,0,"foo")
-hasLocation(#20133,#20061)
-enclosing_stmt(#20133,#20130)
-expr_containers(#20133,#20001)
-literals("foo","foo",#20133)
+stmts(#20131,34,#20001,2,"interfa ... bar] {}")
+hasLocation(#20131,#20007)
+stmt_containers(#20131,#20001)
+#20132=*
+typeexprs(#20132,13,#20131,-1,"foo[bar]")
+#20133=@"loc,{#10000},3,27,3,34"
+locations_default(#20133,#10000,3,27,3,34)
+hasLocation(#20132,#20133)
+enclosing_stmt(#20132,#20131)
+expr_containers(#20132,#20001)
 #20134=*
-typeexprs(#20134,15,#20131,1,"bar")
-hasLocation(#20134,#20065)
-enclosing_stmt(#20134,#20130)
+typeexprs(#20134,25,#20132,0,"foo")
+hasLocation(#20134,#20061)
+enclosing_stmt(#20134,#20131)
 expr_containers(#20134,#20001)
-literals("bar","bar",#20134)
+literals("foo","foo",#20134)
 #20135=*
-typeexprs(#20135,1,#20130,0,"Invalid")
-hasLocation(#20135,#20057)
-enclosing_stmt(#20135,#20130)
+typeexprs(#20135,15,#20132,1,"bar")
+hasLocation(#20135,#20065)
+enclosing_stmt(#20135,#20131)
 expr_containers(#20135,#20001)
-literals("Invalid","Invalid",#20135)
-typedecl(#20135,#20125)
+literals("bar","bar",#20135)
 #20136=*
-stmts(#20136,34,#20001,3,"interfa ... .bar {}")
-hasLocation(#20136,#20009)
-stmt_containers(#20136,#20001)
+typeexprs(#20136,1,#20131,0,"Invalid")
+hasLocation(#20136,#20057)
+enclosing_stmt(#20136,#20131)
+expr_containers(#20136,#20001)
+literals("Invalid","Invalid",#20136)
+typedecl(#20136,#20125)
 #20137=*
-typeexprs(#20137,13,#20136,-1,"foo?.bar")
-#20138=@"loc,{#10000},4,27,4,34"
-locations_default(#20138,#10000,4,27,4,34)
-hasLocation(#20137,#20138)
-enclosing_stmt(#20137,#20136)
-expr_containers(#20137,#20001)
-#20139=*
-typeexprs(#20139,25,#20137,0,"foo")
-hasLocation(#20139,#20079)
-enclosing_stmt(#20139,#20136)
-expr_containers(#20139,#20001)
-literals("foo","foo",#20139)
+stmts(#20137,34,#20001,3,"interfa ... .bar {}")
+hasLocation(#20137,#20009)
+stmt_containers(#20137,#20001)
+#20138=*
+typeexprs(#20138,13,#20137,-1,"foo?.bar")
+#20139=@"loc,{#10000},4,27,4,34"
+locations_default(#20139,#10000,4,27,4,34)
+hasLocation(#20138,#20139)
+enclosing_stmt(#20138,#20137)
+expr_containers(#20138,#20001)
 #20140=*
-typeexprs(#20140,15,#20137,1,"bar")
-hasLocation(#20140,#20083)
-enclosing_stmt(#20140,#20136)
+typeexprs(#20140,25,#20138,0,"foo")
+hasLocation(#20140,#20079)
+enclosing_stmt(#20140,#20137)
 expr_containers(#20140,#20001)
-literals("bar","bar",#20140)
-isOptionalChaining(#20137)
+literals("foo","foo",#20140)
 #20141=*
-typeexprs(#20141,1,#20136,0,"Invalid")
-hasLocation(#20141,#20075)
-enclosing_stmt(#20141,#20136)
+typeexprs(#20141,15,#20138,1,"bar")
+hasLocation(#20141,#20083)
+enclosing_stmt(#20141,#20137)
 expr_containers(#20141,#20001)
-literals("Invalid","Invalid",#20141)
-typedecl(#20141,#20125)
+literals("bar","bar",#20141)
+isOptionalChaining(#20138)
 #20142=*
-stmts(#20142,34,#20001,4,"interfa ... .bar {}")
-hasLocation(#20142,#20011)
-stmt_containers(#20142,#20001)
+typeexprs(#20142,1,#20137,0,"Invalid")
+hasLocation(#20142,#20075)
+enclosing_stmt(#20142,#20137)
+expr_containers(#20142,#20001)
+literals("Invalid","Invalid",#20142)
+typedecl(#20142,#20125)
 #20143=*
-typeexprs(#20143,1,#20142,0,"Invalid")
-hasLocation(#20143,#20091)
-enclosing_stmt(#20143,#20142)
-expr_containers(#20143,#20001)
-literals("Invalid","Invalid",#20143)
-typedecl(#20143,#20125)
+stmts(#20143,34,#20001,4,"interfa ... .bar {}")
+hasLocation(#20143,#20011)
+stmt_containers(#20143,#20001)
 #20144=*
-stmts(#20144,34,#20001,5,"interfa ... oo() {}")
-hasLocation(#20144,#20013)
-stmt_containers(#20144,#20001)
+typeexprs(#20144,1,#20143,0,"Invalid")
+hasLocation(#20144,#20091)
+enclosing_stmt(#20144,#20143)
+expr_containers(#20144,#20001)
+literals("Invalid","Invalid",#20144)
+typedecl(#20144,#20125)
 #20145=*
-typeexprs(#20145,1,#20144,0,"Invalid")
-hasLocation(#20145,#20109)
-enclosing_stmt(#20145,#20144)
-expr_containers(#20145,#20001)
-literals("Invalid","Invalid",#20145)
-typedecl(#20145,#20125)
+stmts(#20145,34,#20001,5,"interfa ... oo() {}")
+hasLocation(#20145,#20013)
+stmt_containers(#20145,#20001)
 #20146=*
-entry_cfg_node(#20146,#20001)
-#20147=@"loc,{#10000},1,1,1,0"
-locations_default(#20147,#10000,1,1,1,0)
-hasLocation(#20146,#20147)
-#20148=*
-exit_cfg_node(#20148,#20001)
-hasLocation(#20148,#20123)
-successor(#20144,#20148)
-successor(#20142,#20144)
-successor(#20136,#20142)
-successor(#20130,#20136)
-successor(#20128,#20130)
-successor(#20126,#20128)
-successor(#20146,#20126)
+typeexprs(#20146,1,#20145,0,"Invalid")
+hasLocation(#20146,#20109)
+enclosing_stmt(#20146,#20145)
+expr_containers(#20146,#20001)
+literals("Invalid","Invalid",#20146)
+typedecl(#20146,#20125)
+#20147=*
+entry_cfg_node(#20147,#20001)
+#20148=@"loc,{#10000},1,1,1,0"
+locations_default(#20148,#10000,1,1,1,0)
+hasLocation(#20147,#20148)
+#20149=*
+exit_cfg_node(#20149,#20001)
+hasLocation(#20149,#20123)
+successor(#20145,#20149)
+successor(#20143,#20145)
+successor(#20137,#20143)
+successor(#20131,#20137)
+successor(#20129,#20131)
+successor(#20127,#20129)
+successor(#20147,#20127)
 numlines(#10000,6,6,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/let.ts.trap

@@ -118,98 +118,100 @@ variables(#20041,"varX",#20000)
 variables(#20042,"letX",#20000)
 #20043=@"var;{constX};{#20000}"
 variables(#20043,"constX",#20000)
-#20044=*
-stmts(#20044,18,#20001,0,"var varX = 5;")
-hasLocation(#20044,#20003)
-stmt_containers(#20044,#20001)
+#20044=@"var;{this};{#20000}"
+variables(#20044,"this",#20000)
 #20045=*
-exprs(#20045,64,#20044,0,"varX = 5")
-#20046=@"loc,{#10000},1,5,1,12"
-locations_default(#20046,#10000,1,5,1,12)
-hasLocation(#20045,#20046)
-enclosing_stmt(#20045,#20044)
-expr_containers(#20045,#20001)
-#20047=*
-exprs(#20047,78,#20045,0,"varX")
-hasLocation(#20047,#20011)
-enclosing_stmt(#20047,#20044)
-expr_containers(#20047,#20001)
-literals("varX","varX",#20047)
-decl(#20047,#20041)
+stmts(#20045,18,#20001,0,"var varX = 5;")
+hasLocation(#20045,#20003)
+stmt_containers(#20045,#20001)
+#20046=*
+exprs(#20046,64,#20045,0,"varX = 5")
+#20047=@"loc,{#10000},1,5,1,12"
+locations_default(#20047,#10000,1,5,1,12)
+hasLocation(#20046,#20047)
+enclosing_stmt(#20046,#20045)
+expr_containers(#20046,#20001)
 #20048=*
-exprs(#20048,3,#20045,1,"5")
-hasLocation(#20048,#20015)
-enclosing_stmt(#20048,#20044)
+exprs(#20048,78,#20046,0,"varX")
+hasLocation(#20048,#20011)
+enclosing_stmt(#20048,#20045)
 expr_containers(#20048,#20001)
-literals("5","5",#20048)
+literals("varX","varX",#20048)
+decl(#20048,#20041)
 #20049=*
-stmts(#20049,23,#20001,1,"let letX = 6;")
-hasLocation(#20049,#20005)
-stmt_containers(#20049,#20001)
+exprs(#20049,3,#20046,1,"5")
+hasLocation(#20049,#20015)
+enclosing_stmt(#20049,#20045)
+expr_containers(#20049,#20001)
+literals("5","5",#20049)
 #20050=*
-exprs(#20050,64,#20049,0,"letX = 6")
-#20051=@"loc,{#10000},2,5,2,12"
-locations_default(#20051,#10000,2,5,2,12)
-hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20049)
-expr_containers(#20050,#20001)
-#20052=*
-exprs(#20052,78,#20050,0,"letX")
-hasLocation(#20052,#20021)
-enclosing_stmt(#20052,#20049)
-expr_containers(#20052,#20001)
-literals("letX","letX",#20052)
-decl(#20052,#20042)
+stmts(#20050,23,#20001,1,"let letX = 6;")
+hasLocation(#20050,#20005)
+stmt_containers(#20050,#20001)
+#20051=*
+exprs(#20051,64,#20050,0,"letX = 6")
+#20052=@"loc,{#10000},2,5,2,12"
+locations_default(#20052,#10000,2,5,2,12)
+hasLocation(#20051,#20052)
+enclosing_stmt(#20051,#20050)
+expr_containers(#20051,#20001)
 #20053=*
-exprs(#20053,3,#20050,1,"6")
-hasLocation(#20053,#20025)
-enclosing_stmt(#20053,#20049)
+exprs(#20053,78,#20051,0,"letX")
+hasLocation(#20053,#20021)
+enclosing_stmt(#20053,#20050)
 expr_containers(#20053,#20001)
-literals("6","6",#20053)
+literals("letX","letX",#20053)
+decl(#20053,#20042)
 #20054=*
-stmts(#20054,22,#20001,2,"const constX = 7;")
-hasLocation(#20054,#20007)
-stmt_containers(#20054,#20001)
+exprs(#20054,3,#20051,1,"6")
+hasLocation(#20054,#20025)
+enclosing_stmt(#20054,#20050)
+expr_containers(#20054,#20001)
+literals("6","6",#20054)
 #20055=*
-exprs(#20055,64,#20054,0,"constX = 7")
-#20056=@"loc,{#10000},3,7,3,16"
-locations_default(#20056,#10000,3,7,3,16)
-hasLocation(#20055,#20056)
-enclosing_stmt(#20055,#20054)
-expr_containers(#20055,#20001)
-#20057=*
-exprs(#20057,78,#20055,0,"constX")
-hasLocation(#20057,#20031)
-enclosing_stmt(#20057,#20054)
-expr_containers(#20057,#20001)
-literals("constX","constX",#20057)
-decl(#20057,#20043)
+stmts(#20055,22,#20001,2,"const constX = 7;")
+hasLocation(#20055,#20007)
+stmt_containers(#20055,#20001)
+#20056=*
+exprs(#20056,64,#20055,0,"constX = 7")
+#20057=@"loc,{#10000},3,7,3,16"
+locations_default(#20057,#10000,3,7,3,16)
+hasLocation(#20056,#20057)
+enclosing_stmt(#20056,#20055)
+expr_containers(#20056,#20001)
 #20058=*
-exprs(#20058,3,#20055,1,"7")
-hasLocation(#20058,#20035)
-enclosing_stmt(#20058,#20054)
+exprs(#20058,78,#20056,0,"constX")
+hasLocation(#20058,#20031)
+enclosing_stmt(#20058,#20055)
 expr_containers(#20058,#20001)
-literals("7","7",#20058)
+literals("constX","constX",#20058)
+decl(#20058,#20043)
 #20059=*
-entry_cfg_node(#20059,#20001)
-#20060=@"loc,{#10000},1,1,1,0"
-locations_default(#20060,#10000,1,1,1,0)
-hasLocation(#20059,#20060)
-#20061=*
-exit_cfg_node(#20061,#20001)
-hasLocation(#20061,#20039)
-successor(#20054,#20057)
-successor(#20058,#20055)
-successor(#20057,#20058)
-successor(#20055,#20061)
-successor(#20049,#20052)
-successor(#20053,#20050)
-successor(#20052,#20053)
-successor(#20050,#20054)
-successor(#20044,#20047)
-successor(#20048,#20045)
-successor(#20047,#20048)
-successor(#20045,#20049)
-successor(#20059,#20044)
+exprs(#20059,3,#20056,1,"7")
+hasLocation(#20059,#20035)
+enclosing_stmt(#20059,#20055)
+expr_containers(#20059,#20001)
+literals("7","7",#20059)
+#20060=*
+entry_cfg_node(#20060,#20001)
+#20061=@"loc,{#10000},1,1,1,0"
+locations_default(#20061,#10000,1,1,1,0)
+hasLocation(#20060,#20061)
+#20062=*
+exit_cfg_node(#20062,#20001)
+hasLocation(#20062,#20039)
+successor(#20055,#20058)
+successor(#20059,#20056)
+successor(#20058,#20059)
+successor(#20056,#20062)
+successor(#20050,#20053)
+successor(#20054,#20051)
+successor(#20053,#20054)
+successor(#20051,#20055)
+successor(#20045,#20048)
+successor(#20049,#20046)
+successor(#20048,#20049)
+successor(#20046,#20050)
+successor(#20060,#20045)
 numlines(#10000,3,3,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap

@@ -170,181 +170,185 @@ locations_default(#20061,#10000,1,1,5,0)
 hasLocation(#20001,#20061)
 #20062=@"var;{f};{#20000}"
 variables(#20062,"f",#20000)
-#20063=*
-stmts(#20063,17,#20001,0,"functio ... y) {}\n}")
-#20064=@"loc,{#10000},1,1,4,1"
-locations_default(#20064,#10000,1,1,4,1)
-hasLocation(#20063,#20064)
-stmt_containers(#20063,#20001)
-#20065=*
-exprs(#20065,78,#20063,-1,"f")
-hasLocation(#20065,#20013)
-expr_containers(#20065,#20063)
-literals("f","f",#20065)
-decl(#20065,#20062)
+#20063=@"var;{this};{#20000}"
+variables(#20063,"this",#20000)
+#20064=*
+stmts(#20064,17,#20001,0,"functio ... y) {}\n}")
+#20065=@"loc,{#10000},1,1,4,1"
+locations_default(#20065,#10000,1,1,4,1)
+hasLocation(#20064,#20065)
+stmt_containers(#20064,#20001)
 #20066=*
-scopes(#20066,1)
-scopenodes(#20063,#20066)
-scopenesting(#20066,#20000)
-#20067=@"var;{x};{#20066}"
-variables(#20067,"x",#20066)
-#20068=*
-exprs(#20068,78,#20063,0,"x")
-hasLocation(#20068,#20017)
-expr_containers(#20068,#20063)
-literals("x","x",#20068)
-decl(#20068,#20067)
-#20069=@"var;{y};{#20066}"
-variables(#20069,"y",#20066)
+exprs(#20066,78,#20064,-1,"f")
+hasLocation(#20066,#20013)
+expr_containers(#20066,#20064)
+literals("f","f",#20066)
+decl(#20066,#20062)
+#20067=*
+scopes(#20067,1)
+scopenodes(#20064,#20067)
+scopenesting(#20067,#20000)
+#20068=@"var;{this};{#20067}"
+variables(#20068,"this",#20067)
+#20069=@"var;{x};{#20067}"
+variables(#20069,"x",#20067)
 #20070=*
-exprs(#20070,78,#20063,1,"y")
-hasLocation(#20070,#20021)
-expr_containers(#20070,#20063)
-literals("y","y",#20070)
+exprs(#20070,78,#20064,0,"x")
+hasLocation(#20070,#20017)
+expr_containers(#20070,#20064)
+literals("x","x",#20070)
 decl(#20070,#20069)
-#20071=@"var;{arguments};{#20066}"
-variables(#20071,"arguments",#20066)
-is_arguments_object(#20071)
+#20071=@"var;{y};{#20067}"
+variables(#20071,"y",#20067)
 #20072=*
-stmts(#20072,1,#20063,-2,"{\n  if  ... y) {}\n}")
-#20073=@"loc,{#10000},1,17,4,1"
-locations_default(#20073,#10000,1,17,4,1)
-hasLocation(#20072,#20073)
-stmt_containers(#20072,#20063)
+exprs(#20072,78,#20064,1,"y")
+hasLocation(#20072,#20021)
+expr_containers(#20072,#20064)
+literals("y","y",#20072)
+decl(#20072,#20071)
+#20073=@"var;{arguments};{#20067}"
+variables(#20073,"arguments",#20067)
+is_arguments_object(#20073)
 #20074=*
-stmts(#20074,3,#20072,0,"if (x || y) {}")
-#20075=@"loc,{#10000},2,3,2,16"
-locations_default(#20075,#10000,2,3,2,16)
+stmts(#20074,1,#20064,-2,"{\n  if  ... y) {}\n}")
+#20075=@"loc,{#10000},1,17,4,1"
+locations_default(#20075,#10000,1,17,4,1)
 hasLocation(#20074,#20075)
-stmt_containers(#20074,#20063)
+stmt_containers(#20074,#20064)
 #20076=*
-exprs(#20076,45,#20074,0,"x || y")
-#20077=@"loc,{#10000},2,7,2,12"
-locations_default(#20077,#10000,2,7,2,12)
+stmts(#20076,3,#20074,0,"if (x || y) {}")
+#20077=@"loc,{#10000},2,3,2,16"
+locations_default(#20077,#10000,2,3,2,16)
 hasLocation(#20076,#20077)
-enclosing_stmt(#20076,#20074)
-expr_containers(#20076,#20063)
+stmt_containers(#20076,#20064)
 #20078=*
-exprs(#20078,79,#20076,0,"x")
-hasLocation(#20078,#20031)
-enclosing_stmt(#20078,#20074)
-expr_containers(#20078,#20063)
-literals("x","x",#20078)
-bind(#20078,#20067)
-#20079=*
-exprs(#20079,79,#20076,1,"y")
-hasLocation(#20079,#20035)
-enclosing_stmt(#20079,#20074)
-expr_containers(#20079,#20063)
-literals("y","y",#20079)
-bind(#20079,#20069)
+exprs(#20078,45,#20076,0,"x || y")
+#20079=@"loc,{#10000},2,7,2,12"
+locations_default(#20079,#10000,2,7,2,12)
+hasLocation(#20078,#20079)
+enclosing_stmt(#20078,#20076)
+expr_containers(#20078,#20064)
 #20080=*
-stmts(#20080,1,#20074,1,"{}")
-#20081=@"loc,{#10000},2,15,2,16"
-locations_default(#20081,#10000,2,15,2,16)
-hasLocation(#20080,#20081)
-stmt_containers(#20080,#20063)
+exprs(#20080,79,#20078,0,"x")
+hasLocation(#20080,#20031)
+enclosing_stmt(#20080,#20076)
+expr_containers(#20080,#20064)
+literals("x","x",#20080)
+bind(#20080,#20069)
+#20081=*
+exprs(#20081,79,#20078,1,"y")
+hasLocation(#20081,#20035)
+enclosing_stmt(#20081,#20076)
+expr_containers(#20081,#20064)
+literals("y","y",#20081)
+bind(#20081,#20071)
 #20082=*
-stmts(#20082,3,#20072,1,"if (x && y) {}")
-#20083=@"loc,{#10000},3,3,3,16"
-locations_default(#20083,#10000,3,3,3,16)
+stmts(#20082,1,#20076,1,"{}")
+#20083=@"loc,{#10000},2,15,2,16"
+locations_default(#20083,#10000,2,15,2,16)
 hasLocation(#20082,#20083)
-stmt_containers(#20082,#20063)
+stmt_containers(#20082,#20064)
 #20084=*
-exprs(#20084,44,#20082,0,"x && y")
-#20085=@"loc,{#10000},3,7,3,12"
-locations_default(#20085,#10000,3,7,3,12)
+stmts(#20084,3,#20074,1,"if (x && y) {}")
+#20085=@"loc,{#10000},3,3,3,16"
+locations_default(#20085,#10000,3,3,3,16)
 hasLocation(#20084,#20085)
-enclosing_stmt(#20084,#20082)
-expr_containers(#20084,#20063)
+stmt_containers(#20084,#20064)
 #20086=*
-exprs(#20086,79,#20084,0,"x")
-hasLocation(#20086,#20047)
-enclosing_stmt(#20086,#20082)
-expr_containers(#20086,#20063)
-literals("x","x",#20086)
-bind(#20086,#20067)
-#20087=*
-exprs(#20087,79,#20084,1,"y")
-hasLocation(#20087,#20051)
-enclosing_stmt(#20087,#20082)
-expr_containers(#20087,#20063)
-literals("y","y",#20087)
-bind(#20087,#20069)
+exprs(#20086,44,#20084,0,"x && y")
+#20087=@"loc,{#10000},3,7,3,12"
+locations_default(#20087,#10000,3,7,3,12)
+hasLocation(#20086,#20087)
+enclosing_stmt(#20086,#20084)
+expr_containers(#20086,#20064)
 #20088=*
-stmts(#20088,1,#20082,1,"{}")
-#20089=@"loc,{#10000},3,15,3,16"
-locations_default(#20089,#10000,3,15,3,16)
-hasLocation(#20088,#20089)
-stmt_containers(#20088,#20063)
+exprs(#20088,79,#20086,0,"x")
+hasLocation(#20088,#20047)
+enclosing_stmt(#20088,#20084)
+expr_containers(#20088,#20064)
+literals("x","x",#20088)
+bind(#20088,#20069)
+#20089=*
+exprs(#20089,79,#20086,1,"y")
+hasLocation(#20089,#20051)
+enclosing_stmt(#20089,#20084)
+expr_containers(#20089,#20064)
+literals("y","y",#20089)
+bind(#20089,#20071)
 #20090=*
-entry_cfg_node(#20090,#20001)
-#20091=@"loc,{#10000},1,1,1,0"
-locations_default(#20091,#10000,1,1,1,0)
+stmts(#20090,1,#20084,1,"{}")
+#20091=@"loc,{#10000},3,15,3,16"
+locations_default(#20091,#10000,3,15,3,16)
 hasLocation(#20090,#20091)
+stmt_containers(#20090,#20064)
 #20092=*
-exit_cfg_node(#20092,#20001)
-hasLocation(#20092,#20060)
-successor(#20063,#20092)
-#20093=*
-entry_cfg_node(#20093,#20063)
-hasLocation(#20093,#20091)
+entry_cfg_node(#20092,#20001)
+#20093=@"loc,{#10000},1,1,1,0"
+locations_default(#20093,#10000,1,1,1,0)
+hasLocation(#20092,#20093)
 #20094=*
-exit_cfg_node(#20094,#20063)
-#20095=@"loc,{#10000},4,2,4,1"
-locations_default(#20095,#10000,4,2,4,1)
-hasLocation(#20094,#20095)
-successor(#20082,#20084)
-successor(#20084,#20086)
+exit_cfg_node(#20094,#20001)
+hasLocation(#20094,#20060)
+successor(#20064,#20094)
+#20095=*
+entry_cfg_node(#20095,#20064)
+hasLocation(#20095,#20093)
 #20096=*
-guard_node(#20096,1,#20086)
-hasLocation(#20096,#20047)
-successor(#20096,#20087)
-#20097=*
-guard_node(#20097,0,#20086)
-hasLocation(#20097,#20047)
-successor(#20097,#20094)
-successor(#20086,#20096)
-successor(#20086,#20097)
+exit_cfg_node(#20096,#20064)
+#20097=@"loc,{#10000},4,2,4,1"
+locations_default(#20097,#10000,4,2,4,1)
+hasLocation(#20096,#20097)
+successor(#20084,#20086)
+successor(#20086,#20088)
 #20098=*
-guard_node(#20098,1,#20087)
-hasLocation(#20098,#20051)
-successor(#20098,#20088)
+guard_node(#20098,1,#20088)
+hasLocation(#20098,#20047)
+successor(#20098,#20089)
 #20099=*
-guard_node(#20099,0,#20087)
-hasLocation(#20099,#20051)
-successor(#20099,#20094)
-successor(#20087,#20098)
-successor(#20087,#20099)
-successor(#20088,#20094)
-successor(#20074,#20076)
-successor(#20076,#20078)
+guard_node(#20099,0,#20088)
+hasLocation(#20099,#20047)
+successor(#20099,#20096)
+successor(#20088,#20098)
+successor(#20088,#20099)
 #20100=*
-guard_node(#20100,1,#20078)
-hasLocation(#20100,#20031)
-successor(#20100,#20080)
+guard_node(#20100,1,#20089)
+hasLocation(#20100,#20051)
+successor(#20100,#20090)
 #20101=*
-guard_node(#20101,0,#20078)
-hasLocation(#20101,#20031)
-successor(#20101,#20079)
-successor(#20078,#20100)
-successor(#20078,#20101)
+guard_node(#20101,0,#20089)
+hasLocation(#20101,#20051)
+successor(#20101,#20096)
+successor(#20089,#20100)
+successor(#20089,#20101)
+successor(#20090,#20096)
+successor(#20076,#20078)
+successor(#20078,#20080)
 #20102=*
-guard_node(#20102,1,#20079)
-hasLocation(#20102,#20035)
-successor(#20102,#20080)
+guard_node(#20102,1,#20080)
+hasLocation(#20102,#20031)
+successor(#20102,#20082)
 #20103=*
-guard_node(#20103,0,#20079)
-hasLocation(#20103,#20035)
-successor(#20103,#20082)
-successor(#20079,#20102)
-successor(#20079,#20103)
-successor(#20080,#20082)
+guard_node(#20103,0,#20080)
+hasLocation(#20103,#20031)
+successor(#20103,#20081)
+successor(#20080,#20102)
+successor(#20080,#20103)
+#20104=*
+guard_node(#20104,1,#20081)
+hasLocation(#20104,#20035)
+successor(#20104,#20082)
+#20105=*
+guard_node(#20105,0,#20081)
+hasLocation(#20105,#20035)
+successor(#20105,#20084)
+successor(#20081,#20104)
+successor(#20081,#20105)
+successor(#20082,#20084)
+successor(#20074,#20076)
 successor(#20072,#20074)
 successor(#20070,#20072)
-successor(#20068,#20070)
-successor(#20093,#20068)
-successor(#20065,#20063)
-successor(#20090,#20065)
+successor(#20095,#20070)
+successor(#20066,#20064)
+successor(#20092,#20066)
 numlines(#10000,4,4,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap

@@ -691,496 +691,498 @@ locations_default(#20263,#10000,1,1,12,0)
 hasLocation(#20001,#20263)
 #20264=@"local_namespace_name;{MappedTypeModifiers};{#20000}"
 local_namespace_names(#20264,"MappedTypeModifiers",#20000)
-#20265=*
-stmts(#20265,31,#20001,0,"namespa ... ing }\n}")
-#20266=@"loc,{#10000},1,1,11,1"
-locations_default(#20266,#10000,1,1,11,1)
-hasLocation(#20265,#20266)
-stmt_containers(#20265,#20001)
-#20267=*
-exprs(#20267,78,#20265,-1,"MappedTypeModifiers")
-hasLocation(#20267,#20037)
-enclosing_stmt(#20267,#20265)
-expr_containers(#20267,#20001)
-literals("MappedTypeModifiers","MappedTypeModifiers",#20267)
-namespacedecl(#20267,#20264)
+#20265=@"var;{this};{#20000}"
+variables(#20265,"this",#20000)
+#20266=*
+stmts(#20266,31,#20001,0,"namespa ... ing }\n}")
+#20267=@"loc,{#10000},1,1,11,1"
+locations_default(#20267,#10000,1,1,11,1)
+hasLocation(#20266,#20267)
+stmt_containers(#20266,#20001)
 #20268=*
-scopes(#20268,9)
-scopenodes(#20265,#20268)
-scopenesting(#20268,#20000)
-#20269=@"local_type_name;{MutableRequired};{#20268}"
-local_type_names(#20269,"MutableRequired",#20268)
-#20270=@"local_type_name;{ReadonlyPartial};{#20268}"
-local_type_names(#20270,"ReadonlyPartial",#20268)
-#20271=@"local_type_name;{ReadonlyPartial2};{#20268}"
-local_type_names(#20271,"ReadonlyPartial2",#20268)
-#20272=@"local_type_name;{Required};{#20268}"
-local_type_names(#20272,"Required",#20268)
-#20273=@"local_type_name;{Foo};{#20268}"
-local_type_names(#20273,"Foo",#20268)
-#20274=@"local_type_name;{Bar};{#20268}"
-local_type_names(#20274,"Bar",#20268)
-#20275=*
-stmts(#20275,35,#20265,0,"type Mu ... T[P] };")
-#20276=@"loc,{#10000},2,3,2,65"
-locations_default(#20276,#10000,2,3,2,65)
-hasLocation(#20275,#20276)
-stmt_containers(#20275,#20265)
-#20277=*
-typeexprs(#20277,1,#20275,0,"MutableRequired")
-hasLocation(#20277,#20043)
-enclosing_stmt(#20277,#20275)
-expr_containers(#20277,#20265)
-literals("MutableRequired","MutableRequired",#20277)
-typedecl(#20277,#20269)
+exprs(#20268,78,#20266,-1,"MappedTypeModifiers")
+hasLocation(#20268,#20037)
+enclosing_stmt(#20268,#20266)
+expr_containers(#20268,#20001)
+literals("MappedTypeModifiers","MappedTypeModifiers",#20268)
+namespacedecl(#20268,#20264)
+#20269=*
+scopes(#20269,9)
+scopenodes(#20266,#20269)
+scopenesting(#20269,#20000)
+#20270=@"local_type_name;{MutableRequired};{#20269}"
+local_type_names(#20270,"MutableRequired",#20269)
+#20271=@"local_type_name;{ReadonlyPartial};{#20269}"
+local_type_names(#20271,"ReadonlyPartial",#20269)
+#20272=@"local_type_name;{ReadonlyPartial2};{#20269}"
+local_type_names(#20272,"ReadonlyPartial2",#20269)
+#20273=@"local_type_name;{Required};{#20269}"
+local_type_names(#20273,"Required",#20269)
+#20274=@"local_type_name;{Foo};{#20269}"
+local_type_names(#20274,"Foo",#20269)
+#20275=@"local_type_name;{Bar};{#20269}"
+local_type_names(#20275,"Bar",#20269)
+#20276=*
+stmts(#20276,35,#20266,0,"type Mu ... T[P] };")
+#20277=@"loc,{#10000},2,3,2,65"
+locations_default(#20277,#10000,2,3,2,65)
+hasLocation(#20276,#20277)
+stmt_containers(#20276,#20266)
 #20278=*
-scopes(#20278,12)
-scopenodes(#20275,#20278)
-scopenesting(#20278,#20268)
-#20279=@"local_type_name;{T};{#20278}"
-local_type_names(#20279,"T",#20278)
-#20280=*
-typeexprs(#20280,22,#20275,2,"T")
-hasLocation(#20280,#20047)
-enclosing_stmt(#20280,#20275)
-expr_containers(#20280,#20265)
+typeexprs(#20278,1,#20276,0,"MutableRequired")
+hasLocation(#20278,#20043)
+enclosing_stmt(#20278,#20276)
+expr_containers(#20278,#20266)
+literals("MutableRequired","MutableRequired",#20278)
+typedecl(#20278,#20270)
+#20279=*
+scopes(#20279,12)
+scopenodes(#20276,#20279)
+scopenesting(#20279,#20269)
+#20280=@"local_type_name;{T};{#20279}"
+local_type_names(#20280,"T",#20279)
 #20281=*
-typeexprs(#20281,1,#20280,0,"T")
+typeexprs(#20281,22,#20276,2,"T")
 hasLocation(#20281,#20047)
-enclosing_stmt(#20281,#20275)
-expr_containers(#20281,#20265)
-literals("T","T",#20281)
-typedecl(#20281,#20279)
+enclosing_stmt(#20281,#20276)
+expr_containers(#20281,#20266)
 #20282=*
-typeexprs(#20282,27,#20275,1,"{ -read ...  T[P] }")
-#20283=@"loc,{#10000},2,29,2,64"
-locations_default(#20283,#10000,2,29,2,64)
-hasLocation(#20282,#20283)
-enclosing_stmt(#20282,#20275)
-expr_containers(#20282,#20265)
-#20284=*
-scopes(#20284,13)
-scopenodes(#20282,#20284)
-scopenesting(#20284,#20278)
-#20285=@"local_type_name;{P};{#20284}"
-local_type_names(#20285,"P",#20284)
-#20286=*
-typeexprs(#20286,22,#20282,0,"P in keyof T")
-#20287=@"loc,{#10000},2,42,2,53"
-locations_default(#20287,#10000,2,42,2,53)
-hasLocation(#20286,#20287)
-enclosing_stmt(#20286,#20275)
-expr_containers(#20286,#20265)
-#20288=*
-typeexprs(#20288,1,#20286,0,"P")
-hasLocation(#20288,#20061)
-enclosing_stmt(#20288,#20275)
-expr_containers(#20288,#20265)
-literals("P","P",#20288)
-typedecl(#20288,#20285)
+typeexprs(#20282,1,#20281,0,"T")
+hasLocation(#20282,#20047)
+enclosing_stmt(#20282,#20276)
+expr_containers(#20282,#20266)
+literals("T","T",#20282)
+typedecl(#20282,#20280)
+#20283=*
+typeexprs(#20283,27,#20276,1,"{ -read ...  T[P] }")
+#20284=@"loc,{#10000},2,29,2,64"
+locations_default(#20284,#10000,2,29,2,64)
+hasLocation(#20283,#20284)
+enclosing_stmt(#20283,#20276)
+expr_containers(#20283,#20266)
+#20285=*
+scopes(#20285,13)
+scopenodes(#20283,#20285)
+scopenesting(#20285,#20279)
+#20286=@"local_type_name;{P};{#20285}"
+local_type_names(#20286,"P",#20285)
+#20287=*
+typeexprs(#20287,22,#20283,0,"P in keyof T")
+#20288=@"loc,{#10000},2,42,2,53"
+locations_default(#20288,#10000,2,42,2,53)
+hasLocation(#20287,#20288)
+enclosing_stmt(#20287,#20276)
+expr_containers(#20287,#20266)
 #20289=*
-typeexprs(#20289,12,#20286,1,"keyof T")
-#20290=@"loc,{#10000},2,47,2,53"
-locations_default(#20290,#10000,2,47,2,53)
-hasLocation(#20289,#20290)
-enclosing_stmt(#20289,#20275)
-expr_containers(#20289,#20265)
-#20291=*
-typeexprs(#20291,0,#20289,0,"T")
-hasLocation(#20291,#20067)
-enclosing_stmt(#20291,#20275)
-expr_containers(#20291,#20265)
-literals("T","T",#20291)
-typebind(#20291,#20279)
+typeexprs(#20289,1,#20287,0,"P")
+hasLocation(#20289,#20061)
+enclosing_stmt(#20289,#20276)
+expr_containers(#20289,#20266)
+literals("P","P",#20289)
+typedecl(#20289,#20286)
+#20290=*
+typeexprs(#20290,12,#20287,1,"keyof T")
+#20291=@"loc,{#10000},2,47,2,53"
+locations_default(#20291,#10000,2,47,2,53)
+hasLocation(#20290,#20291)
+enclosing_stmt(#20290,#20276)
+expr_containers(#20290,#20266)
 #20292=*
-typeexprs(#20292,8,#20282,1,"T[P]")
-#20293=@"loc,{#10000},2,59,2,62"
-locations_default(#20293,#10000,2,59,2,62)
-hasLocation(#20292,#20293)
-enclosing_stmt(#20292,#20275)
-expr_containers(#20292,#20265)
-#20294=*
-typeexprs(#20294,0,#20292,0,"T")
-hasLocation(#20294,#20077)
-enclosing_stmt(#20294,#20275)
-expr_containers(#20294,#20265)
-literals("T","T",#20294)
-typebind(#20294,#20279)
+typeexprs(#20292,0,#20290,0,"T")
+hasLocation(#20292,#20067)
+enclosing_stmt(#20292,#20276)
+expr_containers(#20292,#20266)
+literals("T","T",#20292)
+typebind(#20292,#20280)
+#20293=*
+typeexprs(#20293,8,#20283,1,"T[P]")
+#20294=@"loc,{#10000},2,59,2,62"
+locations_default(#20294,#10000,2,59,2,62)
+hasLocation(#20293,#20294)
+enclosing_stmt(#20293,#20276)
+expr_containers(#20293,#20266)
 #20295=*
-typeexprs(#20295,0,#20292,1,"P")
-hasLocation(#20295,#20081)
-enclosing_stmt(#20295,#20275)
-expr_containers(#20295,#20265)
-literals("P","P",#20295)
-typebind(#20295,#20285)
+typeexprs(#20295,0,#20293,0,"T")
+hasLocation(#20295,#20077)
+enclosing_stmt(#20295,#20276)
+expr_containers(#20295,#20266)
+literals("T","T",#20295)
+typebind(#20295,#20280)
 #20296=*
-stmts(#20296,35,#20265,1,"type Re ... T[P] };")
-#20297=@"loc,{#10000},3,3,3,65"
-locations_default(#20297,#10000,3,3,3,65)
-hasLocation(#20296,#20297)
-stmt_containers(#20296,#20265)
-#20298=*
-typeexprs(#20298,1,#20296,0,"ReadonlyPartial")
-hasLocation(#20298,#20091)
-enclosing_stmt(#20298,#20296)
-expr_containers(#20298,#20265)
-literals("ReadonlyPartial","ReadonlyPartial",#20298)
-typedecl(#20298,#20270)
+typeexprs(#20296,0,#20293,1,"P")
+hasLocation(#20296,#20081)
+enclosing_stmt(#20296,#20276)
+expr_containers(#20296,#20266)
+literals("P","P",#20296)
+typebind(#20296,#20286)
+#20297=*
+stmts(#20297,35,#20266,1,"type Re ... T[P] };")
+#20298=@"loc,{#10000},3,3,3,65"
+locations_default(#20298,#10000,3,3,3,65)
+hasLocation(#20297,#20298)
+stmt_containers(#20297,#20266)
 #20299=*
-scopes(#20299,12)
-scopenodes(#20296,#20299)
-scopenesting(#20299,#20268)
-#20300=@"local_type_name;{T};{#20299}"
-local_type_names(#20300,"T",#20299)
-#20301=*
-typeexprs(#20301,22,#20296,2,"T")
-hasLocation(#20301,#20095)
-enclosing_stmt(#20301,#20296)
-expr_containers(#20301,#20265)
+typeexprs(#20299,1,#20297,0,"ReadonlyPartial")
+hasLocation(#20299,#20091)
+enclosing_stmt(#20299,#20297)
+expr_containers(#20299,#20266)
+literals("ReadonlyPartial","ReadonlyPartial",#20299)
+typedecl(#20299,#20271)
+#20300=*
+scopes(#20300,12)
+scopenodes(#20297,#20300)
+scopenesting(#20300,#20269)
+#20301=@"local_type_name;{T};{#20300}"
+local_type_names(#20301,"T",#20300)
 #20302=*
-typeexprs(#20302,1,#20301,0,"T")
+typeexprs(#20302,22,#20297,2,"T")
 hasLocation(#20302,#20095)
-enclosing_stmt(#20302,#20296)
-expr_containers(#20302,#20265)
-literals("T","T",#20302)
-typedecl(#20302,#20300)
+enclosing_stmt(#20302,#20297)
+expr_containers(#20302,#20266)
 #20303=*
-typeexprs(#20303,27,#20296,1,"{ +read ...  T[P] }")
-#20304=@"loc,{#10000},3,29,3,64"
-locations_default(#20304,#10000,3,29,3,64)
-hasLocation(#20303,#20304)
-enclosing_stmt(#20303,#20296)
-expr_containers(#20303,#20265)
-#20305=*
-scopes(#20305,13)
-scopenodes(#20303,#20305)
-scopenesting(#20305,#20299)
-#20306=@"local_type_name;{P};{#20305}"
-local_type_names(#20306,"P",#20305)
-#20307=*
-typeexprs(#20307,22,#20303,0,"P in keyof T")
-#20308=@"loc,{#10000},3,42,3,53"
-locations_default(#20308,#10000,3,42,3,53)
-hasLocation(#20307,#20308)
-enclosing_stmt(#20307,#20296)
-expr_containers(#20307,#20265)
-#20309=*
-typeexprs(#20309,1,#20307,0,"P")
-hasLocation(#20309,#20109)
-enclosing_stmt(#20309,#20296)
-expr_containers(#20309,#20265)
-literals("P","P",#20309)
-typedecl(#20309,#20306)
+typeexprs(#20303,1,#20302,0,"T")
+hasLocation(#20303,#20095)
+enclosing_stmt(#20303,#20297)
+expr_containers(#20303,#20266)
+literals("T","T",#20303)
+typedecl(#20303,#20301)
+#20304=*
+typeexprs(#20304,27,#20297,1,"{ +read ...  T[P] }")
+#20305=@"loc,{#10000},3,29,3,64"
+locations_default(#20305,#10000,3,29,3,64)
+hasLocation(#20304,#20305)
+enclosing_stmt(#20304,#20297)
+expr_containers(#20304,#20266)
+#20306=*
+scopes(#20306,13)
+scopenodes(#20304,#20306)
+scopenesting(#20306,#20300)
+#20307=@"local_type_name;{P};{#20306}"
+local_type_names(#20307,"P",#20306)
+#20308=*
+typeexprs(#20308,22,#20304,0,"P in keyof T")
+#20309=@"loc,{#10000},3,42,3,53"
+locations_default(#20309,#10000,3,42,3,53)
+hasLocation(#20308,#20309)
+enclosing_stmt(#20308,#20297)
+expr_containers(#20308,#20266)
 #20310=*
-typeexprs(#20310,12,#20307,1,"keyof T")
-#20311=@"loc,{#10000},3,47,3,53"
-locations_default(#20311,#10000,3,47,3,53)
-hasLocation(#20310,#20311)
-enclosing_stmt(#20310,#20296)
-expr_containers(#20310,#20265)
-#20312=*
-typeexprs(#20312,0,#20310,0,"T")
-hasLocation(#20312,#20115)
-enclosing_stmt(#20312,#20296)
-expr_containers(#20312,#20265)
-literals("T","T",#20312)
-typebind(#20312,#20300)
+typeexprs(#20310,1,#20308,0,"P")
+hasLocation(#20310,#20109)
+enclosing_stmt(#20310,#20297)
+expr_containers(#20310,#20266)
+literals("P","P",#20310)
+typedecl(#20310,#20307)
+#20311=*
+typeexprs(#20311,12,#20308,1,"keyof T")
+#20312=@"loc,{#10000},3,47,3,53"
+locations_default(#20312,#10000,3,47,3,53)
+hasLocation(#20311,#20312)
+enclosing_stmt(#20311,#20297)
+expr_containers(#20311,#20266)
 #20313=*
-typeexprs(#20313,8,#20303,1,"T[P]")
-#20314=@"loc,{#10000},3,59,3,62"
-locations_default(#20314,#10000,3,59,3,62)
-hasLocation(#20313,#20314)
-enclosing_stmt(#20313,#20296)
-expr_containers(#20313,#20265)
-#20315=*
-typeexprs(#20315,0,#20313,0,"T")
-hasLocation(#20315,#20125)
-enclosing_stmt(#20315,#20296)
-expr_containers(#20315,#20265)
-literals("T","T",#20315)
-typebind(#20315,#20300)
+typeexprs(#20313,0,#20311,0,"T")
+hasLocation(#20313,#20115)
+enclosing_stmt(#20313,#20297)
+expr_containers(#20313,#20266)
+literals("T","T",#20313)
+typebind(#20313,#20301)
+#20314=*
+typeexprs(#20314,8,#20304,1,"T[P]")
+#20315=@"loc,{#10000},3,59,3,62"
+locations_default(#20315,#10000,3,59,3,62)
+hasLocation(#20314,#20315)
+enclosing_stmt(#20314,#20297)
+expr_containers(#20314,#20266)
 #20316=*
-typeexprs(#20316,0,#20313,1,"P")
-hasLocation(#20316,#20129)
-enclosing_stmt(#20316,#20296)
-expr_containers(#20316,#20265)
-literals("P","P",#20316)
-typebind(#20316,#20306)
+typeexprs(#20316,0,#20314,0,"T")
+hasLocation(#20316,#20125)
+enclosing_stmt(#20316,#20297)
+expr_containers(#20316,#20266)
+literals("T","T",#20316)
+typebind(#20316,#20301)
 #20317=*
-stmts(#20317,35,#20265,2,"type Re ... T[P] };")
-#20318=@"loc,{#10000},5,3,5,64"
-locations_default(#20318,#10000,5,3,5,64)
-hasLocation(#20317,#20318)
-stmt_containers(#20317,#20265)
-#20319=*
-typeexprs(#20319,1,#20317,0,"ReadonlyPartial2")
-hasLocation(#20319,#20139)
-enclosing_stmt(#20319,#20317)
-expr_containers(#20319,#20265)
-literals("ReadonlyPartial2","ReadonlyPartial2",#20319)
-typedecl(#20319,#20271)
+typeexprs(#20317,0,#20314,1,"P")
+hasLocation(#20317,#20129)
+enclosing_stmt(#20317,#20297)
+expr_containers(#20317,#20266)
+literals("P","P",#20317)
+typebind(#20317,#20307)
+#20318=*
+stmts(#20318,35,#20266,2,"type Re ... T[P] };")
+#20319=@"loc,{#10000},5,3,5,64"
+locations_default(#20319,#10000,5,3,5,64)
+hasLocation(#20318,#20319)
+stmt_containers(#20318,#20266)
 #20320=*
-scopes(#20320,12)
-scopenodes(#20317,#20320)
-scopenesting(#20320,#20268)
-#20321=@"local_type_name;{T};{#20320}"
-local_type_names(#20321,"T",#20320)
-#20322=*
-typeexprs(#20322,22,#20317,2,"T")
-hasLocation(#20322,#20143)
-enclosing_stmt(#20322,#20317)
-expr_containers(#20322,#20265)
+typeexprs(#20320,1,#20318,0,"ReadonlyPartial2")
+hasLocation(#20320,#20139)
+enclosing_stmt(#20320,#20318)
+expr_containers(#20320,#20266)
+literals("ReadonlyPartial2","ReadonlyPartial2",#20320)
+typedecl(#20320,#20272)
+#20321=*
+scopes(#20321,12)
+scopenodes(#20318,#20321)
+scopenesting(#20321,#20269)
+#20322=@"local_type_name;{T};{#20321}"
+local_type_names(#20322,"T",#20321)
 #20323=*
-typeexprs(#20323,1,#20322,0,"T")
+typeexprs(#20323,22,#20318,2,"T")
 hasLocation(#20323,#20143)
-enclosing_stmt(#20323,#20317)
-expr_containers(#20323,#20265)
-literals("T","T",#20323)
-typedecl(#20323,#20321)
+enclosing_stmt(#20323,#20318)
+expr_containers(#20323,#20266)
 #20324=*
-typeexprs(#20324,27,#20317,1,"{ reado ...  T[P] }")
-#20325=@"loc,{#10000},5,30,5,63"
-locations_default(#20325,#10000,5,30,5,63)
-hasLocation(#20324,#20325)
-enclosing_stmt(#20324,#20317)
-expr_containers(#20324,#20265)
-#20326=*
-scopes(#20326,13)
-scopenodes(#20324,#20326)
-scopenesting(#20326,#20320)
-#20327=@"local_type_name;{P};{#20326}"
-local_type_names(#20327,"P",#20326)
-#20328=*
-typeexprs(#20328,22,#20324,0,"P in keyof T")
-#20329=@"loc,{#10000},5,42,5,53"
-locations_default(#20329,#10000,5,42,5,53)
-hasLocation(#20328,#20329)
-enclosing_stmt(#20328,#20317)
-expr_containers(#20328,#20265)
-#20330=*
-typeexprs(#20330,1,#20328,0,"P")
-hasLocation(#20330,#20155)
-enclosing_stmt(#20330,#20317)
-expr_containers(#20330,#20265)
-literals("P","P",#20330)
-typedecl(#20330,#20327)
+typeexprs(#20324,1,#20323,0,"T")
+hasLocation(#20324,#20143)
+enclosing_stmt(#20324,#20318)
+expr_containers(#20324,#20266)
+literals("T","T",#20324)
+typedecl(#20324,#20322)
+#20325=*
+typeexprs(#20325,27,#20318,1,"{ reado ...  T[P] }")
+#20326=@"loc,{#10000},5,30,5,63"
+locations_default(#20326,#10000,5,30,5,63)
+hasLocation(#20325,#20326)
+enclosing_stmt(#20325,#20318)
+expr_containers(#20325,#20266)
+#20327=*
+scopes(#20327,13)
+scopenodes(#20325,#20327)
+scopenesting(#20327,#20321)
+#20328=@"local_type_name;{P};{#20327}"
+local_type_names(#20328,"P",#20327)
+#20329=*
+typeexprs(#20329,22,#20325,0,"P in keyof T")
+#20330=@"loc,{#10000},5,42,5,53"
+locations_default(#20330,#10000,5,42,5,53)
+hasLocation(#20329,#20330)
+enclosing_stmt(#20329,#20318)
+expr_containers(#20329,#20266)
 #20331=*
-typeexprs(#20331,12,#20328,1,"keyof T")
-#20332=@"loc,{#10000},5,47,5,53"
-locations_default(#20332,#10000,5,47,5,53)
-hasLocation(#20331,#20332)
-enclosing_stmt(#20331,#20317)
-expr_containers(#20331,#20265)
-#20333=*
-typeexprs(#20333,0,#20331,0,"T")
-hasLocation(#20333,#20161)
-enclosing_stmt(#20333,#20317)
-expr_containers(#20333,#20265)
-literals("T","T",#20333)
-typebind(#20333,#20321)
+typeexprs(#20331,1,#20329,0,"P")
+hasLocation(#20331,#20155)
+enclosing_stmt(#20331,#20318)
+expr_containers(#20331,#20266)
+literals("P","P",#20331)
+typedecl(#20331,#20328)
+#20332=*
+typeexprs(#20332,12,#20329,1,"keyof T")
+#20333=@"loc,{#10000},5,47,5,53"
+locations_default(#20333,#10000,5,47,5,53)
+hasLocation(#20332,#20333)
+enclosing_stmt(#20332,#20318)
+expr_containers(#20332,#20266)
 #20334=*
-typeexprs(#20334,8,#20324,1,"T[P]")
-#20335=@"loc,{#10000},5,58,5,61"
-locations_default(#20335,#10000,5,58,5,61)
-hasLocation(#20334,#20335)
-enclosing_stmt(#20334,#20317)
-expr_containers(#20334,#20265)
-#20336=*
-typeexprs(#20336,0,#20334,0,"T")
-hasLocation(#20336,#20169)
-enclosing_stmt(#20336,#20317)
-expr_containers(#20336,#20265)
-literals("T","T",#20336)
-typebind(#20336,#20321)
+typeexprs(#20334,0,#20332,0,"T")
+hasLocation(#20334,#20161)
+enclosing_stmt(#20334,#20318)
+expr_containers(#20334,#20266)
+literals("T","T",#20334)
+typebind(#20334,#20322)
+#20335=*
+typeexprs(#20335,8,#20325,1,"T[P]")
+#20336=@"loc,{#10000},5,58,5,61"
+locations_default(#20336,#10000,5,58,5,61)
+hasLocation(#20335,#20336)
+enclosing_stmt(#20335,#20318)
+expr_containers(#20335,#20266)
 #20337=*
-typeexprs(#20337,0,#20334,1,"P")
-hasLocation(#20337,#20173)
-enclosing_stmt(#20337,#20317)
-expr_containers(#20337,#20265)
-literals("P","P",#20337)
-typebind(#20337,#20327)
+typeexprs(#20337,0,#20335,0,"T")
+hasLocation(#20337,#20169)
+enclosing_stmt(#20337,#20318)
+expr_containers(#20337,#20266)
+literals("T","T",#20337)
+typebind(#20337,#20322)
 #20338=*
-stmts(#20338,35,#20265,3,"type Re ... T[P] };")
-#20339=@"loc,{#10000},7,3,7,48"
-locations_default(#20339,#10000,7,3,7,48)
-hasLocation(#20338,#20339)
-stmt_containers(#20338,#20265)
-#20340=*
-typeexprs(#20340,1,#20338,0,"Required")
-hasLocation(#20340,#20183)
-enclosing_stmt(#20340,#20338)
-expr_containers(#20340,#20265)
-literals("Required","Required",#20340)
-typedecl(#20340,#20272)
+typeexprs(#20338,0,#20335,1,"P")
+hasLocation(#20338,#20173)
+enclosing_stmt(#20338,#20318)
+expr_containers(#20338,#20266)
+literals("P","P",#20338)
+typebind(#20338,#20328)
+#20339=*
+stmts(#20339,35,#20266,3,"type Re ... T[P] };")
+#20340=@"loc,{#10000},7,3,7,48"
+locations_default(#20340,#10000,7,3,7,48)
+hasLocation(#20339,#20340)
+stmt_containers(#20339,#20266)
 #20341=*
-scopes(#20341,12)
-scopenodes(#20338,#20341)
-scopenesting(#20341,#20268)
-#20342=@"local_type_name;{T};{#20341}"
-local_type_names(#20342,"T",#20341)
-#20343=*
-typeexprs(#20343,22,#20338,2,"T")
-hasLocation(#20343,#20187)
-enclosing_stmt(#20343,#20338)
-expr_containers(#20343,#20265)
+typeexprs(#20341,1,#20339,0,"Required")
+hasLocation(#20341,#20183)
+enclosing_stmt(#20341,#20339)
+expr_containers(#20341,#20266)
+literals("Required","Required",#20341)
+typedecl(#20341,#20273)
+#20342=*
+scopes(#20342,12)
+scopenodes(#20339,#20342)
+scopenesting(#20342,#20269)
+#20343=@"local_type_name;{T};{#20342}"
+local_type_names(#20343,"T",#20342)
 #20344=*
-typeexprs(#20344,1,#20343,0,"T")
+typeexprs(#20344,22,#20339,2,"T")
 hasLocation(#20344,#20187)
-enclosing_stmt(#20344,#20338)
-expr_containers(#20344,#20265)
-literals("T","T",#20344)
-typedecl(#20344,#20342)
+enclosing_stmt(#20344,#20339)
+expr_containers(#20344,#20266)
 #20345=*
-typeexprs(#20345,27,#20338,1,"{ [P in ...  T[P] }")
-#20346=@"loc,{#10000},7,22,7,47"
-locations_default(#20346,#10000,7,22,7,47)
-hasLocation(#20345,#20346)
-enclosing_stmt(#20345,#20338)
-expr_containers(#20345,#20265)
-#20347=*
-scopes(#20347,13)
-scopenodes(#20345,#20347)
-scopenesting(#20347,#20341)
-#20348=@"local_type_name;{P};{#20347}"
-local_type_names(#20348,"P",#20347)
-#20349=*
-typeexprs(#20349,22,#20345,0,"P in keyof T")
-#20350=@"loc,{#10000},7,25,7,36"
-locations_default(#20350,#10000,7,25,7,36)
-hasLocation(#20349,#20350)
-enclosing_stmt(#20349,#20338)
-expr_containers(#20349,#20265)
-#20351=*
-typeexprs(#20351,1,#20349,0,"P")
-hasLocation(#20351,#20197)
-enclosing_stmt(#20351,#20338)
-expr_containers(#20351,#20265)
-literals("P","P",#20351)
-typedecl(#20351,#20348)
+typeexprs(#20345,1,#20344,0,"T")
+hasLocation(#20345,#20187)
+enclosing_stmt(#20345,#20339)
+expr_containers(#20345,#20266)
+literals("T","T",#20345)
+typedecl(#20345,#20343)
+#20346=*
+typeexprs(#20346,27,#20339,1,"{ [P in ...  T[P] }")
+#20347=@"loc,{#10000},7,22,7,47"
+locations_default(#20347,#10000,7,22,7,47)
+hasLocation(#20346,#20347)
+enclosing_stmt(#20346,#20339)
+expr_containers(#20346,#20266)
+#20348=*
+scopes(#20348,13)
+scopenodes(#20346,#20348)
+scopenesting(#20348,#20342)
+#20349=@"local_type_name;{P};{#20348}"
+local_type_names(#20349,"P",#20348)
+#20350=*
+typeexprs(#20350,22,#20346,0,"P in keyof T")
+#20351=@"loc,{#10000},7,25,7,36"
+locations_default(#20351,#10000,7,25,7,36)
+hasLocation(#20350,#20351)
+enclosing_stmt(#20350,#20339)
+expr_containers(#20350,#20266)
 #20352=*
-typeexprs(#20352,12,#20349,1,"keyof T")
-#20353=@"loc,{#10000},7,30,7,36"
-locations_default(#20353,#10000,7,30,7,36)
-hasLocation(#20352,#20353)
-enclosing_stmt(#20352,#20338)
-expr_containers(#20352,#20265)
-#20354=*
-typeexprs(#20354,0,#20352,0,"T")
-hasLocation(#20354,#20203)
-enclosing_stmt(#20354,#20338)
-expr_containers(#20354,#20265)
-literals("T","T",#20354)
-typebind(#20354,#20342)
+typeexprs(#20352,1,#20350,0,"P")
+hasLocation(#20352,#20197)
+enclosing_stmt(#20352,#20339)
+expr_containers(#20352,#20266)
+literals("P","P",#20352)
+typedecl(#20352,#20349)
+#20353=*
+typeexprs(#20353,12,#20350,1,"keyof T")
+#20354=@"loc,{#10000},7,30,7,36"
+locations_default(#20354,#10000,7,30,7,36)
+hasLocation(#20353,#20354)
+enclosing_stmt(#20353,#20339)
+expr_containers(#20353,#20266)
 #20355=*
-typeexprs(#20355,8,#20345,1,"T[P]")
-#20356=@"loc,{#10000},7,42,7,45"
-locations_default(#20356,#10000,7,42,7,45)
-hasLocation(#20355,#20356)
-enclosing_stmt(#20355,#20338)
-expr_containers(#20355,#20265)
-#20357=*
-typeexprs(#20357,0,#20355,0,"T")
-hasLocation(#20357,#20213)
-enclosing_stmt(#20357,#20338)
-expr_containers(#20357,#20265)
-literals("T","T",#20357)
-typebind(#20357,#20342)
+typeexprs(#20355,0,#20353,0,"T")
+hasLocation(#20355,#20203)
+enclosing_stmt(#20355,#20339)
+expr_containers(#20355,#20266)
+literals("T","T",#20355)
+typebind(#20355,#20343)
+#20356=*
+typeexprs(#20356,8,#20346,1,"T[P]")
+#20357=@"loc,{#10000},7,42,7,45"
+locations_default(#20357,#10000,7,42,7,45)
+hasLocation(#20356,#20357)
+enclosing_stmt(#20356,#20339)
+expr_containers(#20356,#20266)
 #20358=*
-typeexprs(#20358,0,#20355,1,"P")
-hasLocation(#20358,#20217)
-enclosing_stmt(#20358,#20338)
-expr_containers(#20358,#20265)
-literals("P","P",#20358)
-typebind(#20358,#20348)
+typeexprs(#20358,0,#20356,0,"T")
+hasLocation(#20358,#20213)
+enclosing_stmt(#20358,#20339)
+expr_containers(#20358,#20266)
+literals("T","T",#20358)
+typebind(#20358,#20343)
 #20359=*
-stmts(#20359,35,#20265,4,"type Fo ... ring };")
-#20360=@"loc,{#10000},9,3,9,28"
-locations_default(#20360,#10000,9,3,9,28)
-hasLocation(#20359,#20360)
-stmt_containers(#20359,#20265)
-#20361=*
-typeexprs(#20361,1,#20359,0,"Foo")
-hasLocation(#20361,#20227)
-enclosing_stmt(#20361,#20359)
-expr_containers(#20361,#20265)
-literals("Foo","Foo",#20361)
-typedecl(#20361,#20273)
+typeexprs(#20359,0,#20356,1,"P")
+hasLocation(#20359,#20217)
+enclosing_stmt(#20359,#20339)
+expr_containers(#20359,#20266)
+literals("P","P",#20359)
+typebind(#20359,#20349)
+#20360=*
+stmts(#20360,35,#20266,4,"type Fo ... ring };")
+#20361=@"loc,{#10000},9,3,9,28"
+locations_default(#20361,#10000,9,3,9,28)
+hasLocation(#20360,#20361)
+stmt_containers(#20360,#20266)
 #20362=*
-typeexprs(#20362,21,#20359,1,"{ a?: string }")
-#20363=@"loc,{#10000},9,14,9,27"
-locations_default(#20363,#10000,9,14,9,27)
-hasLocation(#20362,#20363)
-enclosing_stmt(#20362,#20359)
-expr_containers(#20362,#20265)
-#20364=*
-properties(#20364,#20362,0,8,"a?: string")
-#20365=@"loc,{#10000},9,16,9,25"
-locations_default(#20365,#10000,9,16,9,25)
-hasLocation(#20364,#20365)
-#20366=*
-exprs(#20366,0,#20364,0,"a")
-hasLocation(#20366,#20233)
-enclosing_stmt(#20366,#20359)
-expr_containers(#20366,#20265)
-literals("a","a",#20366)
-is_abstract_member(#20364)
-is_optional_member(#20364)
+typeexprs(#20362,1,#20360,0,"Foo")
+hasLocation(#20362,#20227)
+enclosing_stmt(#20362,#20360)
+expr_containers(#20362,#20266)
+literals("Foo","Foo",#20362)
+typedecl(#20362,#20274)
+#20363=*
+typeexprs(#20363,21,#20360,1,"{ a?: string }")
+#20364=@"loc,{#10000},9,14,9,27"
+locations_default(#20364,#10000,9,14,9,27)
+hasLocation(#20363,#20364)
+enclosing_stmt(#20363,#20360)
+expr_containers(#20363,#20266)
+#20365=*
+properties(#20365,#20363,0,8,"a?: string")
+#20366=@"loc,{#10000},9,16,9,25"
+locations_default(#20366,#10000,9,16,9,25)
+hasLocation(#20365,#20366)
 #20367=*
-typeexprs(#20367,2,#20364,2,"string")
-hasLocation(#20367,#20239)
-enclosing_stmt(#20367,#20359)
-expr_containers(#20367,#20265)
-literals("string","string",#20367)
+exprs(#20367,0,#20365,0,"a")
+hasLocation(#20367,#20233)
+enclosing_stmt(#20367,#20360)
+expr_containers(#20367,#20266)
+literals("a","a",#20367)
+is_abstract_member(#20365)
+is_optional_member(#20365)
 #20368=*
-stmts(#20368,35,#20265,5,"type Ba ... d<Foo>;")
-#20369=@"loc,{#10000},10,3,10,27"
-locations_default(#20369,#10000,10,3,10,27)
-hasLocation(#20368,#20369)
-stmt_containers(#20368,#20265)
-#20370=*
-typeexprs(#20370,1,#20368,0,"Bar")
-hasLocation(#20370,#20247)
-enclosing_stmt(#20370,#20368)
-expr_containers(#20370,#20265)
-literals("Bar","Bar",#20370)
-typedecl(#20370,#20274)
+typeexprs(#20368,2,#20365,2,"string")
+hasLocation(#20368,#20239)
+enclosing_stmt(#20368,#20360)
+expr_containers(#20368,#20266)
+literals("string","string",#20368)
+#20369=*
+stmts(#20369,35,#20266,5,"type Ba ... d<Foo>;")
+#20370=@"loc,{#10000},10,3,10,27"
+locations_default(#20370,#10000,10,3,10,27)
+hasLocation(#20369,#20370)
+stmt_containers(#20369,#20266)
 #20371=*
-typeexprs(#20371,14,#20368,1,"Required<Foo>")
-#20372=@"loc,{#10000},10,14,10,26"
-locations_default(#20372,#10000,10,14,10,26)
-hasLocation(#20371,#20372)
-enclosing_stmt(#20371,#20368)
-expr_containers(#20371,#20265)
-#20373=*
-typeexprs(#20373,0,#20371,-1,"Required")
-hasLocation(#20373,#20251)
-enclosing_stmt(#20373,#20368)
-expr_containers(#20373,#20265)
-literals("Required","Required",#20373)
-typebind(#20373,#20272)
+typeexprs(#20371,1,#20369,0,"Bar")
+hasLocation(#20371,#20247)
+enclosing_stmt(#20371,#20369)
+expr_containers(#20371,#20266)
+literals("Bar","Bar",#20371)
+typedecl(#20371,#20275)
+#20372=*
+typeexprs(#20372,14,#20369,1,"Required<Foo>")
+#20373=@"loc,{#10000},10,14,10,26"
+locations_default(#20373,#10000,10,14,10,26)
+hasLocation(#20372,#20373)
+enclosing_stmt(#20372,#20369)
+expr_containers(#20372,#20266)
 #20374=*
-typeexprs(#20374,0,#20371,0,"Foo")
-hasLocation(#20374,#20255)
-enclosing_stmt(#20374,#20368)
-expr_containers(#20374,#20265)
-literals("Foo","Foo",#20374)
+typeexprs(#20374,0,#20372,-1,"Required")
+hasLocation(#20374,#20251)
+enclosing_stmt(#20374,#20369)
+expr_containers(#20374,#20266)
+literals("Required","Required",#20374)
 typebind(#20374,#20273)
 #20375=*
-entry_cfg_node(#20375,#20001)
-#20376=@"loc,{#10000},1,1,1,0"
-locations_default(#20376,#10000,1,1,1,0)
-hasLocation(#20375,#20376)
-#20377=*
-exit_cfg_node(#20377,#20001)
-hasLocation(#20377,#20262)
-successor(#20267,#20265)
-successor(#20368,#20377)
-successor(#20359,#20368)
-successor(#20338,#20359)
-successor(#20317,#20338)
-successor(#20296,#20317)
-successor(#20275,#20296)
-successor(#20265,#20275)
-successor(#20375,#20267)
+typeexprs(#20375,0,#20372,0,"Foo")
+hasLocation(#20375,#20255)
+enclosing_stmt(#20375,#20369)
+expr_containers(#20375,#20266)
+literals("Foo","Foo",#20375)
+typebind(#20375,#20274)
+#20376=*
+entry_cfg_node(#20376,#20001)
+#20377=@"loc,{#10000},1,1,1,0"
+locations_default(#20377,#10000,1,1,1,0)
+hasLocation(#20376,#20377)
+#20378=*
+exit_cfg_node(#20378,#20001)
+hasLocation(#20378,#20262)
+successor(#20268,#20266)
+successor(#20369,#20378)
+successor(#20360,#20369)
+successor(#20339,#20360)
+successor(#20318,#20339)
+successor(#20297,#20318)
+successor(#20276,#20297)
+successor(#20266,#20276)
+successor(#20376,#20268)
 numlines(#10000,11,8,5)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/namespaces.ts.trap

@@ -195,160 +195,162 @@ local_namespace_names(#20070,"x",#20000)
 variables(#20067,"x",#20000)
 local_type_names(#20068,"x",#20000)
 local_namespace_names(#20070,"x",#20000)
-#20071=*
-stmts(#20071,31,#20001,0,"namespa ... ;\n  }\n}")
-#20072=@"loc,{#10000},1,1,5,1"
-locations_default(#20072,#10000,1,1,5,1)
-hasLocation(#20071,#20072)
-stmt_containers(#20071,#20001)
-#20073=*
-exprs(#20073,78,#20071,-1,"M")
-hasLocation(#20073,#20019)
-enclosing_stmt(#20073,#20071)
-expr_containers(#20073,#20001)
-literals("M","M",#20073)
-decl(#20073,#20066)
-namespacedecl(#20073,#20069)
+#20071=@"var;{this};{#20000}"
+variables(#20071,"this",#20000)
+#20072=*
+stmts(#20072,31,#20001,0,"namespa ... ;\n  }\n}")
+#20073=@"loc,{#10000},1,1,5,1"
+locations_default(#20073,#10000,1,1,5,1)
+hasLocation(#20072,#20073)
+stmt_containers(#20072,#20001)
 #20074=*
-scopes(#20074,9)
-scopenodes(#20071,#20074)
-scopenesting(#20074,#20000)
-#20075=@"var;{N};{#20074}"
-variables(#20075,"N",#20074)
-#20076=@"local_namespace_name;{N};{#20074}"
-local_namespace_names(#20076,"N",#20074)
-#20077=*
-stmts(#20077,30,#20071,0,"export  ... 42;\n  }")
-#20078=@"loc,{#10000},2,3,4,3"
-locations_default(#20078,#10000,2,3,4,3)
-hasLocation(#20077,#20078)
-stmt_containers(#20077,#20071)
-#20079=*
-stmts(#20079,31,#20077,-1,"namespa ... 42;\n  }")
-#20080=@"loc,{#10000},2,10,4,3"
-locations_default(#20080,#10000,2,10,4,3)
-hasLocation(#20079,#20080)
-stmt_containers(#20079,#20071)
-#20081=*
-exprs(#20081,78,#20079,-1,"N")
-hasLocation(#20081,#20027)
-enclosing_stmt(#20081,#20079)
-expr_containers(#20081,#20071)
-literals("N","N",#20081)
-decl(#20081,#20075)
-namespacedecl(#20081,#20076)
+exprs(#20074,78,#20072,-1,"M")
+hasLocation(#20074,#20019)
+enclosing_stmt(#20074,#20072)
+expr_containers(#20074,#20001)
+literals("M","M",#20074)
+decl(#20074,#20066)
+namespacedecl(#20074,#20069)
+#20075=*
+scopes(#20075,9)
+scopenodes(#20072,#20075)
+scopenesting(#20075,#20000)
+#20076=@"var;{N};{#20075}"
+variables(#20076,"N",#20075)
+#20077=@"local_namespace_name;{N};{#20075}"
+local_namespace_names(#20077,"N",#20075)
+#20078=*
+stmts(#20078,30,#20072,0,"export  ... 42;\n  }")
+#20079=@"loc,{#10000},2,3,4,3"
+locations_default(#20079,#10000,2,3,4,3)
+hasLocation(#20078,#20079)
+stmt_containers(#20078,#20072)
+#20080=*
+stmts(#20080,31,#20078,-1,"namespa ... 42;\n  }")
+#20081=@"loc,{#10000},2,10,4,3"
+locations_default(#20081,#10000,2,10,4,3)
+hasLocation(#20080,#20081)
+stmt_containers(#20080,#20072)
 #20082=*
-scopes(#20082,9)
-scopenodes(#20079,#20082)
-scopenesting(#20082,#20074)
-#20083=@"var;{x};{#20082}"
-variables(#20083,"x",#20082)
-#20084=*
-stmts(#20084,30,#20079,0,"export let x = 42;")
-#20085=@"loc,{#10000},3,5,3,22"
-locations_default(#20085,#10000,3,5,3,22)
-hasLocation(#20084,#20085)
-stmt_containers(#20084,#20079)
-#20086=*
-stmts(#20086,23,#20084,-1,"let x = 42;")
-#20087=@"loc,{#10000},3,12,3,22"
-locations_default(#20087,#10000,3,12,3,22)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20079)
-#20088=*
-exprs(#20088,64,#20086,0,"x = 42")
-#20089=@"loc,{#10000},3,16,3,21"
-locations_default(#20089,#10000,3,16,3,21)
-hasLocation(#20088,#20089)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20079)
-#20090=*
-exprs(#20090,78,#20088,0,"x")
-hasLocation(#20090,#20035)
-enclosing_stmt(#20090,#20086)
-expr_containers(#20090,#20079)
-literals("x","x",#20090)
-decl(#20090,#20083)
+exprs(#20082,78,#20080,-1,"N")
+hasLocation(#20082,#20027)
+enclosing_stmt(#20082,#20080)
+expr_containers(#20082,#20072)
+literals("N","N",#20082)
+decl(#20082,#20076)
+namespacedecl(#20082,#20077)
+#20083=*
+scopes(#20083,9)
+scopenodes(#20080,#20083)
+scopenesting(#20083,#20075)
+#20084=@"var;{x};{#20083}"
+variables(#20084,"x",#20083)
+#20085=*
+stmts(#20085,30,#20080,0,"export let x = 42;")
+#20086=@"loc,{#10000},3,5,3,22"
+locations_default(#20086,#10000,3,5,3,22)
+hasLocation(#20085,#20086)
+stmt_containers(#20085,#20080)
+#20087=*
+stmts(#20087,23,#20085,-1,"let x = 42;")
+#20088=@"loc,{#10000},3,12,3,22"
+locations_default(#20088,#10000,3,12,3,22)
+hasLocation(#20087,#20088)
+stmt_containers(#20087,#20080)
+#20089=*
+exprs(#20089,64,#20087,0,"x = 42")
+#20090=@"loc,{#10000},3,16,3,21"
+locations_default(#20090,#10000,3,16,3,21)
+hasLocation(#20089,#20090)
+enclosing_stmt(#20089,#20087)
+expr_containers(#20089,#20080)
 #20091=*
-exprs(#20091,3,#20088,1,"42")
-hasLocation(#20091,#20039)
-enclosing_stmt(#20091,#20086)
-expr_containers(#20091,#20079)
-literals("42","42",#20091)
-is_instantiated(#20079)
-is_instantiated(#20071)
+exprs(#20091,78,#20089,0,"x")
+hasLocation(#20091,#20035)
+enclosing_stmt(#20091,#20087)
+expr_containers(#20091,#20080)
+literals("x","x",#20091)
+decl(#20091,#20084)
 #20092=*
-stmts(#20092,32,#20001,1,"import x = M.N.x;")
-hasLocation(#20092,#20015)
-stmt_containers(#20092,#20001)
+exprs(#20092,3,#20089,1,"42")
+hasLocation(#20092,#20039)
+enclosing_stmt(#20092,#20087)
+expr_containers(#20092,#20080)
+literals("42","42",#20092)
+is_instantiated(#20080)
+is_instantiated(#20072)
 #20093=*
-exprs(#20093,78,#20092,0,"x")
-hasLocation(#20093,#20048)
-enclosing_stmt(#20093,#20092)
-expr_containers(#20093,#20001)
-literals("x","x",#20093)
-decl(#20093,#20067)
-typedecl(#20093,#20068)
-namespacedecl(#20093,#20070)
+stmts(#20093,32,#20001,1,"import x = M.N.x;")
+hasLocation(#20093,#20015)
+stmt_containers(#20093,#20001)
 #20094=*
-exprs(#20094,14,#20092,1,"M.N.x")
-#20095=@"loc,{#10000},7,12,7,16"
-locations_default(#20095,#10000,7,12,7,16)
-hasLocation(#20094,#20095)
-enclosing_stmt(#20094,#20092)
+exprs(#20094,78,#20093,0,"x")
+hasLocation(#20094,#20048)
+enclosing_stmt(#20094,#20093)
 expr_containers(#20094,#20001)
-#20096=*
-exprs(#20096,14,#20094,0,"M.N")
-#20097=@"loc,{#10000},7,12,7,14"
-locations_default(#20097,#10000,7,12,7,14)
-hasLocation(#20096,#20097)
-enclosing_stmt(#20096,#20092)
-expr_containers(#20096,#20001)
-#20098=*
-exprs(#20098,103,#20096,0,"M")
-hasLocation(#20098,#20052)
-enclosing_stmt(#20098,#20092)
-expr_containers(#20098,#20001)
-literals("M","M",#20098)
-namespacebind(#20098,#20069)
-bind(#20098,#20066)
+literals("x","x",#20094)
+decl(#20094,#20067)
+typedecl(#20094,#20068)
+namespacedecl(#20094,#20070)
+#20095=*
+exprs(#20095,14,#20093,1,"M.N.x")
+#20096=@"loc,{#10000},7,12,7,16"
+locations_default(#20096,#10000,7,12,7,16)
+hasLocation(#20095,#20096)
+enclosing_stmt(#20095,#20093)
+expr_containers(#20095,#20001)
+#20097=*
+exprs(#20097,14,#20095,0,"M.N")
+#20098=@"loc,{#10000},7,12,7,14"
+locations_default(#20098,#10000,7,12,7,14)
+hasLocation(#20097,#20098)
+enclosing_stmt(#20097,#20093)
+expr_containers(#20097,#20001)
 #20099=*
-exprs(#20099,0,#20096,1,"N")
-hasLocation(#20099,#20056)
-enclosing_stmt(#20099,#20092)
+exprs(#20099,103,#20097,0,"M")
+hasLocation(#20099,#20052)
+enclosing_stmt(#20099,#20093)
 expr_containers(#20099,#20001)
-literals("N","N",#20099)
+literals("M","M",#20099)
+namespacebind(#20099,#20069)
+bind(#20099,#20066)
 #20100=*
-exprs(#20100,0,#20094,1,"x")
-hasLocation(#20100,#20060)
-enclosing_stmt(#20100,#20092)
+exprs(#20100,0,#20097,1,"N")
+hasLocation(#20100,#20056)
+enclosing_stmt(#20100,#20093)
 expr_containers(#20100,#20001)
-literals("x","x",#20100)
+literals("N","N",#20100)
 #20101=*
-entry_cfg_node(#20101,#20001)
-#20102=@"loc,{#10000},1,1,1,0"
-locations_default(#20102,#10000,1,1,1,0)
-hasLocation(#20101,#20102)
-#20103=*
-exit_cfg_node(#20103,#20001)
-hasLocation(#20103,#20064)
-successor(#20100,#20094)
-successor(#20099,#20096)
-successor(#20098,#20099)
-successor(#20096,#20100)
-successor(#20094,#20092)
-successor(#20093,#20098)
-successor(#20092,#20103)
-successor(#20073,#20071)
-successor(#20077,#20081)
-successor(#20081,#20079)
-successor(#20084,#20086)
-successor(#20086,#20090)
-successor(#20091,#20088)
-successor(#20090,#20091)
-successor(#20088,#20093)
-successor(#20079,#20084)
-successor(#20071,#20077)
-successor(#20101,#20073)
+exprs(#20101,0,#20095,1,"x")
+hasLocation(#20101,#20060)
+enclosing_stmt(#20101,#20093)
+expr_containers(#20101,#20001)
+literals("x","x",#20101)
+#20102=*
+entry_cfg_node(#20102,#20001)
+#20103=@"loc,{#10000},1,1,1,0"
+locations_default(#20103,#10000,1,1,1,0)
+hasLocation(#20102,#20103)
+#20104=*
+exit_cfg_node(#20104,#20001)
+hasLocation(#20104,#20064)
+successor(#20101,#20095)
+successor(#20100,#20097)
+successor(#20099,#20100)
+successor(#20097,#20101)
+successor(#20095,#20093)
+successor(#20094,#20099)
+successor(#20093,#20104)
+successor(#20074,#20072)
+successor(#20078,#20082)
+successor(#20082,#20080)
+successor(#20085,#20087)
+successor(#20087,#20091)
+successor(#20092,#20089)
+successor(#20091,#20092)
+successor(#20089,#20094)
+successor(#20080,#20085)
+successor(#20072,#20078)
+successor(#20102,#20074)
 numlines(#10000,7,6,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap

@@ -226,246 +226,248 @@ hasLocation(#20001,#20081)
 local_namespace_names(#20082,"A",#20000)
 #20083=@"local_namespace_name;{X};{#20000}"
 local_namespace_names(#20083,"X",#20000)
-#20084=*
-stmts(#20084,31,#20001,0,"namespace A.B {}")
-hasLocation(#20084,#20003)
-stmt_containers(#20084,#20001)
+#20084=@"var;{this};{#20000}"
+variables(#20084,"this",#20000)
 #20085=*
-exprs(#20085,78,#20084,-1,"A")
-hasLocation(#20085,#20021)
-enclosing_stmt(#20085,#20084)
-expr_containers(#20085,#20001)
-literals("A","A",#20085)
-namespacedecl(#20085,#20082)
+stmts(#20085,31,#20001,0,"namespace A.B {}")
+hasLocation(#20085,#20003)
+stmt_containers(#20085,#20001)
 #20086=*
-scopes(#20086,9)
-scopenodes(#20084,#20086)
-scopenesting(#20086,#20000)
-#20087=@"local_namespace_name;{B};{#20086}"
-local_namespace_names(#20087,"B",#20086)
-#20088=*
-stmts(#20088,30,#20084,0,"B {}")
-#20089=@"loc,{#10000},1,13,1,16"
-locations_default(#20089,#10000,1,13,1,16)
-hasLocation(#20088,#20089)
-stmt_containers(#20088,#20084)
-#20090=*
-stmts(#20090,31,#20088,-1,"B {}")
-hasLocation(#20090,#20089)
-stmt_containers(#20090,#20084)
+exprs(#20086,78,#20085,-1,"A")
+hasLocation(#20086,#20021)
+enclosing_stmt(#20086,#20085)
+expr_containers(#20086,#20001)
+literals("A","A",#20086)
+namespacedecl(#20086,#20082)
+#20087=*
+scopes(#20087,9)
+scopenodes(#20085,#20087)
+scopenesting(#20087,#20000)
+#20088=@"local_namespace_name;{B};{#20087}"
+local_namespace_names(#20088,"B",#20087)
+#20089=*
+stmts(#20089,30,#20085,0,"B {}")
+#20090=@"loc,{#10000},1,13,1,16"
+locations_default(#20090,#10000,1,13,1,16)
+hasLocation(#20089,#20090)
+stmt_containers(#20089,#20085)
 #20091=*
-exprs(#20091,78,#20090,-1,"B")
-hasLocation(#20091,#20025)
-enclosing_stmt(#20091,#20090)
-expr_containers(#20091,#20084)
-literals("B","B",#20091)
-namespacedecl(#20091,#20087)
+stmts(#20091,31,#20089,-1,"B {}")
+hasLocation(#20091,#20090)
+stmt_containers(#20091,#20085)
 #20092=*
-scopes(#20092,9)
-scopenodes(#20090,#20092)
-scopenesting(#20092,#20086)
+exprs(#20092,78,#20091,-1,"B")
+hasLocation(#20092,#20025)
+enclosing_stmt(#20092,#20091)
+expr_containers(#20092,#20085)
+literals("B","B",#20092)
+namespacedecl(#20092,#20088)
 #20093=*
-stmts(#20093,31,#20001,1,"namespace A.B.C {}")
-hasLocation(#20093,#20005)
-stmt_containers(#20093,#20001)
+scopes(#20093,9)
+scopenodes(#20091,#20093)
+scopenesting(#20093,#20087)
 #20094=*
-exprs(#20094,78,#20093,-1,"A")
-hasLocation(#20094,#20033)
-enclosing_stmt(#20094,#20093)
-expr_containers(#20094,#20001)
-literals("A","A",#20094)
-namespacedecl(#20094,#20082)
+stmts(#20094,31,#20001,1,"namespace A.B.C {}")
+hasLocation(#20094,#20005)
+stmt_containers(#20094,#20001)
 #20095=*
-scopes(#20095,9)
-scopenodes(#20093,#20095)
-scopenesting(#20095,#20000)
-#20096=@"local_namespace_name;{B};{#20095}"
-local_namespace_names(#20096,"B",#20095)
-#20097=*
-stmts(#20097,30,#20093,0,"B.C {}")
-#20098=@"loc,{#10000},2,13,2,18"
-locations_default(#20098,#10000,2,13,2,18)
-hasLocation(#20097,#20098)
-stmt_containers(#20097,#20093)
-#20099=*
-stmts(#20099,31,#20097,-1,"B.C {}")
-hasLocation(#20099,#20098)
-stmt_containers(#20099,#20093)
+exprs(#20095,78,#20094,-1,"A")
+hasLocation(#20095,#20033)
+enclosing_stmt(#20095,#20094)
+expr_containers(#20095,#20001)
+literals("A","A",#20095)
+namespacedecl(#20095,#20082)
+#20096=*
+scopes(#20096,9)
+scopenodes(#20094,#20096)
+scopenesting(#20096,#20000)
+#20097=@"local_namespace_name;{B};{#20096}"
+local_namespace_names(#20097,"B",#20096)
+#20098=*
+stmts(#20098,30,#20094,0,"B.C {}")
+#20099=@"loc,{#10000},2,13,2,18"
+locations_default(#20099,#10000,2,13,2,18)
+hasLocation(#20098,#20099)
+stmt_containers(#20098,#20094)
 #20100=*
-exprs(#20100,78,#20099,-1,"B")
-hasLocation(#20100,#20037)
-enclosing_stmt(#20100,#20099)
-expr_containers(#20100,#20093)
-literals("B","B",#20100)
-namespacedecl(#20100,#20096)
+stmts(#20100,31,#20098,-1,"B.C {}")
+hasLocation(#20100,#20099)
+stmt_containers(#20100,#20094)
 #20101=*
-scopes(#20101,9)
-scopenodes(#20099,#20101)
-scopenesting(#20101,#20095)
-#20102=@"local_namespace_name;{C};{#20101}"
-local_namespace_names(#20102,"C",#20101)
-#20103=*
-stmts(#20103,30,#20099,0,"C {}")
-#20104=@"loc,{#10000},2,15,2,18"
-locations_default(#20104,#10000,2,15,2,18)
-hasLocation(#20103,#20104)
-stmt_containers(#20103,#20099)
-#20105=*
-stmts(#20105,31,#20103,-1,"C {}")
-hasLocation(#20105,#20104)
-stmt_containers(#20105,#20099)
+exprs(#20101,78,#20100,-1,"B")
+hasLocation(#20101,#20037)
+enclosing_stmt(#20101,#20100)
+expr_containers(#20101,#20094)
+literals("B","B",#20101)
+namespacedecl(#20101,#20097)
+#20102=*
+scopes(#20102,9)
+scopenodes(#20100,#20102)
+scopenesting(#20102,#20096)
+#20103=@"local_namespace_name;{C};{#20102}"
+local_namespace_names(#20103,"C",#20102)
+#20104=*
+stmts(#20104,30,#20100,0,"C {}")
+#20105=@"loc,{#10000},2,15,2,18"
+locations_default(#20105,#10000,2,15,2,18)
+hasLocation(#20104,#20105)
+stmt_containers(#20104,#20100)
 #20106=*
-exprs(#20106,78,#20105,-1,"C")
-hasLocation(#20106,#20041)
-enclosing_stmt(#20106,#20105)
-expr_containers(#20106,#20099)
-literals("C","C",#20106)
-namespacedecl(#20106,#20102)
+stmts(#20106,31,#20104,-1,"C {}")
+hasLocation(#20106,#20105)
+stmt_containers(#20106,#20100)
 #20107=*
-scopes(#20107,9)
-scopenodes(#20105,#20107)
-scopenesting(#20107,#20101)
+exprs(#20107,78,#20106,-1,"C")
+hasLocation(#20107,#20041)
+enclosing_stmt(#20107,#20106)
+expr_containers(#20107,#20100)
+literals("C","C",#20107)
+namespacedecl(#20107,#20103)
 #20108=*
-stmts(#20108,31,#20001,2,"namespa ... .Q {}\n}")
-#20109=@"loc,{#10000},4,1,8,1"
-locations_default(#20109,#10000,4,1,8,1)
-hasLocation(#20108,#20109)
-stmt_containers(#20108,#20001)
-#20110=*
-exprs(#20110,78,#20108,-1,"X")
-hasLocation(#20110,#20049)
-enclosing_stmt(#20110,#20108)
-expr_containers(#20110,#20001)
-literals("X","X",#20110)
-namespacedecl(#20110,#20083)
+scopes(#20108,9)
+scopenodes(#20106,#20108)
+scopenesting(#20108,#20102)
+#20109=*
+stmts(#20109,31,#20001,2,"namespa ... .Q {}\n}")
+#20110=@"loc,{#10000},4,1,8,1"
+locations_default(#20110,#10000,4,1,8,1)
+hasLocation(#20109,#20110)
+stmt_containers(#20109,#20001)
 #20111=*
-scopes(#20111,9)
-scopenodes(#20108,#20111)
-scopenesting(#20111,#20000)
-#20112=@"local_namespace_name;{Y};{#20111}"
-local_namespace_names(#20112,"Y",#20111)
-#20113=@"local_namespace_name;{W};{#20111}"
-local_namespace_names(#20113,"W",#20111)
-#20114=*
-stmts(#20114,30,#20108,0,"export  ...  Y.Z {}")
-#20115=@"loc,{#10000},5,3,5,25"
-locations_default(#20115,#10000,5,3,5,25)
-hasLocation(#20114,#20115)
-stmt_containers(#20114,#20108)
-#20116=*
-stmts(#20116,31,#20114,-1,"namespace Y.Z {}")
-#20117=@"loc,{#10000},5,10,5,25"
-locations_default(#20117,#10000,5,10,5,25)
-hasLocation(#20116,#20117)
-stmt_containers(#20116,#20108)
-#20118=*
-exprs(#20118,78,#20116,-1,"Y")
-hasLocation(#20118,#20057)
-enclosing_stmt(#20118,#20116)
-expr_containers(#20118,#20108)
-literals("Y","Y",#20118)
-namespacedecl(#20118,#20112)
+exprs(#20111,78,#20109,-1,"X")
+hasLocation(#20111,#20049)
+enclosing_stmt(#20111,#20109)
+expr_containers(#20111,#20001)
+literals("X","X",#20111)
+namespacedecl(#20111,#20083)
+#20112=*
+scopes(#20112,9)
+scopenodes(#20109,#20112)
+scopenesting(#20112,#20000)
+#20113=@"local_namespace_name;{Y};{#20112}"
+local_namespace_names(#20113,"Y",#20112)
+#20114=@"local_namespace_name;{W};{#20112}"
+local_namespace_names(#20114,"W",#20112)
+#20115=*
+stmts(#20115,30,#20109,0,"export  ...  Y.Z {}")
+#20116=@"loc,{#10000},5,3,5,25"
+locations_default(#20116,#10000,5,3,5,25)
+hasLocation(#20115,#20116)
+stmt_containers(#20115,#20109)
+#20117=*
+stmts(#20117,31,#20115,-1,"namespace Y.Z {}")
+#20118=@"loc,{#10000},5,10,5,25"
+locations_default(#20118,#10000,5,10,5,25)
+hasLocation(#20117,#20118)
+stmt_containers(#20117,#20109)
 #20119=*
-scopes(#20119,9)
-scopenodes(#20116,#20119)
-scopenesting(#20119,#20111)
-#20120=@"local_namespace_name;{Z};{#20119}"
-local_namespace_names(#20120,"Z",#20119)
-#20121=*
-stmts(#20121,30,#20116,0,"Z {}")
-#20122=@"loc,{#10000},5,22,5,25"
-locations_default(#20122,#10000,5,22,5,25)
-hasLocation(#20121,#20122)
-stmt_containers(#20121,#20116)
-#20123=*
-stmts(#20123,31,#20121,-1,"Z {}")
-hasLocation(#20123,#20122)
-stmt_containers(#20123,#20116)
+exprs(#20119,78,#20117,-1,"Y")
+hasLocation(#20119,#20057)
+enclosing_stmt(#20119,#20117)
+expr_containers(#20119,#20109)
+literals("Y","Y",#20119)
+namespacedecl(#20119,#20113)
+#20120=*
+scopes(#20120,9)
+scopenodes(#20117,#20120)
+scopenesting(#20120,#20112)
+#20121=@"local_namespace_name;{Z};{#20120}"
+local_namespace_names(#20121,"Z",#20120)
+#20122=*
+stmts(#20122,30,#20117,0,"Z {}")
+#20123=@"loc,{#10000},5,22,5,25"
+locations_default(#20123,#10000,5,22,5,25)
+hasLocation(#20122,#20123)
+stmt_containers(#20122,#20117)
 #20124=*
-exprs(#20124,78,#20123,-1,"Z")
-hasLocation(#20124,#20061)
-enclosing_stmt(#20124,#20123)
-expr_containers(#20124,#20116)
-literals("Z","Z",#20124)
-namespacedecl(#20124,#20120)
+stmts(#20124,31,#20122,-1,"Z {}")
+hasLocation(#20124,#20123)
+stmt_containers(#20124,#20117)
 #20125=*
-scopes(#20125,9)
-scopenodes(#20123,#20125)
-scopenesting(#20125,#20119)
+exprs(#20125,78,#20124,-1,"Z")
+hasLocation(#20125,#20061)
+enclosing_stmt(#20125,#20124)
+expr_containers(#20125,#20117)
+literals("Z","Z",#20125)
+namespacedecl(#20125,#20121)
 #20126=*
-stmts(#20126,31,#20108,1,"namespace W.Q {}")
-#20127=@"loc,{#10000},7,3,7,18"
-locations_default(#20127,#10000,7,3,7,18)
-hasLocation(#20126,#20127)
-stmt_containers(#20126,#20108)
-#20128=*
-exprs(#20128,78,#20126,-1,"W")
-hasLocation(#20128,#20069)
-enclosing_stmt(#20128,#20126)
-expr_containers(#20128,#20108)
-literals("W","W",#20128)
-namespacedecl(#20128,#20113)
+scopes(#20126,9)
+scopenodes(#20124,#20126)
+scopenesting(#20126,#20120)
+#20127=*
+stmts(#20127,31,#20109,1,"namespace W.Q {}")
+#20128=@"loc,{#10000},7,3,7,18"
+locations_default(#20128,#10000,7,3,7,18)
+hasLocation(#20127,#20128)
+stmt_containers(#20127,#20109)
 #20129=*
-scopes(#20129,9)
-scopenodes(#20126,#20129)
-scopenesting(#20129,#20111)
-#20130=@"local_namespace_name;{Q};{#20129}"
-local_namespace_names(#20130,"Q",#20129)
-#20131=*
-stmts(#20131,30,#20126,0,"Q {}")
-#20132=@"loc,{#10000},7,15,7,18"
-locations_default(#20132,#10000,7,15,7,18)
-hasLocation(#20131,#20132)
-stmt_containers(#20131,#20126)
-#20133=*
-stmts(#20133,31,#20131,-1,"Q {}")
-hasLocation(#20133,#20132)
-stmt_containers(#20133,#20126)
+exprs(#20129,78,#20127,-1,"W")
+hasLocation(#20129,#20069)
+enclosing_stmt(#20129,#20127)
+expr_containers(#20129,#20109)
+literals("W","W",#20129)
+namespacedecl(#20129,#20114)
+#20130=*
+scopes(#20130,9)
+scopenodes(#20127,#20130)
+scopenesting(#20130,#20112)
+#20131=@"local_namespace_name;{Q};{#20130}"
+local_namespace_names(#20131,"Q",#20130)
+#20132=*
+stmts(#20132,30,#20127,0,"Q {}")
+#20133=@"loc,{#10000},7,15,7,18"
+locations_default(#20133,#10000,7,15,7,18)
+hasLocation(#20132,#20133)
+stmt_containers(#20132,#20127)
 #20134=*
-exprs(#20134,78,#20133,-1,"Q")
-hasLocation(#20134,#20073)
-enclosing_stmt(#20134,#20133)
-expr_containers(#20134,#20126)
-literals("Q","Q",#20134)
-namespacedecl(#20134,#20130)
+stmts(#20134,31,#20132,-1,"Q {}")
+hasLocation(#20134,#20133)
+stmt_containers(#20134,#20127)
 #20135=*
-scopes(#20135,9)
-scopenodes(#20133,#20135)
-scopenesting(#20135,#20129)
+exprs(#20135,78,#20134,-1,"Q")
+hasLocation(#20135,#20073)
+enclosing_stmt(#20135,#20134)
+expr_containers(#20135,#20127)
+literals("Q","Q",#20135)
+namespacedecl(#20135,#20131)
 #20136=*
-entry_cfg_node(#20136,#20001)
-#20137=@"loc,{#10000},1,1,1,0"
-locations_default(#20137,#10000,1,1,1,0)
-hasLocation(#20136,#20137)
-#20138=*
-exit_cfg_node(#20138,#20001)
-hasLocation(#20138,#20080)
-successor(#20110,#20108)
-successor(#20128,#20126)
-successor(#20131,#20134)
-successor(#20134,#20133)
-successor(#20133,#20138)
-successor(#20126,#20131)
-successor(#20114,#20118)
-successor(#20118,#20116)
-successor(#20121,#20124)
-successor(#20124,#20123)
-successor(#20123,#20128)
-successor(#20116,#20121)
-successor(#20108,#20114)
-successor(#20094,#20093)
-successor(#20097,#20100)
-successor(#20100,#20099)
-successor(#20103,#20106)
-successor(#20106,#20105)
-successor(#20105,#20110)
-successor(#20099,#20103)
-successor(#20093,#20097)
-successor(#20085,#20084)
-successor(#20088,#20091)
-successor(#20091,#20090)
-successor(#20090,#20094)
-successor(#20084,#20088)
-successor(#20136,#20085)
+scopes(#20136,9)
+scopenodes(#20134,#20136)
+scopenesting(#20136,#20130)
+#20137=*
+entry_cfg_node(#20137,#20001)
+#20138=@"loc,{#10000},1,1,1,0"
+locations_default(#20138,#10000,1,1,1,0)
+hasLocation(#20137,#20138)
+#20139=*
+exit_cfg_node(#20139,#20001)
+hasLocation(#20139,#20080)
+successor(#20111,#20109)
+successor(#20129,#20127)
+successor(#20132,#20135)
+successor(#20135,#20134)
+successor(#20134,#20139)
+successor(#20127,#20132)
+successor(#20115,#20119)
+successor(#20119,#20117)
+successor(#20122,#20125)
+successor(#20125,#20124)
+successor(#20124,#20129)
+successor(#20117,#20122)
+successor(#20109,#20115)
+successor(#20095,#20094)
+successor(#20098,#20101)
+successor(#20101,#20100)
+successor(#20104,#20107)
+successor(#20107,#20106)
+successor(#20106,#20111)
+successor(#20100,#20104)
+successor(#20094,#20098)
+successor(#20086,#20085)
+successor(#20089,#20092)
+successor(#20092,#20091)
+successor(#20091,#20095)
+successor(#20085,#20089)
+successor(#20137,#20086)
 numlines(#10000,8,6,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/nobody.ts.trap

@@ -704,499 +704,527 @@ variables(#20255,"D",#20000)
 local_type_names(#20256,"C",#20000)
 #20257=@"local_type_name;{D};{#20000}"
 local_type_names(#20257,"D",#20000)
-#20258=*
-stmts(#20258,17,#20001,0,"declare ... on f();")
-hasLocation(#20258,#20020)
-stmt_containers(#20258,#20001)
-has_declare_keyword(#20258)
+#20258=@"var;{this};{#20000}"
+variables(#20258,"this",#20000)
 #20259=*
-exprs(#20259,78,#20258,-1,"f")
-hasLocation(#20259,#20079)
-expr_containers(#20259,#20258)
-literals("f","f",#20259)
-decl(#20259,#20253)
+stmts(#20259,17,#20001,0,"declare ... on f();")
+hasLocation(#20259,#20020)
+stmt_containers(#20259,#20001)
+has_declare_keyword(#20259)
 #20260=*
-scopes(#20260,1)
-scopenodes(#20258,#20260)
-scopenesting(#20260,#20000)
-#20261=@"var;{arguments};{#20260}"
-variables(#20261,"arguments",#20260)
-is_arguments_object(#20261)
-#20262=*
-stmts(#20262,26,#20001,1,"abstrac ... mber;\n}")
-#20263=@"loc,{#10000},4,1,15,1"
-locations_default(#20263,#10000,4,1,15,1)
-hasLocation(#20262,#20263)
-stmt_containers(#20262,#20001)
-is_abstract_class(#20262)
+exprs(#20260,78,#20259,-1,"f")
+hasLocation(#20260,#20079)
+expr_containers(#20260,#20259)
+literals("f","f",#20260)
+decl(#20260,#20253)
+#20261=*
+scopes(#20261,1)
+scopenodes(#20259,#20261)
+scopenesting(#20261,#20000)
+#20262=@"var;{this};{#20261}"
+variables(#20262,"this",#20261)
+#20263=@"var;{arguments};{#20261}"
+variables(#20263,"arguments",#20261)
+is_arguments_object(#20263)
 #20264=*
-exprs(#20264,78,#20262,0,"C")
-hasLocation(#20264,#20091)
-enclosing_stmt(#20264,#20262)
-expr_containers(#20264,#20001)
-literals("C","C",#20264)
-decl(#20264,#20254)
-typedecl(#20264,#20256)
-#20265=*
-scopes(#20265,10)
-scopenodes(#20262,#20265)
-scopenesting(#20265,#20000)
+stmts(#20264,26,#20001,1,"abstrac ... mber;\n}")
+#20265=@"loc,{#10000},4,1,15,1"
+locations_default(#20265,#10000,4,1,15,1)
+hasLocation(#20264,#20265)
+stmt_containers(#20264,#20001)
+is_abstract_class(#20264)
 #20266=*
-properties(#20266,#20262,2,0,"abstract h();")
-#20267=@"loc,{#10000},6,3,6,15"
-locations_default(#20267,#10000,6,3,6,15)
-hasLocation(#20266,#20267)
-#20268=*
-exprs(#20268,0,#20266,0,"h")
-hasLocation(#20268,#20097)
-enclosing_stmt(#20268,#20262)
-expr_containers(#20268,#20001)
-literals("h","h",#20268)
+exprs(#20266,78,#20264,0,"C")
+hasLocation(#20266,#20091)
+enclosing_stmt(#20266,#20264)
+expr_containers(#20266,#20001)
+literals("C","C",#20266)
+decl(#20266,#20254)
+typedecl(#20266,#20256)
+#20267=*
+scopes(#20267,10)
+scopenodes(#20264,#20267)
+scopenesting(#20267,#20000)
+#20268=@"var;{this};{#20267}"
+variables(#20268,"this",#20267)
 #20269=*
-exprs(#20269,9,#20266,1,"abstract h();")
-hasLocation(#20269,#20267)
-enclosing_stmt(#20269,#20262)
-expr_containers(#20269,#20001)
-#20270=*
-scopes(#20270,1)
-scopenodes(#20269,#20270)
-scopenesting(#20270,#20265)
-#20271=@"var;{arguments};{#20270}"
-variables(#20271,"arguments",#20270)
-is_arguments_object(#20271)
-is_method(#20266)
-is_abstract_member(#20266)
+properties(#20269,#20264,2,0,"abstract h();")
+#20270=@"loc,{#10000},6,3,6,15"
+locations_default(#20270,#10000,6,3,6,15)
+hasLocation(#20269,#20270)
+#20271=*
+exprs(#20271,0,#20269,0,"h")
+hasLocation(#20271,#20097)
+enclosing_stmt(#20271,#20264)
+expr_containers(#20271,#20001)
+literals("h","h",#20271)
 #20272=*
-properties(#20272,#20262,3,0,"g(x: nu ... number;")
-#20273=@"loc,{#10000},9,3,9,23"
-locations_default(#20273,#10000,9,3,9,23)
-hasLocation(#20272,#20273)
-#20274=*
-exprs(#20274,0,#20272,0,"g")
-hasLocation(#20274,#20105)
-enclosing_stmt(#20274,#20262)
-expr_containers(#20274,#20001)
-literals("g","g",#20274)
-#20275=*
-exprs(#20275,9,#20272,1,"g(x: nu ... number;")
-hasLocation(#20275,#20273)
-enclosing_stmt(#20275,#20262)
-expr_containers(#20275,#20001)
+exprs(#20272,9,#20269,1,"abstract h();")
+hasLocation(#20272,#20270)
+enclosing_stmt(#20272,#20264)
+expr_containers(#20272,#20001)
+#20273=*
+scopes(#20273,1)
+scopenodes(#20272,#20273)
+scopenesting(#20273,#20267)
+#20274=@"var;{this};{#20273}"
+variables(#20274,"this",#20273)
+#20275=@"var;{arguments};{#20273}"
+variables(#20275,"arguments",#20273)
+is_arguments_object(#20275)
+is_method(#20269)
+is_abstract_member(#20269)
 #20276=*
-scopes(#20276,1)
-scopenodes(#20275,#20276)
-scopenesting(#20276,#20265)
-#20277=@"var;{x};{#20276}"
-variables(#20277,"x",#20276)
+properties(#20276,#20264,3,0,"g(x: nu ... number;")
+#20277=@"loc,{#10000},9,3,9,23"
+locations_default(#20277,#10000,9,3,9,23)
+hasLocation(#20276,#20277)
 #20278=*
-exprs(#20278,78,#20275,0,"x")
-hasLocation(#20278,#20109)
-expr_containers(#20278,#20275)
-literals("x","x",#20278)
-decl(#20278,#20277)
-#20279=@"var;{arguments};{#20276}"
-variables(#20279,"arguments",#20276)
-is_arguments_object(#20279)
+exprs(#20278,0,#20276,0,"g")
+hasLocation(#20278,#20105)
+enclosing_stmt(#20278,#20264)
+expr_containers(#20278,#20001)
+literals("g","g",#20278)
+#20279=*
+exprs(#20279,9,#20276,1,"g(x: nu ... number;")
+hasLocation(#20279,#20277)
+enclosing_stmt(#20279,#20264)
+expr_containers(#20279,#20001)
 #20280=*
-typeexprs(#20280,2,#20275,-3,"number")
-hasLocation(#20280,#20119)
-expr_containers(#20280,#20275)
-literals("number","number",#20280)
-#20281=*
-typeexprs(#20281,2,#20275,-6,"number")
-hasLocation(#20281,#20113)
-expr_containers(#20281,#20275)
-literals("number","number",#20281)
-is_method(#20272)
-#20282=*
-properties(#20282,#20262,4,0,"g(x: st ... string;")
-#20283=@"loc,{#10000},10,3,10,23"
-locations_default(#20283,#10000,10,3,10,23)
-hasLocation(#20282,#20283)
-#20284=*
-exprs(#20284,0,#20282,0,"g")
-hasLocation(#20284,#20123)
-enclosing_stmt(#20284,#20262)
-expr_containers(#20284,#20001)
-literals("g","g",#20284)
+scopes(#20280,1)
+scopenodes(#20279,#20280)
+scopenesting(#20280,#20267)
+#20281=@"var;{this};{#20280}"
+variables(#20281,"this",#20280)
+#20282=@"var;{x};{#20280}"
+variables(#20282,"x",#20280)
+#20283=*
+exprs(#20283,78,#20279,0,"x")
+hasLocation(#20283,#20109)
+expr_containers(#20283,#20279)
+literals("x","x",#20283)
+decl(#20283,#20282)
+#20284=@"var;{arguments};{#20280}"
+variables(#20284,"arguments",#20280)
+is_arguments_object(#20284)
 #20285=*
-exprs(#20285,9,#20282,1,"g(x: st ... string;")
-hasLocation(#20285,#20283)
-enclosing_stmt(#20285,#20262)
-expr_containers(#20285,#20001)
+typeexprs(#20285,2,#20279,-3,"number")
+hasLocation(#20285,#20119)
+expr_containers(#20285,#20279)
+literals("number","number",#20285)
 #20286=*
-scopes(#20286,1)
-scopenodes(#20285,#20286)
-scopenesting(#20286,#20265)
-#20287=@"var;{x};{#20286}"
-variables(#20287,"x",#20286)
-#20288=*
-exprs(#20288,78,#20285,0,"x")
-hasLocation(#20288,#20127)
-expr_containers(#20288,#20285)
-literals("x","x",#20288)
-decl(#20288,#20287)
-#20289=@"var;{arguments};{#20286}"
-variables(#20289,"arguments",#20286)
-is_arguments_object(#20289)
+typeexprs(#20286,2,#20279,-6,"number")
+hasLocation(#20286,#20113)
+expr_containers(#20286,#20279)
+literals("number","number",#20286)
+is_method(#20276)
+#20287=*
+properties(#20287,#20264,4,0,"g(x: st ... string;")
+#20288=@"loc,{#10000},10,3,10,23"
+locations_default(#20288,#10000,10,3,10,23)
+hasLocation(#20287,#20288)
+#20289=*
+exprs(#20289,0,#20287,0,"g")
+hasLocation(#20289,#20123)
+enclosing_stmt(#20289,#20264)
+expr_containers(#20289,#20001)
+literals("g","g",#20289)
 #20290=*
-typeexprs(#20290,2,#20285,-3,"string")
-hasLocation(#20290,#20137)
-expr_containers(#20290,#20285)
-literals("string","string",#20290)
+exprs(#20290,9,#20287,1,"g(x: st ... string;")
+hasLocation(#20290,#20288)
+enclosing_stmt(#20290,#20264)
+expr_containers(#20290,#20001)
 #20291=*
-typeexprs(#20291,2,#20285,-6,"string")
-hasLocation(#20291,#20131)
-expr_containers(#20291,#20285)
-literals("string","string",#20291)
-is_method(#20282)
-#20292=*
-properties(#20292,#20262,5,0,"g(x: any) {}")
-#20293=@"loc,{#10000},11,3,11,14"
-locations_default(#20293,#10000,11,3,11,14)
-hasLocation(#20292,#20293)
+scopes(#20291,1)
+scopenodes(#20290,#20291)
+scopenesting(#20291,#20267)
+#20292=@"var;{this};{#20291}"
+variables(#20292,"this",#20291)
+#20293=@"var;{x};{#20291}"
+variables(#20293,"x",#20291)
 #20294=*
-exprs(#20294,0,#20292,0,"g")
-hasLocation(#20294,#20141)
-enclosing_stmt(#20294,#20262)
-expr_containers(#20294,#20001)
-literals("g","g",#20294)
-#20295=*
-exprs(#20295,9,#20292,1,"g(x: any) {}")
-hasLocation(#20295,#20293)
-enclosing_stmt(#20295,#20262)
-expr_containers(#20295,#20001)
+exprs(#20294,78,#20290,0,"x")
+hasLocation(#20294,#20127)
+expr_containers(#20294,#20290)
+literals("x","x",#20294)
+decl(#20294,#20293)
+#20295=@"var;{arguments};{#20291}"
+variables(#20295,"arguments",#20291)
+is_arguments_object(#20295)
 #20296=*
-scopes(#20296,1)
-scopenodes(#20295,#20296)
-scopenesting(#20296,#20265)
-#20297=@"var;{x};{#20296}"
-variables(#20297,"x",#20296)
+typeexprs(#20296,2,#20290,-3,"string")
+hasLocation(#20296,#20137)
+expr_containers(#20296,#20290)
+literals("string","string",#20296)
+#20297=*
+typeexprs(#20297,2,#20290,-6,"string")
+hasLocation(#20297,#20131)
+expr_containers(#20297,#20290)
+literals("string","string",#20297)
+is_method(#20287)
 #20298=*
-exprs(#20298,78,#20295,0,"x")
-hasLocation(#20298,#20145)
-expr_containers(#20298,#20295)
-literals("x","x",#20298)
-decl(#20298,#20297)
-#20299=@"var;{arguments};{#20296}"
-variables(#20299,"arguments",#20296)
-is_arguments_object(#20299)
+properties(#20298,#20264,5,0,"g(x: any) {}")
+#20299=@"loc,{#10000},11,3,11,14"
+locations_default(#20299,#10000,11,3,11,14)
+hasLocation(#20298,#20299)
 #20300=*
-typeexprs(#20300,2,#20295,-6,"any")
-hasLocation(#20300,#20149)
-expr_containers(#20300,#20295)
-literals("any","any",#20300)
+exprs(#20300,0,#20298,0,"g")
+hasLocation(#20300,#20141)
+enclosing_stmt(#20300,#20264)
+expr_containers(#20300,#20001)
+literals("g","g",#20300)
 #20301=*
-stmts(#20301,1,#20295,-2,"{}")
-#20302=@"loc,{#10000},11,13,11,14"
-locations_default(#20302,#10000,11,13,11,14)
-hasLocation(#20301,#20302)
-stmt_containers(#20301,#20295)
-is_method(#20292)
-#20303=*
-properties(#20303,#20262,6,8,"abstract x: number;")
-#20304=@"loc,{#10000},14,3,14,21"
-locations_default(#20304,#10000,14,3,14,21)
-hasLocation(#20303,#20304)
+exprs(#20301,9,#20298,1,"g(x: any) {}")
+hasLocation(#20301,#20299)
+enclosing_stmt(#20301,#20264)
+expr_containers(#20301,#20001)
+#20302=*
+scopes(#20302,1)
+scopenodes(#20301,#20302)
+scopenesting(#20302,#20267)
+#20303=@"var;{this};{#20302}"
+variables(#20303,"this",#20302)
+#20304=@"var;{x};{#20302}"
+variables(#20304,"x",#20302)
 #20305=*
-#20306=*
-exprs(#20306,0,#20303,0,"x")
-hasLocation(#20306,#20159)
-expr_containers(#20306,#20305)
-literals("x","x",#20306)
-is_abstract_member(#20303)
+exprs(#20305,78,#20301,0,"x")
+hasLocation(#20305,#20145)
+expr_containers(#20305,#20301)
+literals("x","x",#20305)
+decl(#20305,#20304)
+#20306=@"var;{arguments};{#20302}"
+variables(#20306,"arguments",#20302)
+is_arguments_object(#20306)
 #20307=*
-typeexprs(#20307,2,#20303,2,"number")
-hasLocation(#20307,#20163)
-enclosing_stmt(#20307,#20262)
-expr_containers(#20307,#20001)
-literals("number","number",#20307)
+typeexprs(#20307,2,#20301,-6,"any")
+hasLocation(#20307,#20149)
+expr_containers(#20307,#20301)
+literals("any","any",#20307)
 #20308=*
-properties(#20308,#20262,7,0,"constructor() {}")
-#20309=@"loc,{#10000},4,18,4,17"
-locations_default(#20309,#10000,4,18,4,17)
+stmts(#20308,1,#20301,-2,"{}")
+#20309=@"loc,{#10000},11,13,11,14"
+locations_default(#20309,#10000,11,13,11,14)
 hasLocation(#20308,#20309)
+stmt_containers(#20308,#20301)
+is_method(#20298)
 #20310=*
-exprs(#20310,0,#20308,0,"constructor")
-hasLocation(#20310,#20309)
-enclosing_stmt(#20310,#20262)
-expr_containers(#20310,#20001)
-literals("constructor","constructor",#20310)
-exprs(#20305,9,#20308,1,"() {}")
-hasLocation(#20305,#20309)
-enclosing_stmt(#20305,#20262)
-expr_containers(#20305,#20001)
-#20311=*
-scopes(#20311,1)
-scopenodes(#20305,#20311)
-scopenesting(#20311,#20265)
-#20312=@"var;{arguments};{#20311}"
-variables(#20312,"arguments",#20311)
-is_arguments_object(#20312)
+properties(#20310,#20264,6,8,"abstract x: number;")
+#20311=@"loc,{#10000},14,3,14,21"
+locations_default(#20311,#10000,14,3,14,21)
+hasLocation(#20310,#20311)
+#20312=*
 #20313=*
-stmts(#20313,1,#20305,-2,"{}")
-hasLocation(#20313,#20309)
-stmt_containers(#20313,#20305)
-is_method(#20308)
+exprs(#20313,0,#20310,0,"x")
+hasLocation(#20313,#20159)
+expr_containers(#20313,#20312)
+literals("x","x",#20313)
+is_abstract_member(#20310)
 #20314=*
-stmts(#20314,26,#20001,2,"declare ... mber;\n}")
-#20315=@"loc,{#10000},18,1,29,1"
-locations_default(#20315,#10000,18,1,29,1)
-hasLocation(#20314,#20315)
-stmt_containers(#20314,#20001)
-has_declare_keyword(#20314)
-is_abstract_class(#20314)
-#20316=*
-exprs(#20316,78,#20314,0,"D")
-hasLocation(#20316,#20174)
-enclosing_stmt(#20316,#20314)
-expr_containers(#20316,#20001)
-literals("D","D",#20316)
-decl(#20316,#20255)
-typedecl(#20316,#20257)
+typeexprs(#20314,2,#20310,2,"number")
+hasLocation(#20314,#20163)
+enclosing_stmt(#20314,#20264)
+expr_containers(#20314,#20001)
+literals("number","number",#20314)
+#20315=*
+properties(#20315,#20264,7,0,"constructor() {}")
+#20316=@"loc,{#10000},4,18,4,17"
+locations_default(#20316,#10000,4,18,4,17)
+hasLocation(#20315,#20316)
 #20317=*
-scopes(#20317,10)
-scopenodes(#20314,#20317)
-scopenesting(#20317,#20000)
+exprs(#20317,0,#20315,0,"constructor")
+hasLocation(#20317,#20316)
+enclosing_stmt(#20317,#20264)
+expr_containers(#20317,#20001)
+literals("constructor","constructor",#20317)
+exprs(#20312,9,#20315,1,"() {}")
+hasLocation(#20312,#20316)
+enclosing_stmt(#20312,#20264)
+expr_containers(#20312,#20001)
 #20318=*
-properties(#20318,#20314,2,0,"abstract h();")
-#20319=@"loc,{#10000},20,3,20,15"
-locations_default(#20319,#10000,20,3,20,15)
-hasLocation(#20318,#20319)
-#20320=*
-exprs(#20320,0,#20318,0,"h")
-hasLocation(#20320,#20180)
-enclosing_stmt(#20320,#20314)
-expr_containers(#20320,#20001)
-literals("h","h",#20320)
+scopes(#20318,1)
+scopenodes(#20312,#20318)
+scopenesting(#20318,#20267)
+#20319=@"var;{this};{#20318}"
+variables(#20319,"this",#20318)
+#20320=@"var;{arguments};{#20318}"
+variables(#20320,"arguments",#20318)
+is_arguments_object(#20320)
 #20321=*
-exprs(#20321,9,#20318,1,"abstract h();")
-hasLocation(#20321,#20319)
-enclosing_stmt(#20321,#20314)
-expr_containers(#20321,#20001)
+stmts(#20321,1,#20312,-2,"{}")
+hasLocation(#20321,#20316)
+stmt_containers(#20321,#20312)
+is_method(#20315)
 #20322=*
-scopes(#20322,1)
-scopenodes(#20321,#20322)
-scopenesting(#20322,#20317)
-#20323=@"var;{arguments};{#20322}"
-variables(#20323,"arguments",#20322)
-is_arguments_object(#20323)
-is_method(#20318)
-is_abstract_member(#20318)
+stmts(#20322,26,#20001,2,"declare ... mber;\n}")
+#20323=@"loc,{#10000},18,1,29,1"
+locations_default(#20323,#10000,18,1,29,1)
+hasLocation(#20322,#20323)
+stmt_containers(#20322,#20001)
+has_declare_keyword(#20322)
+is_abstract_class(#20322)
 #20324=*
-properties(#20324,#20314,3,0,"g(x: nu ... number;")
-#20325=@"loc,{#10000},23,3,23,23"
-locations_default(#20325,#10000,23,3,23,23)
-hasLocation(#20324,#20325)
-#20326=*
-exprs(#20326,0,#20324,0,"g")
-hasLocation(#20326,#20188)
-enclosing_stmt(#20326,#20314)
-expr_containers(#20326,#20001)
-literals("g","g",#20326)
+exprs(#20324,78,#20322,0,"D")
+hasLocation(#20324,#20174)
+enclosing_stmt(#20324,#20322)
+expr_containers(#20324,#20001)
+literals("D","D",#20324)
+decl(#20324,#20255)
+typedecl(#20324,#20257)
+#20325=*
+scopes(#20325,10)
+scopenodes(#20322,#20325)
+scopenesting(#20325,#20000)
+#20326=@"var;{this};{#20325}"
+variables(#20326,"this",#20325)
 #20327=*
-exprs(#20327,9,#20324,1,"g(x: nu ... number;")
-hasLocation(#20327,#20325)
-enclosing_stmt(#20327,#20314)
-expr_containers(#20327,#20001)
-#20328=*
-scopes(#20328,1)
-scopenodes(#20327,#20328)
-scopenesting(#20328,#20317)
-#20329=@"var;{x};{#20328}"
-variables(#20329,"x",#20328)
+properties(#20327,#20322,2,0,"abstract h();")
+#20328=@"loc,{#10000},20,3,20,15"
+locations_default(#20328,#10000,20,3,20,15)
+hasLocation(#20327,#20328)
+#20329=*
+exprs(#20329,0,#20327,0,"h")
+hasLocation(#20329,#20180)
+enclosing_stmt(#20329,#20322)
+expr_containers(#20329,#20001)
+literals("h","h",#20329)
 #20330=*
-exprs(#20330,78,#20327,0,"x")
-hasLocation(#20330,#20192)
-expr_containers(#20330,#20327)
-literals("x","x",#20330)
-decl(#20330,#20329)
-#20331=@"var;{arguments};{#20328}"
-variables(#20331,"arguments",#20328)
-is_arguments_object(#20331)
-#20332=*
-typeexprs(#20332,2,#20327,-3,"number")
-hasLocation(#20332,#20202)
-expr_containers(#20332,#20327)
-literals("number","number",#20332)
-#20333=*
-typeexprs(#20333,2,#20327,-6,"number")
-hasLocation(#20333,#20196)
-expr_containers(#20333,#20327)
-literals("number","number",#20333)
-is_method(#20324)
+exprs(#20330,9,#20327,1,"abstract h();")
+hasLocation(#20330,#20328)
+enclosing_stmt(#20330,#20322)
+expr_containers(#20330,#20001)
+#20331=*
+scopes(#20331,1)
+scopenodes(#20330,#20331)
+scopenesting(#20331,#20325)
+#20332=@"var;{this};{#20331}"
+variables(#20332,"this",#20331)
+#20333=@"var;{arguments};{#20331}"
+variables(#20333,"arguments",#20331)
+is_arguments_object(#20333)
+is_method(#20327)
+is_abstract_member(#20327)
 #20334=*
-properties(#20334,#20314,4,0,"g(x: st ... string;")
-#20335=@"loc,{#10000},24,3,24,23"
-locations_default(#20335,#10000,24,3,24,23)
+properties(#20334,#20322,3,0,"g(x: nu ... number;")
+#20335=@"loc,{#10000},23,3,23,23"
+locations_default(#20335,#10000,23,3,23,23)
 hasLocation(#20334,#20335)
 #20336=*
 exprs(#20336,0,#20334,0,"g")
-hasLocation(#20336,#20206)
-enclosing_stmt(#20336,#20314)
+hasLocation(#20336,#20188)
+enclosing_stmt(#20336,#20322)
 expr_containers(#20336,#20001)
 literals("g","g",#20336)
 #20337=*
-exprs(#20337,9,#20334,1,"g(x: st ... string;")
+exprs(#20337,9,#20334,1,"g(x: nu ... number;")
 hasLocation(#20337,#20335)
-enclosing_stmt(#20337,#20314)
+enclosing_stmt(#20337,#20322)
 expr_containers(#20337,#20001)
 #20338=*
 scopes(#20338,1)
 scopenodes(#20337,#20338)
-scopenesting(#20338,#20317)
-#20339=@"var;{x};{#20338}"
-variables(#20339,"x",#20338)
-#20340=*
-exprs(#20340,78,#20337,0,"x")
-hasLocation(#20340,#20210)
-expr_containers(#20340,#20337)
-literals("x","x",#20340)
-decl(#20340,#20339)
-#20341=@"var;{arguments};{#20338}"
-variables(#20341,"arguments",#20338)
-is_arguments_object(#20341)
-#20342=*
-typeexprs(#20342,2,#20337,-3,"string")
-hasLocation(#20342,#20220)
-expr_containers(#20342,#20337)
-literals("string","string",#20342)
+scopenesting(#20338,#20325)
+#20339=@"var;{this};{#20338}"
+variables(#20339,"this",#20338)
+#20340=@"var;{x};{#20338}"
+variables(#20340,"x",#20338)
+#20341=*
+exprs(#20341,78,#20337,0,"x")
+hasLocation(#20341,#20192)
+expr_containers(#20341,#20337)
+literals("x","x",#20341)
+decl(#20341,#20340)
+#20342=@"var;{arguments};{#20338}"
+variables(#20342,"arguments",#20338)
+is_arguments_object(#20342)
 #20343=*
-typeexprs(#20343,2,#20337,-6,"string")
-hasLocation(#20343,#20214)
+typeexprs(#20343,2,#20337,-3,"number")
+hasLocation(#20343,#20202)
 expr_containers(#20343,#20337)
-literals("string","string",#20343)
-is_method(#20334)
+literals("number","number",#20343)
 #20344=*
-properties(#20344,#20314,5,0,"g(x: any) {}")
-#20345=@"loc,{#10000},25,3,25,14"
-locations_default(#20345,#10000,25,3,25,14)
-hasLocation(#20344,#20345)
-#20346=*
-exprs(#20346,0,#20344,0,"g")
-hasLocation(#20346,#20224)
-enclosing_stmt(#20346,#20314)
-expr_containers(#20346,#20001)
-literals("g","g",#20346)
+typeexprs(#20344,2,#20337,-6,"number")
+hasLocation(#20344,#20196)
+expr_containers(#20344,#20337)
+literals("number","number",#20344)
+is_method(#20334)
+#20345=*
+properties(#20345,#20322,4,0,"g(x: st ... string;")
+#20346=@"loc,{#10000},24,3,24,23"
+locations_default(#20346,#10000,24,3,24,23)
+hasLocation(#20345,#20346)
 #20347=*
-exprs(#20347,9,#20344,1,"g(x: any) {}")
-hasLocation(#20347,#20345)
-enclosing_stmt(#20347,#20314)
+exprs(#20347,0,#20345,0,"g")
+hasLocation(#20347,#20206)
+enclosing_stmt(#20347,#20322)
 expr_containers(#20347,#20001)
+literals("g","g",#20347)
 #20348=*
-scopes(#20348,1)
-scopenodes(#20347,#20348)
-scopenesting(#20348,#20317)
-#20349=@"var;{x};{#20348}"
-variables(#20349,"x",#20348)
-#20350=*
-exprs(#20350,78,#20347,0,"x")
-hasLocation(#20350,#20228)
-expr_containers(#20350,#20347)
-literals("x","x",#20350)
-decl(#20350,#20349)
-#20351=@"var;{arguments};{#20348}"
-variables(#20351,"arguments",#20348)
-is_arguments_object(#20351)
+exprs(#20348,9,#20345,1,"g(x: st ... string;")
+hasLocation(#20348,#20346)
+enclosing_stmt(#20348,#20322)
+expr_containers(#20348,#20001)
+#20349=*
+scopes(#20349,1)
+scopenodes(#20348,#20349)
+scopenesting(#20349,#20325)
+#20350=@"var;{this};{#20349}"
+variables(#20350,"this",#20349)
+#20351=@"var;{x};{#20349}"
+variables(#20351,"x",#20349)
 #20352=*
-typeexprs(#20352,2,#20347,-6,"any")
-hasLocation(#20352,#20232)
-expr_containers(#20352,#20347)
-literals("any","any",#20352)
-#20353=*
-stmts(#20353,1,#20347,-2,"{}")
-#20354=@"loc,{#10000},25,13,25,14"
-locations_default(#20354,#10000,25,13,25,14)
-hasLocation(#20353,#20354)
-stmt_containers(#20353,#20347)
-is_method(#20344)
+exprs(#20352,78,#20348,0,"x")
+hasLocation(#20352,#20210)
+expr_containers(#20352,#20348)
+literals("x","x",#20352)
+decl(#20352,#20351)
+#20353=@"var;{arguments};{#20349}"
+variables(#20353,"arguments",#20349)
+is_arguments_object(#20353)
+#20354=*
+typeexprs(#20354,2,#20348,-3,"string")
+hasLocation(#20354,#20220)
+expr_containers(#20354,#20348)
+literals("string","string",#20354)
 #20355=*
-properties(#20355,#20314,6,8,"abstract x: number;")
-#20356=@"loc,{#10000},28,3,28,21"
-locations_default(#20356,#10000,28,3,28,21)
-hasLocation(#20355,#20356)
-#20357=*
+typeexprs(#20355,2,#20348,-6,"string")
+hasLocation(#20355,#20214)
+expr_containers(#20355,#20348)
+literals("string","string",#20355)
+is_method(#20345)
+#20356=*
+properties(#20356,#20322,5,0,"g(x: any) {}")
+#20357=@"loc,{#10000},25,3,25,14"
+locations_default(#20357,#10000,25,3,25,14)
+hasLocation(#20356,#20357)
 #20358=*
-exprs(#20358,0,#20355,0,"x")
-hasLocation(#20358,#20242)
-expr_containers(#20358,#20357)
-literals("x","x",#20358)
-is_abstract_member(#20355)
+exprs(#20358,0,#20356,0,"g")
+hasLocation(#20358,#20224)
+enclosing_stmt(#20358,#20322)
+expr_containers(#20358,#20001)
+literals("g","g",#20358)
 #20359=*
-typeexprs(#20359,2,#20355,2,"number")
-hasLocation(#20359,#20246)
-enclosing_stmt(#20359,#20314)
+exprs(#20359,9,#20356,1,"g(x: any) {}")
+hasLocation(#20359,#20357)
+enclosing_stmt(#20359,#20322)
 expr_containers(#20359,#20001)
-literals("number","number",#20359)
 #20360=*
-properties(#20360,#20314,7,0,"constructor() {}")
-#20361=@"loc,{#10000},18,26,18,25"
-locations_default(#20361,#10000,18,26,18,25)
-hasLocation(#20360,#20361)
-#20362=*
-exprs(#20362,0,#20360,0,"constructor")
-hasLocation(#20362,#20361)
-enclosing_stmt(#20362,#20314)
-expr_containers(#20362,#20001)
-literals("constructor","constructor",#20362)
-exprs(#20357,9,#20360,1,"() {}")
-hasLocation(#20357,#20361)
-enclosing_stmt(#20357,#20314)
-expr_containers(#20357,#20001)
+scopes(#20360,1)
+scopenodes(#20359,#20360)
+scopenesting(#20360,#20325)
+#20361=@"var;{this};{#20360}"
+variables(#20361,"this",#20360)
+#20362=@"var;{x};{#20360}"
+variables(#20362,"x",#20360)
 #20363=*
-scopes(#20363,1)
-scopenodes(#20357,#20363)
-scopenesting(#20363,#20317)
-#20364=@"var;{arguments};{#20363}"
-variables(#20364,"arguments",#20363)
+exprs(#20363,78,#20359,0,"x")
+hasLocation(#20363,#20228)
+expr_containers(#20363,#20359)
+literals("x","x",#20363)
+decl(#20363,#20362)
+#20364=@"var;{arguments};{#20360}"
+variables(#20364,"arguments",#20360)
 is_arguments_object(#20364)
 #20365=*
-stmts(#20365,1,#20357,-2,"{}")
-hasLocation(#20365,#20361)
-stmt_containers(#20365,#20357)
-is_method(#20360)
+typeexprs(#20365,2,#20359,-6,"any")
+hasLocation(#20365,#20232)
+expr_containers(#20365,#20359)
+literals("any","any",#20365)
 #20366=*
-entry_cfg_node(#20366,#20001)
-#20367=@"loc,{#10000},2,1,2,0"
-locations_default(#20367,#10000,2,1,2,0)
+stmts(#20366,1,#20359,-2,"{}")
+#20367=@"loc,{#10000},25,13,25,14"
+locations_default(#20367,#10000,25,13,25,14)
 hasLocation(#20366,#20367)
+stmt_containers(#20366,#20359)
+is_method(#20356)
 #20368=*
-exit_cfg_node(#20368,#20001)
-hasLocation(#20368,#20251)
-successor(#20314,#20368)
-successor(#20305,#20308)
-#20369=*
-entry_cfg_node(#20369,#20305)
-hasLocation(#20369,#20309)
+properties(#20368,#20322,6,8,"abstract x: number;")
+#20369=@"loc,{#10000},28,3,28,21"
+locations_default(#20369,#10000,28,3,28,21)
+hasLocation(#20368,#20369)
 #20370=*
-exit_cfg_node(#20370,#20305)
-hasLocation(#20370,#20309)
-successor(#20313,#20370)
-successor(#20369,#20313)
-successor(#20310,#20305)
-successor(#20308,#20262)
-successor(#20295,#20292)
 #20371=*
-entry_cfg_node(#20371,#20295)
-#20372=@"loc,{#10000},11,3,11,2"
-locations_default(#20372,#10000,11,3,11,2)
-hasLocation(#20371,#20372)
+exprs(#20371,0,#20368,0,"x")
+hasLocation(#20371,#20242)
+expr_containers(#20371,#20370)
+literals("x","x",#20371)
+is_abstract_member(#20368)
+#20372=*
+typeexprs(#20372,2,#20368,2,"number")
+hasLocation(#20372,#20246)
+enclosing_stmt(#20372,#20322)
+expr_containers(#20372,#20001)
+literals("number","number",#20372)
 #20373=*
-exit_cfg_node(#20373,#20295)
-#20374=@"loc,{#10000},11,15,11,14"
-locations_default(#20374,#10000,11,15,11,14)
+properties(#20373,#20322,7,0,"constructor() {}")
+#20374=@"loc,{#10000},18,26,18,25"
+locations_default(#20374,#10000,18,26,18,25)
 hasLocation(#20373,#20374)
-successor(#20301,#20373)
-successor(#20298,#20301)
-successor(#20371,#20298)
-successor(#20294,#20295)
-successor(#20292,#20310)
-successor(#20282,#20294)
-successor(#20272,#20282)
-successor(#20266,#20272)
-successor(#20264,#20266)
-successor(#20262,#20314)
-successor(#20258,#20264)
-successor(#20366,#20258)
+#20375=*
+exprs(#20375,0,#20373,0,"constructor")
+hasLocation(#20375,#20374)
+enclosing_stmt(#20375,#20322)
+expr_containers(#20375,#20001)
+literals("constructor","constructor",#20375)
+exprs(#20370,9,#20373,1,"() {}")
+hasLocation(#20370,#20374)
+enclosing_stmt(#20370,#20322)
+expr_containers(#20370,#20001)
+#20376=*
+scopes(#20376,1)
+scopenodes(#20370,#20376)
+scopenesting(#20376,#20325)
+#20377=@"var;{this};{#20376}"
+variables(#20377,"this",#20376)
+#20378=@"var;{arguments};{#20376}"
+variables(#20378,"arguments",#20376)
+is_arguments_object(#20378)
+#20379=*
+stmts(#20379,1,#20370,-2,"{}")
+hasLocation(#20379,#20374)
+stmt_containers(#20379,#20370)
+is_method(#20373)
+#20380=*
+entry_cfg_node(#20380,#20001)
+#20381=@"loc,{#10000},2,1,2,0"
+locations_default(#20381,#10000,2,1,2,0)
+hasLocation(#20380,#20381)
+#20382=*
+exit_cfg_node(#20382,#20001)
+hasLocation(#20382,#20251)
+successor(#20322,#20382)
+successor(#20312,#20315)
+#20383=*
+entry_cfg_node(#20383,#20312)
+hasLocation(#20383,#20316)
+#20384=*
+exit_cfg_node(#20384,#20312)
+hasLocation(#20384,#20316)
+successor(#20321,#20384)
+successor(#20383,#20321)
+successor(#20317,#20312)
+successor(#20315,#20264)
+successor(#20301,#20298)
+#20385=*
+entry_cfg_node(#20385,#20301)
+#20386=@"loc,{#10000},11,3,11,2"
+locations_default(#20386,#10000,11,3,11,2)
+hasLocation(#20385,#20386)
+#20387=*
+exit_cfg_node(#20387,#20301)
+#20388=@"loc,{#10000},11,15,11,14"
+locations_default(#20388,#10000,11,15,11,14)
+hasLocation(#20387,#20388)
+successor(#20308,#20387)
+successor(#20305,#20308)
+successor(#20385,#20305)
+successor(#20300,#20301)
+successor(#20298,#20317)
+successor(#20287,#20300)
+successor(#20276,#20287)
+successor(#20269,#20276)
+successor(#20266,#20269)
+successor(#20264,#20322)
+successor(#20259,#20266)
+successor(#20380,#20259)
 numlines(#10000,29,15,8)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap

@@ -150,158 +150,164 @@ locations_default(#20053,#10000,1,1,5,0)
 hasLocation(#20001,#20053)
 #20054=@"var;{x};{#20000}"
 variables(#20054,"x",#20000)
-#20055=*
-stmts(#20055,18,#20001,0,"var x = ... v) {}\n}")
-#20056=@"loc,{#10000},1,1,4,1"
-locations_default(#20056,#10000,1,1,4,1)
-hasLocation(#20055,#20056)
-stmt_containers(#20055,#20001)
-#20057=*
-exprs(#20057,64,#20055,0,"x = {\n  ... v) {}\n}")
-#20058=@"loc,{#10000},1,5,4,1"
-locations_default(#20058,#10000,1,5,4,1)
-hasLocation(#20057,#20058)
-enclosing_stmt(#20057,#20055)
-expr_containers(#20057,#20001)
-#20059=*
-exprs(#20059,78,#20057,0,"x")
-hasLocation(#20059,#20013)
-enclosing_stmt(#20059,#20055)
-expr_containers(#20059,#20001)
-literals("x","x",#20059)
-decl(#20059,#20054)
+#20055=@"var;{this};{#20000}"
+variables(#20055,"this",#20000)
+#20056=*
+stmts(#20056,18,#20001,0,"var x = ... v) {}\n}")
+#20057=@"loc,{#10000},1,1,4,1"
+locations_default(#20057,#10000,1,1,4,1)
+hasLocation(#20056,#20057)
+stmt_containers(#20056,#20001)
+#20058=*
+exprs(#20058,64,#20056,0,"x = {\n  ... v) {}\n}")
+#20059=@"loc,{#10000},1,5,4,1"
+locations_default(#20059,#10000,1,5,4,1)
+hasLocation(#20058,#20059)
+enclosing_stmt(#20058,#20056)
+expr_containers(#20058,#20001)
 #20060=*
-exprs(#20060,8,#20057,1,"{\n  get ... v) {}\n}")
-#20061=@"loc,{#10000},1,9,4,1"
-locations_default(#20061,#10000,1,9,4,1)
-hasLocation(#20060,#20061)
-enclosing_stmt(#20060,#20055)
+exprs(#20060,78,#20058,0,"x")
+hasLocation(#20060,#20013)
+enclosing_stmt(#20060,#20056)
 expr_containers(#20060,#20001)
-#20062=*
-properties(#20062,#20060,0,1,"get foo() {return 1}")
-#20063=@"loc,{#10000},2,3,2,22"
-locations_default(#20063,#10000,2,3,2,22)
-hasLocation(#20062,#20063)
-#20064=*
-exprs(#20064,0,#20062,0,"foo")
-hasLocation(#20064,#20021)
-enclosing_stmt(#20064,#20055)
-expr_containers(#20064,#20001)
-literals("foo","foo",#20064)
+literals("x","x",#20060)
+decl(#20060,#20054)
+#20061=*
+exprs(#20061,8,#20058,1,"{\n  get ... v) {}\n}")
+#20062=@"loc,{#10000},1,9,4,1"
+locations_default(#20062,#10000,1,9,4,1)
+hasLocation(#20061,#20062)
+enclosing_stmt(#20061,#20056)
+expr_containers(#20061,#20001)
+#20063=*
+properties(#20063,#20061,0,1,"get foo() {return 1}")
+#20064=@"loc,{#10000},2,3,2,22"
+locations_default(#20064,#10000,2,3,2,22)
+hasLocation(#20063,#20064)
 #20065=*
-exprs(#20065,9,#20062,1,"get foo() {return 1}")
-hasLocation(#20065,#20063)
-enclosing_stmt(#20065,#20055)
+exprs(#20065,0,#20063,0,"foo")
+hasLocation(#20065,#20021)
+enclosing_stmt(#20065,#20056)
 expr_containers(#20065,#20001)
+literals("foo","foo",#20065)
 #20066=*
-scopes(#20066,1)
-scopenodes(#20065,#20066)
-scopenesting(#20066,#20000)
-#20067=@"var;{arguments};{#20066}"
-variables(#20067,"arguments",#20066)
-is_arguments_object(#20067)
-#20068=*
-stmts(#20068,1,#20065,-2,"{return 1}")
-#20069=@"loc,{#10000},2,13,2,22"
-locations_default(#20069,#10000,2,13,2,22)
-hasLocation(#20068,#20069)
-stmt_containers(#20068,#20065)
+exprs(#20066,9,#20063,1,"get foo() {return 1}")
+hasLocation(#20066,#20064)
+enclosing_stmt(#20066,#20056)
+expr_containers(#20066,#20001)
+#20067=*
+scopes(#20067,1)
+scopenodes(#20066,#20067)
+scopenesting(#20067,#20000)
+#20068=@"var;{this};{#20067}"
+variables(#20068,"this",#20067)
+#20069=@"var;{arguments};{#20067}"
+variables(#20069,"arguments",#20067)
+is_arguments_object(#20069)
 #20070=*
-stmts(#20070,9,#20068,0,"return 1")
-#20071=@"loc,{#10000},2,14,2,21"
-locations_default(#20071,#10000,2,14,2,21)
+stmts(#20070,1,#20066,-2,"{return 1}")
+#20071=@"loc,{#10000},2,13,2,22"
+locations_default(#20071,#10000,2,13,2,22)
 hasLocation(#20070,#20071)
-stmt_containers(#20070,#20065)
+stmt_containers(#20070,#20066)
 #20072=*
-exprs(#20072,3,#20070,0,"1")
-hasLocation(#20072,#20031)
-enclosing_stmt(#20072,#20070)
-expr_containers(#20072,#20065)
-literals("1","1",#20072)
-is_method(#20062)
-#20073=*
-properties(#20073,#20060,1,2,"set foo(v) {}")
-#20074=@"loc,{#10000},3,3,3,15"
-locations_default(#20074,#10000,3,3,3,15)
-hasLocation(#20073,#20074)
+stmts(#20072,9,#20070,0,"return 1")
+#20073=@"loc,{#10000},2,14,2,21"
+locations_default(#20073,#10000,2,14,2,21)
+hasLocation(#20072,#20073)
+stmt_containers(#20072,#20066)
+#20074=*
+exprs(#20074,3,#20072,0,"1")
+hasLocation(#20074,#20031)
+enclosing_stmt(#20074,#20072)
+expr_containers(#20074,#20066)
+literals("1","1",#20074)
+is_method(#20063)
 #20075=*
-exprs(#20075,0,#20073,0,"foo")
-hasLocation(#20075,#20039)
-enclosing_stmt(#20075,#20055)
-expr_containers(#20075,#20001)
-literals("foo","foo",#20075)
-#20076=*
-exprs(#20076,9,#20073,1,"set foo(v) {}")
-hasLocation(#20076,#20074)
-enclosing_stmt(#20076,#20055)
-expr_containers(#20076,#20001)
+properties(#20075,#20061,1,2,"set foo(v) {}")
+#20076=@"loc,{#10000},3,3,3,15"
+locations_default(#20076,#10000,3,3,3,15)
+hasLocation(#20075,#20076)
 #20077=*
-scopes(#20077,1)
-scopenodes(#20076,#20077)
-scopenesting(#20077,#20000)
-#20078=@"var;{v};{#20077}"
-variables(#20078,"v",#20077)
+exprs(#20077,0,#20075,0,"foo")
+hasLocation(#20077,#20039)
+enclosing_stmt(#20077,#20056)
+expr_containers(#20077,#20001)
+literals("foo","foo",#20077)
+#20078=*
+exprs(#20078,9,#20075,1,"set foo(v) {}")
+hasLocation(#20078,#20076)
+enclosing_stmt(#20078,#20056)
+expr_containers(#20078,#20001)
 #20079=*
-exprs(#20079,78,#20076,0,"v")
-hasLocation(#20079,#20043)
-expr_containers(#20079,#20076)
-literals("v","v",#20079)
-decl(#20079,#20078)
-#20080=@"var;{arguments};{#20077}"
-variables(#20080,"arguments",#20077)
-is_arguments_object(#20080)
-#20081=*
-stmts(#20081,1,#20076,-2,"{}")
-#20082=@"loc,{#10000},3,14,3,15"
-locations_default(#20082,#10000,3,14,3,15)
-hasLocation(#20081,#20082)
-stmt_containers(#20081,#20076)
-is_method(#20073)
-#20083=*
-entry_cfg_node(#20083,#20001)
-#20084=@"loc,{#10000},1,1,1,0"
-locations_default(#20084,#10000,1,1,1,0)
-hasLocation(#20083,#20084)
-#20085=*
-exit_cfg_node(#20085,#20001)
-hasLocation(#20085,#20052)
-successor(#20055,#20059)
-successor(#20060,#20064)
-successor(#20076,#20073)
+scopes(#20079,1)
+scopenodes(#20078,#20079)
+scopenesting(#20079,#20000)
+#20080=@"var;{this};{#20079}"
+variables(#20080,"this",#20079)
+#20081=@"var;{v};{#20079}"
+variables(#20081,"v",#20079)
+#20082=*
+exprs(#20082,78,#20078,0,"v")
+hasLocation(#20082,#20043)
+expr_containers(#20082,#20078)
+literals("v","v",#20082)
+decl(#20082,#20081)
+#20083=@"var;{arguments};{#20079}"
+variables(#20083,"arguments",#20079)
+is_arguments_object(#20083)
+#20084=*
+stmts(#20084,1,#20078,-2,"{}")
+#20085=@"loc,{#10000},3,14,3,15"
+locations_default(#20085,#10000,3,14,3,15)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20078)
+is_method(#20075)
 #20086=*
-entry_cfg_node(#20086,#20076)
-#20087=@"loc,{#10000},3,3,3,2"
-locations_default(#20087,#10000,3,3,3,2)
+entry_cfg_node(#20086,#20001)
+#20087=@"loc,{#10000},1,1,1,0"
+locations_default(#20087,#10000,1,1,1,0)
 hasLocation(#20086,#20087)
 #20088=*
-exit_cfg_node(#20088,#20076)
-#20089=@"loc,{#10000},3,16,3,15"
-locations_default(#20089,#10000,3,16,3,15)
-hasLocation(#20088,#20089)
-successor(#20081,#20088)
-successor(#20079,#20081)
-successor(#20086,#20079)
-successor(#20075,#20076)
-successor(#20073,#20057)
-successor(#20065,#20062)
-#20090=*
-entry_cfg_node(#20090,#20065)
-#20091=@"loc,{#10000},2,3,2,2"
-locations_default(#20091,#10000,2,3,2,2)
-hasLocation(#20090,#20091)
-#20092=*
-exit_cfg_node(#20092,#20065)
-#20093=@"loc,{#10000},2,23,2,22"
-locations_default(#20093,#10000,2,23,2,22)
-hasLocation(#20092,#20093)
-successor(#20072,#20070)
-successor(#20070,#20092)
-successor(#20068,#20072)
-successor(#20090,#20068)
-successor(#20064,#20065)
-successor(#20062,#20075)
-successor(#20059,#20060)
-successor(#20057,#20085)
-successor(#20083,#20055)
+exit_cfg_node(#20088,#20001)
+hasLocation(#20088,#20052)
+successor(#20056,#20060)
+successor(#20061,#20065)
+successor(#20078,#20075)
+#20089=*
+entry_cfg_node(#20089,#20078)
+#20090=@"loc,{#10000},3,3,3,2"
+locations_default(#20090,#10000,3,3,3,2)
+hasLocation(#20089,#20090)
+#20091=*
+exit_cfg_node(#20091,#20078)
+#20092=@"loc,{#10000},3,16,3,15"
+locations_default(#20092,#10000,3,16,3,15)
+hasLocation(#20091,#20092)
+successor(#20084,#20091)
+successor(#20082,#20084)
+successor(#20089,#20082)
+successor(#20077,#20078)
+successor(#20075,#20058)
+successor(#20066,#20063)
+#20093=*
+entry_cfg_node(#20093,#20066)
+#20094=@"loc,{#10000},2,3,2,2"
+locations_default(#20094,#10000,2,3,2,2)
+hasLocation(#20093,#20094)
+#20095=*
+exit_cfg_node(#20095,#20066)
+#20096=@"loc,{#10000},2,23,2,22"
+locations_default(#20096,#10000,2,23,2,22)
+hasLocation(#20095,#20096)
+successor(#20074,#20072)
+successor(#20072,#20095)
+successor(#20070,#20074)
+successor(#20093,#20070)
+successor(#20065,#20066)
+successor(#20063,#20077)
+successor(#20060,#20061)
+successor(#20058,#20088)
+successor(#20086,#20056)
 numlines(#10000,4,4,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/omitted.ts.trap

@@ -52,35 +52,37 @@ locations_default(#20017,#10000,1,8,1,7)
 hasLocation(#20016,#20017)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20018=*
-stmts(#20018,2,#20001,0,"[, ,1];")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,7,#20018,0,"[, ,1]")
-#20020=@"loc,{#10000},1,1,1,6"
-locations_default(#20020,#10000,1,1,1,6)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,3,#20019,2,"1")
-hasLocation(#20021,#20011)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("1","1",#20021)
-array_size(#20019,3)
+stmts(#20019,2,#20001,0,"[, ,1];")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,7,#20019,0,"[, ,1]")
+#20021=@"loc,{#10000},1,1,1,6"
+locations_default(#20021,#10000,1,1,1,6)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
 #20022=*
-entry_cfg_node(#20022,#20001)
-#20023=@"loc,{#10000},1,1,1,0"
-locations_default(#20023,#10000,1,1,1,0)
-hasLocation(#20022,#20023)
-#20024=*
-exit_cfg_node(#20024,#20001)
-hasLocation(#20024,#20017)
-successor(#20018,#20019)
-successor(#20019,#20021)
-successor(#20021,#20024)
-successor(#20022,#20018)
+exprs(#20022,3,#20020,2,"1")
+hasLocation(#20022,#20011)
+enclosing_stmt(#20022,#20019)
+expr_containers(#20022,#20001)
+literals("1","1",#20022)
+array_size(#20020,3)
+#20023=*
+entry_cfg_node(#20023,#20001)
+#20024=@"loc,{#10000},1,1,1,0"
+locations_default(#20024,#10000,1,1,1,0)
+hasLocation(#20023,#20024)
+#20025=*
+exit_cfg_node(#20025,#20001)
+hasLocation(#20025,#20017)
+successor(#20019,#20020)
+successor(#20020,#20022)
+successor(#20022,#20025)
+successor(#20023,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap

@@ -147,157 +147,159 @@ toplevels(#20001,0)
 #20054=@"loc,{#10000},1,1,4,0"
 locations_default(#20054,#10000,1,1,4,0)
 hasLocation(#20001,#20054)
-#20055=*
-stmts(#20055,2,#20001,0,"base?.x.y;")
-hasLocation(#20055,#20003)
-stmt_containers(#20055,#20001)
+#20055=@"var;{this};{#20000}"
+variables(#20055,"this",#20000)
 #20056=*
-exprs(#20056,14,#20055,0,"base?.x.y")
-#20057=@"loc,{#10000},1,1,1,9"
-locations_default(#20057,#10000,1,1,1,9)
-hasLocation(#20056,#20057)
-enclosing_stmt(#20056,#20055)
-expr_containers(#20056,#20001)
-#20058=*
-exprs(#20058,14,#20056,0,"base?.x")
-#20059=@"loc,{#10000},1,1,1,7"
-locations_default(#20059,#10000,1,1,1,7)
-hasLocation(#20058,#20059)
-enclosing_stmt(#20058,#20055)
-expr_containers(#20058,#20001)
-#20060=*
-exprs(#20060,79,#20058,0,"base")
-hasLocation(#20060,#20009)
-enclosing_stmt(#20060,#20055)
-expr_containers(#20060,#20001)
-literals("base","base",#20060)
-#20061=@"var;{base};{#20000}"
-variables(#20061,"base",#20000)
-bind(#20060,#20061)
-#20062=*
-exprs(#20062,0,#20058,1,"x")
-hasLocation(#20062,#20013)
-enclosing_stmt(#20062,#20055)
-expr_containers(#20062,#20001)
-literals("x","x",#20062)
-isOptionalChaining(#20058)
+stmts(#20056,2,#20001,0,"base?.x.y;")
+hasLocation(#20056,#20003)
+stmt_containers(#20056,#20001)
+#20057=*
+exprs(#20057,14,#20056,0,"base?.x.y")
+#20058=@"loc,{#10000},1,1,1,9"
+locations_default(#20058,#10000,1,1,1,9)
+hasLocation(#20057,#20058)
+enclosing_stmt(#20057,#20056)
+expr_containers(#20057,#20001)
+#20059=*
+exprs(#20059,14,#20057,0,"base?.x")
+#20060=@"loc,{#10000},1,1,1,7"
+locations_default(#20060,#10000,1,1,1,7)
+hasLocation(#20059,#20060)
+enclosing_stmt(#20059,#20056)
+expr_containers(#20059,#20001)
+#20061=*
+exprs(#20061,79,#20059,0,"base")
+hasLocation(#20061,#20009)
+enclosing_stmt(#20061,#20056)
+expr_containers(#20061,#20001)
+literals("base","base",#20061)
+#20062=@"var;{base};{#20000}"
+variables(#20062,"base",#20000)
+bind(#20061,#20062)
 #20063=*
-exprs(#20063,0,#20056,1,"y")
-hasLocation(#20063,#20017)
-enclosing_stmt(#20063,#20055)
+exprs(#20063,0,#20059,1,"x")
+hasLocation(#20063,#20013)
+enclosing_stmt(#20063,#20056)
 expr_containers(#20063,#20001)
-literals("y","y",#20063)
+literals("x","x",#20063)
+isOptionalChaining(#20059)
 #20064=*
-stmts(#20064,2,#20001,1,"base?.(x).y;")
-hasLocation(#20064,#20005)
-stmt_containers(#20064,#20001)
+exprs(#20064,0,#20057,1,"y")
+hasLocation(#20064,#20017)
+enclosing_stmt(#20064,#20056)
+expr_containers(#20064,#20001)
+literals("y","y",#20064)
 #20065=*
-exprs(#20065,14,#20064,0,"base?.(x).y")
-#20066=@"loc,{#10000},2,1,2,11"
-locations_default(#20066,#10000,2,1,2,11)
-hasLocation(#20065,#20066)
-enclosing_stmt(#20065,#20064)
-expr_containers(#20065,#20001)
-#20067=*
-exprs(#20067,13,#20065,0,"base?.(x)")
-#20068=@"loc,{#10000},2,1,2,9"
-locations_default(#20068,#10000,2,1,2,9)
-hasLocation(#20067,#20068)
-enclosing_stmt(#20067,#20064)
-expr_containers(#20067,#20001)
-#20069=*
-exprs(#20069,79,#20067,-1,"base")
-hasLocation(#20069,#20021)
-enclosing_stmt(#20069,#20064)
-expr_containers(#20069,#20001)
-literals("base","base",#20069)
-bind(#20069,#20061)
+stmts(#20065,2,#20001,1,"base?.(x).y;")
+hasLocation(#20065,#20005)
+stmt_containers(#20065,#20001)
+#20066=*
+exprs(#20066,14,#20065,0,"base?.(x).y")
+#20067=@"loc,{#10000},2,1,2,11"
+locations_default(#20067,#10000,2,1,2,11)
+hasLocation(#20066,#20067)
+enclosing_stmt(#20066,#20065)
+expr_containers(#20066,#20001)
+#20068=*
+exprs(#20068,13,#20066,0,"base?.(x)")
+#20069=@"loc,{#10000},2,1,2,9"
+locations_default(#20069,#10000,2,1,2,9)
+hasLocation(#20068,#20069)
+enclosing_stmt(#20068,#20065)
+expr_containers(#20068,#20001)
 #20070=*
-exprs(#20070,79,#20067,0,"x")
-hasLocation(#20070,#20027)
-enclosing_stmt(#20070,#20064)
+exprs(#20070,79,#20068,-1,"base")
+hasLocation(#20070,#20021)
+enclosing_stmt(#20070,#20065)
 expr_containers(#20070,#20001)
-literals("x","x",#20070)
-#20071=@"var;{x};{#20000}"
-variables(#20071,"x",#20000)
-bind(#20070,#20071)
-isOptionalChaining(#20067)
-#20072=*
-exprs(#20072,0,#20065,1,"y")
-hasLocation(#20072,#20033)
-enclosing_stmt(#20072,#20064)
-expr_containers(#20072,#20001)
-literals("y","y",#20072)
+literals("base","base",#20070)
+bind(#20070,#20062)
+#20071=*
+exprs(#20071,79,#20068,0,"x")
+hasLocation(#20071,#20027)
+enclosing_stmt(#20071,#20065)
+expr_containers(#20071,#20001)
+literals("x","x",#20071)
+#20072=@"var;{x};{#20000}"
+variables(#20072,"x",#20000)
+bind(#20071,#20072)
+isOptionalChaining(#20068)
 #20073=*
-stmts(#20073,2,#20001,2,"base?.[z].y;")
-hasLocation(#20073,#20007)
-stmt_containers(#20073,#20001)
+exprs(#20073,0,#20066,1,"y")
+hasLocation(#20073,#20033)
+enclosing_stmt(#20073,#20065)
+expr_containers(#20073,#20001)
+literals("y","y",#20073)
 #20074=*
-exprs(#20074,14,#20073,0,"base?.[z].y")
-#20075=@"loc,{#10000},3,1,3,11"
-locations_default(#20075,#10000,3,1,3,11)
-hasLocation(#20074,#20075)
-enclosing_stmt(#20074,#20073)
-expr_containers(#20074,#20001)
-#20076=*
-exprs(#20076,15,#20074,0,"base?.[z]")
-#20077=@"loc,{#10000},3,1,3,9"
-locations_default(#20077,#10000,3,1,3,9)
-hasLocation(#20076,#20077)
-enclosing_stmt(#20076,#20073)
-expr_containers(#20076,#20001)
-#20078=*
-exprs(#20078,79,#20076,0,"base")
-hasLocation(#20078,#20037)
-enclosing_stmt(#20078,#20073)
-expr_containers(#20078,#20001)
-literals("base","base",#20078)
-bind(#20078,#20061)
+stmts(#20074,2,#20001,2,"base?.[z].y;")
+hasLocation(#20074,#20007)
+stmt_containers(#20074,#20001)
+#20075=*
+exprs(#20075,14,#20074,0,"base?.[z].y")
+#20076=@"loc,{#10000},3,1,3,11"
+locations_default(#20076,#10000,3,1,3,11)
+hasLocation(#20075,#20076)
+enclosing_stmt(#20075,#20074)
+expr_containers(#20075,#20001)
+#20077=*
+exprs(#20077,15,#20075,0,"base?.[z]")
+#20078=@"loc,{#10000},3,1,3,9"
+locations_default(#20078,#10000,3,1,3,9)
+hasLocation(#20077,#20078)
+enclosing_stmt(#20077,#20074)
+expr_containers(#20077,#20001)
 #20079=*
-exprs(#20079,79,#20076,1,"z")
-hasLocation(#20079,#20043)
-enclosing_stmt(#20079,#20073)
+exprs(#20079,79,#20077,0,"base")
+hasLocation(#20079,#20037)
+enclosing_stmt(#20079,#20074)
 expr_containers(#20079,#20001)
-literals("z","z",#20079)
-#20080=@"var;{z};{#20000}"
-variables(#20080,"z",#20000)
-bind(#20079,#20080)
-isOptionalChaining(#20076)
-#20081=*
-exprs(#20081,0,#20074,1,"y")
-hasLocation(#20081,#20049)
-enclosing_stmt(#20081,#20073)
-expr_containers(#20081,#20001)
-literals("y","y",#20081)
+literals("base","base",#20079)
+bind(#20079,#20062)
+#20080=*
+exprs(#20080,79,#20077,1,"z")
+hasLocation(#20080,#20043)
+enclosing_stmt(#20080,#20074)
+expr_containers(#20080,#20001)
+literals("z","z",#20080)
+#20081=@"var;{z};{#20000}"
+variables(#20081,"z",#20000)
+bind(#20080,#20081)
+isOptionalChaining(#20077)
 #20082=*
-entry_cfg_node(#20082,#20001)
-#20083=@"loc,{#10000},1,1,1,0"
-locations_default(#20083,#10000,1,1,1,0)
-hasLocation(#20082,#20083)
-#20084=*
-exit_cfg_node(#20084,#20001)
-hasLocation(#20084,#20053)
-successor(#20073,#20078)
-successor(#20081,#20074)
-successor(#20079,#20076)
-successor(#20078,#20079)
-successor(#20076,#20081)
-successor(#20078,#20084)
-successor(#20074,#20084)
-successor(#20064,#20069)
-successor(#20072,#20065)
-successor(#20070,#20067)
-successor(#20069,#20070)
-successor(#20067,#20072)
-successor(#20069,#20073)
-successor(#20065,#20073)
-successor(#20055,#20060)
-successor(#20063,#20056)
-successor(#20062,#20058)
-successor(#20060,#20062)
-successor(#20058,#20063)
-successor(#20060,#20064)
-successor(#20056,#20064)
-successor(#20082,#20055)
+exprs(#20082,0,#20075,1,"y")
+hasLocation(#20082,#20049)
+enclosing_stmt(#20082,#20074)
+expr_containers(#20082,#20001)
+literals("y","y",#20082)
+#20083=*
+entry_cfg_node(#20083,#20001)
+#20084=@"loc,{#10000},1,1,1,0"
+locations_default(#20084,#10000,1,1,1,0)
+hasLocation(#20083,#20084)
+#20085=*
+exit_cfg_node(#20085,#20001)
+hasLocation(#20085,#20053)
+successor(#20074,#20079)
+successor(#20082,#20075)
+successor(#20080,#20077)
+successor(#20079,#20080)
+successor(#20077,#20082)
+successor(#20079,#20085)
+successor(#20075,#20085)
+successor(#20065,#20070)
+successor(#20073,#20066)
+successor(#20071,#20068)
+successor(#20070,#20071)
+successor(#20068,#20073)
+successor(#20070,#20074)
+successor(#20066,#20074)
+successor(#20056,#20061)
+successor(#20064,#20057)
+successor(#20063,#20059)
+successor(#20061,#20063)
+successor(#20059,#20064)
+successor(#20061,#20065)
+successor(#20057,#20065)
+successor(#20083,#20056)
 numlines(#10000,3,3,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/privateField.ts.trap

@@ -136,138 +136,145 @@ hasLocation(#20001,#20045)
 variables(#20046,"C",#20000)
 #20047=@"local_type_name;{C};{#20000}"
 local_type_names(#20047,"C",#20000)
-#20048=*
-stmts(#20048,26,#20001,0,"class C ... 5;\n }\n}")
-#20049=@"loc,{#10000},1,1,6,1"
-locations_default(#20049,#10000,1,1,6,1)
-hasLocation(#20048,#20049)
-stmt_containers(#20048,#20001)
-#20050=*
-exprs(#20050,78,#20048,0,"C")
-hasLocation(#20050,#20017)
-enclosing_stmt(#20050,#20048)
-expr_containers(#20050,#20001)
-literals("C","C",#20050)
-decl(#20050,#20046)
-typedecl(#20050,#20047)
+#20048=@"var;{this};{#20000}"
+variables(#20048,"this",#20000)
+#20049=*
+stmts(#20049,26,#20001,0,"class C ... 5;\n }\n}")
+#20050=@"loc,{#10000},1,1,6,1"
+locations_default(#20050,#10000,1,1,6,1)
+hasLocation(#20049,#20050)
+stmt_containers(#20049,#20001)
 #20051=*
-scopes(#20051,10)
-scopenodes(#20048,#20051)
-scopenesting(#20051,#20000)
+exprs(#20051,78,#20049,0,"C")
+hasLocation(#20051,#20017)
+enclosing_stmt(#20051,#20049)
+expr_containers(#20051,#20001)
+literals("C","C",#20051)
+decl(#20051,#20046)
+typedecl(#20051,#20047)
 #20052=*
-properties(#20052,#20048,2,8,"#foo;")
-#20053=@"loc,{#10000},2,2,2,6"
-locations_default(#20053,#10000,2,2,2,6)
-hasLocation(#20052,#20053)
+scopes(#20052,10)
+scopenodes(#20049,#20052)
+scopenesting(#20052,#20000)
+#20053=@"var;{this};{#20052}"
+variables(#20053,"this",#20052)
 #20054=*
-#20055=*
-exprs(#20055,0,#20052,0,"#foo")
-#20056=@"loc,{#10000},2,2,2,5"
-locations_default(#20056,#10000,2,2,2,5)
-hasLocation(#20055,#20056)
-expr_containers(#20055,#20054)
-literals("#foo","#foo",#20055)
+properties(#20054,#20049,2,8,"#foo;")
+#20055=@"loc,{#10000},2,2,2,6"
+locations_default(#20055,#10000,2,2,2,6)
+hasLocation(#20054,#20055)
+#20056=*
 #20057=*
-properties(#20057,#20048,3,0,"constru ... = 5;\n }")
-#20058=@"loc,{#10000},3,2,5,2"
-locations_default(#20058,#10000,3,2,5,2)
+exprs(#20057,0,#20054,0,"#foo")
+#20058=@"loc,{#10000},2,2,2,5"
+locations_default(#20058,#10000,2,2,2,5)
 hasLocation(#20057,#20058)
+expr_containers(#20057,#20056)
+literals("#foo","#foo",#20057)
 #20059=*
-exprs(#20059,0,#20057,0,"constru ... = 5;\n }")
-hasLocation(#20059,#20058)
-enclosing_stmt(#20059,#20048)
-expr_containers(#20059,#20001)
-literals("constructor","constructor",#20059)
-exprs(#20054,9,#20057,1,"constru ... = 5;\n }")
-hasLocation(#20054,#20058)
-enclosing_stmt(#20054,#20048)
-expr_containers(#20054,#20001)
-#20060=*
-scopes(#20060,1)
-scopenodes(#20054,#20060)
-scopenesting(#20060,#20051)
-#20061=@"var;{arguments};{#20060}"
-variables(#20061,"arguments",#20060)
-is_arguments_object(#20061)
+properties(#20059,#20049,3,0,"constru ... = 5;\n }")
+#20060=@"loc,{#10000},3,2,5,2"
+locations_default(#20060,#10000,3,2,5,2)
+hasLocation(#20059,#20060)
+#20061=*
+exprs(#20061,0,#20059,0,"constru ... = 5;\n }")
+hasLocation(#20061,#20060)
+enclosing_stmt(#20061,#20049)
+expr_containers(#20061,#20001)
+literals("constructor","constructor",#20061)
+exprs(#20056,9,#20059,1,"constru ... = 5;\n }")
+hasLocation(#20056,#20060)
+enclosing_stmt(#20056,#20049)
+expr_containers(#20056,#20001)
 #20062=*
-stmts(#20062,1,#20054,-2,"{\n   th ... = 5;\n }")
-#20063=@"loc,{#10000},3,16,5,2"
-locations_default(#20063,#10000,3,16,5,2)
-hasLocation(#20062,#20063)
-stmt_containers(#20062,#20054)
-#20064=*
-stmts(#20064,2,#20062,0,"this.#foo = 5;")
-#20065=@"loc,{#10000},4,4,4,17"
-locations_default(#20065,#10000,4,4,4,17)
-hasLocation(#20064,#20065)
-stmt_containers(#20064,#20054)
-#20066=*
-exprs(#20066,47,#20064,0,"this.#foo = 5")
-#20067=@"loc,{#10000},4,4,4,16"
-locations_default(#20067,#10000,4,4,4,16)
-hasLocation(#20066,#20067)
-enclosing_stmt(#20066,#20064)
-expr_containers(#20066,#20054)
-#20068=*
-exprs(#20068,14,#20066,0,"this.#foo")
-#20069=@"loc,{#10000},4,4,4,12"
-locations_default(#20069,#10000,4,4,4,12)
-hasLocation(#20068,#20069)
-enclosing_stmt(#20068,#20064)
-expr_containers(#20068,#20054)
-#20070=*
-exprs(#20070,6,#20068,0,"this")
-hasLocation(#20070,#20031)
-enclosing_stmt(#20070,#20064)
-expr_containers(#20070,#20054)
+scopes(#20062,1)
+scopenodes(#20056,#20062)
+scopenesting(#20062,#20052)
+#20063=@"var;{this};{#20062}"
+variables(#20063,"this",#20062)
+#20064=@"var;{arguments};{#20062}"
+variables(#20064,"arguments",#20062)
+is_arguments_object(#20064)
+#20065=*
+stmts(#20065,1,#20056,-2,"{\n   th ... = 5;\n }")
+#20066=@"loc,{#10000},3,16,5,2"
+locations_default(#20066,#10000,3,16,5,2)
+hasLocation(#20065,#20066)
+stmt_containers(#20065,#20056)
+#20067=*
+stmts(#20067,2,#20065,0,"this.#foo = 5;")
+#20068=@"loc,{#10000},4,4,4,17"
+locations_default(#20068,#10000,4,4,4,17)
+hasLocation(#20067,#20068)
+stmt_containers(#20067,#20056)
+#20069=*
+exprs(#20069,47,#20067,0,"this.#foo = 5")
+#20070=@"loc,{#10000},4,4,4,16"
+locations_default(#20070,#10000,4,4,4,16)
+hasLocation(#20069,#20070)
+enclosing_stmt(#20069,#20067)
+expr_containers(#20069,#20056)
 #20071=*
-exprs(#20071,0,#20068,1,"#foo")
-#20072=@"loc,{#10000},4,9,4,12"
-locations_default(#20072,#10000,4,9,4,12)
+exprs(#20071,14,#20069,0,"this.#foo")
+#20072=@"loc,{#10000},4,4,4,12"
+locations_default(#20072,#10000,4,4,4,12)
 hasLocation(#20071,#20072)
-enclosing_stmt(#20071,#20064)
-expr_containers(#20071,#20054)
-literals("#foo","#foo",#20071)
+enclosing_stmt(#20071,#20067)
+expr_containers(#20071,#20056)
 #20073=*
-exprs(#20073,3,#20066,1,"5")
-hasLocation(#20073,#20037)
-enclosing_stmt(#20073,#20064)
-expr_containers(#20073,#20054)
-literals("5","5",#20073)
-is_method(#20057)
+exprs(#20073,6,#20071,0,"this")
+hasLocation(#20073,#20031)
+enclosing_stmt(#20073,#20067)
+expr_containers(#20073,#20056)
+bind(#20073,#20063)
 #20074=*
-entry_cfg_node(#20074,#20001)
-#20075=@"loc,{#10000},1,1,1,0"
-locations_default(#20075,#10000,1,1,1,0)
+exprs(#20074,0,#20071,1,"#foo")
+#20075=@"loc,{#10000},4,9,4,12"
+locations_default(#20075,#10000,4,9,4,12)
 hasLocation(#20074,#20075)
+enclosing_stmt(#20074,#20067)
+expr_containers(#20074,#20056)
+literals("#foo","#foo",#20074)
 #20076=*
-exit_cfg_node(#20076,#20001)
-hasLocation(#20076,#20044)
-successor(#20055,#20052)
-successor(#20054,#20057)
+exprs(#20076,3,#20069,1,"5")
+hasLocation(#20076,#20037)
+enclosing_stmt(#20076,#20067)
+expr_containers(#20076,#20056)
+literals("5","5",#20076)
+is_method(#20059)
 #20077=*
-entry_cfg_node(#20077,#20054)
-#20078=@"loc,{#10000},3,2,3,1"
-locations_default(#20078,#10000,3,2,3,1)
+entry_cfg_node(#20077,#20001)
+#20078=@"loc,{#10000},1,1,1,0"
+locations_default(#20078,#10000,1,1,1,0)
 hasLocation(#20077,#20078)
-successor(#20052,#20062)
 #20079=*
-exit_cfg_node(#20079,#20054)
-#20080=@"loc,{#10000},5,3,5,2"
-locations_default(#20080,#10000,5,3,5,2)
-hasLocation(#20079,#20080)
-successor(#20064,#20070)
-successor(#20073,#20066)
-successor(#20071,#20068)
-successor(#20070,#20071)
-successor(#20068,#20073)
-successor(#20066,#20079)
-successor(#20062,#20064)
-successor(#20077,#20055)
-successor(#20059,#20054)
-successor(#20057,#20048)
-successor(#20050,#20059)
-successor(#20048,#20076)
-successor(#20074,#20050)
+exit_cfg_node(#20079,#20001)
+hasLocation(#20079,#20044)
+successor(#20057,#20054)
+successor(#20056,#20059)
+#20080=*
+entry_cfg_node(#20080,#20056)
+#20081=@"loc,{#10000},3,2,3,1"
+locations_default(#20081,#10000,3,2,3,1)
+hasLocation(#20080,#20081)
+successor(#20054,#20065)
+#20082=*
+exit_cfg_node(#20082,#20056)
+#20083=@"loc,{#10000},5,3,5,2"
+locations_default(#20083,#10000,5,3,5,2)
+hasLocation(#20082,#20083)
+successor(#20067,#20073)
+successor(#20076,#20069)
+successor(#20074,#20071)
+successor(#20073,#20074)
+successor(#20071,#20076)
+successor(#20069,#20082)
+successor(#20065,#20067)
+successor(#20080,#20057)
+successor(#20061,#20056)
+successor(#20059,#20049)
+successor(#20051,#20061)
+successor(#20049,#20079)
+successor(#20077,#20051)
 numlines(#10000,6,6,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/regexp.ts.trap

@@ -25,32 +25,34 @@ locations_default(#20006,#10000,1,4,1,3)
 hasLocation(#20005,#20006)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20007=*
-stmts(#20007,2,#20001,0,"/a/")
-hasLocation(#20007,#20003)
-stmt_containers(#20007,#20001)
+#20007=@"var;{this};{#20000}"
+variables(#20007,"this",#20000)
 #20008=*
-exprs(#20008,5,#20007,0,"/a/")
+stmts(#20008,2,#20001,0,"/a/")
 hasLocation(#20008,#20003)
-enclosing_stmt(#20008,#20007)
-expr_containers(#20008,#20001)
-literals("/a/","/a/",#20008)
+stmt_containers(#20008,#20001)
 #20009=*
-regexpterm(#20009,14,#20008,0,"a")
-#20010=@"loc,{#10000},1,2,1,2"
-locations_default(#20010,#10000,1,2,1,2)
-hasLocation(#20009,#20010)
-regexp_const_value(#20009,"a")
-#20011=*
-entry_cfg_node(#20011,#20001)
-#20012=@"loc,{#10000},1,1,1,0"
-locations_default(#20012,#10000,1,1,1,0)
-hasLocation(#20011,#20012)
-#20013=*
-exit_cfg_node(#20013,#20001)
-hasLocation(#20013,#20006)
-successor(#20007,#20008)
-successor(#20008,#20013)
-successor(#20011,#20007)
+exprs(#20009,5,#20008,0,"/a/")
+hasLocation(#20009,#20003)
+enclosing_stmt(#20009,#20008)
+expr_containers(#20009,#20001)
+literals("/a/","/a/",#20009)
+#20010=*
+regexpterm(#20010,14,#20009,0,"a")
+#20011=@"loc,{#10000},1,2,1,2"
+locations_default(#20011,#10000,1,2,1,2)
+hasLocation(#20010,#20011)
+regexp_const_value(#20010,"a")
+#20012=*
+entry_cfg_node(#20012,#20001)
+#20013=@"loc,{#10000},1,1,1,0"
+locations_default(#20013,#10000,1,1,1,0)
+hasLocation(#20012,#20013)
+#20014=*
+exit_cfg_node(#20014,#20001)
+hasLocation(#20014,#20006)
+successor(#20008,#20009)
+successor(#20009,#20014)
+successor(#20012,#20008)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/templates.ts.trap

@@ -60,83 +60,85 @@ toplevels(#20001,0)
 #20020=@"loc,{#10000},1,1,2,0"
 locations_default(#20020,#10000,1,1,2,0)
 hasLocation(#20001,#20020)
-#20021=*
-stmts(#20021,2,#20001,0,"`url(""$ ... age}"")`")
-hasLocation(#20021,#20003)
-stmt_containers(#20021,#20001)
+#20021=@"var;{this};{#20000}"
+variables(#20021,"this",#20000)
 #20022=*
-exprs(#20022,71,#20021,0,"`url(""$ ... age}"")`")
+stmts(#20022,2,#20001,0,"`url(""$ ... age}"")`")
 hasLocation(#20022,#20003)
-enclosing_stmt(#20022,#20021)
-expr_containers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
-exprs(#20023,72,#20022,0,"url(""")
-#20024=@"loc,{#10000},1,2,1,6"
-locations_default(#20024,#10000,1,2,1,6)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20021)
+exprs(#20023,71,#20022,0,"`url(""$ ... age}"")`")
+hasLocation(#20023,#20003)
+enclosing_stmt(#20023,#20022)
 expr_containers(#20023,#20001)
-literals("url(""","url(""",#20023)
-#20025=*
-exprs(#20025,14,#20022,1,"ctx.expected.image")
-#20026=@"loc,{#10000},1,9,1,26"
-locations_default(#20026,#10000,1,9,1,26)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20021)
-expr_containers(#20025,#20001)
-#20027=*
-exprs(#20027,14,#20025,0,"ctx.expected")
-#20028=@"loc,{#10000},1,9,1,20"
-locations_default(#20028,#10000,1,9,1,20)
-hasLocation(#20027,#20028)
-enclosing_stmt(#20027,#20021)
-expr_containers(#20027,#20001)
-#20029=*
-exprs(#20029,79,#20027,0,"ctx")
-hasLocation(#20029,#20007)
-enclosing_stmt(#20029,#20021)
-expr_containers(#20029,#20001)
-literals("ctx","ctx",#20029)
-#20030=@"var;{ctx};{#20000}"
-variables(#20030,"ctx",#20000)
-bind(#20029,#20030)
-#20031=*
-exprs(#20031,0,#20027,1,"expected")
-hasLocation(#20031,#20011)
-enclosing_stmt(#20031,#20021)
-expr_containers(#20031,#20001)
-literals("expected","expected",#20031)
+#20024=*
+exprs(#20024,72,#20023,0,"url(""")
+#20025=@"loc,{#10000},1,2,1,6"
+locations_default(#20025,#10000,1,2,1,6)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20022)
+expr_containers(#20024,#20001)
+literals("url(""","url(""",#20024)
+#20026=*
+exprs(#20026,14,#20023,1,"ctx.expected.image")
+#20027=@"loc,{#10000},1,9,1,26"
+locations_default(#20027,#10000,1,9,1,26)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20022)
+expr_containers(#20026,#20001)
+#20028=*
+exprs(#20028,14,#20026,0,"ctx.expected")
+#20029=@"loc,{#10000},1,9,1,20"
+locations_default(#20029,#10000,1,9,1,20)
+hasLocation(#20028,#20029)
+enclosing_stmt(#20028,#20022)
+expr_containers(#20028,#20001)
+#20030=*
+exprs(#20030,79,#20028,0,"ctx")
+hasLocation(#20030,#20007)
+enclosing_stmt(#20030,#20022)
+expr_containers(#20030,#20001)
+literals("ctx","ctx",#20030)
+#20031=@"var;{ctx};{#20000}"
+variables(#20031,"ctx",#20000)
+bind(#20030,#20031)
 #20032=*
-exprs(#20032,0,#20025,1,"image")
-hasLocation(#20032,#20015)
-enclosing_stmt(#20032,#20021)
+exprs(#20032,0,#20028,1,"expected")
+hasLocation(#20032,#20011)
+enclosing_stmt(#20032,#20022)
 expr_containers(#20032,#20001)
-literals("image","image",#20032)
+literals("expected","expected",#20032)
 #20033=*
-exprs(#20033,72,#20022,2,""")")
-#20034=@"loc,{#10000},1,28,1,29"
-locations_default(#20034,#10000,1,28,1,29)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20021)
+exprs(#20033,0,#20026,1,"image")
+hasLocation(#20033,#20015)
+enclosing_stmt(#20033,#20022)
 expr_containers(#20033,#20001)
-literals(""")",""")",#20033)
-#20035=*
-entry_cfg_node(#20035,#20001)
-#20036=@"loc,{#10000},1,1,1,0"
-locations_default(#20036,#10000,1,1,1,0)
-hasLocation(#20035,#20036)
-#20037=*
-exit_cfg_node(#20037,#20001)
-hasLocation(#20037,#20019)
-successor(#20021,#20022)
+literals("image","image",#20033)
+#20034=*
+exprs(#20034,72,#20023,2,""")")
+#20035=@"loc,{#10000},1,28,1,29"
+locations_default(#20035,#10000,1,28,1,29)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20022)
+expr_containers(#20034,#20001)
+literals(""")",""")",#20034)
+#20036=*
+entry_cfg_node(#20036,#20001)
+#20037=@"loc,{#10000},1,1,1,0"
+locations_default(#20037,#10000,1,1,1,0)
+hasLocation(#20036,#20037)
+#20038=*
+exit_cfg_node(#20038,#20001)
+hasLocation(#20038,#20019)
 successor(#20022,#20023)
-successor(#20033,#20037)
-successor(#20032,#20025)
-successor(#20031,#20027)
-successor(#20029,#20031)
-successor(#20027,#20032)
-successor(#20025,#20033)
-successor(#20023,#20029)
-successor(#20035,#20021)
+successor(#20023,#20024)
+successor(#20034,#20038)
+successor(#20033,#20026)
+successor(#20032,#20028)
+successor(#20030,#20032)
+successor(#20028,#20033)
+successor(#20026,#20034)
+successor(#20024,#20030)
+successor(#20036,#20022)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap

@@ -433,333 +433,349 @@ variables(#20162,"C",#20000)
 local_type_names(#20163,"C",#20000)
 #20164=@"local_type_name;{I};{#20000}"
 local_type_names(#20164,"I",#20000)
-#20165=*
-stmts(#20165,17,#20001,0,"functio ... ber) {}")
-hasLocation(#20165,#20003)
-stmt_containers(#20165,#20001)
+#20165=@"var;{this};{#20000}"
+variables(#20165,"this",#20000)
 #20166=*
-exprs(#20166,78,#20165,-1,"declaration")
-hasLocation(#20166,#20033)
-expr_containers(#20166,#20165)
-literals("declaration","declaration",#20166)
-decl(#20166,#20159)
+stmts(#20166,17,#20001,0,"functio ... ber) {}")
+hasLocation(#20166,#20003)
+stmt_containers(#20166,#20001)
 #20167=*
-scopes(#20167,1)
-scopenodes(#20165,#20167)
-scopenesting(#20167,#20000)
-#20168=@"var;{x};{#20167}"
-variables(#20168,"x",#20167)
-#20169=*
-exprs(#20169,78,#20165,0,"x")
-hasLocation(#20169,#20045)
-expr_containers(#20169,#20165)
-literals("x","x",#20169)
-decl(#20169,#20168)
-#20170=@"var;{arguments};{#20167}"
-variables(#20170,"arguments",#20167)
-is_arguments_object(#20170)
+exprs(#20167,78,#20166,-1,"declaration")
+hasLocation(#20167,#20033)
+expr_containers(#20167,#20166)
+literals("declaration","declaration",#20167)
+decl(#20167,#20159)
+#20168=*
+scopes(#20168,1)
+scopenodes(#20166,#20168)
+scopenesting(#20168,#20000)
+#20169=@"var;{this};{#20168}"
+variables(#20169,"this",#20168)
+#20170=@"var;{x};{#20168}"
+variables(#20170,"x",#20168)
 #20171=*
-typeexprs(#20171,2,#20165,-4,"void")
-hasLocation(#20171,#20041)
-expr_containers(#20171,#20165)
-literals("void","void",#20171)
-#20172=*
-typeexprs(#20172,2,#20165,-6,"number")
-hasLocation(#20172,#20049)
-expr_containers(#20172,#20165)
-literals("number","number",#20172)
+exprs(#20171,78,#20166,0,"x")
+hasLocation(#20171,#20045)
+expr_containers(#20171,#20166)
+literals("x","x",#20171)
+decl(#20171,#20170)
+#20172=@"var;{arguments};{#20168}"
+variables(#20172,"arguments",#20168)
+is_arguments_object(#20172)
 #20173=*
-stmts(#20173,1,#20165,-2,"{}")
-#20174=@"loc,{#10000},1,45,1,46"
-locations_default(#20174,#10000,1,45,1,46)
-hasLocation(#20173,#20174)
-stmt_containers(#20173,#20165)
+typeexprs(#20173,2,#20166,-4,"void")
+hasLocation(#20173,#20041)
+expr_containers(#20173,#20166)
+literals("void","void",#20173)
+#20174=*
+typeexprs(#20174,2,#20166,-6,"number")
+hasLocation(#20174,#20049)
+expr_containers(#20174,#20166)
+literals("number","number",#20174)
 #20175=*
-stmts(#20175,18,#20001,1,"var f = ... ber) {}")
-hasLocation(#20175,#20007)
-stmt_containers(#20175,#20001)
-#20176=*
-exprs(#20176,64,#20175,0,"f = fun ... ber) {}")
-#20177=@"loc,{#10000},3,5,3,44"
-locations_default(#20177,#10000,3,5,3,44)
-hasLocation(#20176,#20177)
-enclosing_stmt(#20176,#20175)
-expr_containers(#20176,#20001)
+stmts(#20175,1,#20166,-2,"{}")
+#20176=@"loc,{#10000},1,45,1,46"
+locations_default(#20176,#10000,1,45,1,46)
+hasLocation(#20175,#20176)
+stmt_containers(#20175,#20166)
+#20177=*
+stmts(#20177,18,#20001,1,"var f = ... ber) {}")
+hasLocation(#20177,#20007)
+stmt_containers(#20177,#20001)
 #20178=*
-exprs(#20178,78,#20176,0,"f")
-hasLocation(#20178,#20059)
-enclosing_stmt(#20178,#20175)
+exprs(#20178,64,#20177,0,"f = fun ... ber) {}")
+#20179=@"loc,{#10000},3,5,3,44"
+locations_default(#20179,#10000,3,5,3,44)
+hasLocation(#20178,#20179)
+enclosing_stmt(#20178,#20177)
 expr_containers(#20178,#20001)
-literals("f","f",#20178)
-decl(#20178,#20160)
-#20179=*
-exprs(#20179,9,#20176,1,"functio ... ber) {}")
-#20180=@"loc,{#10000},3,9,3,44"
-locations_default(#20180,#10000,3,9,3,44)
-hasLocation(#20179,#20180)
-enclosing_stmt(#20179,#20175)
-expr_containers(#20179,#20001)
+#20180=*
+exprs(#20180,78,#20178,0,"f")
+hasLocation(#20180,#20059)
+enclosing_stmt(#20180,#20177)
+expr_containers(#20180,#20001)
+literals("f","f",#20180)
+decl(#20180,#20160)
 #20181=*
-scopes(#20181,1)
-scopenodes(#20179,#20181)
-scopenesting(#20181,#20000)
-#20182=@"var;{x};{#20181}"
-variables(#20182,"x",#20181)
+exprs(#20181,9,#20178,1,"functio ... ber) {}")
+#20182=@"loc,{#10000},3,9,3,44"
+locations_default(#20182,#10000,3,9,3,44)
+hasLocation(#20181,#20182)
+enclosing_stmt(#20181,#20177)
+expr_containers(#20181,#20001)
 #20183=*
-exprs(#20183,78,#20179,0,"x")
-hasLocation(#20183,#20075)
-expr_containers(#20183,#20179)
-literals("x","x",#20183)
-decl(#20183,#20182)
-#20184=@"var;{arguments};{#20181}"
-variables(#20184,"arguments",#20181)
-is_arguments_object(#20184)
-#20185=*
-typeexprs(#20185,2,#20179,-4,"string")
-hasLocation(#20185,#20071)
-expr_containers(#20185,#20179)
-literals("string","string",#20185)
+scopes(#20183,1)
+scopenodes(#20181,#20183)
+scopenesting(#20183,#20000)
+#20184=@"var;{this};{#20183}"
+variables(#20184,"this",#20183)
+#20185=@"var;{x};{#20183}"
+variables(#20185,"x",#20183)
 #20186=*
-typeexprs(#20186,2,#20179,-6,"number")
-hasLocation(#20186,#20079)
-expr_containers(#20186,#20179)
-literals("number","number",#20186)
-#20187=*
-stmts(#20187,1,#20179,-2,"{}")
-#20188=@"loc,{#10000},3,43,3,44"
-locations_default(#20188,#10000,3,43,3,44)
-hasLocation(#20187,#20188)
-stmt_containers(#20187,#20179)
+exprs(#20186,78,#20181,0,"x")
+hasLocation(#20186,#20075)
+expr_containers(#20186,#20181)
+literals("x","x",#20186)
+decl(#20186,#20185)
+#20187=@"var;{arguments};{#20183}"
+variables(#20187,"arguments",#20183)
+is_arguments_object(#20187)
+#20188=*
+typeexprs(#20188,2,#20181,-4,"string")
+hasLocation(#20188,#20071)
+expr_containers(#20188,#20181)
+literals("string","string",#20188)
 #20189=*
-stmts(#20189,17,#20001,2,"declare ... umber);")
-hasLocation(#20189,#20011)
-stmt_containers(#20189,#20001)
-has_declare_keyword(#20189)
+typeexprs(#20189,2,#20181,-6,"number")
+hasLocation(#20189,#20079)
+expr_containers(#20189,#20181)
+literals("number","number",#20189)
 #20190=*
-exprs(#20190,78,#20189,-1,"ambient")
-hasLocation(#20190,#20091)
-expr_containers(#20190,#20189)
-literals("ambient","ambient",#20190)
-decl(#20190,#20161)
-#20191=*
-scopes(#20191,1)
-scopenodes(#20189,#20191)
-scopenesting(#20191,#20000)
-#20192=@"var;{x};{#20191}"
-variables(#20192,"x",#20191)
+stmts(#20190,1,#20181,-2,"{}")
+#20191=@"loc,{#10000},3,43,3,44"
+locations_default(#20191,#10000,3,43,3,44)
+hasLocation(#20190,#20191)
+stmt_containers(#20190,#20181)
+#20192=*
+stmts(#20192,17,#20001,2,"declare ... umber);")
+hasLocation(#20192,#20011)
+stmt_containers(#20192,#20001)
+has_declare_keyword(#20192)
 #20193=*
-exprs(#20193,78,#20189,0,"x")
-hasLocation(#20193,#20103)
-expr_containers(#20193,#20189)
-literals("x","x",#20193)
-decl(#20193,#20192)
-#20194=@"var;{arguments};{#20191}"
-variables(#20194,"arguments",#20191)
-is_arguments_object(#20194)
-#20195=*
-typeexprs(#20195,2,#20189,-4,"string")
-hasLocation(#20195,#20099)
-expr_containers(#20195,#20189)
-literals("string","string",#20195)
-#20196=*
-typeexprs(#20196,2,#20189,-6,"number")
-hasLocation(#20196,#20107)
-expr_containers(#20196,#20189)
-literals("number","number",#20196)
+exprs(#20193,78,#20192,-1,"ambient")
+hasLocation(#20193,#20091)
+expr_containers(#20193,#20192)
+literals("ambient","ambient",#20193)
+decl(#20193,#20161)
+#20194=*
+scopes(#20194,1)
+scopenodes(#20192,#20194)
+scopenesting(#20194,#20000)
+#20195=@"var;{this};{#20194}"
+variables(#20195,"this",#20194)
+#20196=@"var;{x};{#20194}"
+variables(#20196,"x",#20194)
 #20197=*
-stmts(#20197,26,#20001,3,"class C ... C) {}\n}")
-#20198=@"loc,{#10000},7,1,9,1"
-locations_default(#20198,#10000,7,1,9,1)
-hasLocation(#20197,#20198)
-stmt_containers(#20197,#20001)
+exprs(#20197,78,#20192,0,"x")
+hasLocation(#20197,#20103)
+expr_containers(#20197,#20192)
+literals("x","x",#20197)
+decl(#20197,#20196)
+#20198=@"var;{arguments};{#20194}"
+variables(#20198,"arguments",#20194)
+is_arguments_object(#20198)
 #20199=*
-exprs(#20199,78,#20197,0,"C")
-hasLocation(#20199,#20115)
-enclosing_stmt(#20199,#20197)
-expr_containers(#20199,#20001)
-literals("C","C",#20199)
-decl(#20199,#20162)
-typedecl(#20199,#20163)
+typeexprs(#20199,2,#20192,-4,"string")
+hasLocation(#20199,#20099)
+expr_containers(#20199,#20192)
+literals("string","string",#20199)
 #20200=*
-scopes(#20200,10)
-scopenodes(#20197,#20200)
-scopenesting(#20200,#20000)
+typeexprs(#20200,2,#20192,-6,"number")
+hasLocation(#20200,#20107)
+expr_containers(#20200,#20192)
+literals("number","number",#20200)
 #20201=*
-properties(#20201,#20197,2,0,"member(this: C) {}")
-#20202=@"loc,{#10000},8,3,8,20"
-locations_default(#20202,#10000,8,3,8,20)
+stmts(#20201,26,#20001,3,"class C ... C) {}\n}")
+#20202=@"loc,{#10000},7,1,9,1"
+locations_default(#20202,#10000,7,1,9,1)
 hasLocation(#20201,#20202)
+stmt_containers(#20201,#20001)
 #20203=*
-exprs(#20203,0,#20201,0,"member")
-hasLocation(#20203,#20119)
-enclosing_stmt(#20203,#20197)
+exprs(#20203,78,#20201,0,"C")
+hasLocation(#20203,#20115)
+enclosing_stmt(#20203,#20201)
 expr_containers(#20203,#20001)
-literals("member","member",#20203)
+literals("C","C",#20203)
+decl(#20203,#20162)
+typedecl(#20203,#20163)
 #20204=*
-exprs(#20204,9,#20201,1,"member(this: C) {}")
-hasLocation(#20204,#20202)
-enclosing_stmt(#20204,#20197)
-expr_containers(#20204,#20001)
-#20205=*
-scopes(#20205,1)
-scopenodes(#20204,#20205)
-scopenesting(#20205,#20200)
-#20206=@"var;{arguments};{#20205}"
-variables(#20206,"arguments",#20205)
-is_arguments_object(#20206)
-#20207=*
-typeexprs(#20207,0,#20204,-4,"C")
-hasLocation(#20207,#20127)
-expr_containers(#20207,#20204)
-literals("C","C",#20207)
-typebind(#20207,#20163)
+scopes(#20204,10)
+scopenodes(#20201,#20204)
+scopenesting(#20204,#20000)
+#20205=@"var;{this};{#20204}"
+variables(#20205,"this",#20204)
+#20206=*
+properties(#20206,#20201,2,0,"member(this: C) {}")
+#20207=@"loc,{#10000},8,3,8,20"
+locations_default(#20207,#10000,8,3,8,20)
+hasLocation(#20206,#20207)
 #20208=*
-stmts(#20208,1,#20204,-2,"{}")
-#20209=@"loc,{#10000},8,19,8,20"
-locations_default(#20209,#10000,8,19,8,20)
-hasLocation(#20208,#20209)
-stmt_containers(#20208,#20204)
-is_method(#20201)
+exprs(#20208,0,#20206,0,"member")
+hasLocation(#20208,#20119)
+enclosing_stmt(#20208,#20201)
+expr_containers(#20208,#20001)
+literals("member","member",#20208)
+#20209=*
+exprs(#20209,9,#20206,1,"member(this: C) {}")
+hasLocation(#20209,#20207)
+enclosing_stmt(#20209,#20201)
+expr_containers(#20209,#20001)
 #20210=*
-properties(#20210,#20197,3,0,"constructor() {}")
-#20211=@"loc,{#10000},7,9,7,8"
-locations_default(#20211,#10000,7,9,7,8)
-hasLocation(#20210,#20211)
-#20212=*
-exprs(#20212,0,#20210,0,"constructor")
-hasLocation(#20212,#20211)
-enclosing_stmt(#20212,#20197)
-expr_containers(#20212,#20001)
-literals("constructor","constructor",#20212)
+scopes(#20210,1)
+scopenodes(#20209,#20210)
+scopenesting(#20210,#20204)
+#20211=@"var;{this};{#20210}"
+variables(#20211,"this",#20210)
+#20212=@"var;{arguments};{#20210}"
+variables(#20212,"arguments",#20210)
+is_arguments_object(#20212)
 #20213=*
-exprs(#20213,9,#20210,1,"() {}")
-hasLocation(#20213,#20211)
-enclosing_stmt(#20213,#20197)
-expr_containers(#20213,#20001)
+typeexprs(#20213,0,#20209,-4,"C")
+hasLocation(#20213,#20127)
+expr_containers(#20213,#20209)
+literals("C","C",#20213)
+typebind(#20213,#20163)
 #20214=*
-scopes(#20214,1)
-scopenodes(#20213,#20214)
-scopenesting(#20214,#20200)
-#20215=@"var;{arguments};{#20214}"
-variables(#20215,"arguments",#20214)
-is_arguments_object(#20215)
+stmts(#20214,1,#20209,-2,"{}")
+#20215=@"loc,{#10000},8,19,8,20"
+locations_default(#20215,#10000,8,19,8,20)
+hasLocation(#20214,#20215)
+stmt_containers(#20214,#20209)
+is_method(#20206)
 #20216=*
-stmts(#20216,1,#20213,-2,"{}")
-hasLocation(#20216,#20211)
-stmt_containers(#20216,#20213)
-is_method(#20210)
-#20217=*
-stmts(#20217,34,#20001,4,"interfa ... : I);\n}")
-#20218=@"loc,{#10000},11,1,13,1"
-locations_default(#20218,#10000,11,1,13,1)
-hasLocation(#20217,#20218)
-stmt_containers(#20217,#20001)
+properties(#20216,#20201,3,0,"constructor() {}")
+#20217=@"loc,{#10000},7,9,7,8"
+locations_default(#20217,#10000,7,9,7,8)
+hasLocation(#20216,#20217)
+#20218=*
+exprs(#20218,0,#20216,0,"constructor")
+hasLocation(#20218,#20217)
+enclosing_stmt(#20218,#20201)
+expr_containers(#20218,#20001)
+literals("constructor","constructor",#20218)
 #20219=*
-typeexprs(#20219,1,#20217,0,"I")
-hasLocation(#20219,#20138)
-enclosing_stmt(#20219,#20217)
+exprs(#20219,9,#20216,1,"() {}")
+hasLocation(#20219,#20217)
+enclosing_stmt(#20219,#20201)
 expr_containers(#20219,#20001)
-literals("I","I",#20219)
-typedecl(#20219,#20164)
 #20220=*
-properties(#20220,#20217,2,0,"method(this: I);")
-#20221=@"loc,{#10000},12,3,12,18"
-locations_default(#20221,#10000,12,3,12,18)
-hasLocation(#20220,#20221)
-#20222=*
-exprs(#20222,0,#20220,0,"method")
-hasLocation(#20222,#20142)
-enclosing_stmt(#20222,#20217)
-expr_containers(#20222,#20001)
-literals("method","method",#20222)
+scopes(#20220,1)
+scopenodes(#20219,#20220)
+scopenesting(#20220,#20204)
+#20221=@"var;{this};{#20220}"
+variables(#20221,"this",#20220)
+#20222=@"var;{arguments};{#20220}"
+variables(#20222,"arguments",#20220)
+is_arguments_object(#20222)
 #20223=*
-exprs(#20223,9,#20220,1,"method(this: I);")
-hasLocation(#20223,#20221)
-enclosing_stmt(#20223,#20217)
-expr_containers(#20223,#20001)
+stmts(#20223,1,#20219,-2,"{}")
+hasLocation(#20223,#20217)
+stmt_containers(#20223,#20219)
+is_method(#20216)
 #20224=*
-scopes(#20224,1)
-scopenodes(#20223,#20224)
-scopenesting(#20224,#20000)
-#20225=@"var;{arguments};{#20224}"
-variables(#20225,"arguments",#20224)
-is_arguments_object(#20225)
+stmts(#20224,34,#20001,4,"interfa ... : I);\n}")
+#20225=@"loc,{#10000},11,1,13,1"
+locations_default(#20225,#10000,11,1,13,1)
+hasLocation(#20224,#20225)
+stmt_containers(#20224,#20001)
 #20226=*
-typeexprs(#20226,0,#20223,-4,"I")
-hasLocation(#20226,#20150)
-expr_containers(#20226,#20223)
+typeexprs(#20226,1,#20224,0,"I")
+hasLocation(#20226,#20138)
+enclosing_stmt(#20226,#20224)
+expr_containers(#20226,#20001)
 literals("I","I",#20226)
-typebind(#20226,#20164)
-is_method(#20220)
-is_abstract_member(#20220)
+typedecl(#20226,#20164)
 #20227=*
-entry_cfg_node(#20227,#20001)
-#20228=@"loc,{#10000},1,1,1,0"
-locations_default(#20228,#10000,1,1,1,0)
+properties(#20227,#20224,2,0,"method(this: I);")
+#20228=@"loc,{#10000},12,3,12,18"
+locations_default(#20228,#10000,12,3,12,18)
 hasLocation(#20227,#20228)
 #20229=*
-exit_cfg_node(#20229,#20001)
-hasLocation(#20229,#20157)
-successor(#20217,#20229)
-successor(#20213,#20210)
+exprs(#20229,0,#20227,0,"method")
+hasLocation(#20229,#20142)
+enclosing_stmt(#20229,#20224)
+expr_containers(#20229,#20001)
+literals("method","method",#20229)
 #20230=*
-entry_cfg_node(#20230,#20213)
-hasLocation(#20230,#20211)
+exprs(#20230,9,#20227,1,"method(this: I);")
+hasLocation(#20230,#20228)
+enclosing_stmt(#20230,#20224)
+expr_containers(#20230,#20001)
 #20231=*
-exit_cfg_node(#20231,#20213)
-hasLocation(#20231,#20211)
-successor(#20216,#20231)
-successor(#20230,#20216)
-successor(#20212,#20213)
-successor(#20210,#20197)
-successor(#20204,#20201)
-#20232=*
-entry_cfg_node(#20232,#20204)
-#20233=@"loc,{#10000},8,3,8,2"
-locations_default(#20233,#10000,8,3,8,2)
-hasLocation(#20232,#20233)
+scopes(#20231,1)
+scopenodes(#20230,#20231)
+scopenesting(#20231,#20000)
+#20232=@"var;{this};{#20231}"
+variables(#20232,"this",#20231)
+#20233=@"var;{arguments};{#20231}"
+variables(#20233,"arguments",#20231)
+is_arguments_object(#20233)
 #20234=*
-exit_cfg_node(#20234,#20204)
-#20235=@"loc,{#10000},8,21,8,20"
-locations_default(#20235,#10000,8,21,8,20)
-hasLocation(#20234,#20235)
-successor(#20208,#20234)
-successor(#20232,#20208)
-successor(#20203,#20204)
-successor(#20201,#20212)
-successor(#20199,#20203)
-successor(#20197,#20217)
-successor(#20189,#20199)
-successor(#20175,#20178)
-successor(#20179,#20176)
-#20236=*
-entry_cfg_node(#20236,#20179)
-#20237=@"loc,{#10000},3,9,3,8"
-locations_default(#20237,#10000,3,9,3,8)
-hasLocation(#20236,#20237)
+typeexprs(#20234,0,#20230,-4,"I")
+hasLocation(#20234,#20150)
+expr_containers(#20234,#20230)
+literals("I","I",#20234)
+typebind(#20234,#20164)
+is_method(#20227)
+is_abstract_member(#20227)
+#20235=*
+entry_cfg_node(#20235,#20001)
+#20236=@"loc,{#10000},1,1,1,0"
+locations_default(#20236,#10000,1,1,1,0)
+hasLocation(#20235,#20236)
+#20237=*
+exit_cfg_node(#20237,#20001)
+hasLocation(#20237,#20157)
+successor(#20224,#20237)
+successor(#20219,#20216)
 #20238=*
-exit_cfg_node(#20238,#20179)
-#20239=@"loc,{#10000},3,45,3,44"
-locations_default(#20239,#10000,3,45,3,44)
-hasLocation(#20238,#20239)
-successor(#20187,#20238)
-successor(#20183,#20187)
-successor(#20236,#20183)
-successor(#20178,#20179)
-successor(#20176,#20189)
-successor(#20165,#20175)
+entry_cfg_node(#20238,#20219)
+hasLocation(#20238,#20217)
+#20239=*
+exit_cfg_node(#20239,#20219)
+hasLocation(#20239,#20217)
+successor(#20223,#20239)
+successor(#20238,#20223)
+successor(#20218,#20219)
+successor(#20216,#20201)
+successor(#20209,#20206)
 #20240=*
-entry_cfg_node(#20240,#20165)
-hasLocation(#20240,#20228)
-#20241=*
-exit_cfg_node(#20241,#20165)
-#20242=@"loc,{#10000},1,47,1,46"
-locations_default(#20242,#10000,1,47,1,46)
-hasLocation(#20241,#20242)
-successor(#20173,#20241)
-successor(#20169,#20173)
-successor(#20240,#20169)
-successor(#20166,#20165)
-successor(#20227,#20166)
+entry_cfg_node(#20240,#20209)
+#20241=@"loc,{#10000},8,3,8,2"
+locations_default(#20241,#10000,8,3,8,2)
+hasLocation(#20240,#20241)
+#20242=*
+exit_cfg_node(#20242,#20209)
+#20243=@"loc,{#10000},8,21,8,20"
+locations_default(#20243,#10000,8,21,8,20)
+hasLocation(#20242,#20243)
+successor(#20214,#20242)
+successor(#20240,#20214)
+successor(#20208,#20209)
+successor(#20206,#20218)
+successor(#20203,#20208)
+successor(#20201,#20224)
+successor(#20192,#20203)
+successor(#20177,#20180)
+successor(#20181,#20178)
+#20244=*
+entry_cfg_node(#20244,#20181)
+#20245=@"loc,{#10000},3,9,3,8"
+locations_default(#20245,#10000,3,9,3,8)
+hasLocation(#20244,#20245)
+#20246=*
+exit_cfg_node(#20246,#20181)
+#20247=@"loc,{#10000},3,45,3,44"
+locations_default(#20247,#10000,3,45,3,44)
+hasLocation(#20246,#20247)
+successor(#20190,#20246)
+successor(#20186,#20190)
+successor(#20244,#20186)
+successor(#20180,#20181)
+successor(#20178,#20192)
+successor(#20166,#20177)
+#20248=*
+entry_cfg_node(#20248,#20166)
+hasLocation(#20248,#20236)
+#20249=*
+exit_cfg_node(#20249,#20166)
+#20250=@"loc,{#10000},1,47,1,46"
+locations_default(#20250,#10000,1,47,1,46)
+hasLocation(#20249,#20250)
+successor(#20175,#20249)
+successor(#20171,#20175)
+successor(#20248,#20171)
+successor(#20167,#20166)
+successor(#20235,#20167)
 numlines(#10000,14,9,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap

@@ -166,119 +166,123 @@ locations_default(#20057,#10000,1,1,8,0)
 hasLocation(#20001,#20057)
 #20058=@"var;{foo};{#20000}"
 variables(#20058,"foo",#20000)
-#20059=*
-stmts(#20059,17,#20001,0,"functio ... ;\n  }\n}")
-#20060=@"loc,{#10000},1,1,7,1"
-locations_default(#20060,#10000,1,1,7,1)
-hasLocation(#20059,#20060)
-stmt_containers(#20059,#20001)
-#20061=*
-exprs(#20061,78,#20059,-1,"foo")
-hasLocation(#20061,#20019)
-expr_containers(#20061,#20059)
-literals("foo","foo",#20061)
-decl(#20061,#20058)
+#20059=@"var;{this};{#20000}"
+variables(#20059,"this",#20000)
+#20060=*
+stmts(#20060,17,#20001,0,"functio ... ;\n  }\n}")
+#20061=@"loc,{#10000},1,1,7,1"
+locations_default(#20061,#10000,1,1,7,1)
+hasLocation(#20060,#20061)
+stmt_containers(#20060,#20001)
 #20062=*
-scopes(#20062,1)
-scopenodes(#20059,#20062)
-scopenesting(#20062,#20000)
-#20063=@"var;{x};{#20062}"
-variables(#20063,"x",#20062)
-#20064=@"var;{arguments};{#20062}"
-variables(#20064,"arguments",#20062)
-is_arguments_object(#20064)
-#20065=*
-stmts(#20065,1,#20059,-2,"{\n  var ... ;\n  }\n}")
-#20066=@"loc,{#10000},1,16,7,1"
-locations_default(#20066,#10000,1,16,7,1)
-hasLocation(#20065,#20066)
-stmt_containers(#20065,#20059)
+exprs(#20062,78,#20060,-1,"foo")
+hasLocation(#20062,#20019)
+expr_containers(#20062,#20060)
+literals("foo","foo",#20062)
+decl(#20062,#20058)
+#20063=*
+scopes(#20063,1)
+scopenodes(#20060,#20063)
+scopenesting(#20063,#20000)
+#20064=@"var;{x};{#20063}"
+variables(#20064,"x",#20063)
+#20065=@"var;{this};{#20063}"
+variables(#20065,"this",#20063)
+#20066=@"var;{arguments};{#20063}"
+variables(#20066,"arguments",#20063)
+is_arguments_object(#20066)
 #20067=*
-stmts(#20067,18,#20065,0,"var x = 5;")
-#20068=@"loc,{#10000},2,3,2,12"
-locations_default(#20068,#10000,2,3,2,12)
+stmts(#20067,1,#20060,-2,"{\n  var ... ;\n  }\n}")
+#20068=@"loc,{#10000},1,16,7,1"
+locations_default(#20068,#10000,1,16,7,1)
 hasLocation(#20067,#20068)
-stmt_containers(#20067,#20059)
+stmt_containers(#20067,#20060)
 #20069=*
-exprs(#20069,64,#20067,0,"x = 5")
-#20070=@"loc,{#10000},2,7,2,11"
-locations_default(#20070,#10000,2,7,2,11)
+stmts(#20069,18,#20067,0,"var x = 5;")
+#20070=@"loc,{#10000},2,3,2,12"
+locations_default(#20070,#10000,2,3,2,12)
 hasLocation(#20069,#20070)
-enclosing_stmt(#20069,#20067)
-expr_containers(#20069,#20059)
+stmt_containers(#20069,#20060)
 #20071=*
-exprs(#20071,78,#20069,0,"x")
-hasLocation(#20071,#20029)
-enclosing_stmt(#20071,#20067)
-expr_containers(#20071,#20059)
-literals("x","x",#20071)
-decl(#20071,#20063)
-#20072=*
-exprs(#20072,3,#20069,1,"5")
-hasLocation(#20072,#20033)
-enclosing_stmt(#20072,#20067)
-expr_containers(#20072,#20059)
-literals("5","5",#20072)
+exprs(#20071,64,#20069,0,"x = 5")
+#20072=@"loc,{#10000},2,7,2,11"
+locations_default(#20072,#10000,2,7,2,11)
+hasLocation(#20071,#20072)
+enclosing_stmt(#20071,#20069)
+expr_containers(#20071,#20060)
 #20073=*
-stmts(#20073,11,#20065,1,"try {\n  ...  x;\n  }")
-#20074=@"loc,{#10000},3,3,6,3"
-locations_default(#20074,#10000,3,3,6,3)
-hasLocation(#20073,#20074)
-stmt_containers(#20073,#20059)
+exprs(#20073,78,#20071,0,"x")
+hasLocation(#20073,#20029)
+enclosing_stmt(#20073,#20069)
+expr_containers(#20073,#20060)
+literals("x","x",#20073)
+decl(#20073,#20064)
+#20074=*
+exprs(#20074,3,#20071,1,"5")
+hasLocation(#20074,#20033)
+enclosing_stmt(#20074,#20069)
+expr_containers(#20074,#20060)
+literals("5","5",#20074)
 #20075=*
-stmts(#20075,1,#20073,0,"{\n  }")
-#20076=@"loc,{#10000},3,7,4,3"
-locations_default(#20076,#10000,3,7,4,3)
+stmts(#20075,11,#20067,1,"try {\n  ...  x;\n  }")
+#20076=@"loc,{#10000},3,3,6,3"
+locations_default(#20076,#10000,3,3,6,3)
 hasLocation(#20075,#20076)
-stmt_containers(#20075,#20059)
+stmt_containers(#20075,#20060)
 #20077=*
-stmts(#20077,1,#20073,-1,"{\n    return x;\n  }")
-#20078=@"loc,{#10000},4,13,6,3"
-locations_default(#20078,#10000,4,13,6,3)
+stmts(#20077,1,#20075,0,"{\n  }")
+#20078=@"loc,{#10000},3,7,4,3"
+locations_default(#20078,#10000,3,7,4,3)
 hasLocation(#20077,#20078)
-stmt_containers(#20077,#20059)
+stmt_containers(#20077,#20060)
 #20079=*
-stmts(#20079,9,#20077,0,"return x;")
-#20080=@"loc,{#10000},5,5,5,13"
-locations_default(#20080,#10000,5,5,5,13)
+stmts(#20079,1,#20075,-1,"{\n    return x;\n  }")
+#20080=@"loc,{#10000},4,13,6,3"
+locations_default(#20080,#10000,4,13,6,3)
 hasLocation(#20079,#20080)
-stmt_containers(#20079,#20059)
+stmt_containers(#20079,#20060)
 #20081=*
-exprs(#20081,79,#20079,0,"x")
-hasLocation(#20081,#20049)
-enclosing_stmt(#20081,#20079)
-expr_containers(#20081,#20059)
-literals("x","x",#20081)
-bind(#20081,#20063)
-#20082=*
-entry_cfg_node(#20082,#20001)
-#20083=@"loc,{#10000},1,1,1,0"
-locations_default(#20083,#10000,1,1,1,0)
-hasLocation(#20082,#20083)
+stmts(#20081,9,#20079,0,"return x;")
+#20082=@"loc,{#10000},5,5,5,13"
+locations_default(#20082,#10000,5,5,5,13)
+hasLocation(#20081,#20082)
+stmt_containers(#20081,#20060)
+#20083=*
+exprs(#20083,79,#20081,0,"x")
+hasLocation(#20083,#20049)
+enclosing_stmt(#20083,#20081)
+expr_containers(#20083,#20060)
+literals("x","x",#20083)
+bind(#20083,#20064)
 #20084=*
-exit_cfg_node(#20084,#20001)
-hasLocation(#20084,#20056)
-successor(#20059,#20084)
-#20085=*
-entry_cfg_node(#20085,#20059)
-hasLocation(#20085,#20083)
+entry_cfg_node(#20084,#20001)
+#20085=@"loc,{#10000},1,1,1,0"
+locations_default(#20085,#10000,1,1,1,0)
+hasLocation(#20084,#20085)
 #20086=*
-exit_cfg_node(#20086,#20059)
-#20087=@"loc,{#10000},7,2,7,1"
-locations_default(#20087,#10000,7,2,7,1)
-hasLocation(#20086,#20087)
-successor(#20073,#20075)
+exit_cfg_node(#20086,#20001)
+hasLocation(#20086,#20056)
+successor(#20060,#20086)
+#20087=*
+entry_cfg_node(#20087,#20060)
+hasLocation(#20087,#20085)
+#20088=*
+exit_cfg_node(#20088,#20060)
+#20089=@"loc,{#10000},7,2,7,1"
+locations_default(#20089,#10000,7,2,7,1)
+hasLocation(#20088,#20089)
 successor(#20075,#20077)
-successor(#20081,#20079)
-successor(#20079,#20086)
-successor(#20077,#20081)
-successor(#20067,#20071)
-successor(#20072,#20069)
-successor(#20071,#20072)
+successor(#20077,#20079)
+successor(#20083,#20081)
+successor(#20081,#20088)
+successor(#20079,#20083)
 successor(#20069,#20073)
-successor(#20065,#20067)
-successor(#20085,#20065)
-successor(#20061,#20059)
-successor(#20082,#20061)
+successor(#20074,#20071)
+successor(#20073,#20074)
+successor(#20071,#20075)
+successor(#20067,#20069)
+successor(#20087,#20067)
+successor(#20062,#20060)
+successor(#20084,#20062)
 numlines(#10000,7,7,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/unicode.ts.trap

@@ -47,12 +47,14 @@ next_token(#20004,#20011)
 next_token(#20006,#20011)
 toplevels(#20001,0)
 hasLocation(#20001,#20012)
-#20013=*
-entry_cfg_node(#20013,#20001)
-hasLocation(#20013,#20012)
+#20013=@"var;{this};{#20000}"
+variables(#20013,"this",#20000)
 #20014=*
-exit_cfg_node(#20014,#20001)
+entry_cfg_node(#20014,#20001)
 hasLocation(#20014,#20012)
-successor(#20013,#20014)
+#20015=*
+exit_cfg_node(#20015,#20001)
+hasLocation(#20015,#20012)
+successor(#20014,#20015)
 numlines(#10000,3,0,3)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap

@@ -52,42 +52,44 @@ locations_default(#20016,#10000,1,1,2,0)
 hasLocation(#20001,#20016)
 #20017=@"var;{才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123};{#20000}"
 variables(#20017,"才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123",#20000)
-#20018=*
-stmts(#20018,18,#20001,0,"var \u624d\u80fd\u30bd ... 23 = 1;")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,64,#20018,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... 123 = 1")
-#20020=@"loc,{#10000},1,5,1,81"
-locations_default(#20020,#10000,1,5,1,81)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,78,#20019,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... Abcd123")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123","才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123",#20021)
-decl(#20021,#20017)
+stmts(#20019,18,#20001,0,"var \u624d\u80fd\u30bd ... 23 = 1;")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,64,#20019,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... 123 = 1")
+#20021=@"loc,{#10000},1,5,1,81"
+locations_default(#20021,#10000,1,5,1,81)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
 #20022=*
-exprs(#20022,3,#20019,1,"1")
-hasLocation(#20022,#20011)
-enclosing_stmt(#20022,#20018)
+exprs(#20022,78,#20020,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... Abcd123")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20019)
 expr_containers(#20022,#20001)
-literals("1","1",#20022)
+literals("才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123","才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123",#20022)
+decl(#20022,#20017)
 #20023=*
-entry_cfg_node(#20023,#20001)
-#20024=@"loc,{#10000},1,1,1,0"
-locations_default(#20024,#10000,1,1,1,0)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20001)
-hasLocation(#20025,#20015)
-successor(#20018,#20021)
-successor(#20022,#20019)
-successor(#20021,#20022)
-successor(#20019,#20025)
-successor(#20023,#20018)
+exprs(#20023,3,#20020,1,"1")
+hasLocation(#20023,#20011)
+enclosing_stmt(#20023,#20019)
+expr_containers(#20023,#20001)
+literals("1","1",#20023)
+#20024=*
+entry_cfg_node(#20024,#20001)
+#20025=@"loc,{#10000},1,1,1,0"
+locations_default(#20025,#10000,1,1,1,0)
+hasLocation(#20024,#20025)
+#20026=*
+exit_cfg_node(#20026,#20001)
+hasLocation(#20026,#20015)
+successor(#20019,#20022)
+successor(#20023,#20020)
+successor(#20022,#20023)
+successor(#20020,#20026)
+successor(#20024,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")

javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap

@@ -583,415 +583,419 @@ hasLocation(#20001,#20209)
 variables(#20210,"Wrapper",#20000)
 #20211=@"local_namespace_name;{Wrapper};{#20000}"
 local_namespace_names(#20211,"Wrapper",#20000)
-#20212=*
-stmts(#20212,31,#20001,0,"namespa ... lock]\n}")
-#20213=@"loc,{#10000},1,1,25,1"
-locations_default(#20213,#10000,1,1,25,1)
-hasLocation(#20212,#20213)
-stmt_containers(#20212,#20001)
-#20214=*
-exprs(#20214,78,#20212,-1,"Wrapper")
-hasLocation(#20214,#20059)
-enclosing_stmt(#20214,#20212)
-expr_containers(#20214,#20001)
-literals("Wrapper","Wrapper",#20214)
-decl(#20214,#20210)
-namespacedecl(#20214,#20211)
+#20212=@"var;{this};{#20000}"
+variables(#20212,"this",#20000)
+#20213=*
+stmts(#20213,31,#20001,0,"namespa ... lock]\n}")
+#20214=@"loc,{#10000},1,1,25,1"
+locations_default(#20214,#10000,1,1,25,1)
+hasLocation(#20213,#20214)
+stmt_containers(#20213,#20001)
 #20215=*
-scopes(#20215,9)
-scopenodes(#20212,#20215)
-scopenesting(#20215,#20000)
-#20216=@"var;{EmptyStatement};{#20215}"
-variables(#20216,"EmptyStatement",#20215)
-#20217=@"var;{EmptyBlock};{#20215}"
-variables(#20217,"EmptyBlock",#20215)
-#20218=@"var;{x};{#20215}"
-variables(#20218,"x",#20215)
-#20219=@"local_namespace_name;{Empty};{#20215}"
-local_namespace_names(#20219,"Empty",#20215)
-#20220=@"local_namespace_name;{Comments};{#20215}"
-local_namespace_names(#20220,"Comments",#20215)
-#20221=@"local_namespace_name;{Outer};{#20215}"
-local_namespace_names(#20221,"Outer",#20215)
-#20222=@"local_namespace_name;{Outer2};{#20215}"
-local_namespace_names(#20222,"Outer2",#20215)
-#20223=@"local_namespace_name;{Interfaces};{#20215}"
-local_namespace_names(#20223,"Interfaces",#20215)
-#20224=@"local_namespace_name;{EmptyStatement};{#20215}"
-local_namespace_names(#20224,"EmptyStatement",#20215)
-#20225=@"local_namespace_name;{EmptyBlock};{#20215}"
-local_namespace_names(#20225,"EmptyBlock",#20215)
-#20226=*
-stmts(#20226,31,#20212,0,"namespace Empty {}")
-#20227=@"loc,{#10000},3,3,3,20"
-locations_default(#20227,#10000,3,3,3,20)
-hasLocation(#20226,#20227)
-stmt_containers(#20226,#20212)
-#20228=*
-exprs(#20228,78,#20226,-1,"Empty")
-hasLocation(#20228,#20065)
-enclosing_stmt(#20228,#20226)
-expr_containers(#20228,#20212)
-literals("Empty","Empty",#20228)
-namespacedecl(#20228,#20219)
+exprs(#20215,78,#20213,-1,"Wrapper")
+hasLocation(#20215,#20059)
+enclosing_stmt(#20215,#20213)
+expr_containers(#20215,#20001)
+literals("Wrapper","Wrapper",#20215)
+decl(#20215,#20210)
+namespacedecl(#20215,#20211)
+#20216=*
+scopes(#20216,9)
+scopenodes(#20213,#20216)
+scopenesting(#20216,#20000)
+#20217=@"var;{EmptyStatement};{#20216}"
+variables(#20217,"EmptyStatement",#20216)
+#20218=@"var;{EmptyBlock};{#20216}"
+variables(#20218,"EmptyBlock",#20216)
+#20219=@"var;{x};{#20216}"
+variables(#20219,"x",#20216)
+#20220=@"local_namespace_name;{Empty};{#20216}"
+local_namespace_names(#20220,"Empty",#20216)
+#20221=@"local_namespace_name;{Comments};{#20216}"
+local_namespace_names(#20221,"Comments",#20216)
+#20222=@"local_namespace_name;{Outer};{#20216}"
+local_namespace_names(#20222,"Outer",#20216)
+#20223=@"local_namespace_name;{Outer2};{#20216}"
+local_namespace_names(#20223,"Outer2",#20216)
+#20224=@"local_namespace_name;{Interfaces};{#20216}"
+local_namespace_names(#20224,"Interfaces",#20216)
+#20225=@"local_namespace_name;{EmptyStatement};{#20216}"
+local_namespace_names(#20225,"EmptyStatement",#20216)
+#20226=@"local_namespace_name;{EmptyBlock};{#20216}"
+local_namespace_names(#20226,"EmptyBlock",#20216)
+#20227=*
+stmts(#20227,31,#20213,0,"namespace Empty {}")
+#20228=@"loc,{#10000},3,3,3,20"
+locations_default(#20228,#10000,3,3,3,20)
+hasLocation(#20227,#20228)
+stmt_containers(#20227,#20213)
 #20229=*
-scopes(#20229,9)
-scopenodes(#20226,#20229)
-scopenesting(#20229,#20215)
+exprs(#20229,78,#20227,-1,"Empty")
+hasLocation(#20229,#20065)
+enclosing_stmt(#20229,#20227)
+expr_containers(#20229,#20213)
+literals("Empty","Empty",#20229)
+namespacedecl(#20229,#20220)
 #20230=*
-stmts(#20230,31,#20212,1,"namespa ...  */\n  }")
-#20231=@"loc,{#10000},4,3,7,3"
-locations_default(#20231,#10000,4,3,7,3)
-hasLocation(#20230,#20231)
-stmt_containers(#20230,#20212)
-#20232=*
-exprs(#20232,78,#20230,-1,"Comments")
-hasLocation(#20232,#20073)
-enclosing_stmt(#20232,#20230)
-expr_containers(#20232,#20212)
-literals("Comments","Comments",#20232)
-namespacedecl(#20232,#20220)
+scopes(#20230,9)
+scopenodes(#20227,#20230)
+scopenesting(#20230,#20216)
+#20231=*
+stmts(#20231,31,#20213,1,"namespa ...  */\n  }")
+#20232=@"loc,{#10000},4,3,7,3"
+locations_default(#20232,#10000,4,3,7,3)
+hasLocation(#20231,#20232)
+stmt_containers(#20231,#20213)
 #20233=*
-scopes(#20233,9)
-scopenodes(#20230,#20233)
-scopenesting(#20233,#20215)
+exprs(#20233,78,#20231,-1,"Comments")
+hasLocation(#20233,#20073)
+enclosing_stmt(#20233,#20231)
+expr_containers(#20233,#20213)
+literals("Comments","Comments",#20233)
+namespacedecl(#20233,#20221)
 #20234=*
-stmts(#20234,31,#20212,2,"namespa ...  {}\n  }")
-#20235=@"loc,{#10000},8,3,10,3"
-locations_default(#20235,#10000,8,3,10,3)
-hasLocation(#20234,#20235)
-stmt_containers(#20234,#20212)
-#20236=*
-exprs(#20236,78,#20234,-1,"Outer")
-hasLocation(#20236,#20081)
-enclosing_stmt(#20236,#20234)
-expr_containers(#20236,#20212)
-literals("Outer","Outer",#20236)
-namespacedecl(#20236,#20221)
+scopes(#20234,9)
+scopenodes(#20231,#20234)
+scopenesting(#20234,#20216)
+#20235=*
+stmts(#20235,31,#20213,2,"namespa ...  {}\n  }")
+#20236=@"loc,{#10000},8,3,10,3"
+locations_default(#20236,#10000,8,3,10,3)
+hasLocation(#20235,#20236)
+stmt_containers(#20235,#20213)
 #20237=*
-scopes(#20237,9)
-scopenodes(#20234,#20237)
-scopenesting(#20237,#20215)
-#20238=@"local_namespace_name;{Inner};{#20237}"
-local_namespace_names(#20238,"Inner",#20237)
-#20239=*
-stmts(#20239,31,#20234,0,"namespace Inner {}")
-#20240=@"loc,{#10000},9,5,9,22"
-locations_default(#20240,#10000,9,5,9,22)
-hasLocation(#20239,#20240)
-stmt_containers(#20239,#20234)
-#20241=*
-exprs(#20241,78,#20239,-1,"Inner")
-hasLocation(#20241,#20087)
-enclosing_stmt(#20241,#20239)
-expr_containers(#20241,#20234)
-literals("Inner","Inner",#20241)
-namespacedecl(#20241,#20238)
+exprs(#20237,78,#20235,-1,"Outer")
+hasLocation(#20237,#20081)
+enclosing_stmt(#20237,#20235)
+expr_containers(#20237,#20213)
+literals("Outer","Outer",#20237)
+namespacedecl(#20237,#20222)
+#20238=*
+scopes(#20238,9)
+scopenodes(#20235,#20238)
+scopenesting(#20238,#20216)
+#20239=@"local_namespace_name;{Inner};{#20238}"
+local_namespace_names(#20239,"Inner",#20238)
+#20240=*
+stmts(#20240,31,#20235,0,"namespace Inner {}")
+#20241=@"loc,{#10000},9,5,9,22"
+locations_default(#20241,#10000,9,5,9,22)
+hasLocation(#20240,#20241)
+stmt_containers(#20240,#20235)
 #20242=*
-scopes(#20242,9)
-scopenodes(#20239,#20242)
-scopenesting(#20242,#20237)
+exprs(#20242,78,#20240,-1,"Inner")
+hasLocation(#20242,#20087)
+enclosing_stmt(#20242,#20240)
+expr_containers(#20242,#20235)
+literals("Inner","Inner",#20242)
+namespacedecl(#20242,#20239)
 #20243=*
-stmts(#20243,31,#20212,3,"namespa ...  {}\n  }")
-#20244=@"loc,{#10000},11,3,13,3"
-locations_default(#20244,#10000,11,3,13,3)
-hasLocation(#20243,#20244)
-stmt_containers(#20243,#20212)
-#20245=*
-exprs(#20245,78,#20243,-1,"Outer2")
-hasLocation(#20245,#20097)
-enclosing_stmt(#20245,#20243)
-expr_containers(#20245,#20212)
-literals("Outer2","Outer2",#20245)
-namespacedecl(#20245,#20222)
+scopes(#20243,9)
+scopenodes(#20240,#20243)
+scopenesting(#20243,#20238)
+#20244=*
+stmts(#20244,31,#20213,3,"namespa ...  {}\n  }")
+#20245=@"loc,{#10000},11,3,13,3"
+locations_default(#20245,#10000,11,3,13,3)
+hasLocation(#20244,#20245)
+stmt_containers(#20244,#20213)
 #20246=*
-scopes(#20246,9)
-scopenodes(#20243,#20246)
-scopenesting(#20246,#20215)
-#20247=@"local_namespace_name;{Inner};{#20246}"
-local_namespace_names(#20247,"Inner",#20246)
-#20248=*
-stmts(#20248,30,#20243,0,"export  ... nner {}")
-#20249=@"loc,{#10000},12,5,12,29"
-locations_default(#20249,#10000,12,5,12,29)
-hasLocation(#20248,#20249)
-stmt_containers(#20248,#20243)
-#20250=*
-stmts(#20250,31,#20248,-1,"namespace Inner {}")
-#20251=@"loc,{#10000},12,12,12,29"
-locations_default(#20251,#10000,12,12,12,29)
-hasLocation(#20250,#20251)
-stmt_containers(#20250,#20243)
-#20252=*
-exprs(#20252,78,#20250,-1,"Inner")
-hasLocation(#20252,#20105)
-enclosing_stmt(#20252,#20250)
-expr_containers(#20252,#20243)
-literals("Inner","Inner",#20252)
-namespacedecl(#20252,#20247)
+exprs(#20246,78,#20244,-1,"Outer2")
+hasLocation(#20246,#20097)
+enclosing_stmt(#20246,#20244)
+expr_containers(#20246,#20213)
+literals("Outer2","Outer2",#20246)
+namespacedecl(#20246,#20223)
+#20247=*
+scopes(#20247,9)
+scopenodes(#20244,#20247)
+scopenesting(#20247,#20216)
+#20248=@"local_namespace_name;{Inner};{#20247}"
+local_namespace_names(#20248,"Inner",#20247)
+#20249=*
+stmts(#20249,30,#20244,0,"export  ... nner {}")
+#20250=@"loc,{#10000},12,5,12,29"
+locations_default(#20250,#10000,12,5,12,29)
+hasLocation(#20249,#20250)
+stmt_containers(#20249,#20244)
+#20251=*
+stmts(#20251,31,#20249,-1,"namespace Inner {}")
+#20252=@"loc,{#10000},12,12,12,29"
+locations_default(#20252,#10000,12,12,12,29)
+hasLocation(#20251,#20252)
+stmt_containers(#20251,#20244)
 #20253=*
-scopes(#20253,9)
-scopenodes(#20250,#20253)
-scopenesting(#20253,#20246)
+exprs(#20253,78,#20251,-1,"Inner")
+hasLocation(#20253,#20105)
+enclosing_stmt(#20253,#20251)
+expr_containers(#20253,#20244)
+literals("Inner","Inner",#20253)
+namespacedecl(#20253,#20248)
 #20254=*
-stmts(#20254,31,#20212,4,"namespa ...   }\n  }")
-#20255=@"loc,{#10000},14,3,19,3"
-locations_default(#20255,#10000,14,3,19,3)
-hasLocation(#20254,#20255)
-stmt_containers(#20254,#20212)
-#20256=*
-exprs(#20256,78,#20254,-1,"Interfaces")
-hasLocation(#20256,#20115)
-enclosing_stmt(#20256,#20254)
-expr_containers(#20256,#20212)
-literals("Interfaces","Interfaces",#20256)
-namespacedecl(#20256,#20223)
+scopes(#20254,9)
+scopenodes(#20251,#20254)
+scopenesting(#20254,#20247)
+#20255=*
+stmts(#20255,31,#20213,4,"namespa ...   }\n  }")
+#20256=@"loc,{#10000},14,3,19,3"
+locations_default(#20256,#10000,14,3,19,3)
+hasLocation(#20255,#20256)
+stmt_containers(#20255,#20213)
 #20257=*
-scopes(#20257,9)
-scopenodes(#20254,#20257)
-scopenesting(#20257,#20215)
-#20258=@"local_type_name;{I};{#20257}"
-local_type_names(#20258,"I",#20257)
-#20259=*
-stmts(#20259,34,#20254,0,"interfa ... ;\n    }")
-#20260=@"loc,{#10000},15,5,18,5"
-locations_default(#20260,#10000,15,5,18,5)
-hasLocation(#20259,#20260)
-stmt_containers(#20259,#20254)
-#20261=*
-typeexprs(#20261,1,#20259,0,"I")
-hasLocation(#20261,#20121)
-enclosing_stmt(#20261,#20259)
-expr_containers(#20261,#20254)
-literals("I","I",#20261)
-typedecl(#20261,#20258)
+exprs(#20257,78,#20255,-1,"Interfaces")
+hasLocation(#20257,#20115)
+enclosing_stmt(#20257,#20255)
+expr_containers(#20257,#20213)
+literals("Interfaces","Interfaces",#20257)
+namespacedecl(#20257,#20224)
+#20258=*
+scopes(#20258,9)
+scopenodes(#20255,#20258)
+scopenesting(#20258,#20216)
+#20259=@"local_type_name;{I};{#20258}"
+local_type_names(#20259,"I",#20258)
+#20260=*
+stmts(#20260,34,#20255,0,"interfa ... ;\n    }")
+#20261=@"loc,{#10000},15,5,18,5"
+locations_default(#20261,#10000,15,5,18,5)
+hasLocation(#20260,#20261)
+stmt_containers(#20260,#20255)
 #20262=*
-properties(#20262,#20259,2,8,"x: number;")
-#20263=@"loc,{#10000},16,7,16,16"
-locations_default(#20263,#10000,16,7,16,16)
-hasLocation(#20262,#20263)
-#20264=*
-exprs(#20264,0,#20262,0,"x")
-hasLocation(#20264,#20125)
-enclosing_stmt(#20264,#20259)
-expr_containers(#20264,#20254)
-literals("x","x",#20264)
-is_abstract_member(#20262)
+typeexprs(#20262,1,#20260,0,"I")
+hasLocation(#20262,#20121)
+enclosing_stmt(#20262,#20260)
+expr_containers(#20262,#20255)
+literals("I","I",#20262)
+typedecl(#20262,#20259)
+#20263=*
+properties(#20263,#20260,2,8,"x: number;")
+#20264=@"loc,{#10000},16,7,16,16"
+locations_default(#20264,#10000,16,7,16,16)
+hasLocation(#20263,#20264)
 #20265=*
-typeexprs(#20265,2,#20262,2,"number")
-hasLocation(#20265,#20129)
-enclosing_stmt(#20265,#20259)
-expr_containers(#20265,#20254)
-literals("number","number",#20265)
+exprs(#20265,0,#20263,0,"x")
+hasLocation(#20265,#20125)
+enclosing_stmt(#20265,#20260)
+expr_containers(#20265,#20255)
+literals("x","x",#20265)
+is_abstract_member(#20263)
 #20266=*
-properties(#20266,#20259,3,0,"foo(): number;")
-#20267=@"loc,{#10000},17,7,17,20"
-locations_default(#20267,#10000,17,7,17,20)
-hasLocation(#20266,#20267)
-#20268=*
-exprs(#20268,0,#20266,0,"foo")
-hasLocation(#20268,#20133)
-enclosing_stmt(#20268,#20259)
-expr_containers(#20268,#20254)
-literals("foo","foo",#20268)
+typeexprs(#20266,2,#20263,2,"number")
+hasLocation(#20266,#20129)
+enclosing_stmt(#20266,#20260)
+expr_containers(#20266,#20255)
+literals("number","number",#20266)
+#20267=*
+properties(#20267,#20260,3,0,"foo(): number;")
+#20268=@"loc,{#10000},17,7,17,20"
+locations_default(#20268,#10000,17,7,17,20)
+hasLocation(#20267,#20268)
 #20269=*
-exprs(#20269,9,#20266,1,"foo(): number;")
-hasLocation(#20269,#20267)
-enclosing_stmt(#20269,#20259)
-expr_containers(#20269,#20254)
+exprs(#20269,0,#20267,0,"foo")
+hasLocation(#20269,#20133)
+enclosing_stmt(#20269,#20260)
+expr_containers(#20269,#20255)
+literals("foo","foo",#20269)
 #20270=*
-scopes(#20270,1)
-scopenodes(#20269,#20270)
-scopenesting(#20270,#20257)
-#20271=@"var;{arguments};{#20270}"
-variables(#20271,"arguments",#20270)
-is_arguments_object(#20271)
-#20272=*
-typeexprs(#20272,2,#20269,-3,"number")
-hasLocation(#20272,#20141)
-expr_containers(#20272,#20269)
-literals("number","number",#20272)
-is_method(#20266)
-is_abstract_member(#20266)
-#20273=*
-stmts(#20273,31,#20212,5,"namespa ... ent {;}")
-#20274=@"loc,{#10000},21,3,21,30"
-locations_default(#20274,#10000,21,3,21,30)
-hasLocation(#20273,#20274)
-stmt_containers(#20273,#20212)
+exprs(#20270,9,#20267,1,"foo(): number;")
+hasLocation(#20270,#20268)
+enclosing_stmt(#20270,#20260)
+expr_containers(#20270,#20255)
+#20271=*
+scopes(#20271,1)
+scopenodes(#20270,#20271)
+scopenesting(#20271,#20258)
+#20272=@"var;{this};{#20271}"
+variables(#20272,"this",#20271)
+#20273=@"var;{arguments};{#20271}"
+variables(#20273,"arguments",#20271)
+is_arguments_object(#20273)
+#20274=*
+typeexprs(#20274,2,#20270,-3,"number")
+hasLocation(#20274,#20141)
+expr_containers(#20274,#20270)
+literals("number","number",#20274)
+is_method(#20267)
+is_abstract_member(#20267)
 #20275=*
-exprs(#20275,78,#20273,-1,"EmptyStatement")
-hasLocation(#20275,#20151)
-enclosing_stmt(#20275,#20273)
-expr_containers(#20275,#20212)
-literals("EmptyStatement","EmptyStatement",#20275)
-decl(#20275,#20216)
-namespacedecl(#20275,#20224)
-#20276=*
-scopes(#20276,9)
-scopenodes(#20273,#20276)
-scopenesting(#20276,#20215)
+stmts(#20275,31,#20213,5,"namespa ... ent {;}")
+#20276=@"loc,{#10000},21,3,21,30"
+locations_default(#20276,#10000,21,3,21,30)
+hasLocation(#20275,#20276)
+stmt_containers(#20275,#20213)
 #20277=*
-stmts(#20277,0,#20273,0,";")
-hasLocation(#20277,#20155)
-stmt_containers(#20277,#20273)
-is_instantiated(#20273)
+exprs(#20277,78,#20275,-1,"EmptyStatement")
+hasLocation(#20277,#20151)
+enclosing_stmt(#20277,#20275)
+expr_containers(#20277,#20213)
+literals("EmptyStatement","EmptyStatement",#20277)
+decl(#20277,#20217)
+namespacedecl(#20277,#20225)
 #20278=*
-stmts(#20278,31,#20212,6,"namespa ... ck {{}}")
-#20279=@"loc,{#10000},22,3,22,27"
-locations_default(#20279,#10000,22,3,22,27)
-hasLocation(#20278,#20279)
-stmt_containers(#20278,#20212)
+scopes(#20278,9)
+scopenodes(#20275,#20278)
+scopenesting(#20278,#20216)
+#20279=*
+stmts(#20279,0,#20275,0,";")
+hasLocation(#20279,#20155)
+stmt_containers(#20279,#20275)
+is_instantiated(#20275)
 #20280=*
-exprs(#20280,78,#20278,-1,"EmptyBlock")
-hasLocation(#20280,#20161)
-enclosing_stmt(#20280,#20278)
-expr_containers(#20280,#20212)
-literals("EmptyBlock","EmptyBlock",#20280)
-decl(#20280,#20217)
-namespacedecl(#20280,#20225)
-#20281=*
-scopes(#20281,9)
-scopenodes(#20278,#20281)
-scopenesting(#20281,#20215)
+stmts(#20280,31,#20213,6,"namespa ... ck {{}}")
+#20281=@"loc,{#10000},22,3,22,27"
+locations_default(#20281,#10000,22,3,22,27)
+hasLocation(#20280,#20281)
+stmt_containers(#20280,#20213)
 #20282=*
-stmts(#20282,1,#20278,0,"{}")
-#20283=@"loc,{#10000},22,25,22,26"
-locations_default(#20283,#10000,22,25,22,26)
-hasLocation(#20282,#20283)
-stmt_containers(#20282,#20278)
-is_instantiated(#20278)
+exprs(#20282,78,#20280,-1,"EmptyBlock")
+hasLocation(#20282,#20161)
+enclosing_stmt(#20282,#20280)
+expr_containers(#20282,#20213)
+literals("EmptyBlock","EmptyBlock",#20282)
+decl(#20282,#20218)
+namespacedecl(#20282,#20226)
+#20283=*
+scopes(#20283,9)
+scopenodes(#20280,#20283)
+scopenesting(#20283,#20216)
 #20284=*
-stmts(#20284,18,#20212,7,"var x = ... yBlock]")
-#20285=@"loc,{#10000},24,3,24,82"
-locations_default(#20285,#10000,24,3,24,82)
+stmts(#20284,1,#20280,0,"{}")
+#20285=@"loc,{#10000},22,25,22,26"
+locations_default(#20285,#10000,22,25,22,26)
 hasLocation(#20284,#20285)
-stmt_containers(#20284,#20212)
+stmt_containers(#20284,#20280)
+is_instantiated(#20280)
 #20286=*
-exprs(#20286,64,#20284,0,"x = [Em ... yBlock]")
-#20287=@"loc,{#10000},24,7,24,82"
-locations_default(#20287,#10000,24,7,24,82)
+stmts(#20286,18,#20213,7,"var x = ... yBlock]")
+#20287=@"loc,{#10000},24,3,24,82"
+locations_default(#20287,#10000,24,3,24,82)
 hasLocation(#20286,#20287)
-enclosing_stmt(#20286,#20284)
-expr_containers(#20286,#20212)
+stmt_containers(#20286,#20213)
 #20288=*
-exprs(#20288,78,#20286,0,"x")
-hasLocation(#20288,#20173)
-enclosing_stmt(#20288,#20284)
-expr_containers(#20288,#20212)
-literals("x","x",#20288)
-decl(#20288,#20218)
-#20289=*
-exprs(#20289,7,#20286,1,"[Empty, ... yBlock]")
-#20290=@"loc,{#10000},24,11,24,82"
-locations_default(#20290,#10000,24,11,24,82)
-hasLocation(#20289,#20290)
-enclosing_stmt(#20289,#20284)
-expr_containers(#20289,#20212)
+exprs(#20288,64,#20286,0,"x = [Em ... yBlock]")
+#20289=@"loc,{#10000},24,7,24,82"
+locations_default(#20289,#10000,24,7,24,82)
+hasLocation(#20288,#20289)
+enclosing_stmt(#20288,#20286)
+expr_containers(#20288,#20213)
+#20290=*
+exprs(#20290,78,#20288,0,"x")
+hasLocation(#20290,#20173)
+enclosing_stmt(#20290,#20286)
+expr_containers(#20290,#20213)
+literals("x","x",#20290)
+decl(#20290,#20219)
 #20291=*
-exprs(#20291,79,#20289,0,"Empty")
-hasLocation(#20291,#20179)
-enclosing_stmt(#20291,#20284)
-expr_containers(#20291,#20212)
-literals("Empty","Empty",#20291)
-#20292=@"var;{Empty};{#20000}"
-variables(#20292,"Empty",#20000)
-bind(#20291,#20292)
+exprs(#20291,7,#20288,1,"[Empty, ... yBlock]")
+#20292=@"loc,{#10000},24,11,24,82"
+locations_default(#20292,#10000,24,11,24,82)
+hasLocation(#20291,#20292)
+enclosing_stmt(#20291,#20286)
+expr_containers(#20291,#20213)
 #20293=*
-exprs(#20293,79,#20289,1,"Comments")
-hasLocation(#20293,#20183)
-enclosing_stmt(#20293,#20284)
-expr_containers(#20293,#20212)
-literals("Comments","Comments",#20293)
-#20294=@"var;{Comments};{#20000}"
-variables(#20294,"Comments",#20000)
+exprs(#20293,79,#20291,0,"Empty")
+hasLocation(#20293,#20179)
+enclosing_stmt(#20293,#20286)
+expr_containers(#20293,#20213)
+literals("Empty","Empty",#20293)
+#20294=@"var;{Empty};{#20000}"
+variables(#20294,"Empty",#20000)
 bind(#20293,#20294)
 #20295=*
-exprs(#20295,79,#20289,2,"Outer")
-hasLocation(#20295,#20187)
-enclosing_stmt(#20295,#20284)
-expr_containers(#20295,#20212)
-literals("Outer","Outer",#20295)
-#20296=@"var;{Outer};{#20000}"
-variables(#20296,"Outer",#20000)
+exprs(#20295,79,#20291,1,"Comments")
+hasLocation(#20295,#20183)
+enclosing_stmt(#20295,#20286)
+expr_containers(#20295,#20213)
+literals("Comments","Comments",#20295)
+#20296=@"var;{Comments};{#20000}"
+variables(#20296,"Comments",#20000)
 bind(#20295,#20296)
 #20297=*
-exprs(#20297,79,#20289,3,"Outer2")
-hasLocation(#20297,#20191)
-enclosing_stmt(#20297,#20284)
-expr_containers(#20297,#20212)
-literals("Outer2","Outer2",#20297)
-#20298=@"var;{Outer2};{#20000}"
-variables(#20298,"Outer2",#20000)
+exprs(#20297,79,#20291,2,"Outer")
+hasLocation(#20297,#20187)
+enclosing_stmt(#20297,#20286)
+expr_containers(#20297,#20213)
+literals("Outer","Outer",#20297)
+#20298=@"var;{Outer};{#20000}"
+variables(#20298,"Outer",#20000)
 bind(#20297,#20298)
 #20299=*
-exprs(#20299,79,#20289,4,"Interfaces")
-hasLocation(#20299,#20195)
-enclosing_stmt(#20299,#20284)
-expr_containers(#20299,#20212)
-literals("Interfaces","Interfaces",#20299)
-#20300=@"var;{Interfaces};{#20000}"
-variables(#20300,"Interfaces",#20000)
+exprs(#20299,79,#20291,3,"Outer2")
+hasLocation(#20299,#20191)
+enclosing_stmt(#20299,#20286)
+expr_containers(#20299,#20213)
+literals("Outer2","Outer2",#20299)
+#20300=@"var;{Outer2};{#20000}"
+variables(#20300,"Outer2",#20000)
 bind(#20299,#20300)
 #20301=*
-exprs(#20301,79,#20289,5,"EmptyStatement")
-hasLocation(#20301,#20199)
-enclosing_stmt(#20301,#20284)
-expr_containers(#20301,#20212)
-literals("EmptyStatement","EmptyStatement",#20301)
-bind(#20301,#20216)
-#20302=*
-exprs(#20302,79,#20289,6,"EmptyBlock")
-hasLocation(#20302,#20203)
-enclosing_stmt(#20302,#20284)
-expr_containers(#20302,#20212)
-literals("EmptyBlock","EmptyBlock",#20302)
-bind(#20302,#20217)
-array_size(#20289,7)
-is_instantiated(#20212)
+exprs(#20301,79,#20291,4,"Interfaces")
+hasLocation(#20301,#20195)
+enclosing_stmt(#20301,#20286)
+expr_containers(#20301,#20213)
+literals("Interfaces","Interfaces",#20301)
+#20302=@"var;{Interfaces};{#20000}"
+variables(#20302,"Interfaces",#20000)
+bind(#20301,#20302)
 #20303=*
-entry_cfg_node(#20303,#20001)
-#20304=@"loc,{#10000},1,1,1,0"
-locations_default(#20304,#10000,1,1,1,0)
-hasLocation(#20303,#20304)
+exprs(#20303,79,#20291,5,"EmptyStatement")
+hasLocation(#20303,#20199)
+enclosing_stmt(#20303,#20286)
+expr_containers(#20303,#20213)
+literals("EmptyStatement","EmptyStatement",#20303)
+bind(#20303,#20217)
+#20304=*
+exprs(#20304,79,#20291,6,"EmptyBlock")
+hasLocation(#20304,#20203)
+enclosing_stmt(#20304,#20286)
+expr_containers(#20304,#20213)
+literals("EmptyBlock","EmptyBlock",#20304)
+bind(#20304,#20218)
+array_size(#20291,7)
+is_instantiated(#20213)
 #20305=*
-exit_cfg_node(#20305,#20001)
-hasLocation(#20305,#20208)
-successor(#20214,#20212)
-successor(#20284,#20288)
-successor(#20289,#20291)
-successor(#20302,#20286)
-successor(#20301,#20302)
+entry_cfg_node(#20305,#20001)
+#20306=@"loc,{#10000},1,1,1,0"
+locations_default(#20306,#10000,1,1,1,0)
+hasLocation(#20305,#20306)
+#20307=*
+exit_cfg_node(#20307,#20001)
+hasLocation(#20307,#20208)
+successor(#20215,#20213)
+successor(#20286,#20290)
+successor(#20291,#20293)
+successor(#20304,#20288)
+successor(#20303,#20304)
+successor(#20301,#20303)
 successor(#20299,#20301)
 successor(#20297,#20299)
 successor(#20295,#20297)
 successor(#20293,#20295)
-successor(#20291,#20293)
-successor(#20288,#20289)
-successor(#20286,#20305)
-successor(#20280,#20278)
-successor(#20282,#20284)
-successor(#20278,#20282)
-successor(#20275,#20273)
-successor(#20277,#20280)
-successor(#20273,#20277)
-successor(#20256,#20254)
-successor(#20259,#20275)
-successor(#20254,#20259)
-successor(#20245,#20243)
-successor(#20248,#20252)
-successor(#20252,#20250)
-successor(#20250,#20256)
-successor(#20243,#20248)
-successor(#20236,#20234)
-successor(#20241,#20239)
-successor(#20239,#20245)
-successor(#20234,#20241)
-successor(#20232,#20230)
-successor(#20230,#20236)
-successor(#20228,#20226)
-successor(#20226,#20232)
-successor(#20212,#20228)
-successor(#20303,#20214)
+successor(#20290,#20291)
+successor(#20288,#20307)
+successor(#20282,#20280)
+successor(#20284,#20286)
+successor(#20280,#20284)
+successor(#20277,#20275)
+successor(#20279,#20282)
+successor(#20275,#20279)
+successor(#20257,#20255)
+successor(#20260,#20277)
+successor(#20255,#20260)
+successor(#20246,#20244)
+successor(#20249,#20253)
+successor(#20253,#20251)
+successor(#20251,#20257)
+successor(#20244,#20249)
+successor(#20237,#20235)
+successor(#20242,#20240)
+successor(#20240,#20246)
+successor(#20235,#20242)
+successor(#20233,#20231)
+successor(#20231,#20237)
+successor(#20229,#20227)
+successor(#20227,#20233)
+successor(#20213,#20229)
+successor(#20305,#20215)
 numlines(#10000,25,20,2)
 filetype(#10000,"typescript")