JS: Update TRAP

javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap

@@ -43,44 +43,21 @@ enclosingStmt(#20011,#20010)
 exprContainers(#20011,#20001)
 literals("/dice/y","/dice/y",#20011)
 #20012=*
-regexpterm(#20012,1,#20011,0,"dice")
+regexpterm(#20012,14,#20011,0,"dice")
 #20013=@"loc,{#10000},1,2,1,5"
 locations_default(#20013,#10000,1,2,1,5)
 hasLocation(#20012,#20013)
+regexpConstValue(#20012,"dice")
 #20014=*
-regexpterm(#20014,14,#20012,0,"d")
-#20015=@"loc,{#10000},1,2,1,2"
-locations_default(#20015,#10000,1,2,1,2)
+entry_cfg_node(#20014,#20001)
+#20015=@"loc,{#10000},1,1,1,0"
+locations_default(#20015,#10000,1,1,1,0)
 hasLocation(#20014,#20015)
-regexpConstValue(#20014,"d")
 #20016=*
-regexpterm(#20016,14,#20012,1,"i")
-#20017=@"loc,{#10000},1,3,1,3"
-locations_default(#20017,#10000,1,3,1,3)
-hasLocation(#20016,#20017)
-regexpConstValue(#20016,"i")
-#20018=*
-regexpterm(#20018,14,#20012,2,"c")
-#20019=@"loc,{#10000},1,4,1,4"
-locations_default(#20019,#10000,1,4,1,4)
-hasLocation(#20018,#20019)
-regexpConstValue(#20018,"c")
-#20020=*
-regexpterm(#20020,14,#20012,3,"e")
-#20021=@"loc,{#10000},1,5,1,5"
-locations_default(#20021,#10000,1,5,1,5)
-hasLocation(#20020,#20021)
-regexpConstValue(#20020,"e")
-#20022=*
-entry_cfg_node(#20022,#20001)
-#20023=@"loc,{#10000},1,1,1,0"
-locations_default(#20023,#10000,1,1,1,0)
-hasLocation(#20022,#20023)
-#20024=*
-exit_cfg_node(#20024,#20001)
-hasLocation(#20024,#20009)
+exit_cfg_node(#20016,#20001)
+hasLocation(#20016,#20009)
 successor(#20010,#20011)
-successor(#20011,#20024)
-successor(#20022,#20010)
+successor(#20011,#20016)
+successor(#20014,#20010)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")

javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap

@@ -240,153 +240,171 @@ enclosingStmt(#20081,#20075)
 exprContainers(#20081,#20001)
 literals("x","""x""",#20081)
 #20082=*
-exprs(#20082,44,#20077,1,"(r = /[ ... && r[0]")
-#20083=@"loc,{#10000},5,3,5,33"
-locations_default(#20083,#10000,5,3,5,33)
+regexpterm(#20082,14,#20081,0,"x")
+#20083=@"loc,{#10000},4,4,4,4"
+locations_default(#20083,#10000,4,4,4,4)
 hasLocation(#20082,#20083)
-enclosingStmt(#20082,#20075)
-exprContainers(#20082,#20001)
+regexpConstValue(#20082,"x")
 #20084=*
-exprs(#20084,63,#20082,0,"(r = /[ ... c(""x""))")
-#20085=@"loc,{#10000},5,3,5,25"
-locations_default(#20085,#10000,5,3,5,25)
+exprs(#20084,44,#20077,1,"(r = /[ ... && r[0]")
+#20085=@"loc,{#10000},5,3,5,33"
+locations_default(#20085,#10000,5,3,5,33)
 hasLocation(#20084,#20085)
 enclosingStmt(#20084,#20075)
 exprContainers(#20084,#20001)
 #20086=*
-exprs(#20086,47,#20084,0,"r = /[\ ... ec(""x"")")
-#20087=@"loc,{#10000},5,4,5,24"
-locations_default(#20087,#10000,5,4,5,24)
+exprs(#20086,63,#20084,0,"(r = /[ ... c(""x""))")
+#20087=@"loc,{#10000},5,3,5,25"
+locations_default(#20087,#10000,5,3,5,25)
 hasLocation(#20086,#20087)
 enclosingStmt(#20086,#20075)
 exprContainers(#20086,#20001)
 #20088=*
-exprs(#20088,79,#20086,0,"r")
-hasLocation(#20088,#20033)
+exprs(#20088,47,#20086,0,"r = /[\ ... ec(""x"")")
+#20089=@"loc,{#10000},5,4,5,24"
+locations_default(#20089,#10000,5,4,5,24)
+hasLocation(#20088,#20089)
 enclosingStmt(#20088,#20075)
 exprContainers(#20088,#20001)
-literals("r","r",#20088)
-bind(#20088,#20071)
-#20089=*
-exprs(#20089,13,#20086,1,"/[\x]+/.exec(""x"")")
-#20090=@"loc,{#10000},5,8,5,24"
-locations_default(#20090,#10000,5,8,5,24)
-hasLocation(#20089,#20090)
-enclosingStmt(#20089,#20075)
-exprContainers(#20089,#20001)
+#20090=*
+exprs(#20090,79,#20088,0,"r")
+hasLocation(#20090,#20033)
+enclosingStmt(#20090,#20075)
+exprContainers(#20090,#20001)
+literals("r","r",#20090)
+bind(#20090,#20071)
 #20091=*
-exprs(#20091,14,#20089,-1,"/[\x]+/.exec")
-#20092=@"loc,{#10000},5,8,5,19"
-locations_default(#20092,#10000,5,8,5,19)
+exprs(#20091,13,#20088,1,"/[\x]+/.exec(""x"")")
+#20092=@"loc,{#10000},5,8,5,24"
+locations_default(#20092,#10000,5,8,5,24)
 hasLocation(#20091,#20092)
 enclosingStmt(#20091,#20075)
 exprContainers(#20091,#20001)
 #20093=*
-exprs(#20093,5,#20091,0,"/[\x]+/")
-hasLocation(#20093,#20037)
+exprs(#20093,14,#20091,-1,"/[\x]+/.exec")
+#20094=@"loc,{#10000},5,8,5,19"
+locations_default(#20094,#10000,5,8,5,19)
+hasLocation(#20093,#20094)
 enclosingStmt(#20093,#20075)
 exprContainers(#20093,#20001)
-literals("/[\x]+/","/[\x]+/",#20093)
-#20094=*
-regexpterm(#20094,9,#20093,0,"[\x]+")
-#20095=@"loc,{#10000},5,9,5,13"
-locations_default(#20095,#10000,5,9,5,13)
-hasLocation(#20094,#20095)
-isGreedy(#20094)
+#20095=*
+exprs(#20095,5,#20093,0,"/[\x]+/")
+hasLocation(#20095,#20037)
+enclosingStmt(#20095,#20075)
+exprContainers(#20095,#20001)
+literals("/[\x]+/","/[\x]+/",#20095)
 #20096=*
-regexpterm(#20096,23,#20094,0,"[\x]")
-#20097=@"loc,{#10000},5,9,5,12"
-locations_default(#20097,#10000,5,9,5,12)
+regexpterm(#20096,9,#20095,0,"[\x]+")
+#20097=@"loc,{#10000},5,9,5,13"
+locations_default(#20097,#10000,5,9,5,13)
 hasLocation(#20096,#20097)
+isGreedy(#20096)
 #20098=*
-regexpterm(#20098,15,#20096,0,"\x")
-#20099=@"loc,{#10000},5,10,5,11"
-locations_default(#20099,#10000,5,10,5,11)
+regexpterm(#20098,23,#20096,0,"[\x]")
+#20099=@"loc,{#10000},5,9,5,12"
+locations_default(#20099,#10000,5,9,5,12)
 hasLocation(#20098,#20099)
-regexpConstValue(#20098,"")
 #20100=*
-regexpParseErrors(#20100,#20094,"expected hexadecimal digit")
-#20101=@"loc,{#10000},5,12,5,12"
-locations_default(#20101,#10000,5,12,5,12)
+regexpterm(#20100,15,#20098,0,"\x")
+#20101=@"loc,{#10000},5,10,5,11"
+locations_default(#20101,#10000,5,10,5,11)
 hasLocation(#20100,#20101)
+regexpConstValue(#20100,"")
 #20102=*
-regexpParseErrors(#20102,#20094,"expected hexadecimal digit")
-hasLocation(#20102,#20101)
-#20103=*
-exprs(#20103,0,#20091,1,"exec")
-hasLocation(#20103,#20041)
-enclosingStmt(#20103,#20075)
-exprContainers(#20103,#20001)
-literals("exec","exec",#20103)
+regexpParseErrors(#20102,#20096,"expected hexadecimal digit")
+#20103=@"loc,{#10000},5,12,5,12"
+locations_default(#20103,#10000,5,12,5,12)
+hasLocation(#20102,#20103)
 #20104=*
-exprs(#20104,4,#20089,0,"""x""")
-hasLocation(#20104,#20045)
-enclosingStmt(#20104,#20075)
-exprContainers(#20104,#20001)
-literals("x","""x""",#20104)
+regexpParseErrors(#20104,#20096,"expected hexadecimal digit")
+hasLocation(#20104,#20103)
 #20105=*
-exprs(#20105,15,#20082,1,"r[0]")
-#20106=@"loc,{#10000},5,30,5,33"
-locations_default(#20106,#10000,5,30,5,33)
-hasLocation(#20105,#20106)
+exprs(#20105,0,#20093,1,"exec")
+hasLocation(#20105,#20041)
 enclosingStmt(#20105,#20075)
 exprContainers(#20105,#20001)
+literals("exec","exec",#20105)
+#20106=*
+exprs(#20106,4,#20091,0,"""x""")
+hasLocation(#20106,#20045)
+enclosingStmt(#20106,#20075)
+exprContainers(#20106,#20001)
+literals("x","""x""",#20106)
 #20107=*
-exprs(#20107,79,#20105,0,"r")
-hasLocation(#20107,#20053)
-enclosingStmt(#20107,#20075)
-exprContainers(#20107,#20001)
-literals("r","r",#20107)
-bind(#20107,#20071)
-#20108=*
-exprs(#20108,3,#20105,1,"0")
-hasLocation(#20108,#20057)
-enclosingStmt(#20108,#20075)
-exprContainers(#20108,#20001)
-literals("0","0",#20108)
+regexpterm(#20107,14,#20106,0,"x")
+#20108=@"loc,{#10000},5,22,5,22"
+locations_default(#20108,#10000,5,22,5,22)
+hasLocation(#20107,#20108)
+regexpConstValue(#20107,"x")
 #20109=*
-exprs(#20109,4,#20077,2,"""Section 1""")
-hasLocation(#20109,#20063)
+exprs(#20109,15,#20084,1,"r[0]")
+#20110=@"loc,{#10000},5,30,5,33"
+locations_default(#20110,#10000,5,30,5,33)
+hasLocation(#20109,#20110)
 enclosingStmt(#20109,#20075)
 exprContainers(#20109,#20001)
-literals("Section 1","""Section 1""",#20109)
-#20110=*
-entry_cfg_node(#20110,#20001)
-#20111=@"loc,{#10000},1,1,1,0"
-locations_default(#20111,#10000,1,1,1,0)
-hasLocation(#20110,#20111)
+#20111=*
+exprs(#20111,79,#20109,0,"r")
+hasLocation(#20111,#20053)
+enclosingStmt(#20111,#20075)
+exprContainers(#20111,#20001)
+literals("r","r",#20111)
+bind(#20111,#20071)
 #20112=*
-exit_cfg_node(#20112,#20001)
-hasLocation(#20112,#20069)
-successor(#20075,#20079)
-successor(#20109,#20077)
-successor(#20082,#20084)
-successor(#20084,#20088)
-successor(#20104,#20089)
-successor(#20103,#20091)
-successor(#20093,#20103)
-successor(#20091,#20104)
-successor(#20089,#20086)
-successor(#20088,#20093)
+exprs(#20112,3,#20109,1,"0")
+hasLocation(#20112,#20057)
+enclosingStmt(#20112,#20075)
+exprContainers(#20112,#20001)
+literals("0","0",#20112)
 #20113=*
-guard_node(#20113,1,#20086)
-hasLocation(#20113,#20087)
-successor(#20113,#20107)
+exprs(#20113,4,#20077,2,"""Section 1""")
+hasLocation(#20113,#20063)
+enclosingStmt(#20113,#20075)
+exprContainers(#20113,#20001)
+literals("Section 1","""Section 1""",#20113)
 #20114=*
-guard_node(#20114,0,#20086)
-hasLocation(#20114,#20087)
-successor(#20114,#20109)
-successor(#20086,#20113)
-successor(#20086,#20114)
-successor(#20108,#20105)
-successor(#20107,#20108)
-successor(#20105,#20109)
-successor(#20081,#20082)
+regexpterm(#20114,14,#20113,0,"Section 1")
+#20115=@"loc,{#10000},6,4,6,12"
+locations_default(#20115,#10000,6,4,6,12)
+hasLocation(#20114,#20115)
+regexpConstValue(#20114,"Section 1")
+#20116=*
+entry_cfg_node(#20116,#20001)
+#20117=@"loc,{#10000},1,1,1,0"
+locations_default(#20117,#10000,1,1,1,0)
+hasLocation(#20116,#20117)
+#20118=*
+exit_cfg_node(#20118,#20001)
+hasLocation(#20118,#20069)
+successor(#20075,#20079)
+successor(#20113,#20077)
+successor(#20084,#20086)
+successor(#20086,#20090)
+successor(#20106,#20091)
+successor(#20105,#20093)
+successor(#20095,#20105)
+successor(#20093,#20106)
+successor(#20091,#20088)
+successor(#20090,#20095)
+#20119=*
+guard_node(#20119,1,#20088)
+hasLocation(#20119,#20089)
+successor(#20119,#20111)
+#20120=*
+guard_node(#20120,0,#20088)
+hasLocation(#20120,#20089)
+successor(#20120,#20113)
+successor(#20088,#20119)
+successor(#20088,#20120)
+successor(#20112,#20109)
+successor(#20111,#20112)
+successor(#20109,#20113)
+successor(#20081,#20084)
 successor(#20079,#20081)
-successor(#20077,#20112)
+successor(#20077,#20118)
 successor(#20072,#20074)
 successor(#20074,#20073)
 successor(#20073,#20075)
-successor(#20110,#20072)
+successor(#20116,#20072)
 numlines(#10000,7,6,0)
 filetype(#10000,"javascript")