renamed "isAbstractClass" to "is_abstract_class"

erik-krogh · erik-krogh · commit 29e5bdb4d70e · 2020-09-04T11:51:56.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
@@ -1287,7 +1287,7 @@ public Label visit(ClassDeclaration nd, Context c) {
         trapwriter.addTuple("has_declare_keyword", lbl);
       }
       if (nd.hasAbstractKeyword()) {
-        trapwriter.addTuple("isAbstractClass", lbl);
+        trapwriter.addTuple("is_abstract_class", lbl);
       }
       return visit(nd.getClassDef(), lbl, nd, false);
     }
diff --git a/javascript/extractor/tests/ts/output/trap/classes.ts.trap b/javascript/extractor/tests/ts/output/trap/classes.ts.trap
@@ -107,7 +107,7 @@ stmts(#20037,26,#20001,0,"abstrac ... F>\n  {}")
 locations_default(#20038,#10000,1,1,2,4)
 hasLocation(#20037,#20038)
 stmt_containers(#20037,#20001)
-isAbstractClass(#20037)
+is_abstract_class(#20037)
 #20039=*
 exprs(#20039,78,#20037,0,"C")
 hasLocation(#20039,#20011)
diff --git a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
@@ -724,7 +724,7 @@ stmts(#20260,26,#20001,1,"abstrac ... mber;\n}")
 locations_default(#20261,#10000,4,1,15,1)
 hasLocation(#20260,#20261)
 stmt_containers(#20260,#20001)
-isAbstractClass(#20260)
+is_abstract_class(#20260)
 #20262=*
 exprs(#20262,78,#20260,0,"C")
 hasLocation(#20262,#20091)
@@ -941,7 +941,7 @@ locations_default(#20313,#10000,18,1,29,1)
 hasLocation(#20312,#20313)
 stmt_containers(#20312,#20001)
 has_declare_keyword(#20312)
-isAbstractClass(#20312)
+is_abstract_class(#20312)
 #20314=*
 exprs(#20314,78,#20312,0,"D")
 hasLocation(#20314,#20174)
diff --git a/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap b/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
@@ -4175,7 +4175,7 @@ stmts(#21350,26,#20001,44,"abstrac ... ): T;\n}")
 locations_default(#21351,#10000,54,1,57,1)
 hasLocation(#21350,#21351)
 stmt_containers(#21350,#20001)
-isAbstractClass(#21350)
+is_abstract_class(#21350)
 #21352=*
 exprs(#21352,78,#21350,0,"GenericClass")
 hasLocation(#21352,#20801)
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -165,3 +165,8 @@ deprecated predicate isAbstractMember(Property prop) { is_abstract_member(prop)
  * Use `EnumDeclaration#isConst()` instead.
  */ 
 deprecated predicate isConstEnum(EnumDeclaration id) { is_const_enum(id) }
+/**
+ * Alias for the predicate `is_abstract_class` defined in the .dbscheme.
+ * Use `ClassDefinition#isAbstract()` instead.
+ */ 
+deprecated predicate isAbstractClass(ClassDeclStmt id) { is_abstract_class(id) }
diff --git a/javascript/ql/src/semmle/javascript/Classes.qll b/javascript/ql/src/semmle/javascript/Classes.qll
@@ -215,7 +215,7 @@ class ClassDefinition extends @classdefinition, ClassOrInterface, AST::ValueNode
   /**
    * Holds if this class has the `abstract` modifier.
    */
-  override predicate isAbstract() { isAbstractClass(this) }
+  override predicate isAbstract() { is_abstract_class(this) }
 
   override string describe() {
     if exists(inferNameFromVarDef())
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -518,7 +518,7 @@ is_method   (int id: @property ref);
 is_static   (int id: @property ref);
 is_abstract_member (int id: @property ref);
 is_const_enum (int id: @enumdeclaration ref);
-isAbstractClass (int id: @classdeclstmt ref);
+is_abstract_class (int id: @classdeclstmt ref);
 
 hasPublicKeyword (int id: @property ref);
 hasPrivateKeyword (int id: @property ref);
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -8407,7 +8407,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>isAbstractClass</name>
+<name>is_abstract_class</name>
 <cardinality>116</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -40,3 +40,5 @@ 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
+is_abstract_class.rel: reorder isAbstractClass.rel(int id) id
+isAbstractClass.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -1287,7 +1287,7 @@ public Label visit(ClassDeclaration nd, Context c) {`
`1287`	`1287`	`trapwriter.addTuple("has_declare_keyword", lbl);`
`1288`	`1288`	`}`
`1289`	`1289`	`if (nd.hasAbstractKeyword()) {`
`1290`		`- trapwriter.addTuple("isAbstractClass", lbl);`
	`1290`	`+ trapwriter.addTuple("is_abstract_class", lbl);`
`1291`	`1291`	`}`
`1292`	`1292`	`return visit(nd.getClassDef(), lbl, nd, false);`
`1293`	`1293`	`}`