JS: Update TRAP output

2026-05-05 21:55:19 +02:00 · 2021-08-10 12:17:17 +02:00
parent b9b10af9b5
commit 13fa49a7f1
12 changed files with 1529 additions and 1416 deletions
--- a/javascript/extractor/tests/generatedcode/output/trap/ejs.js.trap
+++ b/javascript/extractor/tests/generatedcode/output/trap/ejs.js.trap
@@ -243,7 +243,7 @@ locations_default(#20087,#10000,1,13,1,29)
 hasLocation(#20086,#20087)
 enclosing_stmt(#20086,#20082)
 expr_containers(#20086,#20001)
-generated_code_expr_info(#20086,"<%=","%>"," user_data1 ")
+expr_contains_template_tag_location(#20086,#20087)
 #20088=*
 stmts(#20088,23,#20001,1,"let dat ... ta2 %>;")
 hasLocation(#20088,#20007)
@@ -269,7 +269,7 @@ locations_default(#20093,#10000,2,13,2,29)
 hasLocation(#20092,#20093)
 enclosing_stmt(#20092,#20088)
 expr_containers(#20092,#20001)
-generated_code_expr_info(#20092,"<%-","%>"," user_data2 ")
+expr_contains_template_tag_location(#20092,#20093)
 #20094=*
 stmts(#20094,3,#20001,2,"if (<%s ... g%>) {}")
 hasLocation(#20094,#20009)
@@ -281,7 +281,7 @@ locations_default(#20096,#10000,3,5,3,17)
 hasLocation(#20095,#20096)
 enclosing_stmt(#20095,#20094)
 expr_containers(#20095,#20001)
-generated_code_expr_info(#20095,"<%","%>","something")
+expr_contains_template_tag_location(#20095,#20096)
 #20097=*
 stmts(#20097,1,#20094,1,"{}")
 #20098=@"loc,{#10000},3,20,3,21"
@@ -315,7 +315,7 @@ locations_default(#20105,#10000,4,5,4,11)
 hasLocation(#20104,#20105)
 enclosing_stmt(#20104,#20099)
 expr_containers(#20104,#20001)
-generated_code_expr_info(#20104,"<%","%>","bar")
+expr_contains_template_tag_location(#20104,#20105)
 #20106=*
 exprs(#20106,120,#20100,1,"<%baz%>")
 #20107=@"loc,{#10000},4,14,4,20"
@@ -323,7 +323,7 @@ locations_default(#20107,#10000,4,14,4,20)
 hasLocation(#20106,#20107)
 enclosing_stmt(#20106,#20099)
 expr_containers(#20106,#20001)
-generated_code_expr_info(#20106,"<%","%>","baz")
+expr_contains_template_tag_location(#20106,#20107)
 #20108=*
 stmts(#20108,2,#20001,4,"<% generated_code %>")
 hasLocation(#20108,#20015)
@@ -333,7 +333,7 @@ exprs(#20109,120,#20108,0,"<% generated_code %>")
 hasLocation(#20109,#20015)
 enclosing_stmt(#20109,#20108)
 expr_containers(#20109,#20001)
-generated_code_expr_info(#20109,"<%","%>"," generated_code ")
+expr_contains_template_tag_location(#20109,#20015)
 #20110=*
 stmts(#20110,23,#20001,5,"let str ... de %>"";")
 #20111=@"loc,{#10000},7,1,7,41"
--- a/javascript/extractor/tests/generatedcode/output/trap/test.html.trap
+++ b/javascript/extractor/tests/generatedcode/output/trap/test.html.trap
@@ -160,7 +160,7 @@ locations_default(#20055,#10000,9,19,9,36)
 hasLocation(#20054,#20055)
 enclosing_stmt(#20054,#20049)
 expr_containers(#20054,#20002)
-generated_code_expr_info(#20054,"{{{","}}}"," user_data1 ")
+expr_contains_template_tag_location(#20054,#20055)
 #20056=*
 stmts(#20056,18,#20002,1,"var dat ... afe }};")
 #20057=@"loc,{#10000},10,7,10,49"
@@ -188,7 +188,7 @@ locations_default(#20062,#10000,10,19,10,48)
 hasLocation(#20061,#20062)
 enclosing_stmt(#20061,#20056)
 expr_containers(#20061,#20002)
-generated_code_expr_info(#20061,"{{","}}"," user_data2 | json | safe ")
+expr_contains_template_tag_location(#20061,#20062)
 #20063=*
 stmts(#20063,18,#20002,2,"var dat ... ta3 %>;")
 #20064=@"loc,{#10000},11,7,11,36"
@@ -216,7 +216,7 @@ locations_default(#20069,#10000,11,19,11,35)
 hasLocation(#20068,#20069)
 enclosing_stmt(#20068,#20063)
 expr_containers(#20068,#20002)
-generated_code_expr_info(#20068,"<%-","%>"," user_data3 ")
+expr_contains_template_tag_location(#20068,#20069)
 #20070=*
 entry_cfg_node(#20070,#20002)
 hasLocation(#20070,#20004)
@@ -276,6 +276,7 @@ template_placeholder_tag_info(#20084,#20080,"{{{subtitle_html}}}")
 #20085=@"loc,{#10000},5,5,5,23"
 locations_default(#20085,#10000,5,5,5,23)
 hasLocation(#20084,#20085)
+scopes(#20000,0)
 #20086=@"script;{#10000},5,8"
 #20087=*
 lines(#20087,#20086,"subtitle_html","")
@@ -356,6 +357,7 @@ xmllocations(#20001,#20107)
 template_placeholder_tag_info(#20108,#20001,"{{{ user_data1 }}}")
 locations_default(#20055,#10000,9,19,9,36)
 hasLocation(#20108,#20055)
+scopes(#20000,0)
 #20109=@"script;{#10000},9,22"
 #20110=*
 lines(#20110,#20109," user_data1 ","")
@@ -410,6 +412,7 @@ toplevel_parent_xml_node(#20109,#20108)
 template_placeholder_tag_info(#20123,#20001,"{{ user_data2 | json | safe }}")
 locations_default(#20062,#10000,10,19,10,48)
 hasLocation(#20123,#20062)
+scopes(#20000,0)
 #20124=@"script;{#10000},10,21"
 #20125=*
 lines(#20125,#20124," user_data2 | json | safe ","")
@@ -524,6 +527,7 @@ toplevel_parent_xml_node(#20124,#20123)
 template_placeholder_tag_info(#20154,#20001,"<%- user_data3 %>")
 locations_default(#20069,#10000,11,19,11,35)
 hasLocation(#20154,#20069)
+scopes(#20000,0)
 #20155=@"script;{#10000},11,22"
 #20156=*
 lines(#20156,#20155," user_data3 ","")
@@ -592,6 +596,7 @@ template_placeholder_tag_info(#20172,#20170,"<%= footer %>")
 #20173=@"loc,{#10000},7,8,7,20"
 locations_default(#20173,#10000,7,8,7,20)
 hasLocation(#20172,#20173)
+scopes(#20000,0)
 #20174=@"script;{#10000},7,11"
 #20175=*
 lines(#20175,#20174," footer ","")
@@ -656,6 +661,7 @@ template_placeholder_tag_info(#20191,#20189,"<%- body_html %>")
 #20192=@"loc,{#10000},6,8,6,23"
 locations_default(#20192,#10000,6,8,6,23)
 hasLocation(#20191,#20192)
+scopes(#20000,0)
 #20193=@"script;{#10000},6,11"
 #20194=*
 lines(#20194,#20193," body_html ","")
@@ -720,6 +726,7 @@ template_placeholder_tag_info(#20210,#20208,"{{title}}")
 #20211=@"loc,{#10000},4,9,4,17"
 locations_default(#20211,#10000,4,9,4,17)
 hasLocation(#20210,#20211)
+scopes(#20000,0)
 #20212=@"script;{#10000},4,11"
 #20213=*
 lines(#20213,#20212,"title","")
--- a/javascript/extractor/tests/generatedcode/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/generatedcode/output/trap/tst.js.trap
@@ -398,7 +398,7 @@ locations_default(#20147,#10000,1,13,1,28)
 hasLocation(#20146,#20147)
 enclosing_stmt(#20146,#20142)
 expr_containers(#20146,#20001)
-generated_code_expr_info(#20146,"{{","}}"," user_data1 ")
+expr_contains_template_tag_location(#20146,#20147)
 #20148=*
 stmts(#20148,23,#20001,1,"let dat ... a2 }}};")
 hasLocation(#20148,#20013)
@@ -424,7 +424,7 @@ locations_default(#20153,#10000,2,13,2,30)
 hasLocation(#20152,#20153)
 enclosing_stmt(#20152,#20148)
 expr_containers(#20152,#20001)
-generated_code_expr_info(#20152,"{{{","}}}"," user_data2 ")
+expr_contains_template_tag_location(#20152,#20153)
 #20154=*
 stmts(#20154,3,#20001,2,"if ({{s ... g}}) {}")
 hasLocation(#20154,#20015)
@@ -436,7 +436,7 @@ locations_default(#20156,#10000,3,5,3,17)
 hasLocation(#20155,#20156)
 enclosing_stmt(#20155,#20154)
 expr_containers(#20155,#20001)
-generated_code_expr_info(#20155,"{{","}}","something")
+expr_contains_template_tag_location(#20155,#20156)
 #20157=*
 stmts(#20157,1,#20154,1,"{}")
 #20158=@"loc,{#10000},3,20,3,21"
@@ -470,7 +470,7 @@ locations_default(#20165,#10000,4,5,4,11)
 hasLocation(#20164,#20165)
 enclosing_stmt(#20164,#20159)
 expr_containers(#20164,#20001)
-generated_code_expr_info(#20164,"{{","}}","bar")
+expr_contains_template_tag_location(#20164,#20165)
 #20166=*
 exprs(#20166,120,#20160,1,"{{baz}}")
 #20167=@"loc,{#10000},4,14,4,20"
@@ -478,7 +478,7 @@ locations_default(#20167,#10000,4,14,4,20)
 hasLocation(#20166,#20167)
 enclosing_stmt(#20166,#20159)
 expr_containers(#20166,#20001)
-generated_code_expr_info(#20166,"{{","}}","baz")
+expr_contains_template_tag_location(#20166,#20167)
 #20168=*
 stmts(#20168,1,#20001,4,"{{not_g ... _code}}")
 #20169=@"loc,{#10000},6,1,6,22"
--- a/javascript/extractor/tests/html/output/trap/entities.html.trap
+++ b/javascript/extractor/tests/html/output/trap/entities.html.trap
@@ -8,116 +8,116 @@ locations_default(#10002,#10000,0,0,0,0)
 hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
-#20001=@"script;{#10000},6,29"
-#20002=*
-lines(#20002,#20001,"void(alert(""Nope!""))","")
-#20003=@"loc,{#10000},6,29,6,48"
-locations_default(#20003,#10000,6,29,6,48)
-hasLocation(#20002,#20003)
-numlines(#20001,1,1,0)
-#20004=*
-tokeninfo(#20004,7,#20001,0,"void")
-#20005=@"loc,{#10000},6,29,6,32"
-locations_default(#20005,#10000,6,29,6,32)
-hasLocation(#20004,#20005)
-#20006=*
-tokeninfo(#20006,8,#20001,1,"(")
-#20007=@"loc,{#10000},6,33,6,33"
-locations_default(#20007,#10000,6,33,6,33)
-hasLocation(#20006,#20007)
-#20008=*
-tokeninfo(#20008,6,#20001,2,"alert")
-#20009=@"loc,{#10000},6,34,6,38"
-locations_default(#20009,#10000,6,34,6,38)
-hasLocation(#20008,#20009)
-#20010=*
-tokeninfo(#20010,8,#20001,3,"(")
-#20011=@"loc,{#10000},6,39,6,39"
-locations_default(#20011,#10000,6,39,6,39)
-hasLocation(#20010,#20011)
-#20012=*
-tokeninfo(#20012,4,#20001,4,"""Nope!""")
-#20013=@"loc,{#10000},6,40,6,46"
-locations_default(#20013,#10000,6,40,6,46)
-hasLocation(#20012,#20013)
-#20014=*
-tokeninfo(#20014,8,#20001,5,")")
-#20015=@"loc,{#10000},6,47,6,47"
-locations_default(#20015,#10000,6,47,6,47)
-hasLocation(#20014,#20015)
-#20016=*
-tokeninfo(#20016,8,#20001,6,")")
-#20017=@"loc,{#10000},6,48,6,48"
-locations_default(#20017,#10000,6,48,6,48)
-hasLocation(#20016,#20017)
-#20018=*
-tokeninfo(#20018,0,#20001,7,"")
-#20019=@"loc,{#10000},6,49,6,48"
-locations_default(#20019,#10000,6,49,6,48)
-hasLocation(#20018,#20019)
-toplevels(#20001,3)
-hasLocation(#20001,#20003)
-#20020=*
-stmts(#20020,2,#20001,0,"void(alert(""Nope!""))")
-hasLocation(#20020,#20003)
-stmt_containers(#20020,#20001)
+#20001=*
+#20002=@"script;{#10000},6,29"
+#20003=*
+lines(#20003,#20002,"void(alert(""Nope!""))","")
+#20004=@"loc,{#10000},6,29,6,48"
+locations_default(#20004,#10000,6,29,6,48)
+hasLocation(#20003,#20004)
+numlines(#20002,1,1,0)
+#20005=*
+tokeninfo(#20005,7,#20002,0,"void")
+#20006=@"loc,{#10000},6,29,6,32"
+locations_default(#20006,#10000,6,29,6,32)
+hasLocation(#20005,#20006)
+#20007=*
+tokeninfo(#20007,8,#20002,1,"(")
+#20008=@"loc,{#10000},6,33,6,33"
+locations_default(#20008,#10000,6,33,6,33)
+hasLocation(#20007,#20008)
+#20009=*
+tokeninfo(#20009,6,#20002,2,"alert")
+#20010=@"loc,{#10000},6,34,6,38"
+locations_default(#20010,#10000,6,34,6,38)
+hasLocation(#20009,#20010)
+#20011=*
+tokeninfo(#20011,8,#20002,3,"(")
+#20012=@"loc,{#10000},6,39,6,39"
+locations_default(#20012,#10000,6,39,6,39)
+hasLocation(#20011,#20012)
+#20013=*
+tokeninfo(#20013,4,#20002,4,"""Nope!""")
+#20014=@"loc,{#10000},6,40,6,46"
+locations_default(#20014,#10000,6,40,6,46)
+hasLocation(#20013,#20014)
+#20015=*
+tokeninfo(#20015,8,#20002,5,")")
+#20016=@"loc,{#10000},6,47,6,47"
+locations_default(#20016,#10000,6,47,6,47)
+hasLocation(#20015,#20016)
+#20017=*
+tokeninfo(#20017,8,#20002,6,")")
+#20018=@"loc,{#10000},6,48,6,48"
+locations_default(#20018,#10000,6,48,6,48)
+hasLocation(#20017,#20018)
+#20019=*
+tokeninfo(#20019,0,#20002,7,"")
+#20020=@"loc,{#10000},6,49,6,48"
+locations_default(#20020,#10000,6,49,6,48)
+hasLocation(#20019,#20020)
+toplevels(#20002,3)
+hasLocation(#20002,#20004)
 #20021=*
-exprs(#20021,21,#20020,0,"void(alert(""Nope!""))")
-hasLocation(#20021,#20003)
-enclosing_stmt(#20021,#20020)
-expr_containers(#20021,#20001)
+stmts(#20021,2,#20002,0,"void(alert(""Nope!""))")
+hasLocation(#20021,#20004)
+stmt_containers(#20021,#20002)
 #20022=*
-exprs(#20022,63,#20021,0,"(alert(""Nope!""))")
-#20023=@"loc,{#10000},6,33,6,48"
-locations_default(#20023,#10000,6,33,6,48)
-hasLocation(#20022,#20023)
-enclosing_stmt(#20022,#20020)
-expr_containers(#20022,#20001)
-#20024=*
-exprs(#20024,13,#20022,0,"alert(""Nope!"")")
-#20025=@"loc,{#10000},6,34,6,47"
-locations_default(#20025,#10000,6,34,6,47)
-hasLocation(#20024,#20025)
-enclosing_stmt(#20024,#20020)
-expr_containers(#20024,#20001)
-#20026=*
-exprs(#20026,79,#20024,-1,"alert")
-hasLocation(#20026,#20009)
-enclosing_stmt(#20026,#20020)
-expr_containers(#20026,#20001)
-literals("alert","alert",#20026)
-#20027=@"var;{alert};{#20000}"
-variables(#20027,"alert",#20000)
-bind(#20026,#20027)
-#20028=*
-exprs(#20028,4,#20024,0,"""Nope!""")
-hasLocation(#20028,#20013)
-enclosing_stmt(#20028,#20020)
-expr_containers(#20028,#20001)
-literals("Nope!","""Nope!""",#20028)
+exprs(#20022,21,#20021,0,"void(alert(""Nope!""))")
+hasLocation(#20022,#20004)
+enclosing_stmt(#20022,#20021)
+expr_containers(#20022,#20002)
+#20023=*
+exprs(#20023,63,#20022,0,"(alert(""Nope!""))")
+#20024=@"loc,{#10000},6,33,6,48"
+locations_default(#20024,#10000,6,33,6,48)
+hasLocation(#20023,#20024)
+enclosing_stmt(#20023,#20021)
+expr_containers(#20023,#20002)
+#20025=*
+exprs(#20025,13,#20023,0,"alert(""Nope!"")")
+#20026=@"loc,{#10000},6,34,6,47"
+locations_default(#20026,#10000,6,34,6,47)
+hasLocation(#20025,#20026)
+enclosing_stmt(#20025,#20021)
+expr_containers(#20025,#20002)
+#20027=*
+exprs(#20027,79,#20025,-1,"alert")
+hasLocation(#20027,#20010)
+enclosing_stmt(#20027,#20021)
+expr_containers(#20027,#20002)
+literals("alert","alert",#20027)
+#20028=@"var;{alert};{#20000}"
+variables(#20028,"alert",#20000)
+bind(#20027,#20028)
 #20029=*
-regexpterm(#20029,14,#20028,0,"Nope!")
-#20030=@"loc,{#10000},6,41,6,45"
-locations_default(#20030,#10000,6,41,6,45)
-hasLocation(#20029,#20030)
-regexp_const_value(#20029,"Nope!")
-#20031=*
-entry_cfg_node(#20031,#20001)
-#20032=@"loc,{#10000},6,29,6,28"
-locations_default(#20032,#10000,6,29,6,28)
-hasLocation(#20031,#20032)
-#20033=*
-exit_cfg_node(#20033,#20001)
-hasLocation(#20033,#20019)
-successor(#20020,#20022)
-successor(#20022,#20026)
-successor(#20028,#20024)
-successor(#20026,#20028)
-successor(#20024,#20021)
-successor(#20021,#20033)
-successor(#20031,#20020)
+exprs(#20029,4,#20025,0,"""Nope!""")
+hasLocation(#20029,#20014)
+enclosing_stmt(#20029,#20021)
+expr_containers(#20029,#20002)
+literals("Nope!","""Nope!""",#20029)
+#20030=*
+regexpterm(#20030,14,#20029,0,"Nope!")
+#20031=@"loc,{#10000},6,41,6,45"
+locations_default(#20031,#10000,6,41,6,45)
+hasLocation(#20030,#20031)
+regexp_const_value(#20030,"Nope!")
+#20032=*
+entry_cfg_node(#20032,#20002)
+#20033=@"loc,{#10000},6,29,6,28"
+locations_default(#20033,#10000,6,29,6,28)
+hasLocation(#20032,#20033)
 #20034=*
-toplevel_parent_xml_node(#20001,#20034)
+exit_cfg_node(#20034,#20002)
+hasLocation(#20034,#20020)
+successor(#20021,#20023)
+successor(#20023,#20027)
+successor(#20029,#20025)
+successor(#20027,#20029)
+successor(#20025,#20022)
+successor(#20022,#20034)
+successor(#20032,#20021)
+toplevel_parent_xml_node(#20002,#20001)
 #20035=*
 xmlElements(#20035,"html",#10000,0,#10000)
 #20036=@"loc,{#10000},1,1,8,7"
@@ -133,10 +133,10 @@ xmlElements(#20039,"a",#20037,0,#10000)
 #20040=@"loc,{#10000},6,9,6,80"
 locations_default(#20040,#10000,6,9,6,80)
 xmllocations(#20039,#20040)
-xmlAttrs(#20034,#20039,"href","javascript:void(alert(""Nope!""))",0,#10000)
+xmlAttrs(#20001,#20039,"href","javascript:void(alert(""Nope!""))",0,#10000)
 #20041=@"loc,{#10000},6,12,6,65"
 locations_default(#20041,#10000,6,12,6,65)
-xmllocations(#20034,#20041)
+xmllocations(#20001,#20041)
 #20042=*
 xmlElements(#20042,"head",#20035,0,#10000)
 #20043=@"loc,{#10000},2,5,4,11"
--- a/javascript/extractor/tests/html/output/trap/json_in_script.html.trap
+++ b/javascript/extractor/tests/html/output/trap/json_in_script.html.trap
@@ -9,26 +9,26 @@ hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
 #20001=*
-json(#20001,5,#10000,0,"{""Hello"": 123}")
-#20002=@"loc,{#10000},3,1,3,14"
-locations_default(#20002,#10000,3,1,3,14)
-json_locations(#20001,#20002)
-#20003=*
-json(#20003,2,#20001,0,"123")
-#20004=@"loc,{#10000},3,11,3,13"
-locations_default(#20004,#10000,3,11,3,13)
-json_locations(#20003,#20004)
-json_literals("123","123",#20003)
-json_properties(#20001,"Hello",#20003)
-#20005=*
-xmlElements(#20005,"html",#10000,0,#10000)
-#20006=@"loc,{#10000},1,1,5,7"
-locations_default(#20006,#10000,1,1,5,7)
-xmllocations(#20005,#20006)
-#20007=*
-xmlElements(#20007,"script",#20005,0,#10000)
+#20002=*
+json(#20002,5,#10000,0,"{""Hello"": 123}")
+#20003=@"loc,{#10000},3,1,3,14"
+locations_default(#20003,#10000,3,1,3,14)
+json_locations(#20002,#20003)
+#20004=*
+json(#20004,2,#20002,0,"123")
+#20005=@"loc,{#10000},3,11,3,13"
+locations_default(#20005,#10000,3,11,3,13)
+json_locations(#20004,#20005)
+json_literals("123","123",#20004)
+json_properties(#20002,"Hello",#20004)
+#20006=*
+xmlElements(#20006,"html",#10000,0,#10000)
+#20007=@"loc,{#10000},1,1,5,7"
+locations_default(#20007,#10000,1,1,5,7)
+xmllocations(#20006,#20007)
+xmlElements(#20001,"script",#20006,0,#10000)
 #20008=@"loc,{#10000},2,1,4,9"
 locations_default(#20008,#10000,2,1,4,9)
-xmllocations(#20007,#20008)
+xmllocations(#20001,#20008)
 numlines(#10000,5,0,0)
 filetype(#10000,"html")
--- a/javascript/extractor/tests/html/output/trap/module.html.trap
+++ b/javascript/extractor/tests/html/output/trap/module.html.trap
@@ -8,193 +8,193 @@ locations_default(#10002,#10000,0,0,0,0)
 hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
-#20001=@"script;{#10000},4,31"
-#20002=*
-lines(#20002,#20001,"","
+#20001=*
+#20002=@"script;{#10000},4,31"
+#20003=*
+lines(#20003,#20002,"","
 ")
-#20003=@"loc,{#10000},4,31,4,30"
-locations_default(#20003,#10000,4,31,4,30)
-hasLocation(#20002,#20003)
-#20004=*
-lines(#20004,#20001,"            import foo from 'bar';","
+#20004=@"loc,{#10000},4,31,4,30"
+locations_default(#20004,#10000,4,31,4,30)
+hasLocation(#20003,#20004)
+#20005=*
+lines(#20005,#20002,"            import foo from 'bar';","
 ")
-#20005=@"loc,{#10000},5,1,5,34"
-locations_default(#20005,#10000,5,1,5,34)
-hasLocation(#20004,#20005)
+#20006=@"loc,{#10000},5,1,5,34"
+locations_default(#20006,#10000,5,1,5,34)
+hasLocation(#20005,#20006)
 indentation(#10000,5," ",12)
-#20006=*
-lines(#20006,#20001,"            foo.baz();","
+#20007=*
+lines(#20007,#20002,"            foo.baz();","
 ")
-#20007=@"loc,{#10000},6,1,6,22"
-locations_default(#20007,#10000,6,1,6,22)
-hasLocation(#20006,#20007)
+#20008=@"loc,{#10000},6,1,6,22"
+locations_default(#20008,#10000,6,1,6,22)
+hasLocation(#20007,#20008)
 indentation(#10000,6," ",12)
-#20008=*
-lines(#20008,#20001,"        ","")
-#20009=@"loc,{#10000},7,1,7,8"
-locations_default(#20009,#10000,7,1,7,8)
-hasLocation(#20008,#20009)
-numlines(#20001,4,2,0)
-#20010=*
-tokeninfo(#20010,7,#20001,0,"import")
-#20011=@"loc,{#10000},5,13,5,18"
-locations_default(#20011,#10000,5,13,5,18)
-hasLocation(#20010,#20011)
-#20012=*
-tokeninfo(#20012,6,#20001,1,"foo")
-#20013=@"loc,{#10000},5,20,5,22"
-locations_default(#20013,#10000,5,20,5,22)
-hasLocation(#20012,#20013)
-#20014=*
-tokeninfo(#20014,6,#20001,2,"from")
-#20015=@"loc,{#10000},5,24,5,27"
-locations_default(#20015,#10000,5,24,5,27)
-hasLocation(#20014,#20015)
-#20016=*
-tokeninfo(#20016,4,#20001,3,"'bar'")
-#20017=@"loc,{#10000},5,29,5,33"
-locations_default(#20017,#10000,5,29,5,33)
-hasLocation(#20016,#20017)
-#20018=*
-tokeninfo(#20018,8,#20001,4,";")
-#20019=@"loc,{#10000},5,34,5,34"
-locations_default(#20019,#10000,5,34,5,34)
-hasLocation(#20018,#20019)
-#20020=*
-tokeninfo(#20020,6,#20001,5,"foo")
-#20021=@"loc,{#10000},6,13,6,15"
-locations_default(#20021,#10000,6,13,6,15)
-hasLocation(#20020,#20021)
-#20022=*
-tokeninfo(#20022,8,#20001,6,".")
-#20023=@"loc,{#10000},6,16,6,16"
-locations_default(#20023,#10000,6,16,6,16)
-hasLocation(#20022,#20023)
-#20024=*
-tokeninfo(#20024,6,#20001,7,"baz")
-#20025=@"loc,{#10000},6,17,6,19"
-locations_default(#20025,#10000,6,17,6,19)
-hasLocation(#20024,#20025)
-#20026=*
-tokeninfo(#20026,8,#20001,8,"(")
-#20027=@"loc,{#10000},6,20,6,20"
-locations_default(#20027,#10000,6,20,6,20)
-hasLocation(#20026,#20027)
-#20028=*
-tokeninfo(#20028,8,#20001,9,")")
-#20029=@"loc,{#10000},6,21,6,21"
-locations_default(#20029,#10000,6,21,6,21)
-hasLocation(#20028,#20029)
-#20030=*
-tokeninfo(#20030,8,#20001,10,";")
-#20031=@"loc,{#10000},6,22,6,22"
-locations_default(#20031,#10000,6,22,6,22)
-hasLocation(#20030,#20031)
-#20032=*
-tokeninfo(#20032,0,#20001,11,"")
-#20033=@"loc,{#10000},7,9,7,8"
-locations_default(#20033,#10000,7,9,7,8)
-hasLocation(#20032,#20033)
-toplevels(#20001,1)
-#20034=@"loc,{#10000},4,31,7,8"
-locations_default(#20034,#10000,4,31,7,8)
-hasLocation(#20001,#20034)
-#20035=@"module;{#10000},4,31"
-scopes(#20035,3)
-scopenodes(#20001,#20035)
-scopenesting(#20035,#20000)
-is_module(#20001)
-is_es2015_module(#20001)
-#20036=@"var;{foo};{#20035}"
-variables(#20036,"foo",#20035)
-#20037=@"local_type_name;{foo};{#20035}"
-local_type_names(#20037,"foo",#20035)
-#20038=@"local_namespace_name;{foo};{#20035}"
-local_namespace_names(#20038,"foo",#20035)
-variables(#20036,"foo",#20035)
-local_type_names(#20037,"foo",#20035)
-local_namespace_names(#20038,"foo",#20035)
-#20039=*
-stmts(#20039,27,#20001,0,"import  ...  'bar';")
-#20040=@"loc,{#10000},5,13,5,34"
-locations_default(#20040,#10000,5,13,5,34)
-hasLocation(#20039,#20040)
-stmt_containers(#20039,#20001)
-#20041=*
-exprs(#20041,4,#20039,-1,"'bar'")
-hasLocation(#20041,#20017)
-enclosing_stmt(#20041,#20039)
-expr_containers(#20041,#20001)
-literals("bar","'bar'",#20041)
+#20009=*
+lines(#20009,#20002,"        ","")
+#20010=@"loc,{#10000},7,1,7,8"
+locations_default(#20010,#10000,7,1,7,8)
+hasLocation(#20009,#20010)
+numlines(#20002,4,2,0)
+#20011=*
+tokeninfo(#20011,7,#20002,0,"import")
+#20012=@"loc,{#10000},5,13,5,18"
+locations_default(#20012,#10000,5,13,5,18)
+hasLocation(#20011,#20012)
+#20013=*
+tokeninfo(#20013,6,#20002,1,"foo")
+#20014=@"loc,{#10000},5,20,5,22"
+locations_default(#20014,#10000,5,20,5,22)
+hasLocation(#20013,#20014)
+#20015=*
+tokeninfo(#20015,6,#20002,2,"from")
+#20016=@"loc,{#10000},5,24,5,27"
+locations_default(#20016,#10000,5,24,5,27)
+hasLocation(#20015,#20016)
+#20017=*
+tokeninfo(#20017,4,#20002,3,"'bar'")
+#20018=@"loc,{#10000},5,29,5,33"
+locations_default(#20018,#10000,5,29,5,33)
+hasLocation(#20017,#20018)
+#20019=*
+tokeninfo(#20019,8,#20002,4,";")
+#20020=@"loc,{#10000},5,34,5,34"
+locations_default(#20020,#10000,5,34,5,34)
+hasLocation(#20019,#20020)
+#20021=*
+tokeninfo(#20021,6,#20002,5,"foo")
+#20022=@"loc,{#10000},6,13,6,15"
+locations_default(#20022,#10000,6,13,6,15)
+hasLocation(#20021,#20022)
+#20023=*
+tokeninfo(#20023,8,#20002,6,".")
+#20024=@"loc,{#10000},6,16,6,16"
+locations_default(#20024,#10000,6,16,6,16)
+hasLocation(#20023,#20024)
+#20025=*
+tokeninfo(#20025,6,#20002,7,"baz")
+#20026=@"loc,{#10000},6,17,6,19"
+locations_default(#20026,#10000,6,17,6,19)
+hasLocation(#20025,#20026)
+#20027=*
+tokeninfo(#20027,8,#20002,8,"(")
+#20028=@"loc,{#10000},6,20,6,20"
+locations_default(#20028,#10000,6,20,6,20)
+hasLocation(#20027,#20028)
+#20029=*
+tokeninfo(#20029,8,#20002,9,")")
+#20030=@"loc,{#10000},6,21,6,21"
+locations_default(#20030,#10000,6,21,6,21)
+hasLocation(#20029,#20030)
+#20031=*
+tokeninfo(#20031,8,#20002,10,";")
+#20032=@"loc,{#10000},6,22,6,22"
+locations_default(#20032,#10000,6,22,6,22)
+hasLocation(#20031,#20032)
+#20033=*
+tokeninfo(#20033,0,#20002,11,"")
+#20034=@"loc,{#10000},7,9,7,8"
+locations_default(#20034,#10000,7,9,7,8)
+hasLocation(#20033,#20034)
+toplevels(#20002,1)
+#20035=@"loc,{#10000},4,31,7,8"
+locations_default(#20035,#10000,4,31,7,8)
+hasLocation(#20002,#20035)
+#20036=@"module;{#10000},4,31"
+scopes(#20036,3)
+scopenodes(#20002,#20036)
+scopenesting(#20036,#20000)
+is_module(#20002)
+is_es2015_module(#20002)
+#20037=@"var;{foo};{#20036}"
+variables(#20037,"foo",#20036)
+#20038=@"local_type_name;{foo};{#20036}"
+local_type_names(#20038,"foo",#20036)
+#20039=@"local_namespace_name;{foo};{#20036}"
+local_namespace_names(#20039,"foo",#20036)
+variables(#20037,"foo",#20036)
+local_type_names(#20038,"foo",#20036)
+local_namespace_names(#20039,"foo",#20036)
+#20040=*
+stmts(#20040,27,#20002,0,"import  ...  'bar';")
+#20041=@"loc,{#10000},5,13,5,34"
+locations_default(#20041,#10000,5,13,5,34)
+hasLocation(#20040,#20041)
+stmt_containers(#20040,#20002)
 #20042=*
-regexpterm(#20042,14,#20041,0,"bar")
-#20043=@"loc,{#10000},5,30,5,32"
-locations_default(#20043,#10000,5,30,5,32)
-hasLocation(#20042,#20043)
-regexp_const_value(#20042,"bar")
-#20044=*
-exprs(#20044,84,#20039,0,"foo")
-hasLocation(#20044,#20013)
-enclosing_stmt(#20044,#20039)
-expr_containers(#20044,#20001)
+exprs(#20042,4,#20040,-1,"'bar'")
+hasLocation(#20042,#20018)
+enclosing_stmt(#20042,#20040)
+expr_containers(#20042,#20002)
+literals("bar","'bar'",#20042)
+#20043=*
+regexpterm(#20043,14,#20042,0,"bar")
+#20044=@"loc,{#10000},5,30,5,32"
+locations_default(#20044,#10000,5,30,5,32)
+hasLocation(#20043,#20044)
+regexp_const_value(#20043,"bar")
 #20045=*
-exprs(#20045,78,#20044,1,"foo")
-hasLocation(#20045,#20013)
-enclosing_stmt(#20045,#20039)
-expr_containers(#20045,#20001)
-literals("foo","foo",#20045)
-decl(#20045,#20036)
-typedecl(#20045,#20037)
-namespacedecl(#20045,#20038)
+exprs(#20045,84,#20040,0,"foo")
+hasLocation(#20045,#20014)
+enclosing_stmt(#20045,#20040)
+expr_containers(#20045,#20002)
 #20046=*
-stmts(#20046,2,#20001,1,"foo.baz();")
-#20047=@"loc,{#10000},6,13,6,22"
-locations_default(#20047,#10000,6,13,6,22)
-hasLocation(#20046,#20047)
-stmt_containers(#20046,#20001)
-#20048=*
-exprs(#20048,13,#20046,0,"foo.baz()")
-#20049=@"loc,{#10000},6,13,6,21"
-locations_default(#20049,#10000,6,13,6,21)
-hasLocation(#20048,#20049)
-enclosing_stmt(#20048,#20046)
-expr_containers(#20048,#20001)
-#20050=*
-exprs(#20050,14,#20048,-1,"foo.baz")
-#20051=@"loc,{#10000},6,13,6,19"
-locations_default(#20051,#10000,6,13,6,19)
-hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20046)
-expr_containers(#20050,#20001)
-#20052=*
-exprs(#20052,79,#20050,0,"foo")
-hasLocation(#20052,#20021)
-enclosing_stmt(#20052,#20046)
-expr_containers(#20052,#20001)
-literals("foo","foo",#20052)
-bind(#20052,#20036)
+exprs(#20046,78,#20045,1,"foo")
+hasLocation(#20046,#20014)
+enclosing_stmt(#20046,#20040)
+expr_containers(#20046,#20002)
+literals("foo","foo",#20046)
+decl(#20046,#20037)
+typedecl(#20046,#20038)
+namespacedecl(#20046,#20039)
+#20047=*
+stmts(#20047,2,#20002,1,"foo.baz();")
+#20048=@"loc,{#10000},6,13,6,22"
+locations_default(#20048,#10000,6,13,6,22)
+hasLocation(#20047,#20048)
+stmt_containers(#20047,#20002)
+#20049=*
+exprs(#20049,13,#20047,0,"foo.baz()")
+#20050=@"loc,{#10000},6,13,6,21"
+locations_default(#20050,#10000,6,13,6,21)
+hasLocation(#20049,#20050)
+enclosing_stmt(#20049,#20047)
+expr_containers(#20049,#20002)
+#20051=*
+exprs(#20051,14,#20049,-1,"foo.baz")
+#20052=@"loc,{#10000},6,13,6,19"
+locations_default(#20052,#10000,6,13,6,19)
+hasLocation(#20051,#20052)
+enclosing_stmt(#20051,#20047)
+expr_containers(#20051,#20002)
 #20053=*
-exprs(#20053,0,#20050,1,"baz")
-hasLocation(#20053,#20025)
-enclosing_stmt(#20053,#20046)
-expr_containers(#20053,#20001)
-literals("baz","baz",#20053)
+exprs(#20053,79,#20051,0,"foo")
+hasLocation(#20053,#20022)
+enclosing_stmt(#20053,#20047)
+expr_containers(#20053,#20002)
+literals("foo","foo",#20053)
+bind(#20053,#20037)
 #20054=*
-entry_cfg_node(#20054,#20001)
-hasLocation(#20054,#20003)
+exprs(#20054,0,#20051,1,"baz")
+hasLocation(#20054,#20026)
+enclosing_stmt(#20054,#20047)
+expr_containers(#20054,#20002)
+literals("baz","baz",#20054)
 #20055=*
-exit_cfg_node(#20055,#20001)
-hasLocation(#20055,#20033)
-successor(#20046,#20052)
-successor(#20053,#20050)
-successor(#20052,#20053)
-successor(#20050,#20048)
-successor(#20048,#20055)
-successor(#20039,#20046)
-successor(#20044,#20039)
-successor(#20054,#20044)
+entry_cfg_node(#20055,#20002)
+hasLocation(#20055,#20004)
 #20056=*
-toplevel_parent_xml_node(#20001,#20056)
+exit_cfg_node(#20056,#20002)
+hasLocation(#20056,#20034)
+successor(#20047,#20053)
+successor(#20054,#20051)
+successor(#20053,#20054)
+successor(#20051,#20049)
+successor(#20049,#20056)
+successor(#20040,#20047)
+successor(#20045,#20040)
+successor(#20055,#20045)
+toplevel_parent_xml_node(#20002,#20001)
 #20057=*
 xmlElements(#20057,"html",#10000,0,#10000)
 #20058=@"loc,{#10000},1,1,11,7"
@@ -210,12 +210,12 @@ xmlElements(#20061,"head",#20057,0,#10000)
 #20062=@"loc,{#10000},2,5,8,11"
 locations_default(#20062,#10000,2,5,8,11)
 xmllocations(#20061,#20062)
-xmlElements(#20056,"script",#20061,1,#10000)
+xmlElements(#20001,"script",#20061,1,#10000)
 #20063=@"loc,{#10000},4,9,7,17"
 locations_default(#20063,#10000,4,9,7,17)
-xmllocations(#20056,#20063)
+xmllocations(#20001,#20063)
 #20064=*
-xmlAttrs(#20064,#20056,"type","module",0,#10000)
+xmlAttrs(#20064,#20001,"type","module",0,#10000)
 #20065=@"loc,{#10000},4,17,4,29"
 locations_default(#20065,#10000,4,17,4,29)
 xmllocations(#20064,#20065)
--- a/javascript/extractor/tests/html/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.html.trap
@@ -8,377 +8,377 @@ locations_default(#10002,#10000,0,0,0,0)
 hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
-#20001=@"script;{#10000},5,17"
-#20002=*
-lines(#20002,#20001,"","
+#20001=*
+#20002=@"script;{#10000},5,17"
+#20003=*
+lines(#20003,#20002,"","
 ")
-#20003=@"loc,{#10000},5,17,5,16"
-locations_default(#20003,#10000,5,17,5,16)
-hasLocation(#20002,#20003)
-#20004=*
-lines(#20004,#20001,"            alert(""Hello, world!"");","
+#20004=@"loc,{#10000},5,17,5,16"
+locations_default(#20004,#10000,5,17,5,16)
+hasLocation(#20003,#20004)
+#20005=*
+lines(#20005,#20002,"            alert(""Hello, world!"");","
 ")
-#20005=@"loc,{#10000},6,1,6,35"
-locations_default(#20005,#10000,6,1,6,35)
-hasLocation(#20004,#20005)
+#20006=@"loc,{#10000},6,1,6,35"
+locations_default(#20006,#10000,6,1,6,35)
+hasLocation(#20005,#20006)
 indentation(#10000,6," ",12)
-#20006=*
-lines(#20006,#20001,"        ","")
-#20007=@"loc,{#10000},7,1,7,8"
-locations_default(#20007,#10000,7,1,7,8)
-hasLocation(#20006,#20007)
-numlines(#20001,3,1,0)
-#20008=*
-tokeninfo(#20008,6,#20001,0,"alert")
-#20009=@"loc,{#10000},6,13,6,17"
-locations_default(#20009,#10000,6,13,6,17)
-hasLocation(#20008,#20009)
-#20010=*
-tokeninfo(#20010,8,#20001,1,"(")
-#20011=@"loc,{#10000},6,18,6,18"
-locations_default(#20011,#10000,6,18,6,18)
-hasLocation(#20010,#20011)
-#20012=*
-tokeninfo(#20012,4,#20001,2,"""Hello, world!""")
-#20013=@"loc,{#10000},6,19,6,33"
-locations_default(#20013,#10000,6,19,6,33)
-hasLocation(#20012,#20013)
-#20014=*
-tokeninfo(#20014,8,#20001,3,")")
-#20015=@"loc,{#10000},6,34,6,34"
-locations_default(#20015,#10000,6,34,6,34)
-hasLocation(#20014,#20015)
-#20016=*
-tokeninfo(#20016,8,#20001,4,";")
-#20017=@"loc,{#10000},6,35,6,35"
-locations_default(#20017,#10000,6,35,6,35)
-hasLocation(#20016,#20017)
-#20018=*
-tokeninfo(#20018,0,#20001,5,"")
-#20019=@"loc,{#10000},7,9,7,8"
-locations_default(#20019,#10000,7,9,7,8)
-hasLocation(#20018,#20019)
-toplevels(#20001,1)
-#20020=@"loc,{#10000},5,17,7,8"
-locations_default(#20020,#10000,5,17,7,8)
-hasLocation(#20001,#20020)
-#20021=*
-stmts(#20021,2,#20001,0,"alert("" ... rld!"");")
-#20022=@"loc,{#10000},6,13,6,35"
-locations_default(#20022,#10000,6,13,6,35)
-hasLocation(#20021,#20022)
-stmt_containers(#20021,#20001)
-#20023=*
-exprs(#20023,13,#20021,0,"alert("" ... orld!"")")
-#20024=@"loc,{#10000},6,13,6,34"
-locations_default(#20024,#10000,6,13,6,34)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20021)
-expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,79,#20023,-1,"alert")
-hasLocation(#20025,#20009)
-enclosing_stmt(#20025,#20021)
-expr_containers(#20025,#20001)
-literals("alert","alert",#20025)
-#20026=@"var;{alert};{#20000}"
-variables(#20026,"alert",#20000)
-bind(#20025,#20026)
-#20027=*
-exprs(#20027,4,#20023,0,"""Hello, world!""")
-hasLocation(#20027,#20013)
-enclosing_stmt(#20027,#20021)
-expr_containers(#20027,#20001)
-literals("Hello, world!","""Hello, world!""",#20027)
+#20007=*
+lines(#20007,#20002,"        ","")
+#20008=@"loc,{#10000},7,1,7,8"
+locations_default(#20008,#10000,7,1,7,8)
+hasLocation(#20007,#20008)
+numlines(#20002,3,1,0)
+#20009=*
+tokeninfo(#20009,6,#20002,0,"alert")
+#20010=@"loc,{#10000},6,13,6,17"
+locations_default(#20010,#10000,6,13,6,17)
+hasLocation(#20009,#20010)
+#20011=*
+tokeninfo(#20011,8,#20002,1,"(")
+#20012=@"loc,{#10000},6,18,6,18"
+locations_default(#20012,#10000,6,18,6,18)
+hasLocation(#20011,#20012)
+#20013=*
+tokeninfo(#20013,4,#20002,2,"""Hello, world!""")
+#20014=@"loc,{#10000},6,19,6,33"
+locations_default(#20014,#10000,6,19,6,33)
+hasLocation(#20013,#20014)
+#20015=*
+tokeninfo(#20015,8,#20002,3,")")
+#20016=@"loc,{#10000},6,34,6,34"
+locations_default(#20016,#10000,6,34,6,34)
+hasLocation(#20015,#20016)
+#20017=*
+tokeninfo(#20017,8,#20002,4,";")
+#20018=@"loc,{#10000},6,35,6,35"
+locations_default(#20018,#10000,6,35,6,35)
+hasLocation(#20017,#20018)
+#20019=*
+tokeninfo(#20019,0,#20002,5,"")
+#20020=@"loc,{#10000},7,9,7,8"
+locations_default(#20020,#10000,7,9,7,8)
+hasLocation(#20019,#20020)
+toplevels(#20002,1)
+#20021=@"loc,{#10000},5,17,7,8"
+locations_default(#20021,#10000,5,17,7,8)
+hasLocation(#20002,#20021)
+#20022=*
+stmts(#20022,2,#20002,0,"alert("" ... rld!"");")
+#20023=@"loc,{#10000},6,13,6,35"
+locations_default(#20023,#10000,6,13,6,35)
+hasLocation(#20022,#20023)
+stmt_containers(#20022,#20002)
+#20024=*
+exprs(#20024,13,#20022,0,"alert("" ... orld!"")")
+#20025=@"loc,{#10000},6,13,6,34"
+locations_default(#20025,#10000,6,13,6,34)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20022)
+expr_containers(#20024,#20002)
+#20026=*
+exprs(#20026,79,#20024,-1,"alert")
+hasLocation(#20026,#20010)
+enclosing_stmt(#20026,#20022)
+expr_containers(#20026,#20002)
+literals("alert","alert",#20026)
+#20027=@"var;{alert};{#20000}"
+variables(#20027,"alert",#20000)
+bind(#20026,#20027)
 #20028=*
-regexpterm(#20028,14,#20027,0,"Hello, world!")
-#20029=@"loc,{#10000},6,20,6,32"
-locations_default(#20029,#10000,6,20,6,32)
-hasLocation(#20028,#20029)
-regexp_const_value(#20028,"Hello, world!")
-#20030=*
-entry_cfg_node(#20030,#20001)
-hasLocation(#20030,#20003)
+exprs(#20028,4,#20024,0,"""Hello, world!""")
+hasLocation(#20028,#20014)
+enclosing_stmt(#20028,#20022)
+expr_containers(#20028,#20002)
+literals("Hello, world!","""Hello, world!""",#20028)
+#20029=*
+regexpterm(#20029,14,#20028,0,"Hello, world!")
+#20030=@"loc,{#10000},6,20,6,32"
+locations_default(#20030,#10000,6,20,6,32)
+hasLocation(#20029,#20030)
+regexp_const_value(#20029,"Hello, world!")
 #20031=*
-exit_cfg_node(#20031,#20001)
-hasLocation(#20031,#20019)
-successor(#20021,#20025)
-successor(#20027,#20023)
-successor(#20025,#20027)
-successor(#20023,#20031)
-successor(#20030,#20021)
+entry_cfg_node(#20031,#20002)
+hasLocation(#20031,#20004)
 #20032=*
-toplevel_parent_xml_node(#20001,#20032)
-#20033=@"script;{#10000},8,17"
-#20034=*
-lines(#20034,#20033,";","")
-#20035=@"loc,{#10000},8,17,8,17"
-locations_default(#20035,#10000,8,17,8,17)
-hasLocation(#20034,#20035)
-numlines(#20033,1,1,0)
-#20036=*
-tokeninfo(#20036,8,#20033,0,";")
-hasLocation(#20036,#20035)
+exit_cfg_node(#20032,#20002)
+hasLocation(#20032,#20020)
+successor(#20022,#20026)
+successor(#20028,#20024)
+successor(#20026,#20028)
+successor(#20024,#20032)
+successor(#20031,#20022)
+toplevel_parent_xml_node(#20002,#20001)
+#20033=*
+#20034=@"script;{#10000},8,17"
+#20035=*
+lines(#20035,#20034,";","")
+#20036=@"loc,{#10000},8,17,8,17"
+locations_default(#20036,#10000,8,17,8,17)
+hasLocation(#20035,#20036)
+numlines(#20034,1,1,0)
 #20037=*
-tokeninfo(#20037,0,#20033,1,"")
-#20038=@"loc,{#10000},8,18,8,17"
-locations_default(#20038,#10000,8,18,8,17)
-hasLocation(#20037,#20038)
-toplevels(#20033,1)
-hasLocation(#20033,#20035)
-#20039=*
-stmts(#20039,0,#20033,0,";")
-hasLocation(#20039,#20035)
-stmt_containers(#20039,#20033)
+tokeninfo(#20037,8,#20034,0,";")
+hasLocation(#20037,#20036)
+#20038=*
+tokeninfo(#20038,0,#20034,1,"")
+#20039=@"loc,{#10000},8,18,8,17"
+locations_default(#20039,#10000,8,18,8,17)
+hasLocation(#20038,#20039)
+toplevels(#20034,1)
+hasLocation(#20034,#20036)
 #20040=*
-entry_cfg_node(#20040,#20033)
-#20041=@"loc,{#10000},8,17,8,16"
-locations_default(#20041,#10000,8,17,8,16)
-hasLocation(#20040,#20041)
-#20042=*
-exit_cfg_node(#20042,#20033)
-hasLocation(#20042,#20038)
-successor(#20039,#20042)
-successor(#20040,#20039)
+stmts(#20040,0,#20034,0,";")
+hasLocation(#20040,#20036)
+stmt_containers(#20040,#20034)
+#20041=*
+entry_cfg_node(#20041,#20034)
+#20042=@"loc,{#10000},8,17,8,16"
+locations_default(#20042,#10000,8,17,8,16)
+hasLocation(#20041,#20042)
 #20043=*
-toplevel_parent_xml_node(#20033,#20043)
-#20044=@"script;{#10000},11,29"
-#20045=*
-lines(#20045,#20044,"void(alert('Nope!'))","")
-#20046=@"loc,{#10000},11,29,11,48"
-locations_default(#20046,#10000,11,29,11,48)
-hasLocation(#20045,#20046)
-numlines(#20044,1,1,0)
-#20047=*
-tokeninfo(#20047,7,#20044,0,"void")
-#20048=@"loc,{#10000},11,29,11,32"
-locations_default(#20048,#10000,11,29,11,32)
-hasLocation(#20047,#20048)
-#20049=*
-tokeninfo(#20049,8,#20044,1,"(")
-#20050=@"loc,{#10000},11,33,11,33"
-locations_default(#20050,#10000,11,33,11,33)
-hasLocation(#20049,#20050)
-#20051=*
-tokeninfo(#20051,6,#20044,2,"alert")
-#20052=@"loc,{#10000},11,34,11,38"
-locations_default(#20052,#10000,11,34,11,38)
-hasLocation(#20051,#20052)
-#20053=*
-tokeninfo(#20053,8,#20044,3,"(")
-#20054=@"loc,{#10000},11,39,11,39"
-locations_default(#20054,#10000,11,39,11,39)
-hasLocation(#20053,#20054)
-#20055=*
-tokeninfo(#20055,4,#20044,4,"'Nope!'")
-#20056=@"loc,{#10000},11,40,11,46"
-locations_default(#20056,#10000,11,40,11,46)
-hasLocation(#20055,#20056)
-#20057=*
-tokeninfo(#20057,8,#20044,5,")")
-#20058=@"loc,{#10000},11,47,11,47"
-locations_default(#20058,#10000,11,47,11,47)
-hasLocation(#20057,#20058)
-#20059=*
-tokeninfo(#20059,8,#20044,6,")")
-#20060=@"loc,{#10000},11,48,11,48"
-locations_default(#20060,#10000,11,48,11,48)
-hasLocation(#20059,#20060)
-#20061=*
-tokeninfo(#20061,0,#20044,7,"")
-#20062=@"loc,{#10000},11,49,11,48"
-locations_default(#20062,#10000,11,49,11,48)
-hasLocation(#20061,#20062)
-toplevels(#20044,3)
-hasLocation(#20044,#20046)
-#20063=*
-stmts(#20063,2,#20044,0,"void(alert('Nope!'))")
-hasLocation(#20063,#20046)
-stmt_containers(#20063,#20044)
+exit_cfg_node(#20043,#20034)
+hasLocation(#20043,#20039)
+successor(#20040,#20043)
+successor(#20041,#20040)
+toplevel_parent_xml_node(#20034,#20033)
+#20044=*
+#20045=@"script;{#10000},11,29"
+#20046=*
+lines(#20046,#20045,"void(alert('Nope!'))","")
+#20047=@"loc,{#10000},11,29,11,48"
+locations_default(#20047,#10000,11,29,11,48)
+hasLocation(#20046,#20047)
+numlines(#20045,1,1,0)
+#20048=*
+tokeninfo(#20048,7,#20045,0,"void")
+#20049=@"loc,{#10000},11,29,11,32"
+locations_default(#20049,#10000,11,29,11,32)
+hasLocation(#20048,#20049)
+#20050=*
+tokeninfo(#20050,8,#20045,1,"(")
+#20051=@"loc,{#10000},11,33,11,33"
+locations_default(#20051,#10000,11,33,11,33)
+hasLocation(#20050,#20051)
+#20052=*
+tokeninfo(#20052,6,#20045,2,"alert")
+#20053=@"loc,{#10000},11,34,11,38"
+locations_default(#20053,#10000,11,34,11,38)
+hasLocation(#20052,#20053)
+#20054=*
+tokeninfo(#20054,8,#20045,3,"(")
+#20055=@"loc,{#10000},11,39,11,39"
+locations_default(#20055,#10000,11,39,11,39)
+hasLocation(#20054,#20055)
+#20056=*
+tokeninfo(#20056,4,#20045,4,"'Nope!'")
+#20057=@"loc,{#10000},11,40,11,46"
+locations_default(#20057,#10000,11,40,11,46)
+hasLocation(#20056,#20057)
+#20058=*
+tokeninfo(#20058,8,#20045,5,")")
+#20059=@"loc,{#10000},11,47,11,47"
+locations_default(#20059,#10000,11,47,11,47)
+hasLocation(#20058,#20059)
+#20060=*
+tokeninfo(#20060,8,#20045,6,")")
+#20061=@"loc,{#10000},11,48,11,48"
+locations_default(#20061,#10000,11,48,11,48)
+hasLocation(#20060,#20061)
+#20062=*
+tokeninfo(#20062,0,#20045,7,"")
+#20063=@"loc,{#10000},11,49,11,48"
+locations_default(#20063,#10000,11,49,11,48)
+hasLocation(#20062,#20063)
+toplevels(#20045,3)
+hasLocation(#20045,#20047)
 #20064=*
-exprs(#20064,21,#20063,0,"void(alert('Nope!'))")
-hasLocation(#20064,#20046)
-enclosing_stmt(#20064,#20063)
-expr_containers(#20064,#20044)
+stmts(#20064,2,#20045,0,"void(alert('Nope!'))")
+hasLocation(#20064,#20047)
+stmt_containers(#20064,#20045)
 #20065=*
-exprs(#20065,63,#20064,0,"(alert('Nope!'))")
-#20066=@"loc,{#10000},11,33,11,48"
-locations_default(#20066,#10000,11,33,11,48)
-hasLocation(#20065,#20066)
-enclosing_stmt(#20065,#20063)
-expr_containers(#20065,#20044)
-#20067=*
-exprs(#20067,13,#20065,0,"alert('Nope!')")
-#20068=@"loc,{#10000},11,34,11,47"
-locations_default(#20068,#10000,11,34,11,47)
-hasLocation(#20067,#20068)
-enclosing_stmt(#20067,#20063)
-expr_containers(#20067,#20044)
-#20069=*
-exprs(#20069,79,#20067,-1,"alert")
-hasLocation(#20069,#20052)
-enclosing_stmt(#20069,#20063)
-expr_containers(#20069,#20044)
-literals("alert","alert",#20069)
-bind(#20069,#20026)
+exprs(#20065,21,#20064,0,"void(alert('Nope!'))")
+hasLocation(#20065,#20047)
+enclosing_stmt(#20065,#20064)
+expr_containers(#20065,#20045)
+#20066=*
+exprs(#20066,63,#20065,0,"(alert('Nope!'))")
+#20067=@"loc,{#10000},11,33,11,48"
+locations_default(#20067,#10000,11,33,11,48)
+hasLocation(#20066,#20067)
+enclosing_stmt(#20066,#20064)
+expr_containers(#20066,#20045)
+#20068=*
+exprs(#20068,13,#20066,0,"alert('Nope!')")
+#20069=@"loc,{#10000},11,34,11,47"
+locations_default(#20069,#10000,11,34,11,47)
+hasLocation(#20068,#20069)
+enclosing_stmt(#20068,#20064)
+expr_containers(#20068,#20045)
 #20070=*
-exprs(#20070,4,#20067,0,"'Nope!'")
-hasLocation(#20070,#20056)
-enclosing_stmt(#20070,#20063)
-expr_containers(#20070,#20044)
-literals("Nope!","'Nope!'",#20070)
+exprs(#20070,79,#20068,-1,"alert")
+hasLocation(#20070,#20053)
+enclosing_stmt(#20070,#20064)
+expr_containers(#20070,#20045)
+literals("alert","alert",#20070)
+bind(#20070,#20027)
 #20071=*
-regexpterm(#20071,14,#20070,0,"Nope!")
-#20072=@"loc,{#10000},11,41,11,45"
-locations_default(#20072,#10000,11,41,11,45)
-hasLocation(#20071,#20072)
-regexp_const_value(#20071,"Nope!")
-#20073=*
-entry_cfg_node(#20073,#20044)
-#20074=@"loc,{#10000},11,29,11,28"
-locations_default(#20074,#10000,11,29,11,28)
-hasLocation(#20073,#20074)
-#20075=*
-exit_cfg_node(#20075,#20044)
-hasLocation(#20075,#20062)
-successor(#20063,#20065)
-successor(#20065,#20069)
-successor(#20070,#20067)
-successor(#20069,#20070)
-successor(#20067,#20064)
-successor(#20064,#20075)
-successor(#20073,#20063)
+exprs(#20071,4,#20068,0,"'Nope!'")
+hasLocation(#20071,#20057)
+enclosing_stmt(#20071,#20064)
+expr_containers(#20071,#20045)
+literals("Nope!","'Nope!'",#20071)
+#20072=*
+regexpterm(#20072,14,#20071,0,"Nope!")
+#20073=@"loc,{#10000},11,41,11,45"
+locations_default(#20073,#10000,11,41,11,45)
+hasLocation(#20072,#20073)
+regexp_const_value(#20072,"Nope!")
+#20074=*
+entry_cfg_node(#20074,#20045)
+#20075=@"loc,{#10000},11,29,11,28"
+locations_default(#20075,#10000,11,29,11,28)
+hasLocation(#20074,#20075)
 #20076=*
-toplevel_parent_xml_node(#20044,#20076)
-#20077=@"script;{#10000},12,23"
-#20078=*
-lines(#20078,#20077,"alert('I said don\'t click!')","")
-#20079=@"loc,{#10000},12,23,12,51"
-locations_default(#20079,#10000,12,23,12,51)
-hasLocation(#20078,#20079)
-numlines(#20077,1,1,0)
-#20080=*
-tokeninfo(#20080,6,#20077,0,"alert")
-#20081=@"loc,{#10000},12,23,12,27"
-locations_default(#20081,#10000,12,23,12,27)
-hasLocation(#20080,#20081)
-#20082=*
-tokeninfo(#20082,8,#20077,1,"(")
-#20083=@"loc,{#10000},12,28,12,28"
-locations_default(#20083,#10000,12,28,12,28)
-hasLocation(#20082,#20083)
-#20084=*
-tokeninfo(#20084,4,#20077,2,"'I said don\'t click!'")
-#20085=@"loc,{#10000},12,29,12,50"
-locations_default(#20085,#10000,12,29,12,50)
-hasLocation(#20084,#20085)
-#20086=*
-tokeninfo(#20086,8,#20077,3,")")
-#20087=@"loc,{#10000},12,51,12,51"
-locations_default(#20087,#10000,12,51,12,51)
-hasLocation(#20086,#20087)
-#20088=*
-tokeninfo(#20088,0,#20077,4,"")
-#20089=@"loc,{#10000},12,52,12,51"
-locations_default(#20089,#10000,12,52,12,51)
-hasLocation(#20088,#20089)
-toplevels(#20077,2)
-hasLocation(#20077,#20079)
-#20090=*
-stmts(#20090,2,#20077,0,"alert(' ... lick!')")
-hasLocation(#20090,#20079)
-stmt_containers(#20090,#20077)
+exit_cfg_node(#20076,#20045)
+hasLocation(#20076,#20063)
+successor(#20064,#20066)
+successor(#20066,#20070)
+successor(#20071,#20068)
+successor(#20070,#20071)
+successor(#20068,#20065)
+successor(#20065,#20076)
+successor(#20074,#20064)
+toplevel_parent_xml_node(#20045,#20044)
+#20077=*
+#20078=@"script;{#10000},12,23"
+#20079=*
+lines(#20079,#20078,"alert('I said don\'t click!')","")
+#20080=@"loc,{#10000},12,23,12,51"
+locations_default(#20080,#10000,12,23,12,51)
+hasLocation(#20079,#20080)
+numlines(#20078,1,1,0)
+#20081=*
+tokeninfo(#20081,6,#20078,0,"alert")
+#20082=@"loc,{#10000},12,23,12,27"
+locations_default(#20082,#10000,12,23,12,27)
+hasLocation(#20081,#20082)
+#20083=*
+tokeninfo(#20083,8,#20078,1,"(")
+#20084=@"loc,{#10000},12,28,12,28"
+locations_default(#20084,#10000,12,28,12,28)
+hasLocation(#20083,#20084)
+#20085=*
+tokeninfo(#20085,4,#20078,2,"'I said don\'t click!'")
+#20086=@"loc,{#10000},12,29,12,50"
+locations_default(#20086,#10000,12,29,12,50)
+hasLocation(#20085,#20086)
+#20087=*
+tokeninfo(#20087,8,#20078,3,")")
+#20088=@"loc,{#10000},12,51,12,51"
+locations_default(#20088,#10000,12,51,12,51)
+hasLocation(#20087,#20088)
+#20089=*
+tokeninfo(#20089,0,#20078,4,"")
+#20090=@"loc,{#10000},12,52,12,51"
+locations_default(#20090,#10000,12,52,12,51)
+hasLocation(#20089,#20090)
+toplevels(#20078,2)
+hasLocation(#20078,#20080)
 #20091=*
-exprs(#20091,13,#20090,0,"alert(' ... lick!')")
-hasLocation(#20091,#20079)
-enclosing_stmt(#20091,#20090)
-expr_containers(#20091,#20077)
+stmts(#20091,2,#20078,0,"alert(' ... lick!')")
+hasLocation(#20091,#20080)
+stmt_containers(#20091,#20078)
 #20092=*
-exprs(#20092,79,#20091,-1,"alert")
-hasLocation(#20092,#20081)
-enclosing_stmt(#20092,#20090)
-expr_containers(#20092,#20077)
-literals("alert","alert",#20092)
-bind(#20092,#20026)
+exprs(#20092,13,#20091,0,"alert(' ... lick!')")
+hasLocation(#20092,#20080)
+enclosing_stmt(#20092,#20091)
+expr_containers(#20092,#20078)
 #20093=*
-exprs(#20093,4,#20091,0,"'I said ... click!'")
-hasLocation(#20093,#20085)
-enclosing_stmt(#20093,#20090)
-expr_containers(#20093,#20077)
-literals("I said don't click!","'I said don\'t click!'",#20093)
+exprs(#20093,79,#20092,-1,"alert")
+hasLocation(#20093,#20082)
+enclosing_stmt(#20093,#20091)
+expr_containers(#20093,#20078)
+literals("alert","alert",#20093)
+bind(#20093,#20027)
 #20094=*
-regexpterm(#20094,14,#20093,0,"I said don't click!")
-#20095=@"loc,{#10000},12,30,12,49"
-locations_default(#20095,#10000,12,30,12,49)
-hasLocation(#20094,#20095)
-regexp_const_value(#20094,"I said don't click!")
-#20096=*
-entry_cfg_node(#20096,#20077)
-#20097=@"loc,{#10000},12,23,12,22"
-locations_default(#20097,#10000,12,23,12,22)
-hasLocation(#20096,#20097)
-#20098=*
-exit_cfg_node(#20098,#20077)
-hasLocation(#20098,#20089)
-successor(#20090,#20092)
-successor(#20093,#20091)
-successor(#20092,#20093)
-successor(#20091,#20098)
-successor(#20096,#20090)
+exprs(#20094,4,#20092,0,"'I said ... click!'")
+hasLocation(#20094,#20086)
+enclosing_stmt(#20094,#20091)
+expr_containers(#20094,#20078)
+literals("I said don't click!","'I said don\'t click!'",#20094)
+#20095=*
+regexpterm(#20095,14,#20094,0,"I said don't click!")
+#20096=@"loc,{#10000},12,30,12,49"
+locations_default(#20096,#10000,12,30,12,49)
+hasLocation(#20095,#20096)
+regexp_const_value(#20095,"I said don't click!")
+#20097=*
+entry_cfg_node(#20097,#20078)
+#20098=@"loc,{#10000},12,23,12,22"
+locations_default(#20098,#10000,12,23,12,22)
+hasLocation(#20097,#20098)
 #20099=*
-toplevel_parent_xml_node(#20077,#20099)
-#20100=@"script;{#10000},13,21"
-#20101=*
-lines(#20101,#20100,"return false;","")
-#20102=@"loc,{#10000},13,21,13,33"
-locations_default(#20102,#10000,13,21,13,33)
-hasLocation(#20101,#20102)
-numlines(#20100,1,1,0)
-#20103=*
-tokeninfo(#20103,7,#20100,0,"return")
-#20104=@"loc,{#10000},13,21,13,26"
-locations_default(#20104,#10000,13,21,13,26)
-hasLocation(#20103,#20104)
-#20105=*
-tokeninfo(#20105,2,#20100,1,"false")
-#20106=@"loc,{#10000},13,28,13,32"
-locations_default(#20106,#10000,13,28,13,32)
-hasLocation(#20105,#20106)
-#20107=*
-tokeninfo(#20107,8,#20100,2,";")
-#20108=@"loc,{#10000},13,33,13,33"
-locations_default(#20108,#10000,13,33,13,33)
-hasLocation(#20107,#20108)
-#20109=*
-tokeninfo(#20109,0,#20100,3,"")
-#20110=@"loc,{#10000},13,34,13,33"
-locations_default(#20110,#10000,13,34,13,33)
-hasLocation(#20109,#20110)
-toplevels(#20100,2)
-hasLocation(#20100,#20102)
-#20111=*
-stmts(#20111,9,#20100,0,"return false;")
-hasLocation(#20111,#20102)
-stmt_containers(#20111,#20100)
+exit_cfg_node(#20099,#20078)
+hasLocation(#20099,#20090)
+successor(#20091,#20093)
+successor(#20094,#20092)
+successor(#20093,#20094)
+successor(#20092,#20099)
+successor(#20097,#20091)
+toplevel_parent_xml_node(#20078,#20077)
+#20100=*
+#20101=@"script;{#10000},13,21"
+#20102=*
+lines(#20102,#20101,"return false;","")
+#20103=@"loc,{#10000},13,21,13,33"
+locations_default(#20103,#10000,13,21,13,33)
+hasLocation(#20102,#20103)
+numlines(#20101,1,1,0)
+#20104=*
+tokeninfo(#20104,7,#20101,0,"return")
+#20105=@"loc,{#10000},13,21,13,26"
+locations_default(#20105,#10000,13,21,13,26)
+hasLocation(#20104,#20105)
+#20106=*
+tokeninfo(#20106,2,#20101,1,"false")
+#20107=@"loc,{#10000},13,28,13,32"
+locations_default(#20107,#10000,13,28,13,32)
+hasLocation(#20106,#20107)
+#20108=*
+tokeninfo(#20108,8,#20101,2,";")
+#20109=@"loc,{#10000},13,33,13,33"
+locations_default(#20109,#10000,13,33,13,33)
+hasLocation(#20108,#20109)
+#20110=*
+tokeninfo(#20110,0,#20101,3,"")
+#20111=@"loc,{#10000},13,34,13,33"
+locations_default(#20111,#10000,13,34,13,33)
+hasLocation(#20110,#20111)
+toplevels(#20101,2)
+hasLocation(#20101,#20103)
 #20112=*
-exprs(#20112,2,#20111,0,"false")
-hasLocation(#20112,#20106)
-enclosing_stmt(#20112,#20111)
-expr_containers(#20112,#20100)
-literals("false","false",#20112)
+stmts(#20112,9,#20101,0,"return false;")
+hasLocation(#20112,#20103)
+stmt_containers(#20112,#20101)
 #20113=*
-entry_cfg_node(#20113,#20100)
-#20114=@"loc,{#10000},13,21,13,20"
-locations_default(#20114,#10000,13,21,13,20)
-hasLocation(#20113,#20114)
-#20115=*
-exit_cfg_node(#20115,#20100)
-hasLocation(#20115,#20110)
-successor(#20112,#20111)
-successor(#20111,#20115)
-successor(#20113,#20112)
+exprs(#20113,2,#20112,0,"false")
+hasLocation(#20113,#20107)
+enclosing_stmt(#20113,#20112)
+expr_containers(#20113,#20101)
+literals("false","false",#20113)
+#20114=*
+entry_cfg_node(#20114,#20101)
+#20115=@"loc,{#10000},13,21,13,20"
+locations_default(#20115,#10000,13,21,13,20)
+hasLocation(#20114,#20115)
 #20116=*
-toplevel_parent_xml_node(#20100,#20116)
+exit_cfg_node(#20116,#20101)
+hasLocation(#20116,#20111)
+successor(#20113,#20112)
+successor(#20112,#20116)
+successor(#20114,#20113)
+toplevel_parent_xml_node(#20101,#20100)
 #20117=*
 xmlElements(#20117,"html",#10000,0,#10000)
 #20118=@"loc,{#10000},1,1,18,7"
@@ -405,74 +405,180 @@ xmlAttrs(#20125,#20123,"TYPE","text/x-handlebars-template",0,#10000)
 locations_default(#20126,#10000,16,13,16,45)
 xmllocations(#20125,#20126)
 #20127=*
-xmlElements(#20127,"script",#20117,2,#10000)
-#20128=@"loc,{#10000},15,5,15,71"
-locations_default(#20128,#10000,15,5,15,71)
-xmllocations(#20127,#20128)
-#20129=*
-xmlAttrs(#20129,#20127,"type","text/x-handlebars-template",0,#10000)
-#20130=@"loc,{#10000},15,13,15,45"
-locations_default(#20130,#10000,15,13,15,45)
-xmllocations(#20129,#20130)
-#20131=*
-xmlElements(#20131,"body",#20117,1,#10000)
-#20132=@"loc,{#10000},10,5,14,11"
-locations_default(#20132,#10000,10,5,14,11)
-xmllocations(#20131,#20132)
+template_placeholder_tag_info(#20127,#20123,"{{name}}")
+#20128=@"loc,{#10000},16,54,16,61"
+locations_default(#20128,#10000,16,54,16,61)
+hasLocation(#20127,#20128)
+scopes(#20000,0)
+#20129=@"script;{#10000},16,56"
+#20130=*
+lines(#20130,#20129,"name","")
+#20131=@"loc,{#10000},16,56,16,59"
+locations_default(#20131,#10000,16,56,16,59)
+hasLocation(#20130,#20131)
+numlines(#20129,1,1,0)
+#20132=*
+tokeninfo(#20132,6,#20129,0,"name")
+hasLocation(#20132,#20131)
 #20133=*
-xmlElements(#20133,"a",#20131,2,#10000)
-#20134=@"loc,{#10000},13,9,13,59"
-locations_default(#20134,#10000,13,9,13,59)
-xmllocations(#20133,#20134)
-xmlAttrs(#20116,#20133,"onclick","return false;",0,#10000)
-#20135=@"loc,{#10000},13,12,13,34"
-locations_default(#20135,#10000,13,12,13,34)
-xmllocations(#20116,#20135)
+tokeninfo(#20133,0,#20129,1,"")
+#20134=@"loc,{#10000},16,60,16,59"
+locations_default(#20134,#10000,16,60,16,59)
+hasLocation(#20133,#20134)
+toplevels(#20129,4)
+hasLocation(#20129,#20131)
+#20135=@"module;{#10000},16,56"
+scopes(#20135,3)
+scopenodes(#20129,#20135)
+scopenesting(#20135,#20000)
+is_module(#20129)
 #20136=*
-xmlElements(#20136,"div",#20131,1,#10000)
-#20137=@"loc,{#10000},12,9,12,75"
-locations_default(#20137,#10000,12,9,12,75)
-xmllocations(#20136,#20137)
-xmlAttrs(#20099,#20136,"onclick","alert('I said don\'t click!')",0,#10000)
-#20138=@"loc,{#10000},12,14,12,52"
-locations_default(#20138,#10000,12,14,12,52)
-xmllocations(#20099,#20138)
+stmts(#20136,2,#20129,0,"name")
+hasLocation(#20136,#20131)
+stmt_containers(#20136,#20129)
+#20137=*
+exprs(#20137,79,#20136,0,"name")
+hasLocation(#20137,#20131)
+enclosing_stmt(#20137,#20136)
+expr_containers(#20137,#20129)
+literals("name","name",#20137)
+#20138=@"var;{name};{#20135}"
+variables(#20138,"name",#20135)
+bind(#20137,#20138)
 #20139=*
-xmlElements(#20139,"a",#20131,0,#10000)
-#20140=@"loc,{#10000},11,9,11,64"
-locations_default(#20140,#10000,11,9,11,64)
-xmllocations(#20139,#20140)
-xmlAttrs(#20076,#20139,"href","javascript:void(alert('Nope!'))",0,#10000)
-#20141=@"loc,{#10000},11,12,11,49"
-locations_default(#20141,#10000,11,12,11,49)
-xmllocations(#20076,#20141)
+entry_cfg_node(#20139,#20129)
+#20140=@"loc,{#10000},16,56,16,55"
+locations_default(#20140,#10000,16,56,16,55)
+hasLocation(#20139,#20140)
+#20141=*
+exit_cfg_node(#20141,#20129)
+hasLocation(#20141,#20134)
+successor(#20136,#20137)
+successor(#20137,#20141)
+successor(#20139,#20136)
+toplevel_parent_xml_node(#20129,#20127)
 #20142=*
-xmlElements(#20142,"head",#20117,0,#10000)
-#20143=@"loc,{#10000},2,5,9,11"
-locations_default(#20143,#10000,2,5,9,11)
+xmlElements(#20142,"script",#20117,2,#10000)
+#20143=@"loc,{#10000},15,5,15,71"
+locations_default(#20143,#10000,15,5,15,71)
 xmllocations(#20142,#20143)
-xmlElements(#20043,"script",#20142,3,#10000)
-#20144=@"loc,{#10000},8,9,8,26"
-locations_default(#20144,#10000,8,9,8,26)
-xmllocations(#20043,#20144)
-xmlElements(#20032,"script",#20142,2,#10000)
-#20145=@"loc,{#10000},5,9,7,17"
-locations_default(#20145,#10000,5,9,7,17)
-xmllocations(#20032,#20145)
+#20144=*
+xmlAttrs(#20144,#20142,"type","text/x-handlebars-template",0,#10000)
+#20145=@"loc,{#10000},15,13,15,45"
+locations_default(#20145,#10000,15,13,15,45)
+xmllocations(#20144,#20145)
 #20146=*
-xmlElements(#20146,"script",#20142,1,#10000)
-#20147=@"loc,{#10000},4,9,4,43"
-locations_default(#20147,#10000,4,9,4,43)
-xmllocations(#20146,#20147)
-#20148=*
-xmlAttrs(#20148,#20146,"src","external.js",0,#10000)
-#20149=@"loc,{#10000},4,17,4,33"
-locations_default(#20149,#10000,4,17,4,33)
-xmllocations(#20148,#20149)
-#20150=*
-xmlElements(#20150,"title",#20142,0,#10000)
-#20151=@"loc,{#10000},3,9,3,32"
-locations_default(#20151,#10000,3,9,3,32)
-xmllocations(#20150,#20151)
-numlines(#10000,18,5,0)
+template_placeholder_tag_info(#20146,#20142,"{{name}}")
+#20147=@"loc,{#10000},15,54,15,61"
+locations_default(#20147,#10000,15,54,15,61)
+hasLocation(#20146,#20147)
+scopes(#20000,0)
+#20148=@"script;{#10000},15,56"
+#20149=*
+lines(#20149,#20148,"name","")
+#20150=@"loc,{#10000},15,56,15,59"
+locations_default(#20150,#10000,15,56,15,59)
+hasLocation(#20149,#20150)
+numlines(#20148,1,1,0)
+#20151=*
+tokeninfo(#20151,6,#20148,0,"name")
+hasLocation(#20151,#20150)
+#20152=*
+tokeninfo(#20152,0,#20148,1,"")
+#20153=@"loc,{#10000},15,60,15,59"
+locations_default(#20153,#10000,15,60,15,59)
+hasLocation(#20152,#20153)
+toplevels(#20148,4)
+hasLocation(#20148,#20150)
+#20154=@"module;{#10000},15,56"
+scopes(#20154,3)
+scopenodes(#20148,#20154)
+scopenesting(#20154,#20000)
+is_module(#20148)
+#20155=*
+stmts(#20155,2,#20148,0,"name")
+hasLocation(#20155,#20150)
+stmt_containers(#20155,#20148)
+#20156=*
+exprs(#20156,79,#20155,0,"name")
+hasLocation(#20156,#20150)
+enclosing_stmt(#20156,#20155)
+expr_containers(#20156,#20148)
+literals("name","name",#20156)
+#20157=@"var;{name};{#20154}"
+variables(#20157,"name",#20154)
+bind(#20156,#20157)
+#20158=*
+entry_cfg_node(#20158,#20148)
+#20159=@"loc,{#10000},15,56,15,55"
+locations_default(#20159,#10000,15,56,15,55)
+hasLocation(#20158,#20159)
+#20160=*
+exit_cfg_node(#20160,#20148)
+hasLocation(#20160,#20153)
+successor(#20155,#20156)
+successor(#20156,#20160)
+successor(#20158,#20155)
+toplevel_parent_xml_node(#20148,#20146)
+#20161=*
+xmlElements(#20161,"body",#20117,1,#10000)
+#20162=@"loc,{#10000},10,5,14,11"
+locations_default(#20162,#10000,10,5,14,11)
+xmllocations(#20161,#20162)
+#20163=*
+xmlElements(#20163,"a",#20161,2,#10000)
+#20164=@"loc,{#10000},13,9,13,59"
+locations_default(#20164,#10000,13,9,13,59)
+xmllocations(#20163,#20164)
+xmlAttrs(#20100,#20163,"onclick","return false;",0,#10000)
+#20165=@"loc,{#10000},13,12,13,34"
+locations_default(#20165,#10000,13,12,13,34)
+xmllocations(#20100,#20165)
+#20166=*
+xmlElements(#20166,"div",#20161,1,#10000)
+#20167=@"loc,{#10000},12,9,12,75"
+locations_default(#20167,#10000,12,9,12,75)
+xmllocations(#20166,#20167)
+xmlAttrs(#20077,#20166,"onclick","alert('I said don\'t click!')",0,#10000)
+#20168=@"loc,{#10000},12,14,12,52"
+locations_default(#20168,#10000,12,14,12,52)
+xmllocations(#20077,#20168)
+#20169=*
+xmlElements(#20169,"a",#20161,0,#10000)
+#20170=@"loc,{#10000},11,9,11,64"
+locations_default(#20170,#10000,11,9,11,64)
+xmllocations(#20169,#20170)
+xmlAttrs(#20044,#20169,"href","javascript:void(alert('Nope!'))",0,#10000)
+#20171=@"loc,{#10000},11,12,11,49"
+locations_default(#20171,#10000,11,12,11,49)
+xmllocations(#20044,#20171)
+#20172=*
+xmlElements(#20172,"head",#20117,0,#10000)
+#20173=@"loc,{#10000},2,5,9,11"
+locations_default(#20173,#10000,2,5,9,11)
+xmllocations(#20172,#20173)
+xmlElements(#20033,"script",#20172,3,#10000)
+#20174=@"loc,{#10000},8,9,8,26"
+locations_default(#20174,#10000,8,9,8,26)
+xmllocations(#20033,#20174)
+xmlElements(#20001,"script",#20172,2,#10000)
+#20175=@"loc,{#10000},5,9,7,17"
+locations_default(#20175,#10000,5,9,7,17)
+xmllocations(#20001,#20175)
+#20176=*
+xmlElements(#20176,"script",#20172,1,#10000)
+#20177=@"loc,{#10000},4,9,4,43"
+locations_default(#20177,#10000,4,9,4,43)
+xmllocations(#20176,#20177)
+#20178=*
+xmlAttrs(#20178,#20176,"src","external.js",0,#10000)
+#20179=@"loc,{#10000},4,17,4,33"
+locations_default(#20179,#10000,4,17,4,33)
+xmllocations(#20178,#20179)
+#20180=*
+xmlElements(#20180,"title",#20172,0,#10000)
+#20181=@"loc,{#10000},3,9,3,32"
+locations_default(#20181,#10000,3,9,3,32)
+xmllocations(#20180,#20181)
+numlines(#10000,18,7,0)
 filetype(#10000,"html")
--- a/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
@@ -8,74 +8,74 @@ locations_default(#10002,#10000,0,0,0,0)
 hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
-#20001=@"script;{#10000},7,43"
-#20002=*
-lines(#20002,#20001,"","
+#20001=*
+#20002=@"script;{#10000},7,43"
+#20003=*
+lines(#20003,#20002,"","
 ")
-#20003=@"loc,{#10000},7,43,7,42"
-locations_default(#20003,#10000,7,43,7,42)
-hasLocation(#20002,#20003)
-#20004=*
-lines(#20004,#20001,"              ","
+#20004=@"loc,{#10000},7,43,7,42"
+locations_default(#20004,#10000,7,43,7,42)
+hasLocation(#20003,#20004)
+#20005=*
+lines(#20005,#20002,"              ","
 ")
-#20005=@"loc,{#10000},8,1,8,14"
-locations_default(#20005,#10000,8,1,8,14)
-hasLocation(#20004,#20005)
-#20006=*
-lines(#20006,#20001,"    42;","
+#20006=@"loc,{#10000},8,1,8,14"
+locations_default(#20006,#10000,8,1,8,14)
+hasLocation(#20005,#20006)
+#20007=*
+lines(#20007,#20002,"    42;","
 ")
-#20007=@"loc,{#10000},9,1,9,7"
-locations_default(#20007,#10000,9,1,9,7)
-hasLocation(#20006,#20007)
+#20008=@"loc,{#10000},9,1,9,7"
+locations_default(#20008,#10000,9,1,9,7)
+hasLocation(#20007,#20008)
 indentation(#10000,9," ",4)
-#20008=*
-lines(#20008,#20001,"       ","")
-#20009=@"loc,{#10000},10,1,10,7"
-locations_default(#20009,#10000,10,1,10,7)
-hasLocation(#20008,#20009)
-numlines(#20001,4,1,0)
-#20010=*
-tokeninfo(#20010,3,#20001,0,"42")
-#20011=@"loc,{#10000},9,5,9,6"
-locations_default(#20011,#10000,9,5,9,6)
-hasLocation(#20010,#20011)
-#20012=*
-tokeninfo(#20012,8,#20001,1,";")
-#20013=@"loc,{#10000},9,7,9,7"
-locations_default(#20013,#10000,9,7,9,7)
-hasLocation(#20012,#20013)
-#20014=*
-tokeninfo(#20014,0,#20001,2,"")
-#20015=@"loc,{#10000},10,8,10,7"
-locations_default(#20015,#10000,10,8,10,7)
-hasLocation(#20014,#20015)
-toplevels(#20001,1)
-#20016=@"loc,{#10000},7,43,10,7"
-locations_default(#20016,#10000,7,43,10,7)
-hasLocation(#20001,#20016)
-#20017=*
-stmts(#20017,2,#20001,0,"42;")
-#20018=@"loc,{#10000},9,5,9,7"
-locations_default(#20018,#10000,9,5,9,7)
-hasLocation(#20017,#20018)
-stmt_containers(#20017,#20001)
-#20019=*
-exprs(#20019,3,#20017,0,"42")
-hasLocation(#20019,#20011)
-enclosing_stmt(#20019,#20017)
-expr_containers(#20019,#20001)
-literals("42","42",#20019)
+#20009=*
+lines(#20009,#20002,"       ","")
+#20010=@"loc,{#10000},10,1,10,7"
+locations_default(#20010,#10000,10,1,10,7)
+hasLocation(#20009,#20010)
+numlines(#20002,4,1,0)
+#20011=*
+tokeninfo(#20011,3,#20002,0,"42")
+#20012=@"loc,{#10000},9,5,9,6"
+locations_default(#20012,#10000,9,5,9,6)
+hasLocation(#20011,#20012)
+#20013=*
+tokeninfo(#20013,8,#20002,1,";")
+#20014=@"loc,{#10000},9,7,9,7"
+locations_default(#20014,#10000,9,7,9,7)
+hasLocation(#20013,#20014)
+#20015=*
+tokeninfo(#20015,0,#20002,2,"")
+#20016=@"loc,{#10000},10,8,10,7"
+locations_default(#20016,#10000,10,8,10,7)
+hasLocation(#20015,#20016)
+toplevels(#20002,1)
+#20017=@"loc,{#10000},7,43,10,7"
+locations_default(#20017,#10000,7,43,10,7)
+hasLocation(#20002,#20017)
+#20018=*
+stmts(#20018,2,#20002,0,"42;")
+#20019=@"loc,{#10000},9,5,9,7"
+locations_default(#20019,#10000,9,5,9,7)
+hasLocation(#20018,#20019)
+stmt_containers(#20018,#20002)
 #20020=*
-entry_cfg_node(#20020,#20001)
-hasLocation(#20020,#20003)
+exprs(#20020,3,#20018,0,"42")
+hasLocation(#20020,#20012)
+enclosing_stmt(#20020,#20018)
+expr_containers(#20020,#20002)
+literals("42","42",#20020)
 #20021=*
-exit_cfg_node(#20021,#20001)
-hasLocation(#20021,#20015)
-successor(#20017,#20019)
-successor(#20019,#20021)
-successor(#20020,#20017)
+entry_cfg_node(#20021,#20002)
+hasLocation(#20021,#20004)
 #20022=*
-toplevel_parent_xml_node(#20001,#20022)
+exit_cfg_node(#20022,#20002)
+hasLocation(#20022,#20016)
+successor(#20018,#20020)
+successor(#20020,#20022)
+successor(#20021,#20018)
+toplevel_parent_xml_node(#20002,#20001)
 #20023=*
 xmlElements(#20023,"html",#10000,0,#10000)
 #20024=@"loc,{#10000},2,1,12,7"
@@ -96,12 +96,12 @@ xmlElements(#20029,"body",#20023,1,#10000)
 #20030=@"loc,{#10000},6,1,11,7"
 locations_default(#20030,#10000,6,1,11,7)
 xmllocations(#20029,#20030)
-xmlElements(#20022,"script",#20029,0,#10000)
+xmlElements(#20001,"script",#20029,0,#10000)
 #20031=@"loc,{#10000},7,5,10,16"
 locations_default(#20031,#10000,7,5,10,16)
-xmllocations(#20022,#20031)
+xmllocations(#20001,#20031)
 #20032=*
-xmlAttrs(#20032,#20022,"type","application/javascript",0,#10000)
+xmlAttrs(#20032,#20001,"type","application/javascript",0,#10000)
 #20033=@"loc,{#10000},7,13,7,41"
 locations_default(#20033,#10000,7,13,7,41)
 xmllocations(#20032,#20033)
--- a/javascript/extractor/tests/html/output/trap/tst2.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst2.html.trap
@@ -8,365 +8,365 @@ locations_default(#10002,#10000,0,0,0,0)
 hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
-#20001=@"script;{#10000},2,31"
-#20002=*
-lines(#20002,#20001,"var hello;","")
-#20003=@"loc,{#10000},2,31,2,40"
-locations_default(#20003,#10000,2,31,2,40)
-hasLocation(#20002,#20003)
-numlines(#20001,1,1,0)
-#20004=*
-tokeninfo(#20004,7,#20001,0,"var")
-#20005=@"loc,{#10000},2,31,2,33"
-locations_default(#20005,#10000,2,31,2,33)
-hasLocation(#20004,#20005)
-#20006=*
-tokeninfo(#20006,6,#20001,1,"hello")
-#20007=@"loc,{#10000},2,35,2,39"
-locations_default(#20007,#10000,2,35,2,39)
-hasLocation(#20006,#20007)
-#20008=*
-tokeninfo(#20008,8,#20001,2,";")
-#20009=@"loc,{#10000},2,40,2,40"
-locations_default(#20009,#10000,2,40,2,40)
-hasLocation(#20008,#20009)
-#20010=*
-tokeninfo(#20010,0,#20001,3,"")
-#20011=@"loc,{#10000},2,41,2,40"
-locations_default(#20011,#10000,2,41,2,40)
-hasLocation(#20010,#20011)
-toplevels(#20001,1)
-hasLocation(#20001,#20003)
-#20012=@"var;{hello};{#20000}"
-variables(#20012,"hello",#20000)
-#20013=*
-stmts(#20013,18,#20001,0,"var hello;")
-hasLocation(#20013,#20003)
-stmt_containers(#20013,#20001)
+#20001=*
+#20002=@"script;{#10000},2,31"
+#20003=*
+lines(#20003,#20002,"var hello;","")
+#20004=@"loc,{#10000},2,31,2,40"
+locations_default(#20004,#10000,2,31,2,40)
+hasLocation(#20003,#20004)
+numlines(#20002,1,1,0)
+#20005=*
+tokeninfo(#20005,7,#20002,0,"var")
+#20006=@"loc,{#10000},2,31,2,33"
+locations_default(#20006,#10000,2,31,2,33)
+hasLocation(#20005,#20006)
+#20007=*
+tokeninfo(#20007,6,#20002,1,"hello")
+#20008=@"loc,{#10000},2,35,2,39"
+locations_default(#20008,#10000,2,35,2,39)
+hasLocation(#20007,#20008)
+#20009=*
+tokeninfo(#20009,8,#20002,2,";")
+#20010=@"loc,{#10000},2,40,2,40"
+locations_default(#20010,#10000,2,40,2,40)
+hasLocation(#20009,#20010)
+#20011=*
+tokeninfo(#20011,0,#20002,3,"")
+#20012=@"loc,{#10000},2,41,2,40"
+locations_default(#20012,#10000,2,41,2,40)
+hasLocation(#20011,#20012)
+toplevels(#20002,1)
+hasLocation(#20002,#20004)
+#20013=@"var;{hello};{#20000}"
+variables(#20013,"hello",#20000)
 #20014=*
-exprs(#20014,64,#20013,0,"hello")
-hasLocation(#20014,#20007)
-enclosing_stmt(#20014,#20013)
-expr_containers(#20014,#20001)
+stmts(#20014,18,#20002,0,"var hello;")
+hasLocation(#20014,#20004)
+stmt_containers(#20014,#20002)
 #20015=*
-exprs(#20015,78,#20014,0,"hello")
-hasLocation(#20015,#20007)
-enclosing_stmt(#20015,#20013)
-expr_containers(#20015,#20001)
-literals("hello","hello",#20015)
-decl(#20015,#20012)
+exprs(#20015,64,#20014,0,"hello")
+hasLocation(#20015,#20008)
+enclosing_stmt(#20015,#20014)
+expr_containers(#20015,#20002)
 #20016=*
-entry_cfg_node(#20016,#20001)
-#20017=@"loc,{#10000},2,31,2,30"
-locations_default(#20017,#10000,2,31,2,30)
-hasLocation(#20016,#20017)
-#20018=*
-exit_cfg_node(#20018,#20001)
-hasLocation(#20018,#20011)
-successor(#20013,#20015)
-successor(#20015,#20014)
-successor(#20014,#20018)
-successor(#20016,#20013)
+exprs(#20016,78,#20015,0,"hello")
+hasLocation(#20016,#20008)
+enclosing_stmt(#20016,#20014)
+expr_containers(#20016,#20002)
+literals("hello","hello",#20016)
+decl(#20016,#20013)
+#20017=*
+entry_cfg_node(#20017,#20002)
+#20018=@"loc,{#10000},2,31,2,30"
+locations_default(#20018,#10000,2,31,2,30)
+hasLocation(#20017,#20018)
 #20019=*
-toplevel_parent_xml_node(#20001,#20019)
-#20020=@"script;{#10000},3,29"
-#20021=*
-lines(#20021,#20020,"var world;","")
-#20022=@"loc,{#10000},3,29,3,38"
-locations_default(#20022,#10000,3,29,3,38)
-hasLocation(#20021,#20022)
-numlines(#20020,1,1,0)
-#20023=*
-tokeninfo(#20023,7,#20020,0,"var")
-#20024=@"loc,{#10000},3,29,3,31"
-locations_default(#20024,#10000,3,29,3,31)
-hasLocation(#20023,#20024)
-#20025=*
-tokeninfo(#20025,6,#20020,1,"world")
-#20026=@"loc,{#10000},3,33,3,37"
-locations_default(#20026,#10000,3,33,3,37)
-hasLocation(#20025,#20026)
-#20027=*
-tokeninfo(#20027,8,#20020,2,";")
-#20028=@"loc,{#10000},3,38,3,38"
-locations_default(#20028,#10000,3,38,3,38)
-hasLocation(#20027,#20028)
-#20029=*
-tokeninfo(#20029,0,#20020,3,"")
-#20030=@"loc,{#10000},3,39,3,38"
-locations_default(#20030,#10000,3,39,3,38)
-hasLocation(#20029,#20030)
-toplevels(#20020,1)
-hasLocation(#20020,#20022)
-#20031=@"var;{world};{#20000}"
-variables(#20031,"world",#20000)
-#20032=*
-stmts(#20032,18,#20020,0,"var world;")
-hasLocation(#20032,#20022)
-stmt_containers(#20032,#20020)
+exit_cfg_node(#20019,#20002)
+hasLocation(#20019,#20012)
+successor(#20014,#20016)
+successor(#20016,#20015)
+successor(#20015,#20019)
+successor(#20017,#20014)
+toplevel_parent_xml_node(#20002,#20001)
+#20020=*
+#20021=@"script;{#10000},3,29"
+#20022=*
+lines(#20022,#20021,"var world;","")
+#20023=@"loc,{#10000},3,29,3,38"
+locations_default(#20023,#10000,3,29,3,38)
+hasLocation(#20022,#20023)
+numlines(#20021,1,1,0)
+#20024=*
+tokeninfo(#20024,7,#20021,0,"var")
+#20025=@"loc,{#10000},3,29,3,31"
+locations_default(#20025,#10000,3,29,3,31)
+hasLocation(#20024,#20025)
+#20026=*
+tokeninfo(#20026,6,#20021,1,"world")
+#20027=@"loc,{#10000},3,33,3,37"
+locations_default(#20027,#10000,3,33,3,37)
+hasLocation(#20026,#20027)
+#20028=*
+tokeninfo(#20028,8,#20021,2,";")
+#20029=@"loc,{#10000},3,38,3,38"
+locations_default(#20029,#10000,3,38,3,38)
+hasLocation(#20028,#20029)
+#20030=*
+tokeninfo(#20030,0,#20021,3,"")
+#20031=@"loc,{#10000},3,39,3,38"
+locations_default(#20031,#10000,3,39,3,38)
+hasLocation(#20030,#20031)
+toplevels(#20021,1)
+hasLocation(#20021,#20023)
+#20032=@"var;{world};{#20000}"
+variables(#20032,"world",#20000)
 #20033=*
-exprs(#20033,64,#20032,0,"world")
-hasLocation(#20033,#20026)
-enclosing_stmt(#20033,#20032)
-expr_containers(#20033,#20020)
+stmts(#20033,18,#20021,0,"var world;")
+hasLocation(#20033,#20023)
+stmt_containers(#20033,#20021)
 #20034=*
-exprs(#20034,78,#20033,0,"world")
-hasLocation(#20034,#20026)
-enclosing_stmt(#20034,#20032)
-expr_containers(#20034,#20020)
-literals("world","world",#20034)
-decl(#20034,#20031)
+exprs(#20034,64,#20033,0,"world")
+hasLocation(#20034,#20027)
+enclosing_stmt(#20034,#20033)
+expr_containers(#20034,#20021)
 #20035=*
-entry_cfg_node(#20035,#20020)
-#20036=@"loc,{#10000},3,29,3,28"
-locations_default(#20036,#10000,3,29,3,28)
-hasLocation(#20035,#20036)
-#20037=*
-exit_cfg_node(#20037,#20020)
-hasLocation(#20037,#20030)
-successor(#20032,#20034)
-successor(#20034,#20033)
-successor(#20033,#20037)
-successor(#20035,#20032)
+exprs(#20035,78,#20034,0,"world")
+hasLocation(#20035,#20027)
+enclosing_stmt(#20035,#20033)
+expr_containers(#20035,#20021)
+literals("world","world",#20035)
+decl(#20035,#20032)
+#20036=*
+entry_cfg_node(#20036,#20021)
+#20037=@"loc,{#10000},3,29,3,28"
+locations_default(#20037,#10000,3,29,3,28)
+hasLocation(#20036,#20037)
 #20038=*
-toplevel_parent_xml_node(#20020,#20038)
-#20039=@"script;{#10000},4,75"
-#20040=*
-lines(#20040,#20039,"","
+exit_cfg_node(#20038,#20021)
+hasLocation(#20038,#20031)
+successor(#20033,#20035)
+successor(#20035,#20034)
+successor(#20034,#20038)
+successor(#20036,#20033)
+toplevel_parent_xml_node(#20021,#20020)
+#20039=*
+#20040=@"script;{#10000},4,75"
+#20041=*
+lines(#20041,#20040,"","
 ")
-#20041=@"loc,{#10000},4,75,4,74"
-locations_default(#20041,#10000,4,75,4,74)
-hasLocation(#20040,#20041)
-#20042=*
-lines(#20042,#20039,"      var inAModule;","
+#20042=@"loc,{#10000},4,75,4,74"
+locations_default(#20042,#10000,4,75,4,74)
+hasLocation(#20041,#20042)
+#20043=*
+lines(#20043,#20040,"      var inAModule;","
 ")
-#20043=@"loc,{#10000},5,1,5,20"
-locations_default(#20043,#10000,5,1,5,20)
-hasLocation(#20042,#20043)
+#20044=@"loc,{#10000},5,1,5,20"
+locations_default(#20044,#10000,5,1,5,20)
+hasLocation(#20043,#20044)
 indentation(#10000,5," ",6)
-#20044=*
-lines(#20044,#20039,"    ","")
-#20045=@"loc,{#10000},6,1,6,4"
-locations_default(#20045,#10000,6,1,6,4)
-hasLocation(#20044,#20045)
-numlines(#20039,3,1,0)
-#20046=*
-tokeninfo(#20046,7,#20039,0,"var")
-#20047=@"loc,{#10000},5,7,5,9"
-locations_default(#20047,#10000,5,7,5,9)
-hasLocation(#20046,#20047)
-#20048=*
-tokeninfo(#20048,6,#20039,1,"inAModule")
-#20049=@"loc,{#10000},5,11,5,19"
-locations_default(#20049,#10000,5,11,5,19)
-hasLocation(#20048,#20049)
-#20050=*
-tokeninfo(#20050,8,#20039,2,";")
-#20051=@"loc,{#10000},5,20,5,20"
-locations_default(#20051,#10000,5,20,5,20)
-hasLocation(#20050,#20051)
-#20052=*
-tokeninfo(#20052,0,#20039,3,"")
-#20053=@"loc,{#10000},6,5,6,4"
-locations_default(#20053,#10000,6,5,6,4)
-hasLocation(#20052,#20053)
-toplevels(#20039,1)
-#20054=@"loc,{#10000},4,75,6,4"
-locations_default(#20054,#10000,4,75,6,4)
-hasLocation(#20039,#20054)
-#20055=@"module;{#10000},4,75"
-scopes(#20055,3)
-scopenodes(#20039,#20055)
-scopenesting(#20055,#20000)
-is_module(#20039)
-is_es2015_module(#20039)
-#20056=@"var;{inAModule};{#20055}"
-variables(#20056,"inAModule",#20055)
-#20057=*
-stmts(#20057,18,#20039,0,"var inAModule;")
-#20058=@"loc,{#10000},5,7,5,20"
-locations_default(#20058,#10000,5,7,5,20)
-hasLocation(#20057,#20058)
-stmt_containers(#20057,#20039)
-#20059=*
-exprs(#20059,64,#20057,0,"inAModule")
-hasLocation(#20059,#20049)
-enclosing_stmt(#20059,#20057)
-expr_containers(#20059,#20039)
+#20045=*
+lines(#20045,#20040,"    ","")
+#20046=@"loc,{#10000},6,1,6,4"
+locations_default(#20046,#10000,6,1,6,4)
+hasLocation(#20045,#20046)
+numlines(#20040,3,1,0)
+#20047=*
+tokeninfo(#20047,7,#20040,0,"var")
+#20048=@"loc,{#10000},5,7,5,9"
+locations_default(#20048,#10000,5,7,5,9)
+hasLocation(#20047,#20048)
+#20049=*
+tokeninfo(#20049,6,#20040,1,"inAModule")
+#20050=@"loc,{#10000},5,11,5,19"
+locations_default(#20050,#10000,5,11,5,19)
+hasLocation(#20049,#20050)
+#20051=*
+tokeninfo(#20051,8,#20040,2,";")
+#20052=@"loc,{#10000},5,20,5,20"
+locations_default(#20052,#10000,5,20,5,20)
+hasLocation(#20051,#20052)
+#20053=*
+tokeninfo(#20053,0,#20040,3,"")
+#20054=@"loc,{#10000},6,5,6,4"
+locations_default(#20054,#10000,6,5,6,4)
+hasLocation(#20053,#20054)
+toplevels(#20040,1)
+#20055=@"loc,{#10000},4,75,6,4"
+locations_default(#20055,#10000,4,75,6,4)
+hasLocation(#20040,#20055)
+#20056=@"module;{#10000},4,75"
+scopes(#20056,3)
+scopenodes(#20040,#20056)
+scopenesting(#20056,#20000)
+is_module(#20040)
+is_es2015_module(#20040)
+#20057=@"var;{inAModule};{#20056}"
+variables(#20057,"inAModule",#20056)
+#20058=*
+stmts(#20058,18,#20040,0,"var inAModule;")
+#20059=@"loc,{#10000},5,7,5,20"
+locations_default(#20059,#10000,5,7,5,20)
+hasLocation(#20058,#20059)
+stmt_containers(#20058,#20040)
 #20060=*
-exprs(#20060,78,#20059,0,"inAModule")
-hasLocation(#20060,#20049)
-enclosing_stmt(#20060,#20057)
-expr_containers(#20060,#20039)
-literals("inAModule","inAModule",#20060)
-decl(#20060,#20056)
+exprs(#20060,64,#20058,0,"inAModule")
+hasLocation(#20060,#20050)
+enclosing_stmt(#20060,#20058)
+expr_containers(#20060,#20040)
 #20061=*
-entry_cfg_node(#20061,#20039)
-hasLocation(#20061,#20041)
+exprs(#20061,78,#20060,0,"inAModule")
+hasLocation(#20061,#20050)
+enclosing_stmt(#20061,#20058)
+expr_containers(#20061,#20040)
+literals("inAModule","inAModule",#20061)
+decl(#20061,#20057)
 #20062=*
-exit_cfg_node(#20062,#20039)
-hasLocation(#20062,#20053)
-successor(#20057,#20060)
-successor(#20060,#20059)
-successor(#20059,#20062)
-successor(#20061,#20057)
+entry_cfg_node(#20062,#20040)
+hasLocation(#20062,#20042)
 #20063=*
-toplevel_parent_xml_node(#20039,#20063)
-#20064=@"script;{#10000},7,75"
-#20065=*
-lines(#20065,#20064,"","
+exit_cfg_node(#20063,#20040)
+hasLocation(#20063,#20054)
+successor(#20058,#20061)
+successor(#20061,#20060)
+successor(#20060,#20063)
+successor(#20062,#20058)
+toplevel_parent_xml_node(#20040,#20039)
+#20064=*
+#20065=@"script;{#10000},7,75"
+#20066=*
+lines(#20066,#20065,"","
 ")
-#20066=@"loc,{#10000},7,75,7,74"
-locations_default(#20066,#10000,7,75,7,74)
-hasLocation(#20065,#20066)
-#20067=*
-lines(#20067,#20064,"      import f from ""f""","
+#20067=@"loc,{#10000},7,75,7,74"
+locations_default(#20067,#10000,7,75,7,74)
+hasLocation(#20066,#20067)
+#20068=*
+lines(#20068,#20065,"      import f from ""f""","
 ")
-#20068=@"loc,{#10000},8,1,8,23"
-locations_default(#20068,#10000,8,1,8,23)
-hasLocation(#20067,#20068)
+#20069=@"loc,{#10000},8,1,8,23"
+locations_default(#20069,#10000,8,1,8,23)
+hasLocation(#20068,#20069)
 indentation(#10000,8," ",6)
-#20069=*
-lines(#20069,#20064,"    ","")
-#20070=@"loc,{#10000},9,1,9,4"
-locations_default(#20070,#10000,9,1,9,4)
-hasLocation(#20069,#20070)
-numlines(#20064,3,1,0)
-#20071=*
-tokeninfo(#20071,7,#20064,0,"import")
-#20072=@"loc,{#10000},8,7,8,12"
-locations_default(#20072,#10000,8,7,8,12)
-hasLocation(#20071,#20072)
-#20073=*
-tokeninfo(#20073,6,#20064,1,"f")
-#20074=@"loc,{#10000},8,14,8,14"
-locations_default(#20074,#10000,8,14,8,14)
-hasLocation(#20073,#20074)
-#20075=*
-tokeninfo(#20075,6,#20064,2,"from")
-#20076=@"loc,{#10000},8,16,8,19"
-locations_default(#20076,#10000,8,16,8,19)
-hasLocation(#20075,#20076)
-#20077=*
-tokeninfo(#20077,4,#20064,3,"""f""")
-#20078=@"loc,{#10000},8,21,8,23"
-locations_default(#20078,#10000,8,21,8,23)
-hasLocation(#20077,#20078)
-#20079=*
-tokeninfo(#20079,0,#20064,4,"")
-#20080=@"loc,{#10000},9,5,9,4"
-locations_default(#20080,#10000,9,5,9,4)
-hasLocation(#20079,#20080)
-toplevels(#20064,1)
-#20081=@"loc,{#10000},7,75,9,4"
-locations_default(#20081,#10000,7,75,9,4)
-hasLocation(#20064,#20081)
-#20082=@"module;{#10000},7,75"
-scopes(#20082,3)
-scopenodes(#20064,#20082)
-scopenesting(#20082,#20000)
-is_module(#20064)
-is_es2015_module(#20064)
-#20083=@"var;{f};{#20082}"
-variables(#20083,"f",#20082)
-#20084=@"local_type_name;{f};{#20082}"
-local_type_names(#20084,"f",#20082)
-#20085=@"local_namespace_name;{f};{#20082}"
-local_namespace_names(#20085,"f",#20082)
-variables(#20083,"f",#20082)
-local_type_names(#20084,"f",#20082)
-local_namespace_names(#20085,"f",#20082)
-#20086=*
-stmts(#20086,27,#20064,0,"import f from ""f""")
-#20087=@"loc,{#10000},8,7,8,23"
-locations_default(#20087,#10000,8,7,8,23)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20064)
-#20088=*
-exprs(#20088,4,#20086,-1,"""f""")
-hasLocation(#20088,#20078)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20064)
-literals("f","""f""",#20088)
+#20070=*
+lines(#20070,#20065,"    ","")
+#20071=@"loc,{#10000},9,1,9,4"
+locations_default(#20071,#10000,9,1,9,4)
+hasLocation(#20070,#20071)
+numlines(#20065,3,1,0)
+#20072=*
+tokeninfo(#20072,7,#20065,0,"import")
+#20073=@"loc,{#10000},8,7,8,12"
+locations_default(#20073,#10000,8,7,8,12)
+hasLocation(#20072,#20073)
+#20074=*
+tokeninfo(#20074,6,#20065,1,"f")
+#20075=@"loc,{#10000},8,14,8,14"
+locations_default(#20075,#10000,8,14,8,14)
+hasLocation(#20074,#20075)
+#20076=*
+tokeninfo(#20076,6,#20065,2,"from")
+#20077=@"loc,{#10000},8,16,8,19"
+locations_default(#20077,#10000,8,16,8,19)
+hasLocation(#20076,#20077)
+#20078=*
+tokeninfo(#20078,4,#20065,3,"""f""")
+#20079=@"loc,{#10000},8,21,8,23"
+locations_default(#20079,#10000,8,21,8,23)
+hasLocation(#20078,#20079)
+#20080=*
+tokeninfo(#20080,0,#20065,4,"")
+#20081=@"loc,{#10000},9,5,9,4"
+locations_default(#20081,#10000,9,5,9,4)
+hasLocation(#20080,#20081)
+toplevels(#20065,1)
+#20082=@"loc,{#10000},7,75,9,4"
+locations_default(#20082,#10000,7,75,9,4)
+hasLocation(#20065,#20082)
+#20083=@"module;{#10000},7,75"
+scopes(#20083,3)
+scopenodes(#20065,#20083)
+scopenesting(#20083,#20000)
+is_module(#20065)
+is_es2015_module(#20065)
+#20084=@"var;{f};{#20083}"
+variables(#20084,"f",#20083)
+#20085=@"local_type_name;{f};{#20083}"
+local_type_names(#20085,"f",#20083)
+#20086=@"local_namespace_name;{f};{#20083}"
+local_namespace_names(#20086,"f",#20083)
+variables(#20084,"f",#20083)
+local_type_names(#20085,"f",#20083)
+local_namespace_names(#20086,"f",#20083)
+#20087=*
+stmts(#20087,27,#20065,0,"import f from ""f""")
+#20088=@"loc,{#10000},8,7,8,23"
+locations_default(#20088,#10000,8,7,8,23)
+hasLocation(#20087,#20088)
+stmt_containers(#20087,#20065)
 #20089=*
-regexpterm(#20089,14,#20088,0,"f")
-#20090=@"loc,{#10000},8,22,8,22"
-locations_default(#20090,#10000,8,22,8,22)
-hasLocation(#20089,#20090)
-regexp_const_value(#20089,"f")
-#20091=*
-exprs(#20091,84,#20086,0,"f")
-hasLocation(#20091,#20074)
-enclosing_stmt(#20091,#20086)
-expr_containers(#20091,#20064)
+exprs(#20089,4,#20087,-1,"""f""")
+hasLocation(#20089,#20079)
+enclosing_stmt(#20089,#20087)
+expr_containers(#20089,#20065)
+literals("f","""f""",#20089)
+#20090=*
+regexpterm(#20090,14,#20089,0,"f")
+#20091=@"loc,{#10000},8,22,8,22"
+locations_default(#20091,#10000,8,22,8,22)
+hasLocation(#20090,#20091)
+regexp_const_value(#20090,"f")
 #20092=*
-exprs(#20092,78,#20091,1,"f")
-hasLocation(#20092,#20074)
-enclosing_stmt(#20092,#20086)
-expr_containers(#20092,#20064)
-literals("f","f",#20092)
-decl(#20092,#20083)
-typedecl(#20092,#20084)
-namespacedecl(#20092,#20085)
+exprs(#20092,84,#20087,0,"f")
+hasLocation(#20092,#20075)
+enclosing_stmt(#20092,#20087)
+expr_containers(#20092,#20065)
 #20093=*
-entry_cfg_node(#20093,#20064)
-hasLocation(#20093,#20066)
+exprs(#20093,78,#20092,1,"f")
+hasLocation(#20093,#20075)
+enclosing_stmt(#20093,#20087)
+expr_containers(#20093,#20065)
+literals("f","f",#20093)
+decl(#20093,#20084)
+typedecl(#20093,#20085)
+namespacedecl(#20093,#20086)
 #20094=*
-exit_cfg_node(#20094,#20064)
-hasLocation(#20094,#20080)
-successor(#20086,#20094)
-successor(#20091,#20086)
-successor(#20093,#20091)
+entry_cfg_node(#20094,#20065)
+hasLocation(#20094,#20067)
 #20095=*
-toplevel_parent_xml_node(#20064,#20095)
+exit_cfg_node(#20095,#20065)
+hasLocation(#20095,#20081)
+successor(#20087,#20095)
+successor(#20092,#20087)
+successor(#20094,#20092)
+toplevel_parent_xml_node(#20065,#20064)
 #20096=*
 xmlElements(#20096,"html",#10000,0,#10000)
 #20097=@"loc,{#10000},1,1,10,7"
 locations_default(#20097,#10000,1,1,10,7)
 xmllocations(#20096,#20097)
-xmlElements(#20095,"script",#20096,3,#10000)
+xmlElements(#20064,"script",#20096,3,#10000)
 #20098=@"loc,{#10000},7,5,9,13"
 locations_default(#20098,#10000,7,5,9,13)
-xmllocations(#20095,#20098)
+xmllocations(#20064,#20098)
 #20099=*
-xmlAttrs(#20099,#20095,"type","text/babel",0,#10000)
+xmlAttrs(#20099,#20064,"type","text/babel",0,#10000)
 #20100=@"loc,{#10000},7,13,7,29"
 locations_default(#20100,#10000,7,13,7,29)
 xmllocations(#20099,#20100)
 #20101=*
-xmlAttrs(#20101,#20095,"data-plugins","transform-es2015-modules-umd",1,#10000)
+xmlAttrs(#20101,#20064,"data-plugins","transform-es2015-modules-umd",1,#10000)
 #20102=@"loc,{#10000},7,31,7,73"
 locations_default(#20102,#10000,7,31,7,73)
 xmllocations(#20101,#20102)
-xmlElements(#20063,"script",#20096,2,#10000)
+xmlElements(#20039,"script",#20096,2,#10000)
 #20103=@"loc,{#10000},4,5,6,13"
 locations_default(#20103,#10000,4,5,6,13)
-xmllocations(#20063,#20103)
+xmllocations(#20039,#20103)
 #20104=*
-xmlAttrs(#20104,#20063,"type","text/babel",0,#10000)
+xmlAttrs(#20104,#20039,"type","text/babel",0,#10000)
 #20105=@"loc,{#10000},4,13,4,29"
 locations_default(#20105,#10000,4,13,4,29)
 xmllocations(#20104,#20105)
 #20106=*
-xmlAttrs(#20106,#20063,"data-plugins","transform-es2015-modules-umd",1,#10000)
+xmlAttrs(#20106,#20039,"data-plugins","transform-es2015-modules-umd",1,#10000)
 #20107=@"loc,{#10000},4,31,4,73"
 locations_default(#20107,#10000,4,31,4,73)
 xmllocations(#20106,#20107)
-xmlElements(#20038,"script",#20096,1,#10000)
+xmlElements(#20020,"script",#20096,1,#10000)
 #20108=@"loc,{#10000},3,5,3,47"
 locations_default(#20108,#10000,3,5,3,47)
-xmllocations(#20038,#20108)
+xmllocations(#20020,#20108)
 #20109=*
-xmlAttrs(#20109,#20038,"type","text/jsx",0,#10000)
+xmlAttrs(#20109,#20020,"type","text/jsx",0,#10000)
 #20110=@"loc,{#10000},3,13,3,27"
 locations_default(#20110,#10000,3,13,3,27)
 xmllocations(#20109,#20110)
-xmlElements(#20019,"script",#20096,0,#10000)
+xmlElements(#20001,"script",#20096,0,#10000)
 #20111=@"loc,{#10000},2,5,2,49"
 locations_default(#20111,#10000,2,5,2,49)
-xmllocations(#20019,#20111)
+xmllocations(#20001,#20111)
 #20112=*
-xmlAttrs(#20112,#20019,"type","text/babel",0,#10000)
+xmlAttrs(#20112,#20001,"type","text/babel",0,#10000)
 #20113=@"loc,{#10000},2,13,2,29"
 locations_default(#20113,#10000,2,13,2,29)
 xmllocations(#20112,#20113)
--- a/javascript/extractor/tests/ng-templates/output/trap/component.js.trap
+++ b/javascript/extractor/tests/ng-templates/output/trap/component.js.trap
@@ -329,216 +329,216 @@ literals("
 	<foo [baz]=""expr?.bar"" />
 	",#20099)
 scopes(#20000,0)
-#20100=@"script;{#10000},5,15"
-#20101=*
-lines(#20101,#20100,"expr + expr","")
-#20102=@"loc,{#10000},5,15,5,25"
-locations_default(#20102,#10000,5,15,5,25)
-hasLocation(#20101,#20102)
-numlines(#20100,1,1,0)
-#20103=*
-tokeninfo(#20103,6,#20100,0,"expr")
-#20104=@"loc,{#10000},5,15,5,18"
-locations_default(#20104,#10000,5,15,5,18)
-hasLocation(#20103,#20104)
-#20105=*
-tokeninfo(#20105,8,#20100,1,"+")
-#20106=@"loc,{#10000},5,20,5,20"
-locations_default(#20106,#10000,5,20,5,20)
-hasLocation(#20105,#20106)
-#20107=*
-tokeninfo(#20107,6,#20100,2,"expr")
-#20108=@"loc,{#10000},5,22,5,25"
-locations_default(#20108,#10000,5,22,5,25)
-hasLocation(#20107,#20108)
-#20109=*
-tokeninfo(#20109,0,#20100,3,"")
-#20110=@"loc,{#10000},5,26,5,25"
-locations_default(#20110,#10000,5,26,5,25)
-hasLocation(#20109,#20110)
-toplevels(#20100,4)
-hasLocation(#20100,#20102)
-#20111=@"module;{#10000},5,15"
-scopes(#20111,3)
-scopenodes(#20100,#20111)
-scopenesting(#20111,#20000)
-is_module(#20100)
-#20112=*
-stmts(#20112,2,#20100,0,"expr + expr")
-hasLocation(#20112,#20102)
-stmt_containers(#20112,#20100)
+#20100=*
+#20101=@"script;{#10000},5,15"
+#20102=*
+lines(#20102,#20101,"expr + expr","")
+#20103=@"loc,{#10000},5,15,5,25"
+locations_default(#20103,#10000,5,15,5,25)
+hasLocation(#20102,#20103)
+numlines(#20101,1,1,0)
+#20104=*
+tokeninfo(#20104,6,#20101,0,"expr")
+#20105=@"loc,{#10000},5,15,5,18"
+locations_default(#20105,#10000,5,15,5,18)
+hasLocation(#20104,#20105)
+#20106=*
+tokeninfo(#20106,8,#20101,1,"+")
+#20107=@"loc,{#10000},5,20,5,20"
+locations_default(#20107,#10000,5,20,5,20)
+hasLocation(#20106,#20107)
+#20108=*
+tokeninfo(#20108,6,#20101,2,"expr")
+#20109=@"loc,{#10000},5,22,5,25"
+locations_default(#20109,#10000,5,22,5,25)
+hasLocation(#20108,#20109)
+#20110=*
+tokeninfo(#20110,0,#20101,3,"")
+#20111=@"loc,{#10000},5,26,5,25"
+locations_default(#20111,#10000,5,26,5,25)
+hasLocation(#20110,#20111)
+toplevels(#20101,4)
+hasLocation(#20101,#20103)
+#20112=@"module;{#10000},5,15"
+scopes(#20112,3)
+scopenodes(#20101,#20112)
+scopenesting(#20112,#20000)
+is_module(#20101)
 #20113=*
-exprs(#20113,34,#20112,0,"expr + expr")
-hasLocation(#20113,#20102)
-enclosing_stmt(#20113,#20112)
-expr_containers(#20113,#20100)
+stmts(#20113,2,#20101,0,"expr + expr")
+hasLocation(#20113,#20103)
+stmt_containers(#20113,#20101)
 #20114=*
-exprs(#20114,79,#20113,0,"expr")
-hasLocation(#20114,#20104)
-enclosing_stmt(#20114,#20112)
-expr_containers(#20114,#20100)
-literals("expr","expr",#20114)
-#20115=@"var;{expr};{#20111}"
-variables(#20115,"expr",#20111)
-bind(#20114,#20115)
-#20116=*
-exprs(#20116,79,#20113,1,"expr")
-hasLocation(#20116,#20108)
-enclosing_stmt(#20116,#20112)
-expr_containers(#20116,#20100)
-literals("expr","expr",#20116)
-bind(#20116,#20115)
+exprs(#20114,34,#20113,0,"expr + expr")
+hasLocation(#20114,#20103)
+enclosing_stmt(#20114,#20113)
+expr_containers(#20114,#20101)
+#20115=*
+exprs(#20115,79,#20114,0,"expr")
+hasLocation(#20115,#20105)
+enclosing_stmt(#20115,#20113)
+expr_containers(#20115,#20101)
+literals("expr","expr",#20115)
+#20116=@"var;{expr};{#20112}"
+variables(#20116,"expr",#20112)
+bind(#20115,#20116)
 #20117=*
-entry_cfg_node(#20117,#20100)
-#20118=@"loc,{#10000},5,15,5,14"
-locations_default(#20118,#10000,5,15,5,14)
-hasLocation(#20117,#20118)
-#20119=*
-exit_cfg_node(#20119,#20100)
-hasLocation(#20119,#20110)
-successor(#20112,#20114)
-successor(#20116,#20113)
-successor(#20114,#20116)
-successor(#20113,#20119)
-successor(#20117,#20112)
+exprs(#20117,79,#20114,1,"expr")
+hasLocation(#20117,#20109)
+enclosing_stmt(#20117,#20113)
+expr_containers(#20117,#20101)
+literals("expr","expr",#20117)
+bind(#20117,#20116)
+#20118=*
+entry_cfg_node(#20118,#20101)
+#20119=@"loc,{#10000},5,15,5,14"
+locations_default(#20119,#10000,5,15,5,14)
+hasLocation(#20118,#20119)
 #20120=*
-toplevel_parent_xml_node(#20100,#20120)
-#20121=@"script;{#10000},6,14"
-#20122=*
-lines(#20122,#20121,"expr!","")
-#20123=@"loc,{#10000},6,14,6,18"
-locations_default(#20123,#10000,6,14,6,18)
-hasLocation(#20122,#20123)
-numlines(#20121,1,1,0)
-#20124=*
-tokeninfo(#20124,6,#20121,0,"expr")
-#20125=@"loc,{#10000},6,14,6,17"
-locations_default(#20125,#10000,6,14,6,17)
-hasLocation(#20124,#20125)
-#20126=*
-tokeninfo(#20126,8,#20121,1,"!")
-#20127=@"loc,{#10000},6,18,6,18"
-locations_default(#20127,#10000,6,18,6,18)
-hasLocation(#20126,#20127)
-#20128=*
-tokeninfo(#20128,0,#20121,2,"")
-#20129=@"loc,{#10000},6,19,6,18"
-locations_default(#20129,#10000,6,19,6,18)
-hasLocation(#20128,#20129)
-toplevels(#20121,4)
-hasLocation(#20121,#20123)
-#20130=@"module;{#10000},6,14"
-scopes(#20130,3)
-scopenodes(#20121,#20130)
-scopenesting(#20130,#20000)
-is_module(#20121)
-#20131=*
-stmts(#20131,2,#20121,0,"expr!")
-hasLocation(#20131,#20123)
-stmt_containers(#20131,#20121)
+exit_cfg_node(#20120,#20101)
+hasLocation(#20120,#20111)
+successor(#20113,#20115)
+successor(#20117,#20114)
+successor(#20115,#20117)
+successor(#20114,#20120)
+successor(#20118,#20113)
+toplevel_parent_xml_node(#20101,#20100)
+#20121=*
+#20122=@"script;{#10000},6,14"
+#20123=*
+lines(#20123,#20122,"expr!","")
+#20124=@"loc,{#10000},6,14,6,18"
+locations_default(#20124,#10000,6,14,6,18)
+hasLocation(#20123,#20124)
+numlines(#20122,1,1,0)
+#20125=*
+tokeninfo(#20125,6,#20122,0,"expr")
+#20126=@"loc,{#10000},6,14,6,17"
+locations_default(#20126,#10000,6,14,6,17)
+hasLocation(#20125,#20126)
+#20127=*
+tokeninfo(#20127,8,#20122,1,"!")
+#20128=@"loc,{#10000},6,18,6,18"
+locations_default(#20128,#10000,6,18,6,18)
+hasLocation(#20127,#20128)
+#20129=*
+tokeninfo(#20129,0,#20122,2,"")
+#20130=@"loc,{#10000},6,19,6,18"
+locations_default(#20130,#10000,6,19,6,18)
+hasLocation(#20129,#20130)
+toplevels(#20122,4)
+hasLocation(#20122,#20124)
+#20131=@"module;{#10000},6,14"
+scopes(#20131,3)
+scopenodes(#20122,#20131)
+scopenesting(#20131,#20000)
+is_module(#20122)
 #20132=*
-exprs(#20132,105,#20131,0,"expr!")
-hasLocation(#20132,#20123)
-enclosing_stmt(#20132,#20131)
-expr_containers(#20132,#20121)
+stmts(#20132,2,#20122,0,"expr!")
+hasLocation(#20132,#20124)
+stmt_containers(#20132,#20122)
 #20133=*
-exprs(#20133,79,#20132,0,"expr")
-hasLocation(#20133,#20125)
-enclosing_stmt(#20133,#20131)
-expr_containers(#20133,#20121)
-literals("expr","expr",#20133)
-#20134=@"var;{expr};{#20130}"
-variables(#20134,"expr",#20130)
-bind(#20133,#20134)
-#20135=*
-entry_cfg_node(#20135,#20121)
-#20136=@"loc,{#10000},6,14,6,13"
-locations_default(#20136,#10000,6,14,6,13)
-hasLocation(#20135,#20136)
-#20137=*
-exit_cfg_node(#20137,#20121)
-hasLocation(#20137,#20129)
-successor(#20131,#20133)
-successor(#20133,#20132)
-successor(#20132,#20137)
-successor(#20135,#20131)
+exprs(#20133,105,#20132,0,"expr!")
+hasLocation(#20133,#20124)
+enclosing_stmt(#20133,#20132)
+expr_containers(#20133,#20122)
+#20134=*
+exprs(#20134,79,#20133,0,"expr")
+hasLocation(#20134,#20126)
+enclosing_stmt(#20134,#20132)
+expr_containers(#20134,#20122)
+literals("expr","expr",#20134)
+#20135=@"var;{expr};{#20131}"
+variables(#20135,"expr",#20131)
+bind(#20134,#20135)
+#20136=*
+entry_cfg_node(#20136,#20122)
+#20137=@"loc,{#10000},6,14,6,13"
+locations_default(#20137,#10000,6,14,6,13)
+hasLocation(#20136,#20137)
 #20138=*
-toplevel_parent_xml_node(#20121,#20138)
-#20139=@"script;{#10000},7,14"
-#20140=*
-lines(#20140,#20139,"expr?.bar","")
-#20141=@"loc,{#10000},7,14,7,22"
-locations_default(#20141,#10000,7,14,7,22)
-hasLocation(#20140,#20141)
-numlines(#20139,1,1,0)
-#20142=*
-tokeninfo(#20142,6,#20139,0,"expr")
-#20143=@"loc,{#10000},7,14,7,17"
-locations_default(#20143,#10000,7,14,7,17)
-hasLocation(#20142,#20143)
-#20144=*
-tokeninfo(#20144,8,#20139,1,"?.")
-#20145=@"loc,{#10000},7,18,7,19"
-locations_default(#20145,#10000,7,18,7,19)
-hasLocation(#20144,#20145)
-#20146=*
-tokeninfo(#20146,6,#20139,2,"bar")
-#20147=@"loc,{#10000},7,20,7,22"
-locations_default(#20147,#10000,7,20,7,22)
-hasLocation(#20146,#20147)
-#20148=*
-tokeninfo(#20148,0,#20139,3,"")
-#20149=@"loc,{#10000},7,23,7,22"
-locations_default(#20149,#10000,7,23,7,22)
-hasLocation(#20148,#20149)
-toplevels(#20139,4)
-hasLocation(#20139,#20141)
-#20150=@"module;{#10000},7,14"
-scopes(#20150,3)
-scopenodes(#20139,#20150)
-scopenesting(#20150,#20000)
-is_module(#20139)
-#20151=*
-stmts(#20151,2,#20139,0,"expr?.bar")
-hasLocation(#20151,#20141)
-stmt_containers(#20151,#20139)
+exit_cfg_node(#20138,#20122)
+hasLocation(#20138,#20130)
+successor(#20132,#20134)
+successor(#20134,#20133)
+successor(#20133,#20138)
+successor(#20136,#20132)
+toplevel_parent_xml_node(#20122,#20121)
+#20139=*
+#20140=@"script;{#10000},7,14"
+#20141=*
+lines(#20141,#20140,"expr?.bar","")
+#20142=@"loc,{#10000},7,14,7,22"
+locations_default(#20142,#10000,7,14,7,22)
+hasLocation(#20141,#20142)
+numlines(#20140,1,1,0)
+#20143=*
+tokeninfo(#20143,6,#20140,0,"expr")
+#20144=@"loc,{#10000},7,14,7,17"
+locations_default(#20144,#10000,7,14,7,17)
+hasLocation(#20143,#20144)
+#20145=*
+tokeninfo(#20145,8,#20140,1,"?.")
+#20146=@"loc,{#10000},7,18,7,19"
+locations_default(#20146,#10000,7,18,7,19)
+hasLocation(#20145,#20146)
+#20147=*
+tokeninfo(#20147,6,#20140,2,"bar")
+#20148=@"loc,{#10000},7,20,7,22"
+locations_default(#20148,#10000,7,20,7,22)
+hasLocation(#20147,#20148)
+#20149=*
+tokeninfo(#20149,0,#20140,3,"")
+#20150=@"loc,{#10000},7,23,7,22"
+locations_default(#20150,#10000,7,23,7,22)
+hasLocation(#20149,#20150)
+toplevels(#20140,4)
+hasLocation(#20140,#20142)
+#20151=@"module;{#10000},7,14"
+scopes(#20151,3)
+scopenodes(#20140,#20151)
+scopenesting(#20151,#20000)
+is_module(#20140)
 #20152=*
-exprs(#20152,14,#20151,0,"expr?.bar")
-hasLocation(#20152,#20141)
-enclosing_stmt(#20152,#20151)
-expr_containers(#20152,#20139)
+stmts(#20152,2,#20140,0,"expr?.bar")
+hasLocation(#20152,#20142)
+stmt_containers(#20152,#20140)
 #20153=*
-exprs(#20153,79,#20152,0,"expr")
-hasLocation(#20153,#20143)
-enclosing_stmt(#20153,#20151)
-expr_containers(#20153,#20139)
-literals("expr","expr",#20153)
-#20154=@"var;{expr};{#20150}"
-variables(#20154,"expr",#20150)
-bind(#20153,#20154)
-#20155=*
-exprs(#20155,0,#20152,1,"bar")
-hasLocation(#20155,#20147)
-enclosing_stmt(#20155,#20151)
-expr_containers(#20155,#20139)
-literals("bar","bar",#20155)
-isOptionalChaining(#20152)
+exprs(#20153,14,#20152,0,"expr?.bar")
+hasLocation(#20153,#20142)
+enclosing_stmt(#20153,#20152)
+expr_containers(#20153,#20140)
+#20154=*
+exprs(#20154,79,#20153,0,"expr")
+hasLocation(#20154,#20144)
+enclosing_stmt(#20154,#20152)
+expr_containers(#20154,#20140)
+literals("expr","expr",#20154)
+#20155=@"var;{expr};{#20151}"
+variables(#20155,"expr",#20151)
+bind(#20154,#20155)
 #20156=*
-entry_cfg_node(#20156,#20139)
-#20157=@"loc,{#10000},7,14,7,13"
-locations_default(#20157,#10000,7,14,7,13)
-hasLocation(#20156,#20157)
-#20158=*
-exit_cfg_node(#20158,#20139)
-hasLocation(#20158,#20149)
-successor(#20151,#20153)
-successor(#20155,#20152)
-successor(#20153,#20155)
-successor(#20152,#20158)
-successor(#20153,#20158)
-successor(#20156,#20151)
+exprs(#20156,0,#20153,1,"bar")
+hasLocation(#20156,#20148)
+enclosing_stmt(#20156,#20152)
+expr_containers(#20156,#20140)
+literals("bar","bar",#20156)
+isOptionalChaining(#20153)
+#20157=*
+entry_cfg_node(#20157,#20140)
+#20158=@"loc,{#10000},7,14,7,13"
+locations_default(#20158,#10000,7,14,7,13)
+hasLocation(#20157,#20158)
 #20159=*
-toplevel_parent_xml_node(#20139,#20159)
+exit_cfg_node(#20159,#20140)
+hasLocation(#20159,#20150)
+successor(#20152,#20154)
+successor(#20156,#20153)
+successor(#20154,#20156)
+successor(#20153,#20159)
+successor(#20154,#20159)
+successor(#20157,#20152)
+toplevel_parent_xml_node(#20140,#20139)
 #20160=*
 xmlChars(#20160,"
 	",#10000,0,0,#10000)
@@ -568,28 +568,28 @@ xmlElements(#20168,"foo",#10000,5,#10000)
 #20169=@"loc,{#10000},7,2,7,26"
 locations_default(#20169,#10000,7,2,7,26)
 xmllocations(#20168,#20169)
-xmlAttrs(#20159,#20168,"[baz]","expr?.bar",0,#10000)
+xmlAttrs(#20139,#20168,"[baz]","expr?.bar",0,#10000)
 #20170=@"loc,{#10000},7,7,7,23"
 locations_default(#20170,#10000,7,7,7,23)
-xmllocations(#20159,#20170)
+xmllocations(#20139,#20170)
 #20171=*
 xmlElements(#20171,"foo",#10000,3,#10000)
 #20172=@"loc,{#10000},6,2,6,22"
 locations_default(#20172,#10000,6,2,6,22)
 xmllocations(#20171,#20172)
-xmlAttrs(#20138,#20171,"[baz]","expr!",0,#10000)
+xmlAttrs(#20121,#20171,"[baz]","expr!",0,#10000)
 #20173=@"loc,{#10000},6,7,6,19"
 locations_default(#20173,#10000,6,7,6,19)
-xmllocations(#20138,#20173)
+xmllocations(#20121,#20173)
 #20174=*
 xmlElements(#20174,"foo",#10000,1,#10000)
 #20175=@"loc,{#10000},5,2,5,28"
 locations_default(#20175,#10000,5,2,5,28)
 xmllocations(#20174,#20175)
-xmlAttrs(#20120,#20174,"[prop]","expr + expr",0,#10000)
+xmlAttrs(#20100,#20174,"[prop]","expr + expr",0,#10000)
 #20176=@"loc,{#10000},5,7,5,26"
 locations_default(#20176,#10000,5,7,5,26)
-xmllocations(#20120,#20176)
+xmllocations(#20100,#20176)
 xml_element_parent_expression(#20174,#20097,0)
 xml_element_parent_expression(#20171,#20097,1)
 xml_element_parent_expression(#20168,#20097,2)
--- a/javascript/extractor/tests/node/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.html.trap
@@ -8,86 +8,86 @@ locations_default(#10002,#10000,0,0,0,0)
 hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
-#20001=@"script;{#10000},6,13"
-#20002=*
-lines(#20002,#20001,"var x = 42;","")
-#20003=@"loc,{#10000},6,13,6,23"
-locations_default(#20003,#10000,6,13,6,23)
-hasLocation(#20002,#20003)
-numlines(#20001,1,1,0)
-#20004=*
-tokeninfo(#20004,7,#20001,0,"var")
-#20005=@"loc,{#10000},6,13,6,15"
-locations_default(#20005,#10000,6,13,6,15)
-hasLocation(#20004,#20005)
-#20006=*
-tokeninfo(#20006,6,#20001,1,"x")
-#20007=@"loc,{#10000},6,17,6,17"
-locations_default(#20007,#10000,6,17,6,17)
-hasLocation(#20006,#20007)
-#20008=*
-tokeninfo(#20008,8,#20001,2,"=")
-#20009=@"loc,{#10000},6,19,6,19"
-locations_default(#20009,#10000,6,19,6,19)
-hasLocation(#20008,#20009)
-#20010=*
-tokeninfo(#20010,3,#20001,3,"42")
-#20011=@"loc,{#10000},6,21,6,22"
-locations_default(#20011,#10000,6,21,6,22)
-hasLocation(#20010,#20011)
-#20012=*
-tokeninfo(#20012,8,#20001,4,";")
-#20013=@"loc,{#10000},6,23,6,23"
-locations_default(#20013,#10000,6,23,6,23)
-hasLocation(#20012,#20013)
-#20014=*
-tokeninfo(#20014,0,#20001,5,"")
-#20015=@"loc,{#10000},6,24,6,23"
-locations_default(#20015,#10000,6,24,6,23)
-hasLocation(#20014,#20015)
-toplevels(#20001,2)
-hasLocation(#20001,#20003)
-#20016=@"var;{x};{#20000}"
-variables(#20016,"x",#20000)
-#20017=*
-stmts(#20017,18,#20001,0,"var x = 42;")
-hasLocation(#20017,#20003)
-stmt_containers(#20017,#20001)
+#20001=*
+#20002=@"script;{#10000},6,13"
+#20003=*
+lines(#20003,#20002,"var x = 42;","")
+#20004=@"loc,{#10000},6,13,6,23"
+locations_default(#20004,#10000,6,13,6,23)
+hasLocation(#20003,#20004)
+numlines(#20002,1,1,0)
+#20005=*
+tokeninfo(#20005,7,#20002,0,"var")
+#20006=@"loc,{#10000},6,13,6,15"
+locations_default(#20006,#10000,6,13,6,15)
+hasLocation(#20005,#20006)
+#20007=*
+tokeninfo(#20007,6,#20002,1,"x")
+#20008=@"loc,{#10000},6,17,6,17"
+locations_default(#20008,#10000,6,17,6,17)
+hasLocation(#20007,#20008)
+#20009=*
+tokeninfo(#20009,8,#20002,2,"=")
+#20010=@"loc,{#10000},6,19,6,19"
+locations_default(#20010,#10000,6,19,6,19)
+hasLocation(#20009,#20010)
+#20011=*
+tokeninfo(#20011,3,#20002,3,"42")
+#20012=@"loc,{#10000},6,21,6,22"
+locations_default(#20012,#10000,6,21,6,22)
+hasLocation(#20011,#20012)
+#20013=*
+tokeninfo(#20013,8,#20002,4,";")
+#20014=@"loc,{#10000},6,23,6,23"
+locations_default(#20014,#10000,6,23,6,23)
+hasLocation(#20013,#20014)
+#20015=*
+tokeninfo(#20015,0,#20002,5,"")
+#20016=@"loc,{#10000},6,24,6,23"
+locations_default(#20016,#10000,6,24,6,23)
+hasLocation(#20015,#20016)
+toplevels(#20002,2)
+hasLocation(#20002,#20004)
+#20017=@"var;{x};{#20000}"
+variables(#20017,"x",#20000)
 #20018=*
-exprs(#20018,64,#20017,0,"x = 42")
-#20019=@"loc,{#10000},6,17,6,22"
-locations_default(#20019,#10000,6,17,6,22)
-hasLocation(#20018,#20019)
-enclosing_stmt(#20018,#20017)
-expr_containers(#20018,#20001)
-#20020=*
-exprs(#20020,78,#20018,0,"x")
-hasLocation(#20020,#20007)
-enclosing_stmt(#20020,#20017)
-expr_containers(#20020,#20001)
-literals("x","x",#20020)
-decl(#20020,#20016)
+stmts(#20018,18,#20002,0,"var x = 42;")
+hasLocation(#20018,#20004)
+stmt_containers(#20018,#20002)
+#20019=*
+exprs(#20019,64,#20018,0,"x = 42")
+#20020=@"loc,{#10000},6,17,6,22"
+locations_default(#20020,#10000,6,17,6,22)
+hasLocation(#20019,#20020)
+enclosing_stmt(#20019,#20018)
+expr_containers(#20019,#20002)
 #20021=*
-exprs(#20021,3,#20018,1,"42")
-hasLocation(#20021,#20011)
-enclosing_stmt(#20021,#20017)
-expr_containers(#20021,#20001)
-literals("42","42",#20021)
+exprs(#20021,78,#20019,0,"x")
+hasLocation(#20021,#20008)
+enclosing_stmt(#20021,#20018)
+expr_containers(#20021,#20002)
+literals("x","x",#20021)
+decl(#20021,#20017)
 #20022=*
-entry_cfg_node(#20022,#20001)
-#20023=@"loc,{#10000},6,13,6,12"
-locations_default(#20023,#10000,6,13,6,12)
-hasLocation(#20022,#20023)
-#20024=*
-exit_cfg_node(#20024,#20001)
-hasLocation(#20024,#20015)
-successor(#20017,#20020)
-successor(#20021,#20018)
-successor(#20020,#20021)
-successor(#20018,#20024)
-successor(#20022,#20017)
+exprs(#20022,3,#20019,1,"42")
+hasLocation(#20022,#20012)
+enclosing_stmt(#20022,#20018)
+expr_containers(#20022,#20002)
+literals("42","42",#20022)
+#20023=*
+entry_cfg_node(#20023,#20002)
+#20024=@"loc,{#10000},6,13,6,12"
+locations_default(#20024,#10000,6,13,6,12)
+hasLocation(#20023,#20024)
 #20025=*
-toplevel_parent_xml_node(#20001,#20025)
+exit_cfg_node(#20025,#20002)
+hasLocation(#20025,#20016)
+successor(#20018,#20021)
+successor(#20022,#20019)
+successor(#20021,#20022)
+successor(#20019,#20025)
+successor(#20023,#20018)
+toplevel_parent_xml_node(#20002,#20001)
 #20026=*
 xmlElements(#20026,"html",#10000,0,#10000)
 #20027=@"loc,{#10000},1,1,8,7"
@@ -103,10 +103,10 @@ xmlElements(#20030,"a",#20028,0,#10000)
 #20031=@"loc,{#10000},6,1,6,29"
 locations_default(#20031,#10000,6,1,6,29)
 xmllocations(#20030,#20031)
-xmlAttrs(#20025,#20030,"onclick","var x = 42;",0,#10000)
+xmlAttrs(#20001,#20030,"onclick","var x = 42;",0,#10000)
 #20032=@"loc,{#10000},6,4,6,24"
 locations_default(#20032,#10000,6,4,6,24)
-xmllocations(#20025,#20032)
+xmllocations(#20001,#20032)
 #20033=*
 xmlElements(#20033,"head",#20026,0,#10000)
 #20034=@"loc,{#10000},2,1,4,7"
--- a/javascript/extractor/tests/shebang/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/shebang/output/trap/tst.html.trap
@@ -8,43 +8,43 @@ locations_default(#10002,#10000,0,0,0,0)
 hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
-#20001=@"script;{#10000},3,17"
-toplevels(#20001,1)
-#20002=@"loc,{#10000},3,17,3,17"
-locations_default(#20002,#10000,3,17,3,17)
-hasLocation(#20001,#20002)
-#20003=*
-js_parse_errors(#20003,#20001,"Error: Unexpected token","#!/usr/bin/node
+#20001=*
+#20002=@"script;{#10000},3,17"
+toplevels(#20002,1)
+#20003=@"loc,{#10000},3,17,3,17"
+locations_default(#20003,#10000,3,17,3,17)
+hasLocation(#20002,#20003)
+#20004=*
+js_parse_errors(#20004,#20002,"Error: Unexpected token","#!/usr/bin/node
 ")
-#20004=@"loc,{#10000},4,1,4,1"
-locations_default(#20004,#10000,4,1,4,1)
-hasLocation(#20003,#20004)
-#20005=*
-lines(#20005,#20001,"","
+#20005=@"loc,{#10000},4,1,4,1"
+locations_default(#20005,#10000,4,1,4,1)
+hasLocation(#20004,#20005)
+#20006=*
+lines(#20006,#20002,"","
 ")
-#20006=@"loc,{#10000},3,17,3,16"
-locations_default(#20006,#10000,3,17,3,16)
-hasLocation(#20005,#20006)
-#20007=*
-lines(#20007,#20001,"#!/usr/bin/node","
+#20007=@"loc,{#10000},3,17,3,16"
+locations_default(#20007,#10000,3,17,3,16)
+hasLocation(#20006,#20007)
+#20008=*
+lines(#20008,#20002,"#!/usr/bin/node","
 ")
-#20008=@"loc,{#10000},4,1,4,15"
-locations_default(#20008,#10000,4,1,4,15)
-hasLocation(#20007,#20008)
-#20009=*
-lines(#20009,#20001,"// shebang in HTML is not OK","
+#20009=@"loc,{#10000},4,1,4,15"
+locations_default(#20009,#10000,4,1,4,15)
+hasLocation(#20008,#20009)
+#20010=*
+lines(#20010,#20002,"// shebang in HTML is not OK","
 ")
-#20010=@"loc,{#10000},5,1,5,28"
-locations_default(#20010,#10000,5,1,5,28)
-hasLocation(#20009,#20010)
-#20011=*
-lines(#20011,#20001,"        ","")
-#20012=@"loc,{#10000},6,1,6,8"
-locations_default(#20012,#10000,6,1,6,8)
-hasLocation(#20011,#20012)
-numlines(#20001,4,0,0)
-#20013=*
-toplevel_parent_xml_node(#20001,#20013)
+#20011=@"loc,{#10000},5,1,5,28"
+locations_default(#20011,#10000,5,1,5,28)
+hasLocation(#20010,#20011)
+#20012=*
+lines(#20012,#20002,"        ","")
+#20013=@"loc,{#10000},6,1,6,8"
+locations_default(#20013,#10000,6,1,6,8)
+hasLocation(#20012,#20013)
+numlines(#20002,4,0,0)
+toplevel_parent_xml_node(#20002,#20001)
 #20014=*
 xmlElements(#20014,"html",#10000,0,#10000)
 #20015=@"loc,{#10000},1,1,10,7"
@@ -60,9 +60,9 @@ xmlElements(#20018,"head",#20014,0,#10000)
 #20019=@"loc,{#10000},2,5,7,11"
 locations_default(#20019,#10000,2,5,7,11)
 xmllocations(#20018,#20019)
-xmlElements(#20013,"script",#20018,0,#10000)
+xmlElements(#20001,"script",#20018,0,#10000)
 #20020=@"loc,{#10000},3,9,6,17"
 locations_default(#20020,#10000,3,9,6,17)
-xmllocations(#20013,#20020)
+xmllocations(#20001,#20020)
 numlines(#10000,10,0,0)
 filetype(#10000,"html")