Changeset 90e683b for src/AST

Timestamp:

Feb 3, 2025, 11:46:55 AM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

54f70c6

Parents:

bbbff10

Message:

I set out to do a enum rework. It ended up being much the same and I unwound the core rework. But I hope the new names are a bit clearer and other minor fixes are helpful, so I am keeping those.

Location:

src/AST

Files:

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

src/AST/Decl.cpp

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

src/AST/Decl.hpp

@@ -306 +306 @@
 enum class EnumAttribute{ Value, Posn, Label };
 
-/// enum declaration `enum Foo { ... };`
+/// enum declaration `enum Foo { ... };` or `enum(...) Foo { ... };`
 class EnumDecl final : public AggregateDecl {
 public:
@@ -317 +317 @@
         std::vector< ast::ptr<ast::EnumInstType>> inlinedDecl; // child enums
 
+        bool is_c_enum     () const { return !isCfa; }
+        bool is_opaque_enum() const { return isCfa && nullptr == base; }
+        bool is_typed_enum () const { return isCfa && nullptr != base; }
+
         EnumDecl( const CodeLocation& loc, const std::string& name, bool isCfa = false,
                 std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall,
@@ -331 +335 @@
         const char * typeString() const override { return aggrString( Enum ); }
 
-        bool isTyped() const;
-        bool isOpaque() const;
 private:
         EnumDecl * clone() const override { return new EnumDecl{ *this }; }

src/AST/Util.cpp

@@ -85 +85 @@
         // Check that `type->returns` corresponds with `decl->returns`.
         assert( type->returns.size() == decl->returns.size() );
+}
+
+/// Check that an enumeration has not been made with an inconsistent spec.
+void isEnumerationConsistent( const EnumDecl * node ) {
+        if ( node->is_c_enum() ) {
+                assert( nullptr == node->base );
+        }
 }
 
@@ -135 +142 @@
                 previsit( (const ParseNode *)node );
                 functionDeclMatchesType( node );
+        }
+
+        void previsit( const EnumDecl * node ) {
+                previsit( (const ParseNode *)node );
+                isEnumerationConsistent( node );
         }