Changeset 6ac5223 for src/Parser/ParseNode.h

Timestamp:

Aug 17, 2017, 3:42:21 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e50e9ff

Parents:

97e3296 (diff), 21f0aa8 (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

File:

• src/Parser/ParseNode.h (modified) (3 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Aug 10 16:54:00 2017
-// Update Count     : 789
+// Last Modified On : Thr Aug 17 13:46:00 2017
+// Update Count     : 795
 //
 
 #pragma once
 
-#include <string>
-#include <list>
-#include <iterator>
-#include <memory>
-
-#include "Parser/LinkageSpec.h"
-#include "SynTree/Type.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Label.h"
-#include "Common/utility.h"
-#include "Common/UniqueName.h"
-
+#include <algorithm>               // for move
+#include <cassert>                 // for assert, assertf
+#include <iosfwd>                  // for ostream
+#include <iterator>                // for back_insert_iterator
+#include <list>                    // for list
+#include <memory>                  // for unique_ptr, pointer_traits
+#include <string>                  // for string
+
+#include "Common/CodeLocation.h"   // for CodeLocation
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/UniqueName.h"     // for UniqueName
+#include "Common/utility.h"        // for maybeClone, maybeBuild
+#include "Parser/LinkageSpec.h"    // for Spec
+#include "SynTree/Expression.h"    // for Expression, ConstantExpr (ptr only)
+#include "SynTree/Label.h"         // for Label
+#include "SynTree/Statement.h"     // for Statement, BranchStmt, BranchStmt:...
+#include "SynTree/Type.h"          // for Type, Type::FuncSpecifiers, Type::...
+
+class Attribute;
+class Declaration;
+class DeclarationNode;
+class DeclarationWithType;
+class ExpressionNode;
+class Initializer;
 class StatementNode;
-class CompoundStmtNode;
-class DeclarationNode;
-class ExpressionNode;
-class InitializerNode;
-class Attribute;
 
 //##############################################################################
@@ -371 +377 @@
 Statement * build_expr( ExpressionNode * ctl );
 
+struct IfCtl {
+        IfCtl( DeclarationNode * decl, ExpressionNode * condition ) :
+                init( decl ? new StatementNode( decl ) : nullptr ), condition( condition ) {}
+
+        StatementNode * init;
+        ExpressionNode * condition;
+};
+
 struct ForCtl {
         ForCtl( ExpressionNode * expr, ExpressionNode * condition, ExpressionNode * change ) :
@@ -382 +396 @@
 };
 
-Statement * build_if( ExpressionNode * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
+Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
 Statement * build_switch( ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_case( ExpressionNode * ctl );