Changeset 86841ee for src

Timestamp:

Sep 29, 2024, 4:02:30 PM (3 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

917f67dd

Parents:

c82dad4 (diff), 2d6add4 (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

Files:

• AST/Decl.hpp (modified) (1 diff)
• AST/Stmt.hpp (modified) (1 diff)
• Parser/TypedefTable.cpp (modified) (1 diff)

src/AST/Decl.hpp

@@ -119 +119 @@
 enum ArgumentFlag { FixedArgs, VariableArgs };
 
-/// Object declaration `int foo()`
+/// Function declaration `int foo()`
 class FunctionDecl final : public DeclWithType {
 public:

src/AST/Stmt.hpp

@@ -269 +269 @@
 
         ForeachStmt( const CodeLocation & loc, const std::vector<ptr<Stmt>> && inits,
-                        const Expr * range_over, RangeDirection isInc, const Stmt * body, const Stmt * else_ )
+                        const Expr * range_over, RangeDirection isInc, const Stmt * body,
+                        const Stmt * else_, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), inits(std::move(inits)), range(range_over),
                 body(body), else_(else_), isIncreasing(isInc) {}

src/Parser/TypedefTable.cpp

@@ -25 +25 @@
 #include "ExpressionNode.hpp"                                                   // for LabelNode
 #include "ParserTypes.hpp"                                                              // for Token
-#include "StatementNode.hpp"                                                    // for CondCtl, ForCtrl
+#include "StatementNode.hpp"                                                    // for CondCtrl, ForCtrl
 // This (generated) header must come late as it is missing includes.
 #include "parser.hh"                                                                    // for IDENTIFIER, TYPEDEFname, TYPEGENname