Changeset 15215f02 for src/AST

Timestamp:

Apr 22, 2024, 11:37:36 PM (21 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

13de4478

Parents:

0fe07be (diff), d7c0ad5 (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:

• Pass.hpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)
• Type.hpp (modified) (2 diffs)
• porting.md (deleted)

src/AST/Pass.hpp

@@ -113 +113 @@
         static auto read( node_type const * node, Args&&... args ) {
                 Pass<core_t> visitor( std::forward<Args>( args )... );
-                auto const * temp = node->accept( visitor );
-                assert( temp == node );
-                return visitor.get_result();
-        }
-
-        // Versions of the above for older compilers.
-        template< typename... Args >
-        static void run( TranslationUnit & decls ) {
-                Pass<core_t> visitor;
-                accept_all( decls, visitor );
-        }
-
-        template< typename node_type, typename... Args >
-        static auto read( node_type const * node ) {
-                Pass<core_t> visitor;
                 auto const * temp = node->accept( visitor );
                 assert( temp == node );

src/AST/Print.cpp

@@ -1579 +1579 @@
                 preprint( node );
                 os << "enum attr ";
-        if ( node->attr == ast::EnumAttribute::Label ) {
-            os << "Label ";
-        } else if ( node->attr == ast::EnumAttribute::Value ) {
-            os << "Value ";
-        } else {
-            os << "Posn ";
-        }
+                if ( node->attr == ast::EnumAttribute::Label ) {
+                        os << "Label ";
+                } else if ( node->attr == ast::EnumAttribute::Value ) {
+                        os << "Value ";
+                } else {
+                        os << "Posn ";
+                }
                 (*(node->instance)).accept( *this );
                 return node;

src/AST/Type.hpp

@@ -31 +31 @@
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
 #define MUTATE_FRIEND \
-    template<typename node_t> friend node_t * mutate(const node_t * node); \
+        template<typename node_t> friend node_t * mutate(const node_t * node); \
         template<typename node_t> friend node_t * shallowCopy(const node_t * node);
 
@@ -322 +322 @@
 public:
         readonly<EnumInstType> instance;
-    EnumAttribute attr;
+        EnumAttribute attr;
         const Type * accept( Visitor & v ) const override { return v.visit( this ); }
         EnumAttrType( const EnumInstType * instance, EnumAttribute attr = EnumAttribute::Posn )
                 : instance(instance), attr(attr) {}
-        
-    bool match( const ast::EnumAttrType * other) const {
-        return instance->base->name == other->instance->base->name && attr == other->attr;
-    }
+
+        bool match( const ast::EnumAttrType * other) const {
+                return instance->base->name == other->instance->base->name && attr == other->attr;
+        }
 private:
         EnumAttrType * clone() const override { return new EnumAttrType{ *this }; }