Changeset 640b3df for src/Parser

Timestamp:

Feb 21, 2023, 4:24:34 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

257a8f5, ce44c5f

Parents:

1180175 (diff), 9a533ba (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/Parser

Files:

• DeclarationNode.cc (modified) (12 diffs)
• ExpressionNode.cc (modified) (3 diffs)
• ParseNode.h (modified) (4 diffs)
• RunParser.cpp (modified) (2 diffs)
• RunParser.hpp (modified) (3 diffs)
• TypeData.cc (modified) (2 diffs)
• TypeData.h (modified) (2 diffs)
• parser.yy (modified) (5 diffs)
• parserutility.h (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug  8 17:07:00 2022
-// Update Count     : 1185
+// Last Modified On : Thu Feb 16 14:12:03 2023
+// Update Count     : 1388
 //
 
@@ -61 +61 @@
         variable.initializer = nullptr;
 
-//      attr.name = nullptr;
-        attr.expr = nullptr;
-        attr.type = nullptr;
-
         assert.condition = nullptr;
         assert.message = nullptr;
@@ -70 +66 @@
 
 DeclarationNode::~DeclarationNode() {
-//      delete attr.name;
-        delete attr.expr;
-        delete attr.type;
-
 //      delete variable.name;
         delete variable.assertions;
@@ -115 +107 @@
         newnode->variable.initializer = maybeClone( variable.initializer );
 
-//      newnode->attr.name = attr.name ? new string( *attr.name ) : nullptr;
-        newnode->attr.expr = maybeClone( attr.expr );
-        newnode->attr.type = maybeClone( attr.type );
-
         newnode->assert.condition = maybeClone( assert.condition );
         newnode->assert.message = maybeClone( assert.message );
@@ -154 +142 @@
         } // if
 
-        for ( Attribute * attr: reverseIterate( attributes ) ) {
-                os << string( indent + 2, ' ' ) << "attr " << attr->name.c_str();
-        } // for
+        if ( ! attributes.empty() ) {
+                os << string( indent + 2, ' ' ) << "with attributes " << endl;
+                for ( Attribute * attr: reverseIterate( attributes ) ) {
+                        os << string( indent + 4, ' ' ) << attr->name.c_str() << endl;
+                } // for
+        } // if
 
         os << endl;
@@ -244 +235 @@
         newnode->type = new TypeData( TypeData::Aggregate );
         newnode->type->aggregate.kind = kind;
-        newnode->type->aggregate.name = name == nullptr ? new string( DeclarationNode::anonymous.newName() ) : name;
+        newnode->type->aggregate.anon = name == nullptr;
+        newnode->type->aggregate.name = newnode->type->aggregate.anon ? new string( DeclarationNode::anonymous.newName() ) : name;
         newnode->type->aggregate.actuals = actuals;
         newnode->type->aggregate.fields = fields;
@@ -250 +242 @@
         newnode->type->aggregate.tagged = false;
         newnode->type->aggregate.parent = nullptr;
-        newnode->type->aggregate.anon = name == nullptr;
         return newnode;
 } // DeclarationNode::newAggregate
@@ -257 +248 @@
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Enum );
-        newnode->type->enumeration.name = name == nullptr ? new string( DeclarationNode::anonymous.newName() ) : name;
+        newnode->type->enumeration.anon = name == nullptr;
+        newnode->type->enumeration.name = newnode->type->enumeration.anon ? new string( DeclarationNode::anonymous.newName() ) : name;
         newnode->type->enumeration.constants = constants;
         newnode->type->enumeration.body = body;
-        newnode->type->enumeration.anon = name == nullptr;
         newnode->type->enumeration.typed = typed;
         newnode->type->enumeration.hiding = hiding;
