Changeset 746ae82

Timestamp:

May 22, 2019, 11:38:18 AM (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:

ed5e798

Parents:

907c545

Message:

Finish conversion visitors for Type

Location:

src/AST

Files:

• Convert.cpp (modified) (5 diffs)
• Type.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -755 +755 @@
                         get<Type>().accept1( node->base ),
                         get<Expression>().accept1( node->dimension ),
-                        node->isVarLen,
-                        node->isStatic
+                        (bool)node->isVarLen,
+                        (bool)node->isStatic
                 };
                 return nullptr;
@@ -766 +766 @@
                         get<Type>().accept1( node->base ),
                         get<Expression>().accept1( node->dimension ),
-                        node->isVarLen,
-                        node->isStatic
+                        (bool)node->isVarLen,
+                        (bool)node->isStatic
                 };
                 return nullptr;
@@ -790 +790 @@
 
         const ast::Type * visit( const ast::FunctionType * node ) override final {
-                auto ty = new FunctionType { cv( node ), node->isVarArgs };
+                auto ty = new FunctionType {
+                        cv( node ), 
+                        (bool)node->isVarArgs
+                };
                 ty->returnVals = get<DeclarationWithType>().acceptL( node->returns );
                 ty->parameters = get<DeclarationWithType>().acceptL( node->params );
@@ -907 +910 @@
 
         const ast::Type * visit( const ast::TupleType * node ) override final {
-                (void)node;
+                this->node = new TupleType{
+                        cv( node ),
+                        get<Type>().acceptL( node->types )
+                        // members generated by TupleType c'tor
+                };
                 return nullptr;
         }
 
         const ast::Type * visit( const ast::TypeofType * node ) override final {
-                (void)node;
+                this->node = new TypeofType{
+                        cv( node ),
+                        get<Expression>().accept1( node->expr ),
+                        (bool)node->kind
+                };
                 return nullptr;
         }
 
         const ast::Type * visit( const ast::VarArgsType * node ) override final {
-                (void)node;
+                this->node = new VarArgsType{ cv( node ) };
                 return nullptr;
         }
 
         const ast::Type * visit( const ast::ZeroType * node ) override final {
-                (void)node;
+                this->node = new ZeroType{ cv( node ) };
                 return nullptr;
         }
 
         const ast::Type * visit( const ast::OneType * node ) override final {
-                (void)node;
-                return nullptr;
-        }
-
-        const ast::Type * visit( const ast::GlobalScopeType * node ) override final {
-                (void)node;
+                this->node = new OneType{ cv( node ) };
+                return nullptr;
+        }
+
+        const ast::Type * visit( const ast::GlobalScopeType * ) override final {
+                this->node = new GlobalScopeType{};
                 return nullptr;
         }
@@ -1831 +1842 @@
         }
 
-        virtual void visit( TupleType * ) override final {
-
-        }
-
-        virtual void visit( TypeofType * ) override final {
-
+        virtual void visit( TupleType * old ) override final {
+                this->node = new ast::TupleType{
+                        GET_ACCEPT_V( types, Type ),
+                        // members generated by TupleType c'tor
+                        cv( old )
+                };
+        }
+
+        virtual void visit( TypeofType * old ) override final {
+                this->node = new ast::TypeofType{
+                        GET_ACCEPT_1( expr, Expr ),
+                        (ast::TypeofType::Kind)old->is_basetypeof,
+                        cv( old )
+                };
         }
 
         virtual void visit( AttrType * ) override final {
-
-        }
-
-        virtual void visit( VarArgsType * ) override final {
-
-        }
-
-        virtual void visit( ZeroType * ) override final {
-
-        }
-
-        virtual void visit( OneType * ) override final {
-
+                assertf( false, "AttrType deprecated in new AST." );
+        }
+
+        virtual void visit( VarArgsType * old ) override final {
+                this->node = new ast::VarArgsType{ cv( old ) };
+        }
+
+        virtual void visit( ZeroType * old ) override final {
+                this->node = new ast::ZeroType{ cv( old ) };
+        }
+
+        virtual void visit( OneType * old ) override final {
+                this->node = new ast::OneType{ cv( old ) };
         }
 
         virtual void visit( GlobalScopeType * ) override final {
-
+                this->node = new ast::GlobalScopeType{};
         }
 

src/AST/Type.hpp

@@ -514 +514 @@
 class GlobalScopeType final : public Type {
 public:
-        GlobalScopeType( CV::Qualifiers q = {} ) : Type( q ) {}
+        GlobalScopeType() : Type() {}
 
         const Type * accept( Visitor & v ) const override { return v.visit( this ); }