Ruby: direct -> immediate

Author: asgerf

ruby/ql/lib/codeql/ruby/ast/Module.qll

@@ -25,18 +25,18 @@ class Module extends TModule {
   Module getAnIncludedModule() { result = getAnIncludedModule(this) }
 
   /** Gets the super class or an included or prepended module. */
-  Module getADirectAncestor() {
+  Module getAnImmediateAncestor() {
     result = [this.getSuperClass(), this.getAPrependedModule(), this.getAnIncludedModule()]
   }
 
   /** Gets a direct subclass or module including or prepending this one. */
-  Module getADirectDescendent() { this = result.getADirectAncestor() }
+  Module getAnImmediateDescendent() { this = result.getAnImmediateAncestor() }
 
   /** Gets a module that is transitively subclassed, included, or prepended by this module. */
-  Module getAnAncestor() { result = this.getADirectAncestor*() }
+  Module getAnAncestor() { result = this.getAnImmediateAncestor*() }
 
   /** Gets a module that transitively subclasses, includes, or prepends this module. */
-  Module getADescendent() { result = this.getADirectDescendent*() }
+  Module getADescendent() { result = this.getAnImmediateDescendent*() }
 
   /** Holds if this module is a class. */
   pragma[noinline]

ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll

@@ -733,10 +733,10 @@ class ModuleNode instanceof Module {
   final ModuleNode getAnIncludedModule() { result = super.getAnIncludedModule() }
 
   /** Gets the super class or an included or prepended module. */
-  final ModuleNode getADirectAncestor() { result = super.getADirectAncestor() }
+  final ModuleNode getAnImmediateAncestor() { result = super.getAnImmediateAncestor() }
 
   /** Gets a direct subclass or module including or prepending this one. */
-  final ModuleNode getADirectDescendent() { result = super.getADirectDescendent() }
+  final ModuleNode getAnImmediateDescendent() { result = super.getAnImmediateDescendent() }
 
   /** Gets a module that is transitively subclassed, included, or prepended by this module. */
   final ModuleNode getAnAncestor() { result = super.getAnAncestor() }
@@ -1190,7 +1190,7 @@ class ConstRef extends LocalSourceNode {
    */
   pragma[nomagic]
   private TConstLookupScope getATargetScope() {
-    result = MkAncestorLookup(this.getAncestryTarget().getADirectDescendent*())
+    result = MkAncestorLookup(this.getAncestryTarget().getAnImmediateDescendent*())
     or
     access = any(ConstantAccess ac).getScopeExpr() and
     result = MkQualifiedLookup(access)