renamed "isConstEnum" to "is_const_enum"

erik-krogh · erik-krogh · commit a0afcaa3a867 · 2020-09-04T11:51:55.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -1944,7 +1944,7 @@ public Label visit(EnumDeclaration nd, Context c) {
       visitAll(nd.getMembers(), key, IdContext.varAndTypeDecl, 1, 1);
       scopeManager.leaveScope();
       if (nd.isConst()) {
-        trapwriter.addTuple("isConstEnum", key);
+        trapwriter.addTuple("is_const_enum", key);
       }
       if (nd.hasDeclareKeyword()) {
         trapwriter.addTuple("has_declare_keyword", key);
diff --git a/javascript/extractor/tests/ts/output/trap/enum.ts.trap b/javascript/extractor/tests/ts/output/trap/enum.ts.trap
@@ -757,7 +757,7 @@ expr_containers(#20264,#20001)
 literals("b","b",#20264)
 decl(#20264,#20254)
 typedecl(#20264,#20255)
-isConstEnum(#20249)
+is_const_enum(#20249)
 #20265=*
 stmts(#20265,36,#20001,3,"declare ...  a, b }")
 hasLocation(#20265,#20011)
@@ -805,7 +805,7 @@ expr_containers(#20275,#20001)
 literals("b","b",#20275)
 decl(#20275,#20270)
 typedecl(#20275,#20271)
-isConstEnum(#20265)
+is_const_enum(#20265)
 has_declare_keyword(#20265)
 #20276=*
 stmts(#20276,17,#20001,4,"functio ... rn x; }")
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -160,3 +160,8 @@ deprecated predicate isStatic(Property prop) { is_static(prop) }
  * Use `MemberDeclaration#isAbstract()` instead.
  */ 
 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) }
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -1409,7 +1409,7 @@ class EnumDeclaration extends NamespaceDefinition, @enumdeclaration, AST::ValueN
   int getNumDecorator() { result = count(getADecorator()) }
 
   /** 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() }
 }
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -517,7 +517,7 @@ is_computed (int id: @property ref);
 is_method   (int id: @property ref);
 is_static   (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);
 
 hasPublicKeyword (int id: @property ref);
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -8396,7 +8396,7 @@
 </dependencies>
 </relation>
 <relation>
-<name>isConstEnum</name>
+<name>is_const_enum</name>
 <cardinality>62</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -38,3 +38,5 @@ is_static.rel: reorder isStatic.rel(int prop) prop
 isStatic.rel: delete
 is_abstract_member.rel: reorder isAbstractMember.rel(int prop) prop
 isAbstractMember.rel: delete
+is_const_enum.rel: reorder isConstEnum.rel(int id) id
+isConstEnum.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -1944,7 +1944,7 @@ public Label visit(EnumDeclaration nd, Context c) {`
`1944`	`1944`	`visitAll(nd.getMembers(), key, IdContext.varAndTypeDecl, 1, 1);`
`1945`	`1945`	`scopeManager.leaveScope();`
`1946`	`1946`	`if (nd.isConst()) {`
`1947`		`- trapwriter.addTuple("isConstEnum", key);`
	`1947`	`+ trapwriter.addTuple("is_const_enum", key);`
`1948`	`1948`	`}`
`1949`	`1949`	`if (nd.hasDeclareKeyword()) {`
`1950`	`1950`	`trapwriter.addTuple("has_declare_keyword", key);`
Original file line number	Diff line number	Diff line change
`@@ -1409,7 +1409,7 @@ class EnumDeclaration extends NamespaceDefinition, @enumdeclaration, AST::ValueN`
`1409`	`1409`	`int getNumDecorator() { result = count(getADecorator()) }`
`1410`	`1410`
`1411`	`1411`	/** Holds if this enumeration is declared with the `const` keyword. */
`1412`		`- predicate isConst() { isConstEnum(this) }`
	`1412`	`+ predicate isConst() { is_const_enum(this) }`
`1413`	`1413`
`1414`	`1414`	`override ControlFlowNode getFirstControlFlowNode() { result = getIdentifier() }`
`1415`	`1415`	`}`