revert some type changes that are no longer needed

erik-krogh · erik-krogh · commit cc0d86403e22 · 2021-09-14T20:40:46.000+02:00
diff --git a/javascript/extractor/src/com/semmle/jcorn/Parser.java b/javascript/extractor/src/com/semmle/jcorn/Parser.java
@@ -3219,7 +3219,7 @@ protected Node parseClass(Position startLoc, boolean isStatement) {
     Expression superClass = this.parseClassSuper();
     Position bodyStartLoc = this.startLoc;
     boolean hadConstructor = false;
-    List<MemberDefinition<?>> body = new ArrayList<>();
+    List<MemberDefinition<?>> body = new ArrayList<MemberDefinition<?>>();
     this.expect(TokenType.braceL);
     while (!this.eat(TokenType.braceR)) {
       if (this.eat(TokenType.semi)) continue;
diff --git a/javascript/extractor/src/com/semmle/js/ast/ClassBody.java b/javascript/extractor/src/com/semmle/js/ast/ClassBody.java
@@ -20,7 +20,7 @@ public void addMember(MemberDefinition<?> md) {
   }
 
   public MethodDefinition getConstructor() {
-    for (Node md : body) if (md instanceof MethodDefinition && ((MethodDefinition)md).isConstructor()) return (MethodDefinition) md;
+    for (MemberDefinition<?> md : body) if (md.isConstructor()) return (MethodDefinition) md;
     return null;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public void addMember(MemberDefinition<?> md) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public MethodDefinition getConstructor() {`
`23`		`- for (Node md : body) if (md instanceof MethodDefinition && ((MethodDefinition)md).isConstructor()) return (MethodDefinition) md;`
	`23`	`+ for (MemberDefinition<?> md : body) if (md.isConstructor()) return (MethodDefinition) md;`
`24`	`24`	`return null;`
`25`	`25`	`}`
`26`	`26`