@@ -989 +980 @@
         for ( const DeclarationNode * cur = firstNode; cur; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ) ) {
                 try {
-                        bool extracted = false;
-                        bool anon = false;
+                        bool extracted = false, anon = false;
+                        AggregateDecl * unionDecl = nullptr;
+
                         if ( DeclarationNode * extr = cur->extractAggregate() ) {
                                 // handle the case where a structure declaration is contained within an object or type declaration
+
                                 Declaration * decl = extr->build();
                                 if ( decl ) {
-                                        // hoist the structure declaration
+                                        // Remember the declaration if it is a union aggregate ?
+                                        unionDecl = dynamic_cast<UnionDecl *>( decl );
+
                                         decl->location = cur->location;
-                                        * out++ = decl;
+                                        *out++ = decl;
 
                                         // need to remember the cases where a declaration contains an anonymous aggregate definition
@@ -1003 +998 @@
                                         assert( extr->type );
                                         if ( extr->type->kind == TypeData::Aggregate ) {
+                                                // typedef struct { int A } B is the only case?
                                                 anon = extr->type->aggregate.anon;
                                         } else if ( extr->type->kind == TypeData::Enum ) {
-                                                // xxx - is it useful to have an implicit anonymous enum member?
+                                                // typedef enum { A } B is the only case?
                                                 anon = extr->type->enumeration.anon;
                                         }
@@ -1014 +1010 @@
                         Declaration * decl = cur->build();
                         if ( decl ) {
+                                if ( TypedefDecl * typedefDecl = dynamic_cast<TypedefDecl *>( decl ) ) {
+                                        if ( unionDecl ) {                                      // is the typedef alias a union aggregate ?
+                                                // This code handles a special issue with the attribute transparent_union.
+                                                //
+                                                //    typedef union U { int i; } typedef_name __attribute__(( aligned(16) )) __attribute__(( transparent_union ))
+                                                //
+                                                // Here the attribute aligned goes with the typedef_name, so variables declared of this type are
+                                                // aligned.  However, the attribute transparent_union must be moved from the typedef_name to
+                                                // alias union U.  Currently, this is the only know attribute that must be moved from typedef to
+                                                // alias.
+
+                                                // If typedef is an alias for a union, then its alias type was hoisted above and remembered.
+                                                if ( UnionInstType * unionInstType = dynamic_cast<UnionInstType *>( typedefDecl->base ) ) {
+                                                        // Remove all transparent_union attributes from typedef and move to alias union.
+                                                        list<Attribute *>::iterator attr;
+                                                        for ( attr = unionInstType->attributes.begin(); attr != unionInstType->attributes.end(); ) { // forward order
+                                                                if ( (*attr)->name == "transparent_union" || (*attr)->name == "__transparent_union__" ) {
+                                                                        list<Attribute *>::iterator cur = attr; // remember current node
+                                                                        attr++;                         // advance iterator
+                                                                        unionDecl->attributes.emplace_back( *cur ); // move current
+                                                                        unionInstType->attributes.erase( cur ); // remove current
+                                                                } else {
+                                                                        attr++;                         // advance iterator
+                                                                } // if
+                                                        } // for
+                                                } // if
+                                        } // if
+                                } // if
+
                                 // don't include anonymous declaration for named aggregates, but do include them for anonymous aggregates, e.g.:
                                 // struct S {
@@ -1176 +1201 @@
         assert( type );
 
-        if ( attr.expr ) {
-                return new AttrType( buildQualifiers( type ), *name, attr.expr->build(), attributes );
-        } else if ( attr.type ) {
-                return new AttrType( buildQualifiers( type ), *name, attr.type->buildType(), attributes );
-        } // if
-
         switch ( type->kind ) {
           case TypeData::Enum:

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  7 09:18:56 2021
-// Update Count     : 1077
+// Last Modified On : Sat Feb 11 14:49:00 2023
+// Update Count     : 1079
 //
 
@@ -173 +173 @@
                 if ( posn != string::npos ) { Unsigned = true; type = 2; ltype = 4; str.erase( posn, 1 ); goto FINI; }
 
-                posn = str.rfind( "hh" );                                               // char
+                posn = str.rfind( "hh" );                                               // signed char
                 if ( posn != string::npos ) { type = 1; str.erase( posn, 2 ); goto FINI; }
 
-                posn = str.rfind( "HH" );                                               // char
+                posn = str.rfind( "HH" );                                               // signed char
                 if ( posn != string::npos ) { type = 1; str.erase( posn, 2 ); goto FINI; }
 
@@ -592 +592 @@
 Expression * build_unary_ptr( OperKinds op, ExpressionNode * expr_node ) {
         list< Expression * > args;
-        args.push_back(  maybeMoveBuild< Expression >(expr_node) ); // xxx -- this is exactly the same as the val case now, refactor this code.
+        args.push_back( maybeMoveBuild< Expression >(expr_node) ); // xxx -- this is exactly the same as the val case now, refactor this code.
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 } // build_unary_ptr

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Nov  2 21:27:07 2022
-// Update Count     : 939
+// Last Modified On : Sun Feb 19 09:02:37 2023
+// Update Count     : 940
 //
 
@@ -27 +27 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
-#include "Common/utility.h"        // for maybeClone, maybeBuild
+#include "Common/utility.h"        // for maybeClone
+#include "Parser/parserutility.h"  // for maybeBuild
 #include "SynTree/LinkageSpec.h"   // for Spec
 #include "SynTree/Declaration.h"   // for Aggregate
@@ -324 +325 @@
         Variable_t variable;
 
-        struct Attr_t {
-//              const std::string * name;
-                ExpressionNode * expr;
-                DeclarationNode * type;
-        };
-        Attr_t attr;
-
         struct StaticAssert_t {
                 ExpressionNode * condition;
@@ -342 +336 @@
 
         bool inLine = false;
-        bool enumInLine = false; 
+        bool enumInLine = false;
         Type::FuncSpecifiers funcSpecs;
         Type::StorageClasses storageClasses;

src/Parser/RunParser.cpp

@@ -10 +10 @@
 // Created On       : Mon Dec 19 11:00:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Dec 22 10:18:00 2022
-// Update Count     : 1
+// Last Modified On : Thr Feb 16 10:08:00 2023
+// Update Count     : 2
 //
 
@@ -24 +24 @@
 
 // Variables global to the parsing code.
-LinkageSpec::Spec linkage = LinkageSpec::Cforall;
+ast::Linkage::Spec linkage = ast::Linkage::Cforall;
 TypedefTable typedefTable;
 DeclarationNode * parseTree = nullptr;
 
-void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit ) {
+void parse( FILE * input, ast::Linkage::Spec linkage, bool alwaysExit ) {
         extern int yyparse( void );
         extern FILE * yyin;

src/Parser/RunParser.hpp

@@ -10 +10 @@
 // Created On       : Mon Dec 19 10:42:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Dec 22 10:23:00 2022
-// Update Count     : 1
+// Last Modified On : Thr Feb 16 10:08:00 2023
+// Update Count     : 2
 //
 
@@ -18 +18 @@
 #include <iosfwd>                           // for ostream
 
-#include "SynTree/LinkageSpec.h"            // for Spec
+#include "AST/LinkageSpec.hpp"              // for Spec
 namespace ast {
         class TranslationUnit;
@@ -29 +29 @@
 /// The input file is closed when complete. Exits instead of returning on
 /// error or if alwaysExit is true.
-void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit = false );
+void parse( FILE * input, ast::Linkage::Spec linkage, bool alwaysExit = false );
 
 /// Drain the internal accumulator of parsed code and build a translation

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 10 22:36:52 2022
-// Update Count     : 677
+// Last Modified On : Sun Feb 19 11:00:46 2023
+// Update Count     : 679
 //
 
@@ -375 +375 @@
                 break;
           case Enum:
-                os << "enumeration ";
+                os << "enumeration " << *enumeration.name << endl;;
                 if ( enumeration.constants ) {
                         os << "with constants" << endl;

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 10 22:18:49 2022
-// Update Count     : 203
+// Last Modified On : Sun Feb 19 09:09:39 2023
+// Update Count     : 204
 //
 
@@ -37 +37 @@
                 bool body;
                 bool anon;
-
                 bool tagged;
                 const std::string * parent = nullptr;

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  2 21:36:16 2023
-// Update Count     : 5865
+// Last Modified On : Mon Feb 20 11:31:26 2023
+// Update Count     : 5896
 //
 
@@ -55 +55 @@
 #include "Common/utility.h"                                                             // for maybeMoveBuild, maybeBuild, CodeLo...
 
-#include "SynTree/Attribute.h"     // for Attribute
+#include "SynTree/Attribute.h"                                                  // for Attribute
 
 // lex uses __null in a boolean context, it's fine.
@@ -1951 +1951 @@
                 {
                         typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "6" );
-                        $$ = $4->addType( $3 )->addQualifiers( $1 )->addTypedef();
+                        $$ = $4->addQualifiers( $1 )->addType( $3 )->addTypedef();
                 }
         | type_specifier TYPEDEF declarator
@@ -1961 +1961 @@
                 {
                         typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "8" );
-                        $$ = $4->addQualifiers( $1 )->addTypedef()->addType( $1 );
+                        $$ = $4->addQualifiers( $1 )->addType( $1 )->addTypedef();
                 }
         ;
@@ -1983 +1983 @@
         | typedef_expression                                                            // deprecated GCC, naming expression type
         | sue_declaration_specifier
+                {
+                        assert( $1->type );
+                        if ( $1->type->qualifiers.val != 0 ) {
+                                SemanticError( yylloc, "Useless type qualifier in empty declaration." ); $$ = nullptr;
+                        }
+                }
         ;
 

src/Parser/parserutility.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// parserutility.h -- 
+// parserutility.h -- Collected utilities for the parser.
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:31:46 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:32:58 2017
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Feb 16 12:34:00 2023
+// Update Count     : 5
 //
 
@@ -20 +20 @@
 Expression *notZeroExpr( Expression *orig );
 
+template< typename T, typename U >
+struct maybeBuild_t {
+        static T * doit( const U *orig ) {
+                if ( orig ) {
+                        return orig->build();
+                } else {
+                        return 0;
+                }
+        }
+};
+
+template< typename T, typename U >
+static inline T * maybeBuild( const U *orig ) {
+        return maybeBuild_t<T,U>::doit(orig);
+}
+
+template< typename T, typename U >
+static inline T * maybeMoveBuild( const U *orig ) {
+        T* ret = maybeBuild<T>(orig);
+        delete orig;
+        return ret;
+}
+
 // Local Variables: //
 // tab-width: 4 //