Changeset dd6d7c6

Timestamp:

May 22, 2019, 1:55:16 PM (5 years ago)

Author:

Michael Brooks <mlbrooks@…>

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:

f4c2f1a

Parents:

37eef7a

Message:

Implememented draft conversion in rememaining misc cases

File:

• src/AST/Convert.cpp (modified) (2 diffs)

src/AST/Convert.cpp

@@ -1326 +1326 @@
 
         const ast::Attribute * visit( const ast::Attribute * node ) override final {
-                (void)node;
+                auto attr = new Attribute(
+                        node->name,
+                        get<Expression>().acceptL(node->parameters)
+                );
+                this->node = attr;
                 return nullptr;
         }
 
         const ast::TypeSubstitution * visit( const ast::TypeSubstitution * node ) override final {
-                (void)node;
+                // Handled by convertTypeSubstitution helper instead.
+                // TypeSubstitution is not a node in the old model, so the conversion result wouldn't fit in this->node.
+                assert( 0 );
                 return nullptr;
         }
@@ -2670 +2676 @@
 
         virtual void visit( Constant * ) override final {
-
-        }
-
-        virtual void visit( Attribute * ) override final {
-
+                // Handled in visit( ConstantEpxr * ).
+                // In the new tree, Constant fields are inlined into containing ConstantExpression.
+                assert( 0 );
+        }
+
+        virtual void visit( Attribute * old ) override final {
+                this->node = new ast::Attribute(
+                        old->name,
+                        GET_ACCEPT_V( parameters, Expr )
+                );
         }
 
         virtual void visit( AttrExpr * ) override final {
-
-                assert( 0 );
+                assertf( false, "AttrExpr deprecated in new AST." );
         }
 };