Revert "unified: Validate that inheritance works"

This reverts commit b55eda6.

Author: asgerf

unified/extractor/ast_types.yml

@@ -63,13 +63,11 @@ supertypes:
     - while_stmt
     - do_while_stmt
     - labeled_stmt
-  function_like:
-    - function_declaration
-    - function_expr
   callable:
     subtypes:
       - top_level
-      - function_like
+      - function_expr
+      - function_declaration
       - constructor_declaration
       - destructor_declaration
       - accessor_declaration

unified/ql/lib/codeql/unified/internal/Ast.qll

@@ -678,9 +678,7 @@ module Unified {
   }
 
   /** A class representing `function_declaration` nodes. */
-  class FunctionDeclaration extends @unified_function_declaration, F::FunctionLike, F::Member,
-    F::Stmt
-  {
+  class FunctionDeclaration extends @unified_function_declaration, F::Callable, F::Member, F::Stmt {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "FunctionDeclaration" }
 
@@ -736,7 +734,7 @@ module Unified {
   }
 
   /** A class representing `function_expr` nodes. */
-  class FunctionExpr extends @unified_function_expr, F::Expr, F::FunctionLike {
+  class FunctionExpr extends @unified_function_expr, F::Callable, F::Expr {
     /** Gets the name of the primary QL class for this element. */
     final override string getAPrimaryQlClass() { result = "FunctionExpr" }
 
@@ -778,8 +776,6 @@ module Unified {
     }
   }
 
-  class FunctionLike extends @unified_function_like, F::Callable { }
-
   /** A class representing `generic_type_expr` nodes. */
   class GenericTypeExpr extends @unified_generic_type_expr, F::Expr {
     /** Gets the name of the primary QL class for this element. */
@@ -1898,8 +1894,6 @@ module UnifiedFinal {
 
   final class FunctionExpr = F::FunctionExpr;
 
-  final class FunctionLike = F::FunctionLike;
-
   final class GenericTypeExpr = F::GenericTypeExpr;
 
   final class GuardIfStmt = F::GuardIfStmt;

unified/ql/lib/unified.dbscheme

@@ -286,7 +286,7 @@ unified_call_expr_def(
   int callee: @unified_expr ref
 );
 
-@unified_callable = @unified_accessor_declaration | @unified_constructor_declaration | @unified_destructor_declaration | @unified_function_like | @unified_initializer_declaration | @unified_top_level
+@unified_callable = @unified_accessor_declaration | @unified_constructor_declaration | @unified_destructor_declaration | @unified_function_declaration | @unified_function_expr | @unified_initializer_declaration | @unified_top_level
 
 #keyset[unified_catch_clause, index]
 unified_catch_clause_modifier(
@@ -552,8 +552,6 @@ unified_function_expr_def(
   unique int id: @unified_function_expr
 );
 
-@unified_function_like = @unified_function_declaration | @unified_function_expr
-
 #keyset[unified_generic_type_expr, index]
 unified_generic_type_expr_type_argument(
   int unified_generic_type_expr: @unified_generic_type_expr ref,