[flang] address review comments

Original-commit: flang-compiler/f18@4dd4766f4d52319b6da47288134dd1b80aa425eb
Reviewed-on: https://github.com/flang-compiler/f18/pull/295

diff --git a/flang/lib/IntermediateRepresentation/builder.cc b/flang/lib/FIR/builder.cc
similarity index 87%
rename from flang/lib/IntermediateRepresentation/builder.cc
rename to flang/lib/FIR/builder.cc
index ffa1daf..e802540 100644 (file)
--- a/flang/lib/IntermediateRepresentation/builder.cc
+++ b/flang/lib/FIR/builder.cc
@@ -15,9 +15,9 @@
 #include "builder.h"
 #include <ostream>
 
-namespace Fortran::IntermediateRepresentation {
+namespace Fortran::FIR {
 
-void IntermediateRepresentationBuilder::dump() const {
+void FIRBuilder::dump() const {
   std::cerr << "builder state:\n";
 }
 

diff --git a/flang/lib/IntermediateRepresentation/builder.h b/flang/lib/FIR/builder.h
similarity index 94%
rename from flang/lib/IntermediateRepresentation/builder.h
rename to flang/lib/FIR/builder.h
index 2c81925..990a613 100644 (file)
--- a/flang/lib/IntermediateRepresentation/builder.h
+++ b/flang/lib/FIR/builder.h
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FORTRAN_INTERMEDIATEREPRESENTATION_BUILDER_H_
-#define FORTRAN_INTERMEDIATEREPRESENTATION_BUILDER_H_
+#ifndef FORTRAN_FIR_BUILDER_H_
+#define FORTRAN_FIR_BUILDER_H_
 
 #include "stmt.h"
 #include <initializer_list>
 
-namespace Fortran::IntermediateRepresentation {
+namespace Fortran::FIR {
 
-struct IntermediateRepresentationBuilder {
-  explicit IntermediateRepresentationBuilder(BasicBlock &block)
+struct FIRBuilder {
+  explicit FIRBuilder(BasicBlock &block)
     : cursorRegion_{block.getParent()}, cursorBlock_{&block} {}
   template<typename A> Statement &Insert(A &&s) {
     CHECK(GetInsertionPoint());