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 "isInstantiated" to "is_instantiated"

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2020-09-04 11:51:45 +02:00
parent 76f728aacd
commit 49b71d515c
9 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1375,7 +1375,7 @@ public class ASTExtractor {
contextManager.leaveContainer(); contextManager.leaveContainer();
scopeManager.leaveScope(); scopeManager.leaveScope();
if (nd.isInstantiated()) { if (nd.isInstantiated()) {
trapwriter.addTuple("isInstantiated", lbl); trapwriter.addTuple("is_instantiated", lbl);
} }
return lbl; return lbl;
} }

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

@@ -8415,7 +8415,7 @@ hasLocation(#22804,#21469)
enclosingStmt(#22804,#22777) enclosingStmt(#22804,#22777)
exprContainers(#22804,#22183) exprContainers(#22804,#22183)
literals("any","any",#22804) literals("any","any",#22804)
isInstantiated(#22183) is_instantiated(#22183)
#22805=* #22805=*
stmts(#22805,31,#20001,1,"namespa ... any;\n}") stmts(#22805,31,#20001,1,"namespa ... any;\n}")
#22806=@"loc,{#10000},72,1,101,1" #22806=@"loc,{#10000},72,1,101,1"
@@ -10069,7 +10069,7 @@ hasLocation(#23199,#22172)
enclosingStmt(#23199,#23170) enclosingStmt(#23199,#23170)
exprContainers(#23199,#22805) exprContainers(#23199,#22805)
literals("any","any",#23199) literals("any","any",#23199)
isInstantiated(#22805) is_instantiated(#22805)
#23200=* #23200=*
entry_cfg_node(#23200,#20001) entry_cfg_node(#23200,#20001)
#23201=@"loc,{#10000},1,1,1,0" #23201=@"loc,{#10000},1,1,1,0"

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

@@ -275,8 +275,8 @@ hasLocation(#20091,#20039)
enclosingStmt(#20091,#20086) enclosingStmt(#20091,#20086)
exprContainers(#20091,#20079) exprContainers(#20091,#20079)
literals("42","42",#20091) literals("42","42",#20091)
isInstantiated(#20079) is_instantiated(#20079)
isInstantiated(#20071) is_instantiated(#20071)
#20092=* #20092=*
stmts(#20092,32,#20001,1,"import x = M.N.x;") stmts(#20092,32,#20001,1,"import x = M.N.x;")
hasLocation(#20092,#20015) hasLocation(#20092,#20015)

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

@@ -835,7 +835,7 @@ scopenesting(#20276,#20215)
stmts(#20277,0,#20273,0,";") stmts(#20277,0,#20273,0,";")
hasLocation(#20277,#20155) hasLocation(#20277,#20155)
stmt_containers(#20277,#20273) stmt_containers(#20277,#20273)
isInstantiated(#20273) is_instantiated(#20273)
#20278=* #20278=*
stmts(#20278,31,#20212,6,"namespa ... ck {{}}") stmts(#20278,31,#20212,6,"namespa ... ck {{}}")
#20279=@"loc,{#10000},22,3,22,27" #20279=@"loc,{#10000},22,3,22,27"
@@ -860,7 +860,7 @@ stmts(#20282,1,#20278,0,"{}")
locations_default(#20283,#10000,22,25,22,26) locations_default(#20283,#10000,22,25,22,26)
hasLocation(#20282,#20283) hasLocation(#20282,#20283)
stmt_containers(#20282,#20278) stmt_containers(#20282,#20278)
isInstantiated(#20278) is_instantiated(#20278)
#20284=* #20284=*
stmts(#20284,18,#20212,7,"var x = ... yBlock]") stmts(#20284,18,#20212,7,"var x = ... yBlock]")
#20285=@"loc,{#10000},24,3,24,82" #20285=@"loc,{#10000},24,3,24,82"
@@ -948,7 +948,7 @@ exprContainers(#20302,#20212)
literals("EmptyBlock","EmptyBlock",#20302) literals("EmptyBlock","EmptyBlock",#20302)
bind(#20302,#20217) bind(#20302,#20217)
arraySize(#20289,7) arraySize(#20289,7)
isInstantiated(#20212) is_instantiated(#20212)
#20303=* #20303=*
entry_cfg_node(#20303,#20001) entry_cfg_node(#20303,#20001)
#20304=@"loc,{#10000},1,1,1,0" #20304=@"loc,{#10000},1,1,1,0"

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

@@ -101,3 +101,8 @@ deprecated predicate stmtContainers(Stmt stmt, StmtContainer container) { stmt_c
* Use `JumpStmt#getTarget()` instead. * Use `JumpStmt#getTarget()` instead.
*/ */
deprecated predicate jumpTargets(Stmt jump, Stmt target) { jump_targets(jump, target) } deprecated predicate jumpTargets(Stmt jump, Stmt target) { jump_targets(jump, target) }
/**
* Alias for the predicate `is_instantiated` defined in the .dbscheme.
* Use `NamespaceDeclaration#isInstantiated() instead.`
*/
deprecated predicate isInstantiated(NamespaceDeclaration decl) { is_instantiated(decl) }

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

@@ -83,7 +83,7 @@ class NamespaceDeclaration extends NamespaceDefinition, StmtContainer, @namespac
* A namespace that is empty or only contains interfaces and type aliases is not instantiated, * A namespace that is empty or only contains interfaces and type aliases is not instantiated,
* and thus has no namespace object at runtime and is not associated with a variable. * and thus has no namespace object at runtime and is not associated with a variable.
*/ */
predicate isInstantiated() { isInstantiated(this) } predicate isInstantiated() { is_instantiated(this) }
override ControlFlowNode getFirstControlFlowNode() { override ControlFlowNode getFirstControlFlowNode() {
if hasDeclareKeyword(this) then result = this else result = getIdentifier() if hasDeclareKeyword(this) then result = this else result = getIdentifier()

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

@@ -198,7 +198,7 @@ case @stmt.kind of
@namespacedefinition = @namespacedeclaration | @enumdeclaration; @namespacedefinition = @namespacedeclaration | @enumdeclaration;
@typedefinition = @classdefinition | @interfacedeclaration | @enumdeclaration | @typealiasdeclaration | @enum_member; @typedefinition = @classdefinition | @interfacedeclaration | @enumdeclaration | @typealiasdeclaration | @enum_member;
isInstantiated(unique int decl: @namespacedeclaration ref); is_instantiated(unique int decl: @namespacedeclaration ref);
@declarablenode = @declstmt | @namespacedeclaration | @classdeclstmt | @functiondeclstmt | @enumdeclaration | @externalmoduledeclaration | @globalaugmentationdeclaration | @field; @declarablenode = @declstmt | @namespacedeclaration | @classdeclstmt | @functiondeclstmt | @enumdeclaration | @externalmoduledeclaration | @globalaugmentationdeclaration | @field;
hasDeclareKeyword(unique int stmt: @declarablenode ref); hasDeclareKeyword(unique int stmt: @declarablenode ref);

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

@@ -7908,7 +7908,7 @@
<dependencies/> <dependencies/>
</relation> </relation>
<relation> <relation>
<name>isInstantiated</name> <name>is_instantiated</name>
<cardinality>5</cardinality> <cardinality>5</cardinality>
<columnsizes> <columnsizes>
<e> <e>

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

@@ -14,3 +14,5 @@ stmt_containers.rel: reorder stmtContainers.rel(int stmt, int container) stmt co
stmtContainers.rel: delete stmtContainers.rel: delete
jump_targets.rel: reorder jumpTargets.rel(int jump, int target) jump target jump_targets.rel: reorder jumpTargets.rel(int jump, int target) jump target
jumpTargets.rel: delete jumpTargets.rel: delete
is_instantiated.rel: reorder isInstantiated.rel(int decl) decl
isInstantiated.rel: delete