JavaScript: Update trap tests.

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

@@ -9,76 +9,76 @@ hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
 #20001=@"script;{#10000},1,1"
-toplevels(#20001,0)
-#20002=@"loc,{#10000},1,1,5,24"
-locations_default(#20002,#10000,1,1,5,24)
-hasLocation(#20001,#20002)
-#20003=*
-comments(#20003,0,#20001," line comment","// line comment")
-#20004=@"loc,{#10000},1,1,1,15"
-locations_default(#20004,#10000,1,1,1,15)
-hasLocation(#20003,#20004)
-#20005=*
-comments(#20005,1,#20001," block comment ","/* block comment */")
-#20006=@"loc,{#10000},2,1,2,19"
-locations_default(#20006,#10000,2,1,2,19)
-hasLocation(#20005,#20006)
-#20007=*
-comments(#20007,2,#20001," doc comment ","/** doc comment */")
-#20008=@"loc,{#10000},3,1,3,18"
-locations_default(#20008,#10000,3,1,3,18)
-hasLocation(#20007,#20008)
-#20009=*
-comments(#20009,3,#20001," an HTML comment","<!-- an HTML comment")
-#20010=@"loc,{#10000},4,1,4,20"
-locations_default(#20010,#10000,4,1,4,20)
-hasLocation(#20009,#20010)
-#20011=*
-comments(#20011,4,#20001," another HTML comment","--> ano ... comment")
-#20012=@"loc,{#10000},5,1,5,24"
-locations_default(#20012,#10000,5,1,5,24)
-hasLocation(#20011,#20012)
+#20002=*
+comments(#20002,0,#20001," line comment","// line comment")
+#20003=@"loc,{#10000},1,1,1,15"
+locations_default(#20003,#10000,1,1,1,15)
+hasLocation(#20002,#20003)
+#20004=*
+comments(#20004,1,#20001," block comment ","/* block comment */")
+#20005=@"loc,{#10000},2,1,2,19"
+locations_default(#20005,#10000,2,1,2,19)
+hasLocation(#20004,#20005)
+#20006=*
+comments(#20006,2,#20001," doc comment ","/** doc comment */")
+#20007=@"loc,{#10000},3,1,3,18"
+locations_default(#20007,#10000,3,1,3,18)
+hasLocation(#20006,#20007)
+#20008=*
+comments(#20008,3,#20001," an HTML comment","<!-- an HTML comment")
+#20009=@"loc,{#10000},4,1,4,20"
+locations_default(#20009,#10000,4,1,4,20)
+hasLocation(#20008,#20009)
+#20010=*
+comments(#20010,4,#20001," another HTML comment","--> ano ... comment")
+#20011=@"loc,{#10000},5,1,5,24"
+locations_default(#20011,#10000,5,1,5,24)
+hasLocation(#20010,#20011)
+#20012=*
+lines(#20012,#20001,"// line comment","
+")
+hasLocation(#20012,#20003)
 #20013=*
-lines(#20013,#20001,"// line comment","
+lines(#20013,#20001,"/* block comment */","
 ")
-hasLocation(#20013,#20004)
+hasLocation(#20013,#20005)
 #20014=*
-lines(#20014,#20001,"/* block comment */","
+lines(#20014,#20001,"/** doc comment */","
 ")
-hasLocation(#20014,#20006)
+hasLocation(#20014,#20007)
 #20015=*
-lines(#20015,#20001,"/** doc comment */","
+lines(#20015,#20001,"<!-- an HTML comment","
 ")
-hasLocation(#20015,#20008)
+hasLocation(#20015,#20009)
 #20016=*
-lines(#20016,#20001,"<!-- an HTML comment","
-")
-hasLocation(#20016,#20010)
-#20017=*
-lines(#20017,#20001,"--> another HTML comment","")
-hasLocation(#20017,#20012)
+lines(#20016,#20001,"--> another HTML comment","")
+hasLocation(#20016,#20011)
 numlines(#20001,5,0,5)
-#20018=*
-tokeninfo(#20018,0,#20001,0,"")
-#20019=@"loc,{#10000},5,25,5,24"
-locations_default(#20019,#10000,5,25,5,24)
-hasLocation(#20018,#20019)
-next_token(#20003,#20018)
-next_token(#20005,#20018)
-next_token(#20007,#20018)
-next_token(#20009,#20018)
-next_token(#20011,#20018)
-#20020=*
-entry_cfg_node(#20020,#20001)
-#20021=@"loc,{#10000},1,1,1,0"
-locations_default(#20021,#10000,1,1,1,0)
-hasLocation(#20020,#20021)
-#20022=*
-exit_cfg_node(#20022,#20001)
-hasLocation(#20022,#20019)
-successor(#20020,#20022)
+#20017=*
+tokeninfo(#20017,0,#20001,0,"")
+#20018=@"loc,{#10000},5,25,5,24"
+locations_default(#20018,#10000,5,25,5,24)
+hasLocation(#20017,#20018)
+next_token(#20002,#20017)
+next_token(#20004,#20017)
+next_token(#20006,#20017)
+next_token(#20008,#20017)
+next_token(#20010,#20017)
+#20019=*
+jsdoc(#20019,"doc comment",#20006)
+hasLocation(#20019,#20007)
+toplevels(#20001,0)
+#20020=@"loc,{#10000},1,1,5,24"
+locations_default(#20020,#10000,1,1,5,24)
+hasLocation(#20001,#20020)
+#20021=*
+entry_cfg_node(#20021,#20001)
+#20022=@"loc,{#10000},1,1,1,0"
+locations_default(#20022,#10000,1,1,1,0)
+hasLocation(#20021,#20022)
 #20023=*
-jsdoc(#20023,"doc comment",#20007)
-hasLocation(#20023,#20008)
+exit_cfg_node(#20023,#20001)
+hasLocation(#20023,#20018)
+successor(#20021,#20023)
 numlines(#10000,5,0,5)
 filetype(#10000,"javascript")

javascript/extractor/tests/comments/output/trap/empty_comment.js.trap

@@ -9,26 +9,26 @@ hasLocation(#10000,#10002)
 #20000=@"global_scope"
 scopes(#20000,0)
 #20001=@"script;{#10000},1,1"
-toplevels(#20001,0)
-#20002=@"loc,{#10000},1,1,2,0"
-locations_default(#20002,#10000,1,1,2,0)
-hasLocation(#20001,#20002)
-#20003=*
-comments(#20003,1,#20001,"","/**/")
-#20004=@"loc,{#10000},1,1,1,4"
-locations_default(#20004,#10000,1,1,1,4)
-hasLocation(#20003,#20004)
-#20005=*
-lines(#20005,#20001,"/**/","
+#20002=*
+comments(#20002,1,#20001,"","/**/")
+#20003=@"loc,{#10000},1,1,1,4"
+locations_default(#20003,#10000,1,1,1,4)
+hasLocation(#20002,#20003)
+#20004=*
+lines(#20004,#20001,"/**/","
 ")
-hasLocation(#20005,#20004)
+hasLocation(#20004,#20003)
 numlines(#20001,1,0,1)
-#20006=*
-tokeninfo(#20006,0,#20001,0,"")
-#20007=@"loc,{#10000},2,1,2,0"
-locations_default(#20007,#10000,2,1,2,0)
-hasLocation(#20006,#20007)
-next_token(#20003,#20006)
+#20005=*
+tokeninfo(#20005,0,#20001,0,"")
+#20006=@"loc,{#10000},2,1,2,0"
+locations_default(#20006,#10000,2,1,2,0)
+hasLocation(#20005,#20006)
+next_token(#20002,#20005)
+toplevels(#20001,0)
+#20007=@"loc,{#10000},1,1,2,0"
+locations_default(#20007,#10000,1,1,2,0)
+hasLocation(#20001,#20007)
 #20008=*
 entry_cfg_node(#20008,#20001)
 #20009=@"loc,{#10000},1,1,1,0"
@@ -36,7 +36,7 @@ locations_default(#20009,#10000,1,1,1,0)
 hasLocation(#20008,#20009)
 #20010=*
 exit_cfg_node(#20010,#20001)
-hasLocation(#20010,#20007)
+hasLocation(#20010,#20006)
 successor(#20008,#20010)
 numlines(#10000,1,0,1)
 filetype(#10000,"javascript")