C++: Remove unnecessary Impl suffix from some files

dave-bartolomeo · dave-bartolomeo · commit 9fd5f26e2e71 · 2018-09-04T09:05:10.000-07:00
diff --git a/config/identical-files.json b/config/identical-files.json
@@ -25,19 +25,19 @@
         "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/OperandTag.qll"
     ],
     "C++ IR IRImpl": [
-        "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRImpl.qll",
-        "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRImpl.qll",
-        "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRImpl.qll"
+        "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll",
+        "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll",
+        "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll"
     ],
     "C++ IR IRSanityImpl": [
-        "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanityImpl.qll",
-        "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanityImpl.qll",
-        "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanityImpl.qll"
+        "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll",
+        "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll",
+        "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll"
     ],
     "C++ IR PrintIRImpl": [
-        "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIRImpl.qll",
-        "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIRImpl.qll",
-        "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIRImpl.qll"
+        "cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll",
+        "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll",
+        "cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll"
     ],
     "C++ SSA AliasAnalysis": [
         "cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll",
diff --git a/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIR.qll
@@ -1 +1 @@
-import internal.aliased_ssa_ir.IRImpl
+import internal.aliased_ssa_ir.IR
diff --git a/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/AliasedSSAIRSanity.ql
@@ -5,4 +5,4 @@
  * @id cpp/aliased-ssa-ir-sanity-check
  */
 
-import internal.aliased_ssa_ir.IRSanityImpl
+import internal.aliased_ssa_ir.IRSanity
diff --git a/cpp/ql/src/semmle/code/cpp/ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/IR.qll
@@ -1 +1 @@
-import internal.raw_ir.IRImpl
+import internal.raw_ir.IR
diff --git a/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/IRSanity.ql
@@ -5,4 +5,4 @@
  * @id cpp/ir-sanity-check
  */
 
-import internal.raw_ir.IRSanityImpl
+import internal.raw_ir.IRSanity
diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintAliasedSSAIR.qll
@@ -1 +1 @@
-import internal.aliased_ssa_ir.PrintIRImpl
+import internal.aliased_ssa_ir.PrintIR
diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintIR.qll
@@ -1 +1 @@
-import internal.raw_ir.PrintIRImpl
+import internal.raw_ir.PrintIR
diff --git a/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/PrintSSAIR.qll
@@ -1 +1 @@
-import internal.ssa_ir.PrintIRImpl
+import internal.ssa_ir.PrintIR
diff --git a/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll b/cpp/ql/src/semmle/code/cpp/ir/SSAIR.qll
@@ -1 +1 @@
-import internal.ssa_ir.IRImpl
+import internal.ssa_ir.IR
diff --git a/cpp/ql/src/semmle/code/cpp/ir/SSAIRSanity.ql b/cpp/ql/src/semmle/code/cpp/ir/SSAIRSanity.ql
@@ -5,4 +5,4 @@
  * @id cpp/ssa-ir-sanity-check
  */
 
-import internal.ssa_ir.IRSanityImpl
+import internal.ssa_ir.IRSanity
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysis.qll
@@ -1,6 +1,6 @@
 private import AliasAnalysisInternal
 import cpp
-private import IR
+private import InputIR
 private import semmle.code.cpp.ir.internal.IntegerConstant as Ints
 
 private class IntValue = Ints::IntValue;
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/AliasAnalysisInternal.qll
@@ -1 +1 @@
-import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as IR
+import semmle.code.cpp.ir.internal.ssa_ir.IR as InputIR
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IR.qll
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/IRSanity.qll
@@ -1,3 +1,3 @@
-private import IRImpl
+private import IR
 import InstructionSanity
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/PrintIR.qll
@@ -1,4 +1,4 @@
-private import IRImpl
+private import IR
 import cpp
 
 private newtype TPrintableIRNode =
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstructionInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SSAConstructionInternal.qll
@@ -1,3 +1,3 @@
-import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as OldIR
-import semmle.code.cpp.ir.internal.aliased_ssa_ir.IRImpl as NewIR
+import semmle.code.cpp.ir.internal.ssa_ir.IR as OldIR
+import semmle.code.cpp.ir.internal.aliased_ssa_ir.IR as NewIR
 import SimpleSSA as Alias
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSA.qll
@@ -1,7 +1,7 @@
 import SimpleSSAInternal
 import cpp
 import Alias
-import IR
+private import InputIR
 import semmle.code.cpp.ir.internal.Overlap
 
 private newtype TVirtualVariable =
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/aliased_ssa_ir/SimpleSSAInternal.qll
@@ -1,3 +1,3 @@
 import AliasAnalysis as Alias
-import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as IR
+import semmle.code.cpp.ir.internal.ssa_ir.IR as InputIR
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IR.qll
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRConstruction.qll
@@ -1,5 +1,5 @@
 import cpp
-import semmle.code.cpp.ir.internal.raw_ir.IRImpl
+import semmle.code.cpp.ir.internal.raw_ir.IR
 private import semmle.code.cpp.ir.internal.TempVariableTag
 private import InstructionTag
 private import TranslatedElement
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/IRSanity.qll
@@ -1,3 +1,3 @@
-private import IRImpl
+private import IR
 import InstructionSanity
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/PrintIR.qll
@@ -1,4 +1,4 @@
-private import IRImpl
+private import IR
 import cpp
 
 private newtype TPrintableIRNode =
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedElement.qll
@@ -1,5 +1,5 @@
 import cpp
-import semmle.code.cpp.ir.internal.raw_ir.IRImpl
+import semmle.code.cpp.ir.internal.raw_ir.IR
 private import semmle.code.cpp.ir.internal.Opcode
 private import semmle.code.cpp.ir.internal.TempVariableTag
 private import InstructionTag
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/raw_ir/TranslatedFunction.qll
@@ -1,5 +1,5 @@
 import cpp
-import semmle.code.cpp.ir.internal.raw_ir.IRImpl
+import semmle.code.cpp.ir.internal.raw_ir.IR
 private import semmle.code.cpp.ir.internal.Opcode
 private import semmle.code.cpp.ir.internal.TempVariableTag
 private import InstructionTag
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysis.qll
@@ -1,6 +1,6 @@
 private import AliasAnalysisInternal
 import cpp
-private import IR
+private import InputIR
 private import semmle.code.cpp.ir.internal.IntegerConstant as Ints
 
 private class IntValue = Ints::IntValue;
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/AliasAnalysisInternal.qll
@@ -1 +1 @@
-import semmle.code.cpp.ir.internal.raw_ir.IRImpl as IR
+import semmle.code.cpp.ir.internal.raw_ir.IR as InputIR
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IR.qll
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/IRSanity.qll
@@ -1,3 +1,3 @@
-private import IRImpl
+private import IR
 import InstructionSanity
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/PrintIR.qll
@@ -1,4 +1,4 @@
-private import IRImpl
+private import IR
 import cpp
 
 private newtype TPrintableIRNode =
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SSAConstructionInternal.qll
@@ -1,3 +1,3 @@
-import semmle.code.cpp.ir.internal.raw_ir.IRImpl as OldIR
-import semmle.code.cpp.ir.internal.ssa_ir.IRImpl as NewIR
+import semmle.code.cpp.ir.internal.raw_ir.IR as OldIR
+import semmle.code.cpp.ir.internal.ssa_ir.IR as NewIR
 import SimpleSSA as Alias
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSA.qll
@@ -1,7 +1,7 @@
 import SimpleSSAInternal
 import cpp
 import Alias
-import IR
+private import InputIR
 import semmle.code.cpp.ir.internal.Overlap
 
 private newtype TVirtualVariable =
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/ssa_ir/SimpleSSAInternal.qll
@@ -1,3 +1,2 @@
 import AliasAnalysis as Alias
-import semmle.code.cpp.ir.internal.raw_ir.IRImpl as IR
-
+import semmle.code.cpp.ir.internal.raw_ir.IR as InputIR

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import internal.aliased_ssa_ir.IRImpl`
	`1`	`+import internal.aliased_ssa_ir.IR`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import internal.raw_ir.IRImpl`
	`1`	`+import internal.raw_ir.IR`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import internal.aliased_ssa_ir.PrintIRImpl`
	`1`	`+import internal.aliased_ssa_ir.PrintIR`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import internal.raw_ir.PrintIRImpl`
	`1`	`+import internal.raw_ir.PrintIR`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import internal.ssa_ir.PrintIRImpl`
	`1`	`+import internal.ssa_ir.PrintIR`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import internal.ssa_ir.IRImpl`
	`1`	`+import internal.ssa_ir.IR`