hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-23 20:26:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed "isMethod" to "is_method"

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2020-09-04 11:51:53 +02:00
parent 6382f6d202
commit 10439fb522
49 changed files with 103 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
View File

@@ -1133,7 +1133,7 @@ public class ASTExtractor {
visit(nd.getValue(), propkey, 1, c.idcontext); visit(nd.getValue(), propkey, 1, c.idcontext);
visit(nd.getDefaultValue(), propkey, 2, IdContext.varBind); visit(nd.getDefaultValue(), propkey, 2, IdContext.varBind);
if (nd.isComputed()) trapwriter.addTuple("is_computed", propkey); if (nd.isComputed()) trapwriter.addTuple("is_computed", propkey);
if (nd.isMethod()) trapwriter.addTuple("isMethod", propkey); if (nd.isMethod()) trapwriter.addTuple("is_method", propkey);
return propkey; return propkey;
} }
@@ -1520,7 +1520,7 @@ public class ASTExtractor {
if (ctor != null) contextManager.leaveContainer(); if (ctor != null) contextManager.leaveContainer();
if (nd instanceof MethodDefinition && !nd.isCallSignature() && !nd.isIndexSignature()) if (nd instanceof MethodDefinition && !nd.isCallSignature() && !nd.isIndexSignature())
trapwriter.addTuple("isMethod", methkey); trapwriter.addTuple("is_method", methkey);
// Emit tuples for isStatic, isAbstract, isComputed, etc // Emit tuples for isStatic, isAbstract, isComputed, etc
for (int i = 0; i < DeclarationFlags.numberOfFlags; ++i) { for (int i = 0; i < DeclarationFlags.numberOfFlags; ++i) {
if (DeclarationFlags.hasNthFlag(nd.getFlags(), i)) { if (DeclarationFlags.hasNthFlag(nd.getFlags(), i)) {

2
javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
View File

@@ -92,7 +92,7 @@ is_arguments_object(#20026)
stmts(#20027,1,#20024,-2,"{}") stmts(#20027,1,#20024,-2,"{}")
hasLocation(#20027,#20022) hasLocation(#20027,#20022)
stmt_containers(#20027,#20024) stmt_containers(#20027,#20024)
isMethod(#20021) is_method(#20021)
#20028=* #20028=*
entry_cfg_node(#20028,#20001) entry_cfg_node(#20028,#20001)
#20029=@"loc,{#10000},1,1,1,0" #20029=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
View File

@@ -113,7 +113,7 @@ is_arguments_object(#20032)
stmts(#20033,1,#20030,-2,"{}") stmts(#20033,1,#20030,-2,"{}")
hasLocation(#20033,#20028) hasLocation(#20033,#20028)
stmt_containers(#20033,#20030) stmt_containers(#20033,#20030)
isMethod(#20027) is_method(#20027)
#20034=* #20034=*
entry_cfg_node(#20034,#20001) entry_cfg_node(#20034,#20001)
#20035=@"loc,{#10000},1,1,1,0" #20035=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
View File

@@ -146,7 +146,7 @@ enclosing_stmt(#20040,#20036)
expr_containers(#20040,#20030) expr_containers(#20040,#20030)
literals("args","args",#20040) literals("args","args",#20040)
bind(#20040,#20032) bind(#20040,#20032)
isMethod(#20027) is_method(#20027)
#20041=* #20041=*
entry_cfg_node(#20041,#20001) entry_cfg_node(#20041,#20001)
#20042=@"loc,{#10000},1,1,1,0" #20042=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
View File

@@ -167,7 +167,7 @@ enclosing_stmt(#20046,#20042)
expr_containers(#20046,#20036) expr_containers(#20046,#20036)
literals("args","args",#20046) literals("args","args",#20046)
bind(#20046,#20038) bind(#20046,#20038)
isMethod(#20033) is_method(#20033)
#20047=* #20047=*
entry_cfg_node(#20047,#20001) entry_cfg_node(#20047,#20001)
#20048=@"loc,{#10000},1,1,1,0" #20048=@"loc,{#10000},1,1,1,0"

8
javascript/extractor/tests/cfg/output/trap/fields.js.trap
View File

@@ -448,7 +448,7 @@ literals("ctor","ctor",#20154)
#20155=@"var;{ctor};{#20000}" #20155=@"var;{ctor};{#20000}"
variables(#20155,"ctor",#20000) variables(#20155,"ctor",#20000)
bind(#20154,#20155) bind(#20154,#20155)
isMethod(#20143) is_method(#20143)
#20156=* #20156=*
properties(#20156,#20139,3,8,"x;") properties(#20156,#20139,3,8,"x;")
#20157=@"loc,{#10000},5,3,5,4" #20157=@"loc,{#10000},5,3,5,4"
@@ -502,7 +502,7 @@ stmts(#20169,1,#20165,-2,"{}")
locations_default(#20170,#10000,7,7,7,8) locations_default(#20170,#10000,7,7,7,8)
hasLocation(#20169,#20170) hasLocation(#20169,#20170)
stmt_containers(#20169,#20165) stmt_containers(#20169,#20165)
isMethod(#20162) is_method(#20162)
#20171=* #20171=*
properties(#20171,#20139,6,0,"static g() {}") properties(#20171,#20139,6,0,"static g() {}")
#20172=@"loc,{#10000},8,3,8,15" #20172=@"loc,{#10000},8,3,8,15"
@@ -534,7 +534,7 @@ stmts(#20178,1,#20174,-2,"{}")
locations_default(#20179,#10000,8,14,8,15) locations_default(#20179,#10000,8,14,8,15)
hasLocation(#20178,#20179) hasLocation(#20178,#20179)
stmt_containers(#20178,#20174) stmt_containers(#20178,#20174)
isMethod(#20171) is_method(#20171)
isStatic(#20171) isStatic(#20171)
#20180=* #20180=*
stmts(#20180,26,#20001,1,"class B ... \n z;\n}") stmts(#20180,26,#20001,1,"class B ... \n z;\n}")
@@ -640,7 +640,7 @@ literals("after","after",#20205)
#20206=@"var;{after};{#20000}" #20206=@"var;{after};{#20000}"
variables(#20206,"after",#20000) variables(#20206,"after",#20000)
bind(#20205,#20206) bind(#20205,#20206)
isMethod(#20185) is_method(#20185)
#20207=* #20207=*
properties(#20207,#20180,3,8,"z;") properties(#20207,#20180,3,8,"z;")
#20208=@"loc,{#10000},17,3,17,4" #20208=@"loc,{#10000},17,3,17,4"

6
javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
View File

@@ -290,7 +290,7 @@ hasLocation(#20097,#20041)
enclosing_stmt(#20097,#20092) enclosing_stmt(#20097,#20092)
expr_containers(#20097,#20086) expr_containers(#20097,#20086)
literals("_x","_x",#20097) literals("_x","_x",#20097)
isMethod(#20083) is_method(#20083)
#20098=* #20098=*
properties(#20098,#20080,3,2,"set x(v ... +v;\n }") properties(#20098,#20080,3,2,"set x(v ... +v;\n }")
#20099=@"loc,{#10000},5,3,7,3" #20099=@"loc,{#10000},5,3,7,3"
@@ -375,7 +375,7 @@ enclosing_stmt(#20119,#20109)
expr_containers(#20119,#20101) expr_containers(#20119,#20101)
literals("v","v",#20119) literals("v","v",#20119)
bind(#20119,#20104) bind(#20119,#20104)
isMethod(#20098) is_method(#20098)
#20120=* #20120=*
properties(#20120,#20080,4,0,"constructor() {}") properties(#20120,#20080,4,0,"constructor() {}")
#20121=@"loc,{#10000},1,9,1,8" #20121=@"loc,{#10000},1,9,1,8"
@@ -403,7 +403,7 @@ is_arguments_object(#20125)
stmts(#20126,1,#20123,-2,"{}") stmts(#20126,1,#20123,-2,"{}")
hasLocation(#20126,#20121) hasLocation(#20126,#20121)
stmt_containers(#20126,#20123) stmt_containers(#20126,#20123)
isMethod(#20120) is_method(#20120)
#20127=* #20127=*
entry_cfg_node(#20127,#20001) entry_cfg_node(#20127,#20001)
#20128=@"loc,{#10000},1,1,1,0" #20128=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
View File

@@ -226,7 +226,7 @@ enclosing_stmt(#20070,#20062)
expr_containers(#20070,#20054) expr_containers(#20070,#20054)
literals("x","x",#20070) literals("x","x",#20070)
bind(#20070,#20057) bind(#20070,#20057)
isMethod(#20051) is_method(#20051)
#20071=* #20071=*
entry_cfg_node(#20071,#20001) entry_cfg_node(#20071,#20001)
#20072=@"loc,{#10000},1,1,1,0" #20072=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
View File

@@ -143,7 +143,7 @@ enclosing_stmt(#20038,#20034)
expr_containers(#20038,#20028) expr_containers(#20038,#20028)
literals("args","args",#20038) literals("args","args",#20038)
bind(#20038,#20030) bind(#20038,#20030)
isMethod(#20025) is_method(#20025)
#20039=* #20039=*
entry_cfg_node(#20039,#20001) entry_cfg_node(#20039,#20001)
#20040=@"loc,{#10000},1,1,1,0" #20040=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
View File

@@ -245,7 +245,7 @@ enclosing_stmt(#20071,#20067)
expr_containers(#20071,#20061) expr_containers(#20071,#20061)
literals("args","args",#20071) literals("args","args",#20071)
bind(#20071,#20063) bind(#20071,#20063)
isMethod(#20058) is_method(#20058)
#20072=* #20072=*
entry_cfg_node(#20072,#20001) entry_cfg_node(#20072,#20001)
#20073=@"loc,{#10000},1,1,1,0" #20073=@"loc,{#10000},1,1,1,0"

4
javascript/extractor/tests/es2015/output/trap/class_method.js.trap
View File

@@ -194,7 +194,7 @@ hasLocation(#20061,#20033)
enclosing_stmt(#20061,#20056) enclosing_stmt(#20061,#20056)
expr_containers(#20061,#20050) expr_containers(#20061,#20050)
literals("x","x",#20061) literals("x","x",#20061)
isMethod(#20047) is_method(#20047)
#20062=* #20062=*
properties(#20062,#20044,3,0,"constructor() {}") properties(#20062,#20044,3,0,"constructor() {}")
#20063=@"loc,{#10000},1,9,1,8" #20063=@"loc,{#10000},1,9,1,8"
@@ -222,7 +222,7 @@ is_arguments_object(#20067)
stmts(#20068,1,#20065,-2,"{}") stmts(#20068,1,#20065,-2,"{}")
hasLocation(#20068,#20063) hasLocation(#20068,#20063)
stmt_containers(#20068,#20065) stmt_containers(#20068,#20065)
isMethod(#20062) is_method(#20062)
#20069=* #20069=*
entry_cfg_node(#20069,#20001) entry_cfg_node(#20069,#20001)
#20070=@"loc,{#10000},1,1,1,0" #20070=@"loc,{#10000},1,1,1,0"

4
javascript/extractor/tests/es2015/output/trap/class_static.js.trap
View File

@@ -183,7 +183,7 @@ regexpterm(#20057,14,#20056,0,"A")
locations_default(#20058,#10000,3,13,3,13) locations_default(#20058,#10000,3,13,3,13)
hasLocation(#20057,#20058) hasLocation(#20057,#20058)
regexpConstValue(#20057,"A") regexpConstValue(#20057,"A")
isMethod(#20045) is_method(#20045)
isStatic(#20045) isStatic(#20045)
#20059=* #20059=*
properties(#20059,#20042,3,0,"constructor() {}") properties(#20059,#20042,3,0,"constructor() {}")
@@ -212,7 +212,7 @@ is_arguments_object(#20064)
stmts(#20065,1,#20062,-2,"{}") stmts(#20065,1,#20062,-2,"{}")
hasLocation(#20065,#20060) hasLocation(#20065,#20060)
stmt_containers(#20065,#20062) stmt_containers(#20065,#20062)
isMethod(#20059) is_method(#20059)
#20066=* #20066=*
entry_cfg_node(#20066,#20001) entry_cfg_node(#20066,#20001)
#20067=@"loc,{#10000},1,1,1,0" #20067=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
View File

@@ -89,7 +89,7 @@ is_arguments_object(#20024)
stmts(#20025,1,#20022,-2,"{}") stmts(#20025,1,#20022,-2,"{}")
hasLocation(#20025,#20020) hasLocation(#20025,#20020)
stmt_containers(#20025,#20022) stmt_containers(#20025,#20022)
isMethod(#20019) is_method(#20019)
#20026=* #20026=*
entry_cfg_node(#20026,#20001) entry_cfg_node(#20026,#20001)
#20027=@"loc,{#10000},1,1,1,0" #20027=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
View File

@@ -111,7 +111,7 @@ is_arguments_object(#20031)
stmts(#20032,1,#20029,-2,"{}") stmts(#20032,1,#20029,-2,"{}")
hasLocation(#20032,#20027) hasLocation(#20032,#20027)
stmt_containers(#20032,#20029) stmt_containers(#20032,#20029)
isMethod(#20026) is_method(#20026)
#20033=* #20033=*
entry_cfg_node(#20033,#20001) entry_cfg_node(#20033,#20001)
#20034=@"loc,{#10000},1,1,1,0" #20034=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
View File

@@ -90,7 +90,7 @@ is_arguments_object(#20025)
stmts(#20026,1,#20023,-2,"{}") stmts(#20026,1,#20023,-2,"{}")
hasLocation(#20026,#20021) hasLocation(#20026,#20021)
stmt_containers(#20026,#20023) stmt_containers(#20026,#20023)
isMethod(#20020) is_method(#20020)
#20027=* #20027=*
entry_cfg_node(#20027,#20001) entry_cfg_node(#20027,#20001)
#20028=@"loc,{#10000},1,1,1,0" #20028=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/export11.js.trap
View File

@@ -94,7 +94,7 @@ is_arguments_object(#20026)
stmts(#20027,1,#20024,-2,"{}") stmts(#20027,1,#20024,-2,"{}")
hasLocation(#20027,#20022) hasLocation(#20027,#20022)
stmt_containers(#20027,#20024) stmt_containers(#20027,#20024)
isMethod(#20021) is_method(#20021)
#20028=* #20028=*
entry_cfg_node(#20028,#20001) entry_cfg_node(#20028,#20001)
#20029=@"loc,{#10000},1,1,1,0" #20029=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/export9.js.trap
View File

@@ -131,7 +131,7 @@ is_arguments_object(#20039)
stmts(#20040,1,#20037,-2,"{}") stmts(#20040,1,#20037,-2,"{}")
hasLocation(#20040,#20035) hasLocation(#20040,#20035)
stmt_containers(#20040,#20037) stmt_containers(#20040,#20037)
isMethod(#20034) is_method(#20034)
#20041=* #20041=*
stmts(#20041,2,#20001,1,"[,]") stmts(#20041,2,#20001,1,"[,]")
#20042=@"loc,{#10000},1,27,1,29" #20042=@"loc,{#10000},1,27,1,29"

4
javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
View File

@@ -162,7 +162,7 @@ stmts(#20051,1,#20045,-2,"{ }")
locations_default(#20052,#10000,2,17,2,19) locations_default(#20052,#10000,2,17,2,19)
hasLocation(#20051,#20052) hasLocation(#20051,#20052)
stmt_containers(#20051,#20045) stmt_containers(#20051,#20045)
isMethod(#20042) is_method(#20042)
is_computed(#20042) is_computed(#20042)
#20053=* #20053=*
properties(#20053,#20038,3,0,"constructor() {}") properties(#20053,#20038,3,0,"constructor() {}")
@@ -191,7 +191,7 @@ is_arguments_object(#20058)
stmts(#20059,1,#20056,-2,"{}") stmts(#20059,1,#20056,-2,"{}")
hasLocation(#20059,#20054) hasLocation(#20059,#20054)
stmt_containers(#20059,#20056) stmt_containers(#20059,#20056)
isMethod(#20053) is_method(#20053)
#20060=* #20060=*
entry_cfg_node(#20060,#20001) entry_cfg_node(#20060,#20001)
#20061=@"loc,{#10000},1,1,1,0" #20061=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/properties.js.trap
View File

@@ -387,7 +387,7 @@ hasLocation(#20122,#20069)
enclosing_stmt(#20122,#20120) enclosing_stmt(#20122,#20120)
expr_containers(#20122,#20114) expr_containers(#20122,#20114)
literals("56","56",#20122) literals("56","56",#20122)
isMethod(#20111) is_method(#20111)
#20123=* #20123=*
entry_cfg_node(#20123,#20001) entry_cfg_node(#20123,#20001)
#20124=@"loc,{#10000},1,1,1,0" #20124=@"loc,{#10000},1,1,1,0"

4
javascript/extractor/tests/es2015/output/trap/super_call.js.trap
View File

@@ -253,7 +253,7 @@ hasLocation(#20080,#20045)
enclosing_stmt(#20080,#20070) enclosing_stmt(#20080,#20070)
expr_containers(#20080,#20064) expr_containers(#20080,#20064)
literals("19","19",#20080) literals("19","19",#20080)
isMethod(#20061) is_method(#20061)
#20081=* #20081=*
properties(#20081,#20056,3,0,"constru ... rgs); }") properties(#20081,#20056,3,0,"constru ... rgs); }")
#20082=@"loc,{#10000},1,19,1,18" #20082=@"loc,{#10000},1,19,1,18"
@@ -316,7 +316,7 @@ enclosing_stmt(#20094,#20090)
expr_containers(#20094,#20084) expr_containers(#20094,#20084)
literals("args","args",#20094) literals("args","args",#20094)
bind(#20094,#20086) bind(#20094,#20086)
isMethod(#20081) is_method(#20081)
#20095=* #20095=*
entry_cfg_node(#20095,#20001) entry_cfg_node(#20095,#20001)
#20096=@"loc,{#10000},1,1,1,0" #20096=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
View File

@@ -213,7 +213,7 @@ hasLocation(#20067,#20035)
enclosing_stmt(#20067,#20062) enclosing_stmt(#20067,#20062)
expr_containers(#20067,#20056) expr_containers(#20067,#20056)
literals("42","42",#20067) literals("42","42",#20067)
isMethod(#20053) is_method(#20053)
#20068=* #20068=*
entry_cfg_node(#20068,#20001) entry_cfg_node(#20068,#20001)
#20069=@"loc,{#10000},1,1,1,0" #20069=@"loc,{#10000},1,1,1,0"

10
javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
View File

@@ -439,7 +439,7 @@ stmts(#20154,1,#20150,-2,"{}")
locations_default(#20155,#10000,4,22,4,23) locations_default(#20155,#10000,4,22,4,23)
hasLocation(#20154,#20155) hasLocation(#20154,#20155)
stmt_containers(#20154,#20150) stmt_containers(#20154,#20150)
isMethod(#20147) is_method(#20147)
#20156=* #20156=*
properties(#20156,#20143,3,0,"async * ... r]() {}") properties(#20156,#20143,3,0,"async * ... r]() {}")
#20157=@"loc,{#10000},5,3,5,36" #20157=@"loc,{#10000},5,3,5,36"
@@ -489,7 +489,7 @@ stmts(#20167,1,#20163,-2,"{}")
locations_default(#20168,#10000,5,35,5,36) locations_default(#20168,#10000,5,35,5,36)
hasLocation(#20167,#20168) hasLocation(#20167,#20168)
stmt_containers(#20167,#20163) stmt_containers(#20167,#20163)
isMethod(#20156) is_method(#20156)
is_computed(#20156) is_computed(#20156)
#20169=* #20169=*
properties(#20169,#20143,4,0,"constructor() {}") properties(#20169,#20143,4,0,"constructor() {}")
@@ -518,7 +518,7 @@ is_arguments_object(#20174)
stmts(#20175,1,#20172,-2,"{}") stmts(#20175,1,#20172,-2,"{}")
hasLocation(#20175,#20170) hasLocation(#20175,#20170)
stmt_containers(#20175,#20172) stmt_containers(#20175,#20172)
isMethod(#20169) is_method(#20169)
#20176=* #20176=*
stmts(#20176,18,#20001,2,"var o = ... () {}\n}") stmts(#20176,18,#20001,2,"var o = ... () {}\n}")
#20177=@"loc,{#10000},8,1,11,1" #20177=@"loc,{#10000},8,1,11,1"
@@ -579,7 +579,7 @@ stmts(#20190,1,#20186,-2,"{}")
locations_default(#20191,#10000,9,22,9,23) locations_default(#20191,#10000,9,22,9,23)
hasLocation(#20190,#20191) hasLocation(#20190,#20191)
stmt_containers(#20190,#20186) stmt_containers(#20190,#20186)
isMethod(#20183) is_method(#20183)
#20192=* #20192=*
properties(#20192,#20181,1,0,"async * ... r]() {}") properties(#20192,#20181,1,0,"async * ... r]() {}")
#20193=@"loc,{#10000},10,3,10,36" #20193=@"loc,{#10000},10,3,10,36"
@@ -628,7 +628,7 @@ locations_default(#20203,#10000,10,35,10,36)
hasLocation(#20202,#20203) hasLocation(#20202,#20203)
stmt_containers(#20202,#20198) stmt_containers(#20202,#20198)
is_computed(#20192) is_computed(#20192)
isMethod(#20192) is_method(#20192)
#20204=* #20204=*
entry_cfg_node(#20204,#20001) entry_cfg_node(#20204,#20001)
#20205=@"loc,{#10000},1,1,1,0" #20205=@"loc,{#10000},1,1,1,0"

6
javascript/extractor/tests/esnext/output/trap/fields.js.trap
View File

@@ -295,7 +295,7 @@ is_arguments_object(#20100)
stmts(#20101,1,#20092,-2,"{}") stmts(#20101,1,#20092,-2,"{}")
hasLocation(#20101,#20097) hasLocation(#20101,#20097)
stmt_containers(#20101,#20092) stmt_containers(#20101,#20092)
isMethod(#20096) is_method(#20096)
#20102=* #20102=*
stmts(#20102,26,#20001,1,"class B ... er.x;\n}") stmts(#20102,26,#20001,1,"class B ... er.x;\n}")
#20103=@"loc,{#10000},5,1,7,1" #20103=@"loc,{#10000},5,1,7,1"
@@ -408,7 +408,7 @@ enclosing_stmt(#20127,#20123)
expr_containers(#20127,#20109) expr_containers(#20127,#20109)
literals("args","args",#20127) literals("args","args",#20127)
bind(#20127,#20119) bind(#20127,#20119)
isMethod(#20115) is_method(#20115)
#20128=* #20128=*
stmts(#20128,26,#20001,2,"class C {\n async;\n}") stmts(#20128,26,#20001,2,"class C {\n async;\n}")
#20129=@"loc,{#10000},9,1,11,1" #20129=@"loc,{#10000},9,1,11,1"
@@ -464,7 +464,7 @@ is_arguments_object(#20140)
stmts(#20141,1,#20134,-2,"{}") stmts(#20141,1,#20134,-2,"{}")
hasLocation(#20141,#20137) hasLocation(#20141,#20137)
stmt_containers(#20141,#20134) stmt_containers(#20141,#20134)
isMethod(#20136) is_method(#20136)
#20142=* #20142=*
entry_cfg_node(#20142,#20001) entry_cfg_node(#20142,#20001)
#20143=@"loc,{#10000},1,1,1,0" #20143=@"loc,{#10000},1,1,1,0"

6
javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
View File

@@ -236,7 +236,7 @@ stmts(#20080,1,#20073,-2,"{ }")
locations_default(#20081,#10000,2,18,2,20) locations_default(#20081,#10000,2,18,2,20)
hasLocation(#20080,#20081) hasLocation(#20080,#20081)
stmt_containers(#20080,#20073) stmt_containers(#20080,#20073)
isMethod(#20070) is_method(#20070)
#20082=* #20082=*
properties(#20082,#20066,3,0,"set<T>(v: T) { }") properties(#20082,#20066,3,0,"set<T>(v: T) { }")
#20083=@"loc,{#10000},3,5,3,20" #20083=@"loc,{#10000},3,5,3,20"
@@ -278,7 +278,7 @@ stmts(#20092,1,#20085,-2,"{ }")
locations_default(#20093,#10000,3,18,3,20) locations_default(#20093,#10000,3,18,3,20)
hasLocation(#20092,#20093) hasLocation(#20092,#20093)
stmt_containers(#20092,#20085) stmt_containers(#20092,#20085)
isMethod(#20082) is_method(#20082)
#20094=* #20094=*
properties(#20094,#20066,4,0,"constructor() {}") properties(#20094,#20066,4,0,"constructor() {}")
#20095=@"loc,{#10000},1,9,1,8" #20095=@"loc,{#10000},1,9,1,8"
@@ -306,7 +306,7 @@ is_arguments_object(#20099)
stmts(#20100,1,#20097,-2,"{}") stmts(#20100,1,#20097,-2,"{}")
hasLocation(#20100,#20095) hasLocation(#20100,#20095)
stmt_containers(#20100,#20097) stmt_containers(#20100,#20097)
isMethod(#20094) is_method(#20094)
#20101=* #20101=*
entry_cfg_node(#20101,#20001) entry_cfg_node(#20101,#20001)
#20102=@"loc,{#10000},1,1,1,0" #20102=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
View File

@@ -225,7 +225,7 @@ enclosing_stmt(#20073,#20071)
expr_containers(#20073,#20062) expr_containers(#20073,#20062)
literals("a","a",#20073) literals("a","a",#20073)
bind(#20073,#20065) bind(#20073,#20065)
isMethod(#20059) is_method(#20059)
#20074=* #20074=*
entry_cfg_node(#20074,#20001) entry_cfg_node(#20074,#20001)
#20075=@"loc,{#10000},1,1,1,0" #20075=@"loc,{#10000},1,1,1,0"

4
javascript/extractor/tests/flow/output/trap/tst.js.trap
View File

@@ -578,7 +578,7 @@ stmts(#20208,1,#20204,-2,"{}")
locations_default(#20209,#10000,8,15,8,16) locations_default(#20209,#10000,8,15,8,16)
hasLocation(#20208,#20209) hasLocation(#20208,#20209)
stmt_containers(#20208,#20204) stmt_containers(#20208,#20204)
isMethod(#20201) is_method(#20201)
#20210=* #20210=*
properties(#20210,#20193,4,0,"constructor() {}") properties(#20210,#20193,4,0,"constructor() {}")
#20211=@"loc,{#10000},6,12,6,11" #20211=@"loc,{#10000},6,12,6,11"
@@ -605,7 +605,7 @@ is_arguments_object(#20214)
stmts(#20215,1,#20199,-2,"{}") stmts(#20215,1,#20199,-2,"{}")
hasLocation(#20215,#20211) hasLocation(#20215,#20211)
stmt_containers(#20215,#20199) stmt_containers(#20215,#20199)
isMethod(#20210) is_method(#20210)
#20216=* #20216=*
stmts(#20216,17,#20001,1,"functio ... :\n }\n}") stmts(#20216,17,#20001,1,"functio ... :\n }\n}")
#20217=@"loc,{#10000},11,1,15,1" #20217=@"loc,{#10000},11,1,15,1"

2
javascript/extractor/tests/flow/output/trap/variance.js.trap
View File

@@ -225,7 +225,7 @@ is_arguments_object(#20073)
stmts(#20074,1,#20067,-2,"{}") stmts(#20074,1,#20067,-2,"{}")
hasLocation(#20074,#20070) hasLocation(#20074,#20070)
stmt_containers(#20074,#20067) stmt_containers(#20074,#20067)
isMethod(#20069) is_method(#20069)
#20075=* #20075=*
entry_cfg_node(#20075,#20001) entry_cfg_node(#20075,#20001)
#20076=@"loc,{#10000},1,1,1,0" #20076=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/ts/output/trap/classes.ts.trap
View File

@@ -210,7 +210,7 @@ enclosing_stmt(#20060,#20056)
expr_containers(#20060,#20050) expr_containers(#20060,#20050)
literals("args","args",#20060) literals("args","args",#20060)
bind(#20060,#20052) bind(#20060,#20052)
isMethod(#20047) is_method(#20047)
#20061=* #20061=*
entry_cfg_node(#20061,#20001) entry_cfg_node(#20061,#20001)
#20062=@"loc,{#10000},1,1,1,0" #20062=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
View File

@@ -8158,7 +8158,7 @@ typeexprs(#22748,2,#22742,-6,"string")
hasLocation(#22748,#21349) hasLocation(#22748,#21349)
expr_containers(#22748,#22742) expr_containers(#22748,#22742)
literals("string","string",#22748) literals("string","string",#22748)
isMethod(#22739) is_method(#22739)
isAbstractMember(#22739) isAbstractMember(#22739)
#22749=* #22749=*
stmts(#22749,35,#22183,31,"type T4 ... <Part>;") stmts(#22749,35,#22183,31,"type T4 ... <Part>;")

4
javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
View File

@@ -235,7 +235,7 @@ typeexprs(#20077,2,#20067,-6,"string")
hasLocation(#20077,#20035) hasLocation(#20077,#20035)
expr_containers(#20077,#20067) expr_containers(#20077,#20067)
literals("string","string",#20077) literals("string","string",#20077)
isMethod(#20070) is_method(#20070)
#20078=* #20078=*
properties(#20078,#20062,4,0,"constru ... any) {}") properties(#20078,#20062,4,0,"constru ... any) {}")
#20079=@"loc,{#10000},4,3,4,23" #20079=@"loc,{#10000},4,3,4,23"
@@ -278,7 +278,7 @@ stmts(#20087,1,#20081,-2,"{}")
locations_default(#20088,#10000,4,22,4,23) locations_default(#20088,#10000,4,22,4,23)
hasLocation(#20087,#20088) hasLocation(#20087,#20088)
stmt_containers(#20087,#20081) stmt_containers(#20087,#20081)
isMethod(#20078) is_method(#20078)
#20089=* #20089=*
entry_cfg_node(#20089,#20001) entry_cfg_node(#20089,#20001)
#20090=@"loc,{#10000},1,1,1,0" #20090=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
View File

@@ -95,7 +95,7 @@ is_arguments_object(#20026)
stmts(#20027,1,#20024,-2,"{}") stmts(#20027,1,#20024,-2,"{}")
hasLocation(#20027,#20022) hasLocation(#20027,#20022)
stmt_containers(#20027,#20024) stmt_containers(#20027,#20024)
isMethod(#20021) is_method(#20021)
#20028=* #20028=*
entry_cfg_node(#20028,#20001) entry_cfg_node(#20028,#20001)
#20029=@"loc,{#10000},1,1,1,0" #20029=@"loc,{#10000},1,1,1,0"

6
javascript/extractor/tests/ts/output/trap/decorators.ts.trap
View File

@@ -427,7 +427,7 @@ hasLocation(#20143,#20063)
enclosing_stmt(#20143,#20138) enclosing_stmt(#20143,#20138)
expr_containers(#20143,#20132) expr_containers(#20143,#20132)
literals("field","field",#20143) literals("field","field",#20143)
isMethod(#20125) is_method(#20125)
#20144=* #20144=*
properties(#20144,#20118,3,8,"field: number;") properties(#20144,#20118,3,8,"field: number;")
#20145=@"loc,{#10000},7,3,7,16" #20145=@"loc,{#10000},7,3,7,16"
@@ -487,7 +487,7 @@ is_arguments_object(#20157)
stmts(#20158,1,#20150,-2,"{}") stmts(#20158,1,#20150,-2,"{}")
hasLocation(#20158,#20154) hasLocation(#20158,#20154)
stmt_containers(#20158,#20150) stmt_containers(#20158,#20150)
isMethod(#20153) is_method(#20153)
#20159=* #20159=*
stmts(#20159,17,#20001,1,"@functi ... un() {}") stmts(#20159,17,#20001,1,"@functi ... un() {}")
#20160=@"loc,{#10000},10,1,11,17" #20160=@"loc,{#10000},10,1,11,17"
@@ -576,7 +576,7 @@ is_arguments_object(#20179)
stmts(#20180,1,#20177,-2,"{}") stmts(#20180,1,#20177,-2,"{}")
hasLocation(#20180,#20175) hasLocation(#20180,#20175)
stmt_containers(#20180,#20177) stmt_containers(#20180,#20177)
isMethod(#20174) is_method(#20174)
#20181=* #20181=*
entry_cfg_node(#20181,#20001) entry_cfg_node(#20181,#20001)
#20182=@"loc,{#10000},1,1,1,0" #20182=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/ts/output/trap/export.ts.trap
View File

@@ -242,7 +242,7 @@ is_arguments_object(#20077)
stmts(#20078,1,#20075,-2,"{}") stmts(#20078,1,#20075,-2,"{}")
hasLocation(#20078,#20073) hasLocation(#20078,#20073)
stmt_containers(#20078,#20075) stmt_containers(#20078,#20075)
isMethod(#20072) is_method(#20072)
#20079=* #20079=*
stmts(#20079,29,#20001,2,"export ... f() {}") stmts(#20079,29,#20001,2,"export ... f() {}")
#20080=@"loc,{#10000},5,1,5,30" #20080=@"loc,{#10000},5,1,5,30"

2
javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
View File

@@ -88,7 +88,7 @@ is_arguments_object(#20024)
stmts(#20025,1,#20022,-2,"{}") stmts(#20025,1,#20022,-2,"{}")
hasLocation(#20025,#20020) hasLocation(#20025,#20020)
stmt_containers(#20025,#20022) stmt_containers(#20025,#20022)
isMethod(#20019) is_method(#20019)
#20026=* #20026=*
entry_cfg_node(#20026,#20001) entry_cfg_node(#20026,#20001)
#20027=@"loc,{#10000},1,1,1,0" #20027=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
View File

@@ -346,7 +346,7 @@ typeexprs(#20112,15,#20109,1,"I")
hasLocation(#20112,#20065) hasLocation(#20112,#20065)
expr_containers(#20112,#20106) expr_containers(#20112,#20106)
literals("I","I",#20112) literals("I","I",#20112)
isMethod(#20103) is_method(#20103)
isAbstractMember(#20103) isAbstractMember(#20103)
#20113=* #20113=*
stmts(#20113,33,#20082,2,"export = M;") stmts(#20113,33,#20082,2,"export = M;")

16
javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
View File

@@ -722,7 +722,7 @@ stmts(#20253,1,#20248,-2,"{}")
locations_default(#20254,#10000,6,12,6,13) locations_default(#20254,#10000,6,12,6,13)
hasLocation(#20253,#20254) hasLocation(#20253,#20254)
stmt_containers(#20253,#20248) stmt_containers(#20253,#20248)
isMethod(#20245) is_method(#20245)
#20255=* #20255=*
properties(#20255,#20241,3,0,"m2(@A a) {}") properties(#20255,#20241,3,0,"m2(@A a) {}")
#20256=@"loc,{#10000},7,3,7,13" #20256=@"loc,{#10000},7,3,7,13"
@@ -776,7 +776,7 @@ stmts(#20267,1,#20258,-2,"{}")
locations_default(#20268,#10000,7,12,7,13) locations_default(#20268,#10000,7,12,7,13)
hasLocation(#20267,#20268) hasLocation(#20267,#20268)
stmt_containers(#20267,#20258) stmt_containers(#20267,#20258)
isMethod(#20255) is_method(#20255)
#20269=* #20269=*
properties(#20269,#20241,4,0,"m3(@A @B ab) {}") properties(#20269,#20241,4,0,"m3(@A @B ab) {}")
#20270=@"loc,{#10000},8,3,8,17" #20270=@"loc,{#10000},8,3,8,17"
@@ -844,7 +844,7 @@ stmts(#20285,1,#20272,-2,"{}")
locations_default(#20286,#10000,8,16,8,17) locations_default(#20286,#10000,8,16,8,17)
hasLocation(#20285,#20286) hasLocation(#20285,#20286)
stmt_containers(#20285,#20272) stmt_containers(#20285,#20272)
isMethod(#20269) is_method(#20269)
#20287=* #20287=*
properties(#20287,#20241,5,0,"m4(none, @A a) {}") properties(#20287,#20241,5,0,"m4(none, @A a) {}")
#20288=@"loc,{#10000},10,3,10,19" #20288=@"loc,{#10000},10,3,10,19"
@@ -906,7 +906,7 @@ stmts(#20301,1,#20290,-2,"{}")
locations_default(#20302,#10000,10,18,10,19) locations_default(#20302,#10000,10,18,10,19)
hasLocation(#20301,#20302) hasLocation(#20301,#20302)
stmt_containers(#20301,#20290) stmt_containers(#20301,#20290)
isMethod(#20287) is_method(#20287)
#20303=* #20303=*
properties(#20303,#20241,6,0,"m5(none ... ab) {}") properties(#20303,#20241,6,0,"m5(none ... ab) {}")
#20304=@"loc,{#10000},11,3,11,23" #20304=@"loc,{#10000},11,3,11,23"
@@ -982,7 +982,7 @@ stmts(#20321,1,#20306,-2,"{}")
locations_default(#20322,#10000,11,22,11,23) locations_default(#20322,#10000,11,22,11,23)
hasLocation(#20321,#20322) hasLocation(#20321,#20322)
stmt_containers(#20321,#20306) stmt_containers(#20321,#20306)
isMethod(#20303) is_method(#20303)
#20323=* #20323=*
properties(#20323,#20241,7,0,"m6(@A a, @B b) {}") properties(#20323,#20241,7,0,"m6(@A a, @B b) {}")
#20324=@"loc,{#10000},13,3,13,19" #20324=@"loc,{#10000},13,3,13,19"
@@ -1060,7 +1060,7 @@ stmts(#20341,1,#20326,-2,"{}")
locations_default(#20342,#10000,13,18,13,19) locations_default(#20342,#10000,13,18,13,19)
hasLocation(#20341,#20342) hasLocation(#20341,#20342)
stmt_containers(#20341,#20326) stmt_containers(#20341,#20326)
isMethod(#20323) is_method(#20323)
#20343=* #20343=*
properties(#20343,#20241,8,0,"m7(@A a ... bc) {}") properties(#20343,#20241,8,0,"m7(@A a ... bc) {}")
#20344=@"loc,{#10000},14,3,14,23" #20344=@"loc,{#10000},14,3,14,23"
@@ -1152,7 +1152,7 @@ stmts(#20365,1,#20346,-2,"{}")
locations_default(#20366,#10000,14,22,14,23) locations_default(#20366,#10000,14,22,14,23)
hasLocation(#20365,#20366) hasLocation(#20365,#20366)
stmt_containers(#20365,#20346) stmt_containers(#20365,#20346)
isMethod(#20343) is_method(#20343)
#20367=* #20367=*
properties(#20367,#20241,9,0,"constructor() {}") properties(#20367,#20241,9,0,"constructor() {}")
#20368=@"loc,{#10000},5,9,5,8" #20368=@"loc,{#10000},5,9,5,8"
@@ -1180,7 +1180,7 @@ is_arguments_object(#20372)
stmts(#20373,1,#20370,-2,"{}") stmts(#20373,1,#20370,-2,"{}")
hasLocation(#20373,#20368) hasLocation(#20373,#20368)
stmt_containers(#20373,#20370) stmt_containers(#20373,#20370)
isMethod(#20367) is_method(#20367)
#20374=* #20374=*
entry_cfg_node(#20374,#20001) entry_cfg_node(#20374,#20001)
#20375=@"loc,{#10000},1,1,1,0" #20375=@"loc,{#10000},1,1,1,0"

6
javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
View File

@@ -297,7 +297,7 @@ scopenesting(#20102,#20000)
#20103=@"var;{arguments};{#20102}" #20103=@"var;{arguments};{#20102}"
variables(#20103,"arguments",#20102) variables(#20103,"arguments",#20102)
is_arguments_object(#20103) is_arguments_object(#20103)
isMethod(#20098) is_method(#20098)
isAbstractMember(#20098) isAbstractMember(#20098)
#20104=* #20104=*
properties(#20104,#20095,3,0,"bar(x: ... string;") properties(#20104,#20095,3,0,"bar(x: ... string;")
@@ -340,7 +340,7 @@ typeexprs(#20113,2,#20107,-6,"number")
hasLocation(#20113,#20047) hasLocation(#20113,#20047)
expr_containers(#20113,#20107) expr_containers(#20113,#20107)
literals("number","number",#20113) literals("number","number",#20113)
isMethod(#20104) is_method(#20104)
isAbstractMember(#20104) isAbstractMember(#20104)
#20114=* #20114=*
properties(#20114,#20095,4,8,"field: number;") properties(#20114,#20095,4,8,"field: number;")
@@ -421,7 +421,7 @@ scopenesting(#20132,#20121)
#20133=@"var;{arguments};{#20132}" #20133=@"var;{arguments};{#20132}"
variables(#20133,"arguments",#20132) variables(#20133,"arguments",#20132)
is_arguments_object(#20133) is_arguments_object(#20133)
isMethod(#20128) is_method(#20128)
isAbstractMember(#20128) isAbstractMember(#20128)
#20134=* #20134=*
entry_cfg_node(#20134,#20001) entry_cfg_node(#20134,#20001)

20
javascript/extractor/tests/ts/output/trap/nobody.ts.trap
View File

@@ -760,7 +760,7 @@ scopenesting(#20268,#20263)
#20269=@"var;{arguments};{#20268}" #20269=@"var;{arguments};{#20268}"
variables(#20269,"arguments",#20268) variables(#20269,"arguments",#20268)
is_arguments_object(#20269) is_arguments_object(#20269)
isMethod(#20264) is_method(#20264)
isAbstractMember(#20264) isAbstractMember(#20264)
#20270=* #20270=*
properties(#20270,#20260,3,0,"g(x: nu ... number;") properties(#20270,#20260,3,0,"g(x: nu ... number;")
@@ -803,7 +803,7 @@ typeexprs(#20279,2,#20273,-6,"number")
hasLocation(#20279,#20113) hasLocation(#20279,#20113)
expr_containers(#20279,#20273) expr_containers(#20279,#20273)
literals("number","number",#20279) literals("number","number",#20279)
isMethod(#20270) is_method(#20270)
#20280=* #20280=*
properties(#20280,#20260,4,0,"g(x: st ... string;") properties(#20280,#20260,4,0,"g(x: st ... string;")
#20281=@"loc,{#10000},10,3,10,23" #20281=@"loc,{#10000},10,3,10,23"
@@ -845,7 +845,7 @@ typeexprs(#20289,2,#20283,-6,"string")
hasLocation(#20289,#20131) hasLocation(#20289,#20131)
expr_containers(#20289,#20283) expr_containers(#20289,#20283)
literals("string","string",#20289) literals("string","string",#20289)
isMethod(#20280) is_method(#20280)
#20290=* #20290=*
properties(#20290,#20260,5,0,"g(x: any) {}") properties(#20290,#20260,5,0,"g(x: any) {}")
#20291=@"loc,{#10000},11,3,11,14" #20291=@"loc,{#10000},11,3,11,14"
@@ -888,7 +888,7 @@ stmts(#20299,1,#20293,-2,"{}")
locations_default(#20300,#10000,11,13,11,14) locations_default(#20300,#10000,11,13,11,14)
hasLocation(#20299,#20300) hasLocation(#20299,#20300)
stmt_containers(#20299,#20293) stmt_containers(#20299,#20293)
isMethod(#20290) is_method(#20290)
#20301=* #20301=*
properties(#20301,#20260,6,8,"abstract x: number;") properties(#20301,#20260,6,8,"abstract x: number;")
#20302=@"loc,{#10000},14,3,14,21" #20302=@"loc,{#10000},14,3,14,21"
@@ -933,7 +933,7 @@ is_arguments_object(#20310)
stmts(#20311,1,#20303,-2,"{}") stmts(#20311,1,#20303,-2,"{}")
hasLocation(#20311,#20307) hasLocation(#20311,#20307)
stmt_containers(#20311,#20303) stmt_containers(#20311,#20303)
isMethod(#20306) is_method(#20306)
#20312=* #20312=*
stmts(#20312,26,#20001,2,"declare ... mber;\n}") stmts(#20312,26,#20001,2,"declare ... mber;\n}")
#20313=@"loc,{#10000},18,1,29,1" #20313=@"loc,{#10000},18,1,29,1"
@@ -978,7 +978,7 @@ scopenesting(#20321,#20316)
#20322=@"var;{arguments};{#20321}" #20322=@"var;{arguments};{#20321}"
variables(#20322,"arguments",#20321) variables(#20322,"arguments",#20321)
is_arguments_object(#20322) is_arguments_object(#20322)
isMethod(#20317) is_method(#20317)
isAbstractMember(#20317) isAbstractMember(#20317)
#20323=* #20323=*
properties(#20323,#20312,3,0,"g(x: nu ... number;") properties(#20323,#20312,3,0,"g(x: nu ... number;")
@@ -1021,7 +1021,7 @@ typeexprs(#20332,2,#20326,-6,"number")
hasLocation(#20332,#20196) hasLocation(#20332,#20196)
expr_containers(#20332,#20326) expr_containers(#20332,#20326)
literals("number","number",#20332) literals("number","number",#20332)
isMethod(#20323) is_method(#20323)
#20333=* #20333=*
properties(#20333,#20312,4,0,"g(x: st ... string;") properties(#20333,#20312,4,0,"g(x: st ... string;")
#20334=@"loc,{#10000},24,3,24,23" #20334=@"loc,{#10000},24,3,24,23"
@@ -1063,7 +1063,7 @@ typeexprs(#20342,2,#20336,-6,"string")
hasLocation(#20342,#20214) hasLocation(#20342,#20214)
expr_containers(#20342,#20336) expr_containers(#20342,#20336)
literals("string","string",#20342) literals("string","string",#20342)
isMethod(#20333) is_method(#20333)
#20343=* #20343=*
properties(#20343,#20312,5,0,"g(x: any) {}") properties(#20343,#20312,5,0,"g(x: any) {}")
#20344=@"loc,{#10000},25,3,25,14" #20344=@"loc,{#10000},25,3,25,14"
@@ -1106,7 +1106,7 @@ stmts(#20352,1,#20346,-2,"{}")
locations_default(#20353,#10000,25,13,25,14) locations_default(#20353,#10000,25,13,25,14)
hasLocation(#20352,#20353) hasLocation(#20352,#20353)
stmt_containers(#20352,#20346) stmt_containers(#20352,#20346)
isMethod(#20343) is_method(#20343)
#20354=* #20354=*
properties(#20354,#20312,6,8,"abstract x: number;") properties(#20354,#20312,6,8,"abstract x: number;")
#20355=@"loc,{#10000},28,3,28,21" #20355=@"loc,{#10000},28,3,28,21"
@@ -1151,7 +1151,7 @@ is_arguments_object(#20363)
stmts(#20364,1,#20356,-2,"{}") stmts(#20364,1,#20356,-2,"{}")
hasLocation(#20364,#20360) hasLocation(#20364,#20360)
stmt_containers(#20364,#20356) stmt_containers(#20364,#20356)
isMethod(#20359) is_method(#20359)
#20365=* #20365=*
entry_cfg_node(#20365,#20001) entry_cfg_node(#20365,#20001)
#20366=@"loc,{#10000},2,1,2,0" #20366=@"loc,{#10000},2,1,2,0"

4
javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
View File

@@ -218,7 +218,7 @@ hasLocation(#20072,#20031)
enclosing_stmt(#20072,#20070) enclosing_stmt(#20072,#20070)
expr_containers(#20072,#20065) expr_containers(#20072,#20065)
literals("1","1",#20072) literals("1","1",#20072)
isMethod(#20062) is_method(#20062)
#20073=* #20073=*
properties(#20073,#20060,1,2,"set foo(v) {}") properties(#20073,#20060,1,2,"set foo(v) {}")
#20074=@"loc,{#10000},3,3,3,15" #20074=@"loc,{#10000},3,3,3,15"
@@ -256,7 +256,7 @@ stmts(#20081,1,#20076,-2,"{}")
locations_default(#20082,#10000,3,14,3,15) locations_default(#20082,#10000,3,14,3,15)
hasLocation(#20081,#20082) hasLocation(#20081,#20082)
stmt_containers(#20081,#20076) stmt_containers(#20081,#20076)
isMethod(#20073) is_method(#20073)
#20083=* #20083=*
entry_cfg_node(#20083,#20001) entry_cfg_node(#20083,#20001)
#20084=@"loc,{#10000},1,1,1,0" #20084=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/ts/output/trap/privateField.ts.trap
View File

@@ -234,7 +234,7 @@ hasLocation(#20073,#20037)
enclosing_stmt(#20073,#20064) enclosing_stmt(#20073,#20064)
expr_containers(#20073,#20054) expr_containers(#20073,#20054)
literals("5","5",#20073) literals("5","5",#20073)
isMethod(#20057) is_method(#20057)
#20074=* #20074=*
entry_cfg_node(#20074,#20001) entry_cfg_node(#20074,#20001)
#20075=@"loc,{#10000},1,1,1,0" #20075=@"loc,{#10000},1,1,1,0"

6
javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
View File

@@ -619,7 +619,7 @@ stmts(#20208,1,#20204,-2,"{}")
locations_default(#20209,#10000,8,19,8,20) locations_default(#20209,#10000,8,19,8,20)
hasLocation(#20208,#20209) hasLocation(#20208,#20209)
stmt_containers(#20208,#20204) stmt_containers(#20208,#20204)
isMethod(#20201) is_method(#20201)
#20210=* #20210=*
properties(#20210,#20197,3,0,"constructor() {}") properties(#20210,#20197,3,0,"constructor() {}")
#20211=@"loc,{#10000},7,9,7,8" #20211=@"loc,{#10000},7,9,7,8"
@@ -647,7 +647,7 @@ is_arguments_object(#20215)
stmts(#20216,1,#20213,-2,"{}") stmts(#20216,1,#20213,-2,"{}")
hasLocation(#20216,#20211) hasLocation(#20216,#20211)
stmt_containers(#20216,#20213) stmt_containers(#20216,#20213)
isMethod(#20210) is_method(#20210)
#20217=* #20217=*
stmts(#20217,34,#20001,4,"interfa ... : I);\n}") stmts(#20217,34,#20001,4,"interfa ... : I);\n}")
#20218=@"loc,{#10000},11,1,13,1" #20218=@"loc,{#10000},11,1,13,1"
@@ -690,7 +690,7 @@ hasLocation(#20226,#20150)
expr_containers(#20226,#20223) expr_containers(#20226,#20223)
literals("I","I",#20226) literals("I","I",#20226)
typebind(#20226,#20163) typebind(#20226,#20163)
isMethod(#20220) is_method(#20220)
isAbstractMember(#20220) isAbstractMember(#20220)
#20227=* #20227=*
entry_cfg_node(#20227,#20001) entry_cfg_node(#20227,#20001)

14
javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
View File

@@ -4167,7 +4167,7 @@ hasLocation(#21349,#20786)
expr_containers(#21349,#21343) expr_containers(#21349,#21343)
literals("T","T",#21349) literals("T","T",#21349)
typebind(#21349,#21332) typebind(#21349,#21332)
isMethod(#21340) is_method(#21340)
isAbstractMember(#21340) isAbstractMember(#21340)
#21350=* #21350=*
stmts(#21350,26,#20001,44,"abstrac ... ): T;\n}") stmts(#21350,26,#20001,44,"abstrac ... ): T;\n}")
@@ -4284,7 +4284,7 @@ hasLocation(#21375,#20837)
expr_containers(#21375,#21369) expr_containers(#21375,#21369)
literals("T","T",#21375) literals("T","T",#21375)
typebind(#21375,#21354) typebind(#21375,#21354)
isMethod(#21366) is_method(#21366)
isAbstractMember(#21366) isAbstractMember(#21366)
#21376=* #21376=*
properties(#21376,#21350,4,0,"constructor() {}") properties(#21376,#21350,4,0,"constructor() {}")
@@ -4312,7 +4312,7 @@ is_arguments_object(#21380)
stmts(#21381,1,#21363,-2,"{}") stmts(#21381,1,#21363,-2,"{}")
hasLocation(#21381,#21377) hasLocation(#21381,#21377)
stmt_containers(#21381,#21363) stmt_containers(#21381,#21363)
isMethod(#21376) is_method(#21376)
#21382=* #21382=*
stmts(#21382,26,#20001,45,"class Fish {}") stmts(#21382,26,#20001,45,"class Fish {}")
hasLocation(#21382,#20119) hasLocation(#21382,#20119)
@@ -4356,7 +4356,7 @@ is_arguments_object(#21390)
stmts(#21391,1,#21388,-2,"{}") stmts(#21391,1,#21388,-2,"{}")
hasLocation(#21391,#21386) hasLocation(#21391,#21386)
stmt_containers(#21391,#21388) stmt_containers(#21391,#21388)
isMethod(#21385) is_method(#21385)
#21392=* #21392=*
stmts(#21392,26,#20001,46,"class Bird {}") stmts(#21392,26,#20001,46,"class Bird {}")
hasLocation(#21392,#20121) hasLocation(#21392,#20121)
@@ -4400,7 +4400,7 @@ is_arguments_object(#21400)
stmts(#21401,1,#21398,-2,"{}") stmts(#21401,1,#21398,-2,"{}")
hasLocation(#21401,#21396) hasLocation(#21401,#21396)
stmt_containers(#21401,#21398) stmt_containers(#21401,#21398)
isMethod(#21395) is_method(#21395)
#21402=* #21402=*
stmts(#21402,17,#20001,47,"functio ... Fish {}") stmts(#21402,17,#20001,47,"functio ... Fish {}")
hasLocation(#21402,#20123) hasLocation(#21402,#20123)
@@ -4544,7 +4544,7 @@ exprs(#21436,6,#21434,0,"this")
hasLocation(#21436,#20920) hasLocation(#21436,#20920)
enclosing_stmt(#21436,#21434) enclosing_stmt(#21436,#21434)
expr_containers(#21436,#21425) expr_containers(#21436,#21425)
isMethod(#21422) is_method(#21422)
#21437=* #21437=*
properties(#21437,#21418,3,0,"constructor() {}") properties(#21437,#21418,3,0,"constructor() {}")
#21438=@"loc,{#10000},63,17,63,16" #21438=@"loc,{#10000},63,17,63,16"
@@ -4572,7 +4572,7 @@ is_arguments_object(#21442)
stmts(#21443,1,#21440,-2,"{}") stmts(#21443,1,#21440,-2,"{}")
hasLocation(#21443,#21438) hasLocation(#21443,#21438)
stmt_containers(#21443,#21440) stmt_containers(#21443,#21440)
isMethod(#21437) is_method(#21437)
#21444=* #21444=*
entry_cfg_node(#21444,#20001) entry_cfg_node(#21444,#20001)
#21445=@"loc,{#10000},1,1,1,0" #21445=@"loc,{#10000},1,1,1,0"

2
javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
View File

@@ -811,7 +811,7 @@ typeexprs(#20272,2,#20269,-3,"number")
hasLocation(#20272,#20141) hasLocation(#20272,#20141)
expr_containers(#20272,#20269) expr_containers(#20272,#20269)
literals("number","number",#20272) literals("number","number",#20272)
isMethod(#20266) is_method(#20266)
isAbstractMember(#20266) isAbstractMember(#20266)
#20273=* #20273=*
stmts(#20273,31,#20212,5,"namespa ... ent {;}") stmts(#20273,31,#20212,5,"namespa ... ent {;}")

5
javascript/ql/src/semmle/javascript/Aliases.qll
View File

@@ -145,3 +145,8 @@ deprecated predicate isArgumentsObject(Variable id) { is_arguments_object(id) }
* Use the `isComputed()` method on the `MemberDeclaration`/`Property`/`PropertyPattern` class instead. * Use the `isComputed()` method on the `MemberDeclaration`/`Property`/`PropertyPattern` class instead.
*/ */
deprecated predicate isComputed(Property prop) { is_computed(prop) } deprecated predicate isComputed(Property prop) { is_computed(prop) }
/**
* Alias for the predicate `is_method` defined in the .dbscheme.
* Use the `isMethod()` method on the `MemberDeclaration`/`Property` class instead.
*/
deprecated predicate isMethod(Property prop) { is_method(prop) }

2
javascript/ql/src/semmle/javascript/Classes.qll
View File

@@ -646,7 +646,7 @@ class MemberSignature extends MemberDeclaration {
* Note that TypeScript call signatures are not considered methods. * Note that TypeScript call signatures are not considered methods.
*/ */
class MethodDeclaration extends MemberDeclaration { class MethodDeclaration extends MemberDeclaration {
MethodDeclaration() { isMethod(this) } MethodDeclaration() { is_method(this) }
/** /**
* Gets the body of this method. * Gets the body of this method.

2
javascript/ql/src/semmle/javascript/Expr.qll
View File

@@ -617,7 +617,7 @@ class Property extends @property, Documentable {
predicate isComputed() { is_computed(this) } predicate isComputed() { is_computed(this) }
/** Holds if this property is defined using method syntax. */ /** Holds if this property is defined using method syntax. */
predicate isMethod() { isMethod(this) } predicate isMethod() { is_method(this) }
/** Holds if this property is defined using shorthand syntax. */ /** Holds if this property is defined using shorthand syntax. */
predicate isShorthand() { getNameExpr().getLocation() = getInit().getLocation() } predicate isShorthand() { getNameExpr().getLocation() = getInit().getLocation() }

2
javascript/ql/src/semmlecode.javascript.dbscheme
View File

@@ -514,7 +514,7 @@ case @property.kind of
@field_or_vardeclarator = @field | @vardeclarator; @field_or_vardeclarator = @field | @vardeclarator;
is_computed (int id: @property ref); is_computed (int id: @property ref);
isMethod (int id: @property ref); is_method (int id: @property ref);
isStatic (int id: @property ref); isStatic (int id: @property ref);
isAbstractMember (int id: @property ref); isAbstractMember (int id: @property ref);
isConstEnum (int id: @enumdeclaration ref); isConstEnum (int id: @enumdeclaration ref);

2
javascript/ql/src/semmlecode.javascript.dbscheme.stats
View File

@@ -13528,7 +13528,7 @@
<dependencies/> <dependencies/>
</relation> </relation>
<relation> <relation>
<name>isMethod</name> <name>is_method</name>
<cardinality>392</cardinality> <cardinality>392</cardinality>
<columnsizes> <columnsizes>
<e> <e>

2
javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
View File

@@ -32,3 +32,5 @@ is_arguments_object.rel: reorder isArgumentsObject.rel(int id) id
isArgumentsObject.rel: delete isArgumentsObject.rel: delete
is_computed.rel: reorder isComputed.rel(int prop) prop is_computed.rel: reorder isComputed.rel(int prop) prop
isComputed.rel: delete isComputed.rel: delete
is_method.rel: reorder isMethod.rel(int prop) prop
isMethod.rel: delete