Changeset 835d6e8 for src/AST

Timestamp:

Apr 5, 2023, 4:45:38 PM (15 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

c468150

Parents:

3e94a23

Message:

ast::SuspendStmt::Type -> ::Kind, this fits the new convention where Type is limited for actual compiler types.

Location:

src/AST

Files:

• Convert.cpp (modified) (2 diffs)
• Print.cpp (modified) (1 diff)
• Stmt.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -559 +559 @@
                 auto stmt = new SuspendStmt();
                 stmt->then   = get<CompoundStmt>().accept1( node->then   );
-                switch(node->type) {
+                switch (node->kind) {
                         case ast::SuspendStmt::None     : stmt->type = SuspendStmt::None     ; break;
                         case ast::SuspendStmt::Coroutine: stmt->type = SuspendStmt::Coroutine; break;
@@ -2131 +2131 @@
         virtual void visit( const SuspendStmt * old ) override final {
                 if ( inCache( old ) ) return;
-                ast::SuspendStmt::Type type;
+                ast::SuspendStmt::Kind type;
                 switch (old->type) {
                         case SuspendStmt::Coroutine: type = ast::SuspendStmt::Coroutine; break;

src/AST/Print.cpp

@@ -739 +739 @@
         virtual const ast::Stmt * visit( const ast::SuspendStmt * node ) override final {
                 os << "Suspend Statement";
-                switch (node->type) {
-                        case ast::SuspendStmt::None     : os << " with implicit target"; break;
-                        case ast::SuspendStmt::Generator: os << " for generator"; break;
-                        case ast::SuspendStmt::Coroutine: os << " for coroutine"; break;
+                switch (node->kind) {
+                case ast::SuspendStmt::None     : os << " with implicit target"; break;
+                case ast::SuspendStmt::Generator: os << " for generator"; break;
+                case ast::SuspendStmt::Coroutine: os << " for coroutine"; break;
                 }
                 os << endl;

src/AST/Stmt.hpp

@@ -367 +367 @@
   public:
         ptr<CompoundStmt> then;
-        enum Type { None, Coroutine, Generator } type = None;
-
-        SuspendStmt( const CodeLocation & loc, const CompoundStmt * then, Type type, const std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), then(then), type(type) {}
+        enum Kind { None, Coroutine, Generator } kind = None;
+
+        SuspendStmt( const CodeLocation & loc, const CompoundStmt * then, Kind kind, const std::vector<Label> && labels = {} )
+                : Stmt(loc, std::move(labels)), then(then), kind(kind) {}
 
         const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }