move the consistency predicates where they should be

Author: erik-krogh

ql/ql/src/codeql_ql/ast/internal/Module.qll

@@ -311,4 +311,8 @@ module ModConsistency {
     c > 1 and
     resolveModuleExpr(me, m)
   }
+
+  query predicate noName(Module mod) { not exists(mod.getName()) }
+
+  query predicate nonUniqueName(Module mod) { count(mod.getName()) >= 2 }
 }

ql/ql/src/queries/diagnostics/EmptyConsistencies.ql

@@ -31,23 +31,20 @@ where
   TypeConsistency::multiplePrimitivesExpr(node, _, _) and
   msg = "TypeConsistency::multiplePrimitivesExpr"
   or
-  AstConsistency::nonTotalGetParent(node) and msg = "AstConsistency::nonTotalGetParent"
+  AstConsistency::nonTotalGetParent(node) and msg = "AstConsistency::nonTotalGetParent" // TODO: unique parent
   or
   TypeConsistency::noResolve(node) and msg = "TypeConsistency::noResolve"
   or
   ModConsistency::noResolve(node) and msg = "ModConsistency::noResolve"
   or
   ModConsistency::noResolveModuleExpr(node) and msg = "ModConsistency::noResolveModuleExpr"
   or
-  VarConsistency::noFieldDef(node) and msg = "VarConsistency::noFieldDef"
+  ModConsistency::noName(node) and msg = "ModConsistency::noName"
   or
-  VarConsistency::noVarDef(node) and msg = "VarConsistency::noVarDef"
+  ModConsistency::nonUniqueName(node) and msg = "ModConsistency::nonUniqueName"
   or
-  node instanceof ModuleExpr and
-  not exists(node.(ModuleExpr).getName()) and
-  msg = "exists(ModuleExpr::getName)"
+  VarConsistency::noFieldDef(node) and msg = "VarConsistency::noFieldDef"
   or
-  node instanceof ModuleExpr and
-  count(node.(ModuleExpr).getName()) >= 2 and
-  msg = "unique(ModuleExpr::getName)"
+  VarConsistency::noVarDef(node) and msg = "VarConsistency::noVarDef"
 select node, msg
+// TODO: vardef consistency.