renamed "isConstEnum" to "is_const_enum"

This commit is contained in:
Erik Krogh Kristensen
2020-09-04 11:51:55 +02:00
parent ac345fbecd
commit a0afcaa3a8
7 changed files with 13 additions and 6 deletions

View File

@@ -1944,7 +1944,7 @@ public class ASTExtractor {
visitAll(nd.getMembers(), key, IdContext.varAndTypeDecl, 1, 1); visitAll(nd.getMembers(), key, IdContext.varAndTypeDecl, 1, 1);
scopeManager.leaveScope(); scopeManager.leaveScope();
if (nd.isConst()) { if (nd.isConst()) {
trapwriter.addTuple("isConstEnum", key); trapwriter.addTuple("is_const_enum", key);
} }
if (nd.hasDeclareKeyword()) { if (nd.hasDeclareKeyword()) {
trapwriter.addTuple("has_declare_keyword", key); trapwriter.addTuple("has_declare_keyword", key);

View File

@@ -757,7 +757,7 @@ expr_containers(#20264,#20001)
literals("b","b",#20264) literals("b","b",#20264)
decl(#20264,#20254) decl(#20264,#20254)
typedecl(#20264,#20255) typedecl(#20264,#20255)
isConstEnum(#20249) is_const_enum(#20249)
#20265=* #20265=*
stmts(#20265,36,#20001,3,"declare ... a, b }") stmts(#20265,36,#20001,3,"declare ... a, b }")
hasLocation(#20265,#20011) hasLocation(#20265,#20011)
@@ -805,7 +805,7 @@ expr_containers(#20275,#20001)
literals("b","b",#20275) literals("b","b",#20275)
decl(#20275,#20270) decl(#20275,#20270)
typedecl(#20275,#20271) typedecl(#20275,#20271)
isConstEnum(#20265) is_const_enum(#20265)
has_declare_keyword(#20265) has_declare_keyword(#20265)
#20276=* #20276=*
stmts(#20276,17,#20001,4,"functio ... rn x; }") stmts(#20276,17,#20001,4,"functio ... rn x; }")

View File

@@ -160,3 +160,8 @@ deprecated predicate isStatic(Property prop) { is_static(prop) }
* Use `MemberDeclaration#isAbstract()` instead. * Use `MemberDeclaration#isAbstract()` instead.
*/ */
deprecated predicate isAbstractMember(Property prop) { is_abstract_member(prop) } deprecated predicate isAbstractMember(Property prop) { is_abstract_member(prop) }
/**
* Alias for the predicate `is_const_enum` defined in the .dbscheme.
* Use `EnumDeclaration#isConst()` instead.
*/
deprecated predicate isConstEnum(EnumDeclaration id) { is_const_enum(id) }

View File

@@ -1409,7 +1409,7 @@ class EnumDeclaration extends NamespaceDefinition, @enumdeclaration, AST::ValueN
int getNumDecorator() { result = count(getADecorator()) } int getNumDecorator() { result = count(getADecorator()) }
/** Holds if this enumeration is declared with the `const` keyword. */ /** Holds if this enumeration is declared with the `const` keyword. */
predicate isConst() { isConstEnum(this) } predicate isConst() { is_const_enum(this) }
override ControlFlowNode getFirstControlFlowNode() { result = getIdentifier() } override ControlFlowNode getFirstControlFlowNode() { result = getIdentifier() }
} }

View File

@@ -517,7 +517,7 @@ is_computed (int id: @property ref);
is_method (int id: @property ref); is_method (int id: @property ref);
is_static (int id: @property ref); is_static (int id: @property ref);
is_abstract_member (int id: @property ref); is_abstract_member (int id: @property ref);
isConstEnum (int id: @enumdeclaration ref); is_const_enum (int id: @enumdeclaration ref);
isAbstractClass (int id: @classdeclstmt ref); isAbstractClass (int id: @classdeclstmt ref);
hasPublicKeyword (int id: @property ref); hasPublicKeyword (int id: @property ref);

View File

@@ -8396,7 +8396,7 @@
</dependencies> </dependencies>
</relation> </relation>
<relation> <relation>
<name>isConstEnum</name> <name>is_const_enum</name>
<cardinality>62</cardinality> <cardinality>62</cardinality>
<columnsizes> <columnsizes>
<e> <e>

View File

@@ -38,3 +38,5 @@ is_static.rel: reorder isStatic.rel(int prop) prop
isStatic.rel: delete isStatic.rel: delete
is_abstract_member.rel: reorder isAbstractMember.rel(int prop) prop is_abstract_member.rel: reorder isAbstractMember.rel(int prop) prop
isAbstractMember.rel: delete isAbstractMember.rel: delete
is_const_enum.rel: reorder isConstEnum.rel(int id) id
isConstEnum.rel: delete