Changeset 37eef7a

Timestamp:

May 22, 2019, 1:36:01 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d8938622, dd6d7c6

Parents:

4073b16 (diff), 0f740d6 (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

Files:

• doc/proposals/vtable.md (modified) (1 diff)
• src/AST/Convert.cpp (modified) (2 diffs)
• src/AST/Stmt.hpp (modified) (17 diffs)

doc/proposals/vtable.md

@@ -220 +220 @@
     trait iterator(otype T, otype Item) {
         bool has_next(T const &);
-        Item get_next(T const *);
+        Item get_next(T &);
     }
 

src/AST/Convert.cpp

@@ -1287 +1287 @@
 
         const ast::Designation * visit( const ast::Designation * node ) override final {
-                (void)node;
+                auto designation = new Designation( get<Expression>().acceptL( node->designators ) );
+                designation->location = node->location;
+                this->node = designation;
                 return nullptr;
         }
 
         const ast::Init * visit( const ast::SingleInit * node ) override final {
-                (void)node;
+                auto init = new SingleInit(
+                        get<Expression>().accept1( node->value ),
+                        ast::MaybeConstruct == node->maybeConstructed
+                );
+                init->location = node->location;
+                this->node = init;
                 return nullptr;
         }
 
         const ast::Init * visit( const ast::ListInit * node ) override final {
-                (void)node;
+                auto init = new ListInit(
+                        get<Initializer>().acceptL( node->initializers ),
+                        get<Designation>().acceptL( node->designations ),
+                        ast::MaybeConstruct == node->maybeConstructed
+                );
+                init->location = node->location;
+                this->node = init;
                 return nullptr;
         }
 
         const ast::Init * visit( const ast::ConstructorInit * node ) override final {
-                (void)node;
+                auto init = new ConstructorInit(
+                        get<Statement>().accept1( node->ctor ),
+                        get<Statement>().accept1( node->dtor ),
+                        get<Initializer>().accept1( node->init )
+                );
+                init->location = node->location;
+                this->node = init;
                 return nullptr;
         }
@@ -2617 +2636 @@
         }
 
-        virtual void visit( Designation * ) override final {
-
-        }
-
-        virtual void visit( SingleInit * ) override final {
-
-        }
-
-        virtual void visit( ListInit * ) override final {
-
-        }
-
-        virtual void visit( ConstructorInit * ) override final {
-
+        virtual void visit( Designation * old ) override final {
+                this->node = new ast::Designation(
+                        old->location,
+                        GET_ACCEPT_V(designators, Expr)
+                );
+        }
+
+        virtual void visit( SingleInit * old ) override final {
+                this->node = new ast::SingleInit(
+                        old->location,
+                        GET_ACCEPT_1(value, Expr),
+                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::DoConstruct
+                );
+        }
+
+        virtual void visit( ListInit * old ) override final {
+                this->node = new ast::ListInit(
+                        old->location,
+                        GET_ACCEPT_V(initializers, Init),
+                        GET_ACCEPT_V(designations, Designation),
+                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::DoConstruct
+                );
+        }
+
+        virtual void visit( ConstructorInit * old ) override final {
+                this->node = new ast::ConstructorInit(
+                        old->location,
+                        GET_ACCEPT_1(ctor, Stmt),
+                        GET_ACCEPT_1(dtor, Stmt),
+                        GET_ACCEPT_1(init, Init)
+                );
         }
 

src/AST/Stmt.hpp

@@ -96 +96 @@
 };
 
+/// Assembly statement `asm ... ( "..." : ... )`
 class AsmStmt final : public Stmt {
 public:
@@ -118 +119 @@
 };
 
+/// C-preprocessor directive `#...`
 class DirectiveStmt final : public Stmt {
 public:
@@ -132 +134 @@
 };
 
+/// If conditional statement `if (...) ... else ...`
 class IfStmt final : public Stmt {
 public:
@@ -151 +154 @@
 };
 
+/// Switch or choose conditional statement `switch (...) { ... }`
 class SwitchStmt final : public Stmt {
 public:
@@ -166 +170 @@
 };
 
+/// Case label `case ...:` `default:`
 class CaseStmt final : public Stmt {
 public:
@@ -183 +188 @@
 };
 
+/// While loop `while (...) ...` `do ... while (...);
 class WhileStmt final : public Stmt {
 public:
@@ -201 +207 @@
 };
 
+/// For loop `for (... ; ... ; ...) ...`
 class ForStmt final : public Stmt {
 public:
@@ -219 +226 @@
 };
 
+/// Branch control flow statement `goto ...` `break` `continue` `fallthru`
 class BranchStmt final : public Stmt {
 public:
@@ -246 +254 @@
 };
 
+/// Return statement `return ...`
 class ReturnStmt final : public Stmt {
 public:
@@ -259 +268 @@
 };
 
+/// Throw statement `throw ...`
 class ThrowStmt final : public Stmt {
 public:
@@ -277 +287 @@
 };
 
+/// Try statement `try { ... } ...`
 class TryStmt final : public Stmt {
 public:
@@ -294 +305 @@
 };
 
+/// Catch clause of try statement
 class CatchStmt final : public Stmt {
 public:
@@ -313 +325 @@
 };
 
+/// Finally clause of try statement
 class FinallyStmt final : public Stmt {
 public:
@@ -327 +340 @@
 };
 
+/// Wait for concurrency statement `when (...) waitfor (... , ...) ... timeout(...) ... else ...`
 class WaitForStmt final : public Stmt {
 public:
@@ -364 +378 @@
 };
 
+/// With statement `with (...) ...`
 class WithStmt final : public Stmt {
 public:
@@ -379 +394 @@
 };
 
+/// Any declaration in a (compound) statement.
 class DeclStmt final : public Stmt {
 public:
@@ -392 +408 @@
 };
 
+/// Represents an implicit application of a constructor or destructor.
 class ImplicitCtorDtorStmt final : public Stmt {
 public: