Changeset 2d019af for src/AST

Timestamp:

Mar 12, 2021, 11:14:29 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

41ca6fa, e867b44d

Parents:

6083392

Message:

parser global pragmas, fixes #241

Location:

src/AST

Files:

• Convert.cpp (modified) (3 diffs)
• Decl.hpp (modified) (2 diffs)
• Fwd.hpp (modified) (2 diffs)
• Node.cpp (modified) (2 diffs)
• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)
• Visitor.hpp (modified) (2 diffs)

src/AST/Convert.cpp

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu May 09 15::37::05 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Nov 12 10:07:00 2020
-// Update Count     : 34
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 12 18:43:51 2021
+// Update Count     : 36
 //
 
@@ -327 +327 @@
         const ast::AsmDecl * visit( const ast::AsmDecl * node ) override final {
                 auto decl = new AsmDecl( get<AsmStmt>().accept1( node->stmt ) );
+                declPostamble( decl, node );
+                return nullptr;
+        }
+
+        const ast::DirectiveDecl * visit( const ast::DirectiveDecl * node ) override final {
+                auto decl = new DirectiveDecl( get<DirectiveStmt>().accept1( node->stmt ) );
                 declPostamble( decl, node );
                 return nullptr;
@@ -1769 +1775 @@
         }
 
+        virtual void visit( const DirectiveDecl * old ) override final {
+                auto decl = new ast::DirectiveDecl{
+                        old->location,
+                        GET_ACCEPT_1(stmt, DirectiveStmt)
+                };
+                decl->extension  = old->extension;
+                decl->uniqueId   = old->uniqueId;
+                decl->storage    = { old->storageClasses.val };
+
+                this->node = decl;
+        }
+
         virtual void visit( const StaticAssertDecl * old ) override final {
                 auto decl = new ast::StaticAssertDecl{

src/AST/Decl.hpp

@@ -10 +10 @@
 // Created On       : Thu May 9 10:00:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 11 20:48:38 2021
-// Update Count     : 30
+// Last Modified On : Fri Mar 12 18:25:05 2021
+// Update Count     : 32
 //
 
@@ -365 +365 @@
 };
 
+/// C-preprocessor directive `#...`
+class DirectiveDecl : public Decl {
+public:
+        ptr<DirectiveStmt> stmt;
+
+        DirectiveDecl( const CodeLocation & loc, DirectiveStmt * stmt )
+        : Decl( loc, "", {}, {} ), stmt(stmt) {}
+
+        const DirectiveDecl * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
+        DirectiveDecl * clone() const override { return new DirectiveDecl( *this ); }
+        MUTATE_FRIEND
+};
+
 class StaticAssertDecl : public Decl {
 public:

src/AST/Fwd.hpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Wed May  8 16:05:00 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Jul 23 14:15:00 2020
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 12 18:37:39 2021
+// Update Count     : 4
 //
 
@@ -35 +35 @@
 class TypedefDecl;
 class AsmDecl;
+class DirectiveDecl;
 class StaticAssertDecl;
 

src/AST/Node.cpp

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu May 16 14:16:00 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun  5 10:21:00 2020
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 12 18:25:06 2021
+// Update Count     : 2
 //
 
@@ -130 +130 @@
 template class ast::ptr_base< ast::AsmDecl, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::AsmDecl, ast::Node::ref_type::strong >;
+template class ast::ptr_base< ast::DirectiveDecl, ast::Node::ref_type::weak >;
+template class ast::ptr_base< ast::DirectiveDecl, ast::Node::ref_type::strong >;
 template class ast::ptr_base< ast::StaticAssertDecl, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::StaticAssertDecl, ast::Node::ref_type::strong >;

src/AST/Pass.hpp

@@ -139 +139 @@
         const ast::Decl *             visit( const ast::TypedefDecl          * ) override final;
         const ast::AsmDecl *          visit( const ast::AsmDecl              * ) override final;
+        const ast::DirectiveDecl *    visit( const ast::DirectiveDecl        * ) override final;
         const ast::StaticAssertDecl * visit( const ast::StaticAssertDecl     * ) override final;
         const ast::CompoundStmt *     visit( const ast::CompoundStmt         * ) override final;

src/AST/Pass.impl.hpp

@@ -646 +646 @@
 
 //--------------------------------------------------------------------------
+// DirectiveDecl
+template< typename core_t >
+const ast::DirectiveDecl * ast::Pass< core_t >::visit( const ast::DirectiveDecl * node ) {
+        VISIT_START( node );
+
+        VISIT(
+                maybe_accept( node, &DirectiveDecl::stmt );
+        )
+
+        VISIT_END( DirectiveDecl, node );
+}
+
+//--------------------------------------------------------------------------
 // StaticAssertDecl
 template< typename core_t >

src/AST/Print.cpp

@@ -387 +387 @@
 
         virtual const ast::AsmDecl * visit( const ast::AsmDecl * node ) override final {
+                safe_print( node->stmt );
+                return node;
+        }
+
+        virtual const ast::DirectiveDecl * visit( const ast::DirectiveDecl * node ) override final {
                 safe_print( node->stmt );
                 return node;

src/AST/Visitor.hpp

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Thr May 9 15:28:00 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr May 9 15:33:00 2019
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 12 18:25:07 2021
+// Update Count     : 1
 //
 
@@ -31 +31 @@
     virtual const ast::Decl *             visit( const ast::TypedefDecl          * ) = 0;
     virtual const ast::AsmDecl *          visit( const ast::AsmDecl              * ) = 0;
+    virtual const ast::DirectiveDecl *    visit( const ast::DirectiveDecl        * ) = 0;
     virtual const ast::StaticAssertDecl * visit( const ast::StaticAssertDecl     * ) = 0;
     virtual const ast::CompoundStmt *     visit( const ast::CompoundStmt         * ) = 0;