Changeset 2cb8bf71 for src/SymTab

Timestamp:

May 30, 2023, 5:35:57 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ast-experimental, master

Children:

dd3baf4

Parents:

44198fb9 (diff), 8913de4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SymTab

Files:

• Autogen.h (modified) (2 diffs)
• GenImplicitCall.cpp (modified) (2 diffs)
• GenImplicitCall.hpp (modified) (2 diffs)

src/SymTab/Autogen.h

@@ -20 +20 @@
 #include <string>                 // for string
 
-#include "AST/Decl.hpp"
-#include "AST/Expr.hpp"
-#include "AST/Init.hpp"
-#include "AST/Node.hpp"
-#include "AST/Stmt.hpp"
-#include "AST/Type.hpp"
 #include "CodeGen/OperatorTable.h"
 #include "Common/UniqueName.h"    // for UniqueName
@@ -57 +51 @@
         /// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic
         FunctionType * genCopyType( Type * paramType, bool maybePolymorphic = true );
-
-        /// Enum for loop direction
-        enum LoopDirection { LoopBackward, LoopForward };
 
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.

src/SymTab/GenImplicitCall.cpp

@@ -16 +16 @@
 #include "GenImplicitCall.hpp"
 
+#include "AST/Decl.hpp"                  // for ObjectDecl
+#include "AST/Expr.hpp"                  // for ConstantExpr, UntypedExpr,...
+#include "AST/Init.hpp"                  // for SingleInit
 #include "AST/Inspect.hpp"               // for isUnnamedBitfield
+#include "AST/Stmt.hpp"                  // for ExprStmt
+#include "AST/Type.hpp"                  // for ArrayType, BasicType, ...
 #include "CodeGen/OperatorTable.h"       // for isCtorDtor
 #include "Common/UniqueName.h"           // for UniqueName
 
 namespace SymTab {
+
+namespace {
 
 template< typename OutIter >
@@ -173 +180 @@
 }
 
+} // namespace
+
 ast::ptr< ast::Stmt > genImplicitCall(
         InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,

src/SymTab/GenImplicitCall.hpp

@@ -17 +17 @@
 
 #include "InitTweak/InitTweak.h"  // for InitExpander
-#include "SymTab/Autogen.h"       // for LoopDirection
 
 namespace SymTab {
 
+/// Enum for loop direction
+enum LoopDirection { LoopBackward, LoopForward };
+
+/// Returns a generated call expression to function fname with srcParam and
+/// dstParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
 ast::ptr<ast::Stmt> genImplicitCall(
         InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
@@ -34 +38 @@
 // compile-command: "make install" //
 // End: //
-