Changeset bc07190 for src/AST

Timestamp:

Jun 29, 2024, 7:33:28 AM (19 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

011c29e

Parents:

62a38e7 (diff), 115ac1ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/AST

Files:

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

src/AST/Decl.cpp

@@ -203 +203 @@
 }
 
+bool EnumDecl::isTyped() const { return base;}
+
+bool EnumDecl::isOpague() const { return isCfa && !isTyped(); } 
 }
 

src/AST/Decl.hpp

@@ -308 +308 @@
 class EnumDecl final : public AggregateDecl {
 public:
-        // isTyped indicated if the enum has a declaration like:
+        // isCfa indicated if the enum has a declaration like:
         // enum (type_optional) Name {...}
-        bool isTyped;
-        // if isTyped == true && base.get() == nullptr, it is a "void" type enum
+        bool isCfa;
+        // if isCfa == true && base.get() == nullptr, it is a "opague" enum
         ptr<Type> base;
         enum class EnumHiding { Visible, Hide } hide;
         std::vector< ast::ptr<ast::EnumInstType>> inlinedDecl; // child enums
 
-        EnumDecl( const CodeLocation& loc, const std::string& name, bool isTyped = false,
+        EnumDecl( const CodeLocation& loc, const std::string& name, bool isCfa = false,
                 std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall,
                 Type const * base = nullptr, EnumHiding hide = EnumHiding::Hide,
                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
-        : AggregateDecl( loc, name, std::move(attrs), linkage ), isTyped(isTyped), base(base), hide(hide), enumValues(enumValues) {}
+        : AggregateDecl( loc, name, std::move(attrs), linkage ), isCfa(isCfa), base(base), hide(hide), enumValues(enumValues) {}
 
         /// gets the integer value for this enumerator, returning true iff value found
@@ -336 +336 @@
 
         bool isSubTypeOf(const ast::EnumDecl *) const;
+        bool isTyped() const;
+        bool isOpague() const;
 private:
         EnumDecl * clone() const override { return new EnumDecl{ *this }; }

src/AST/Stmt.hpp

@@ -238 +238 @@
         ptr<Expr> inc;
         ptr<Expr> range_over;
+        bool is_inc;
         ptr<Stmt> body;
         ptr<Stmt> else_;
@@ -251 +252 @@
                         range_over(nullptr), body(body), else_(else_) {}
 
-        ForStmt( const CodeLocation & loc, const std::vector<ptr<Stmt>> && inits, const Expr * range_over, 
+        ForStmt( const CodeLocation & loc, const std::vector<ptr<Stmt>> && inits, const Expr * range_over, bool is_inc,
                          const Stmt * body, const Stmt * else_ )
-                : Stmt(loc, std::move(labels)), inits(std::move(inits)), range_over(range_over), body(body), else_(else_) {}
+                : Stmt(loc, std::move(labels)), inits(std::move(inits)), range_over(range_over), is_inc(is_inc), 
+                body(body), else_(else_) {}
 
         const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }