C++: Move imports from instantiated pyrameterized modules into separate file

Rather than have IR.qll (which depends on the flavor) import EdgeKind.qll (which does not) with an non-relative import, I've moved these imports into internal.IRImports relative to IR.qll. These imports files can be shared across flavors within one language, but are different between C# and C++ due to the difference in paths.

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IR.qll

@@ -3,8 +3,9 @@ import Instruction
 import IRBlock
 import IRVariable
 import Operand
-import semmle.code.cpp.ir.implementation.EdgeKind
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
+private import internal.IRImports as Imports
+import Imports::EdgeKind
+import Imports::MemoryAccessKind
 
 private newtype TIRPropertyProvider = MkIRPropertyProvider()
 

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll

@@ -1,6 +1,7 @@
 private import internal.IRInternal
 import Instruction
-import semmle.code.cpp.ir.implementation.EdgeKind
+private import internal.IRBlockImports as Imports
+import Imports::EdgeKind
 private import Cached
 
 /**

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/IRVariable.qll

@@ -1,9 +1,10 @@
 private import internal.IRInternal
 import IRFunction
-import semmle.code.cpp.ir.implementation.TempVariableTag
-private import semmle.code.cpp.ir.internal.IRUtilities
-private import semmle.code.cpp.ir.internal.TempVariableTag
-private import semmle.code.cpp.ir.internal.TIRVariable
+private import internal.IRVariableImports as Imports
+import Imports::TempVariableTag
+private import Imports::IRUtilities
+private import Imports::TTempVariableTag
+private import Imports::TIRVariable
 
 IRUserVariable getIRUserVariable(Language::Function func, Language::Variable var) {
   result.getVariable() = var and

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Instruction.qll

@@ -3,11 +3,11 @@ import IRFunction
 import IRBlock
 import IRVariable
 import Operand
-import semmle.code.cpp.ir.implementation.EdgeKind
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
-import semmle.code.cpp.ir.implementation.Opcode
-private import semmle.code.cpp.ir.implementation.Opcode
-private import semmle.code.cpp.ir.internal.OperandTag
+private import internal.InstructionImports as Imports
+import Imports::EdgeKind
+import Imports::MemoryAccessKind
+import Imports::Opcode
+private import Imports::OperandTag
 
 module InstructionSanity {
   /**

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll

@@ -1,9 +1,10 @@
 private import internal.IRInternal
 import Instruction
 import IRBlock
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
-import semmle.code.cpp.ir.internal.Overlap
-private import semmle.code.cpp.ir.internal.OperandTag
+private import internal.OperandImports as Imports
+import Imports::MemoryAccessKind
+import Imports::Overlap
+private import Imports::OperandTag
 
 cached
 private newtype TOperand =

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll

@@ -1,7 +1,7 @@
-private import semmle.code.cpp.ir.internal.IRLanguageInternal
+private import internal.IRInternal
 private import IR
-import semmle.code.cpp.ir.IRConfiguration
-private import semmle.code.cpp.Print
+private import internal.PrintIRImports as Imports
+import Imports::IRConfiguration
 
 private newtype TPrintIRConfiguration = MkPrintIRConfiguration()
 
@@ -131,7 +131,7 @@ class PrintableIRFunction extends PrintableIRNode, TPrintableIRFunction {
   }
 
   override string getLabel() {
-    result = getIdentityString(irFunc.getFunction())
+    result = Language::getIdentityString(irFunc.getFunction())
   }
 
   override int getOrder() {
@@ -213,7 +213,7 @@ class PrintableInstruction extends PrintableIRNode, TPrintableInstruction {
     result = instr.toString()
   }
 
-  override Location getLocation() {
+  override Language::Location getLocation() {
     result = instr.getLocation()
   }
 

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/IRBlockImports.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/IRImports.qll

@@ -0,0 +1,2 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/IRVariableImports.qll

@@ -0,0 +1,4 @@
+import semmle.code.cpp.ir.implementation.TempVariableTag as TempVariableTag
+import semmle.code.cpp.ir.internal.IRUtilities as IRUtilities
+import semmle.code.cpp.ir.internal.TempVariableTag as TTempVariableTag
+import semmle.code.cpp.ir.internal.TIRVariable as TIRVariable

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/InstructionImports.qll

@@ -0,0 +1,4 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind
+import semmle.code.cpp.ir.implementation.Opcode as Opcode
+import semmle.code.cpp.ir.internal.OperandTag as OperandTag

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/OperandImports.qll

@@ -0,0 +1,3 @@
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind
+import semmle.code.cpp.ir.internal.Overlap as Overlap
+import semmle.code.cpp.ir.internal.OperandTag as OperandTag

cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/internal/PrintIRImports.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.IRConfiguration as IRConfiguration

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IR.qll

@@ -3,8 +3,9 @@ import Instruction
 import IRBlock
 import IRVariable
 import Operand
-import semmle.code.cpp.ir.implementation.EdgeKind
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
+private import internal.IRImports as Imports
+import Imports::EdgeKind
+import Imports::MemoryAccessKind
 
 private newtype TIRPropertyProvider = MkIRPropertyProvider()
 

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRBlock.qll

@@ -1,6 +1,7 @@
 private import internal.IRInternal
 import Instruction
-import semmle.code.cpp.ir.implementation.EdgeKind
+private import internal.IRBlockImports as Imports
+import Imports::EdgeKind
 private import Cached
 
 /**

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRBlockImports.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/IRVariable.qll

@@ -1,9 +1,10 @@
 private import internal.IRInternal
 import IRFunction
-import semmle.code.cpp.ir.implementation.TempVariableTag
-private import semmle.code.cpp.ir.internal.IRUtilities
-private import semmle.code.cpp.ir.internal.TempVariableTag
-private import semmle.code.cpp.ir.internal.TIRVariable
+private import internal.IRVariableImports as Imports
+import Imports::TempVariableTag
+private import Imports::IRUtilities
+private import Imports::TTempVariableTag
+private import Imports::TIRVariable
 
 IRUserVariable getIRUserVariable(Language::Function func, Language::Variable var) {
   result.getVariable() = var and

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Instruction.qll

@@ -3,11 +3,11 @@ import IRFunction
 import IRBlock
 import IRVariable
 import Operand
-import semmle.code.cpp.ir.implementation.EdgeKind
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
-import semmle.code.cpp.ir.implementation.Opcode
-private import semmle.code.cpp.ir.implementation.Opcode
-private import semmle.code.cpp.ir.internal.OperandTag
+private import internal.InstructionImports as Imports
+import Imports::EdgeKind
+import Imports::MemoryAccessKind
+import Imports::Opcode
+private import Imports::OperandTag
 
 module InstructionSanity {
   /**

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/Operand.qll

@@ -1,9 +1,10 @@
 private import internal.IRInternal
 import Instruction
 import IRBlock
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
-import semmle.code.cpp.ir.internal.Overlap
-private import semmle.code.cpp.ir.internal.OperandTag
+private import internal.OperandImports as Imports
+import Imports::MemoryAccessKind
+import Imports::Overlap
+private import Imports::OperandTag
 
 cached
 private newtype TOperand =

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/PrintIR.qll

@@ -1,7 +1,7 @@
-private import semmle.code.cpp.ir.internal.IRLanguageInternal
+private import internal.IRInternal
 private import IR
-import semmle.code.cpp.ir.IRConfiguration
-private import semmle.code.cpp.Print
+private import internal.PrintIRImports as Imports
+import Imports::IRConfiguration
 
 private newtype TPrintIRConfiguration = MkPrintIRConfiguration()
 
@@ -131,7 +131,7 @@ class PrintableIRFunction extends PrintableIRNode, TPrintableIRFunction {
   }
 
   override string getLabel() {
-    result = getIdentityString(irFunc.getFunction())
+    result = Language::getIdentityString(irFunc.getFunction())
   }
 
   override int getOrder() {
@@ -213,7 +213,7 @@ class PrintableInstruction extends PrintableIRNode, TPrintableInstruction {
     result = instr.toString()
   }
 
-  override Location getLocation() {
+  override Language::Location getLocation() {
     result = instr.getLocation()
   }
 

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/IRBlockImports.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/IRImports.qll

@@ -0,0 +1,2 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/IRVariableImports.qll

@@ -0,0 +1,4 @@
+import semmle.code.cpp.ir.implementation.TempVariableTag as TempVariableTag
+import semmle.code.cpp.ir.internal.IRUtilities as IRUtilities
+import semmle.code.cpp.ir.internal.TempVariableTag as TTempVariableTag
+import semmle.code.cpp.ir.internal.TIRVariable as TIRVariable

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/InstructionImports.qll

@@ -0,0 +1,4 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind
+import semmle.code.cpp.ir.implementation.Opcode as Opcode
+import semmle.code.cpp.ir.internal.OperandTag as OperandTag

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/OperandImports.qll

@@ -0,0 +1,3 @@
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind
+import semmle.code.cpp.ir.internal.Overlap as Overlap
+import semmle.code.cpp.ir.internal.OperandTag as OperandTag

cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/PrintIRImports.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.IRConfiguration as IRConfiguration

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IR.qll

@@ -3,8 +3,9 @@ import Instruction
 import IRBlock
 import IRVariable
 import Operand
-import semmle.code.cpp.ir.implementation.EdgeKind
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
+private import internal.IRImports as Imports
+import Imports::EdgeKind
+import Imports::MemoryAccessKind
 
 private newtype TIRPropertyProvider = MkIRPropertyProvider()
 

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll

@@ -1,6 +1,7 @@
 private import internal.IRInternal
 import Instruction
-import semmle.code.cpp.ir.implementation.EdgeKind
+private import internal.IRBlockImports as Imports
+import Imports::EdgeKind
 private import Cached
 
 /**

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/IRVariable.qll

@@ -1,9 +1,10 @@
 private import internal.IRInternal
 import IRFunction
-import semmle.code.cpp.ir.implementation.TempVariableTag
-private import semmle.code.cpp.ir.internal.IRUtilities
-private import semmle.code.cpp.ir.internal.TempVariableTag
-private import semmle.code.cpp.ir.internal.TIRVariable
+private import internal.IRVariableImports as Imports
+import Imports::TempVariableTag
+private import Imports::IRUtilities
+private import Imports::TTempVariableTag
+private import Imports::TIRVariable
 
 IRUserVariable getIRUserVariable(Language::Function func, Language::Variable var) {
   result.getVariable() = var and

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll

@@ -3,11 +3,11 @@ import IRFunction
 import IRBlock
 import IRVariable
 import Operand
-import semmle.code.cpp.ir.implementation.EdgeKind
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
-import semmle.code.cpp.ir.implementation.Opcode
-private import semmle.code.cpp.ir.implementation.Opcode
-private import semmle.code.cpp.ir.internal.OperandTag
+private import internal.InstructionImports as Imports
+import Imports::EdgeKind
+import Imports::MemoryAccessKind
+import Imports::Opcode
+private import Imports::OperandTag
 
 module InstructionSanity {
   /**

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll

@@ -1,9 +1,10 @@
 private import internal.IRInternal
 import Instruction
 import IRBlock
-import semmle.code.cpp.ir.implementation.MemoryAccessKind
-import semmle.code.cpp.ir.internal.Overlap
-private import semmle.code.cpp.ir.internal.OperandTag
+private import internal.OperandImports as Imports
+import Imports::MemoryAccessKind
+import Imports::Overlap
+private import Imports::OperandTag
 
 cached
 private newtype TOperand =

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll

@@ -1,7 +1,7 @@
-private import semmle.code.cpp.ir.internal.IRLanguageInternal
+private import internal.IRInternal
 private import IR
-import semmle.code.cpp.ir.IRConfiguration
-private import semmle.code.cpp.Print
+private import internal.PrintIRImports as Imports
+import Imports::IRConfiguration
 
 private newtype TPrintIRConfiguration = MkPrintIRConfiguration()
 
@@ -131,7 +131,7 @@ class PrintableIRFunction extends PrintableIRNode, TPrintableIRFunction {
   }
 
   override string getLabel() {
-    result = getIdentityString(irFunc.getFunction())
+    result = Language::getIdentityString(irFunc.getFunction())
   }
 
   override int getOrder() {
@@ -213,7 +213,7 @@ class PrintableInstruction extends PrintableIRNode, TPrintableInstruction {
     result = instr.toString()
   }
 
-  override Location getLocation() {
+  override Language::Location getLocation() {
     result = instr.getLocation()
   }
 

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/IRBlockImports.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/IRImports.qll

@@ -0,0 +1,2 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/IRVariableImports.qll

@@ -0,0 +1,4 @@
+import semmle.code.cpp.ir.implementation.TempVariableTag as TempVariableTag
+import semmle.code.cpp.ir.internal.IRUtilities as IRUtilities
+import semmle.code.cpp.ir.internal.TempVariableTag as TTempVariableTag
+import semmle.code.cpp.ir.internal.TIRVariable as TIRVariable

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/InstructionImports.qll

@@ -0,0 +1,4 @@
+import semmle.code.cpp.ir.implementation.EdgeKind as EdgeKind
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind
+import semmle.code.cpp.ir.implementation.Opcode as Opcode
+import semmle.code.cpp.ir.internal.OperandTag as OperandTag

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/OperandImports.qll

@@ -0,0 +1,3 @@
+import semmle.code.cpp.ir.implementation.MemoryAccessKind as MemoryAccessKind
+import semmle.code.cpp.ir.internal.Overlap as Overlap
+import semmle.code.cpp.ir.internal.OperandTag as OperandTag

cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/PrintIRImports.qll

@@ -0,0 +1 @@
+import semmle.code.cpp.ir.IRConfiguration as IRConfiguration