Changeset 525f7ad for src/AST

Timestamp:

Jun 19, 2024, 3:20:39 PM (16 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

57e43cd

Parents:

1725989

Message:

1. Add count_e( enum_name ), a pseudo function that return the number of element in an enum; 2. Implementation of enum range loop.

Location:

src/AST

Files:

• Expr.cpp (modified) (1 diff)
• Expr.hpp (modified) (1 diff)
• Fwd.hpp (modified) (1 diff)
• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (2 diffs)
• Print.cpp (modified) (1 diff)
• Stmt.hpp (modified) (2 diffs)
• Visitor.hpp (modified) (1 diff)

src/AST/Expr.cpp

@@ -282 +282 @@
 : Expr( loc, new BasicType{ BasicKind::LongUnsignedInt } ), expr( nullptr ), type( t ) {}
 
+// --- CountExpr
+
+CountExpr::CountExpr( const CodeLocation & loc, const Type * t )
+: Expr( loc, new BasicType( BasicKind::LongUnsignedInt) ), type( t ) {}
+
 // --- AlignofExpr
 

src/AST/Expr.hpp

@@ -494 +494 @@
 };
 
+class CountExpr final : public Expr {
+public:
+        ptr<Type> type;
+
+        CountExpr( const CodeLocation & loc, const Type * t );
+
+        const Expr * accept( Visitor & v )const override { return v.visit( this ); }
+private:
+        CountExpr * clone() const override { return new CountExpr( *this ); }
+        MUTATE_FRIEND
+};
+
 /// alignof expression, e.g. `alignof(int)`, `alignof 3+4`
 class AlignofExpr final : public Expr {

src/AST/Fwd.hpp

@@ -85 +85 @@
 class ConstantExpr;
 class SizeofExpr;
+class CountExpr;
 class AlignofExpr;
 class UntypedOffsetofExpr;

src/AST/Pass.hpp

@@ -172 +172 @@
         const ast::Expr *             visit( const ast::ConstantExpr         * ) override final;
         const ast::Expr *             visit( const ast::SizeofExpr           * ) override final;
+        const ast::Expr *             visit( const ast::CountExpr            * ) override final;
         const ast::Expr *             visit( const ast::AlignofExpr          * ) override final;
         const ast::Expr *             visit( const ast::UntypedOffsetofExpr  * ) override final;

src/AST/Pass.impl.hpp

@@ -802 +802 @@
                 maybe_accept_top( node, &ForStmt::cond  );
                 maybe_accept_top( node, &ForStmt::inc   );
+                maybe_accept_top( node, &ForStmt::range_over );
                 maybe_accept_as_compound( node, &ForStmt::body  );
         }
@@ -1323 +1324 @@
         }
 
+        VISIT_END( Expr, node );
+}
+
+//--------------------------------------------------------------------------
+// CountExpr
+template< typename core_t >
+const ast::Expr * ast::Pass< core_t >::visit( const ast::CountExpr * node ) {
+        VISIT_START( node );
+        if ( __visit_children() ) {
+                {
+                        guard_symtab guard { *this };
+                        maybe_accept( node, &CountExpr::result );
+                }
+                maybe_accept( node, &CountExpr::type );
+        }
         VISIT_END( Expr, node );
 }

src/AST/Print.cpp

@@ -1143 +1143 @@
         }
 
+        virtual const ast::Expr * visit( const ast::CountExpr * node ) override final {
+                os << "Count Expression on: ";
+                ++indent;
+                node->type->accept( *this );
+                --indent;
+                postprint( node );
+                return node;
+        }
+
         virtual const ast::Expr * visit( const ast::AlignofExpr * node ) override final {
                 os << "Alignof Expression on: ";

src/AST/Stmt.hpp

@@ -237 +237 @@
         ptr<Expr> cond;
         ptr<Expr> inc;
+        ptr<Expr> range_over;
         ptr<Stmt> body;
         ptr<Stmt> else_;
@@ -242 +243 @@
         ForStmt( const CodeLocation & loc, const std::vector<ptr<Stmt>> && inits, const Expr * cond,
                          const Expr * inc, const Stmt * body, const std::vector<Label> && label = {} )
-                : Stmt(loc, std::move(label)), inits(std::move(inits)), cond(cond), inc(inc), body(body), else_(nullptr) {}
+                : Stmt(loc, std::move(label)), inits(std::move(inits)), cond(cond), inc(inc),
+                        range_over(nullptr), body(body), else_(nullptr) {}
 
         ForStmt( const CodeLocation & loc, const std::vector<ptr<Stmt>> && inits, const Expr * cond,
                          const Expr * inc, const Stmt * body, const Stmt * else_, const std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), inits(std::move(inits)), cond(cond), inc(inc), body(body), else_(else_) {}
+                : Stmt(loc, std::move(labels)), inits(std::move(inits)), cond(cond), inc(inc),
+                        range_over(nullptr), body(body), else_(else_) {}
+
+        ForStmt( const CodeLocation & loc, const std::vector<ptr<Stmt>> && inits, const Expr * range_over, 
+                         const Stmt * body, const Stmt * else_ )
+                : Stmt(loc, std::move(labels)), inits(std::move(inits)), range_over(range_over), body(body), else_(else_) {}
 
         const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Visitor.hpp

@@ -75 +75 @@
     virtual const ast::Expr *             visit( const ast::ConstantExpr         * ) = 0;
     virtual const ast::Expr *             visit( const ast::SizeofExpr           * ) = 0;
+    virtual const ast::Expr *             visit( const ast::CountExpr            * ) = 0;
     virtual const ast::Expr *             visit( const ast::AlignofExpr          * ) = 0;
     virtual const ast::Expr *             visit( const ast::UntypedOffsetofExpr  * ) = 0;