Changeset 1633e04 for src

Timestamp:

Mar 24, 2023, 4:44:50 PM (2 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

75d874a

Parents:

d30e3eb (diff), 056bee8 (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

Files:

• AST/Print.cpp (modified) (1 diff)
• Common/Debug.h (deleted)
• Common/module.mk (modified) (1 diff)
• Common/utility.h (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/FixInitNew.cpp (modified) (1 diff)
• Parser/parser.yy (modified) (4 diffs)
• SynTree/FunctionDecl.cc (modified) (1 diff)

src/AST/Print.cpp

@@ -369 +369 @@
                                 --indent;
                         }
+                }
+
+                if ( ! node->withExprs.empty() ) {
+                        // Not with a clause, but the 'with clause'.
+                        ++indent;
+                        os << " with clause" << endl << indent;
+                        printAll( node->withExprs );
+                        --indent;
                 }
 

src/Common/module.mk

@@ -20 +20 @@
         Common/CodeLocationTools.hpp \
         Common/CodeLocationTools.cpp \
-        Common/Debug.h \
         Common/DeclStats.hpp \
         Common/DeclStats.cpp \

src/Common/utility.h

@@ -190 +190 @@
 }
 
-template< typename... Params >
-void warn( const Params & ... params ) {
-        std::cerr << "Warning: ";
-        toString_single( std::cerr, params... );
-        std::cerr << std::endl;
-}
-
 // determines if pref is a prefix of str
 static inline bool isPrefix( const std::string & str, const std::string & pref, unsigned int start = 0 ) {

src/InitTweak/FixInit.cc

@@ -1233 +1233 @@
                 }
 
-                template< typename Visitor, typename... Params >
-                void error( Visitor & v, CodeLocation loc, const Params &... params ) {
-                        SemanticErrorException err( loc, toString( params... ) );
-                        v.errors.append( err );
-                }
-
                 template< typename... Params >
                 void GenStructMemberCalls::emit( CodeLocation loc, const Params &... params ) {
-                        // toggle warnings vs. errors here.
-                        // warn( params... );
-                        error( *this, loc, params... );
+                        SemanticErrorException err( loc, toString( params... ) );
+                        errors.append( err );
                 }
 

src/InitTweak/FixInitNew.cpp

@@ -1303 +1303 @@
         }
 
-        template< typename Visitor, typename... Params >
-        void error( Visitor & v, CodeLocation loc, const Params &... params ) {
-                SemanticErrorException err( loc, toString( params... ) );
-                v.errors.append( err );
-        }
-
         template< typename... Params >
         void GenStructMemberCalls::emit( CodeLocation loc, const Params &... params ) {
-                // toggle warnings vs. errors here.
-                // warn( params... );
-                error( *this, loc, params... );
+                SemanticErrorException err( loc, toString( params... ) );
+                errors.append( err );
         }
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 21 19:01:00 2023
-// Update Count     : 5990
+// Last Modified On : Wed Mar 22 21:26:01 2023
+// Update Count     : 6002
 //
 
@@ -270 +270 @@
         SemanticError( yylloc, ::toString( "Identifier \"", identifier, "\" cannot appear before a ", kind, ".\n"
                                    "Possible cause is misspelled storage/CV qualifier, misspelled typename, or missing generic parameter." ) );
+} // IdentifierBeforeType
+
+static bool TypedefForall( DeclarationNode * decl ) {
+        if ( decl->type->forall || (decl->type->kind == TypeData::Aggregate && decl->type->aggregate.params) ) {
+                SemanticError( yylloc, "forall qualifier in typedef is currently unimplemented." );
+                return true;
+        } // if
+        return false;
 } // IdentifierBeforeType
 
@@ -1958 +1966 @@
         TYPEDEF type_specifier declarator
                 {
-                        // if type_specifier is an anon aggregate => name 
                         typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "4" );
-                        $$ = $3->addType( $2 )->addTypedef();           // watchout frees $2 and $3
+                        if ( TypedefForall( $2 ) ) $$ = nullptr;
+                        else $$ = $3->addType( $2 )->addTypedef();              // watchout frees $2 and $3
                 }
         | typedef_declaration pop ',' push declarator
@@ -1970 +1978 @@
                 {
                         typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "6" );
-                        $$ = $4->addQualifiers( $1 )->addType( $3 )->addTypedef();
+                        if ( TypedefForall( $1 ) ) $$ = nullptr;
+                        else $$ = $4->addQualifiers( $1 )->addType( $3 )->addTypedef();
                 }
         | type_specifier TYPEDEF declarator
                 {
                         typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "7" );
-                        $$ = $3->addType( $1 )->addTypedef();
+                        if ( TypedefForall( $1 ) ) $$ = nullptr;
+                        else $$ = $3->addType( $1 )->addTypedef();
                 }
         | type_specifier TYPEDEF type_qualifier_list declarator
                 {
                         typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "8" );
-                        $$ = $4->addQualifiers( $1 )->addType( $1 )->addTypedef();
+                        if ( TypedefForall( $3 ) ) $$ = nullptr;
+                        else $$ = $4->addQualifiers( $1 )->addType( $1 )->addTypedef();
                 }
         ;

src/SynTree/FunctionDecl.cc

@@ -87 +87 @@
         } // if
 
+        if ( !withExprs.empty() ) {
+                os << indent << "... with clause" << std::endl;
+                os << indent + 1;
+                printAll( withExprs, os, indent + 1 );
+        }
+
         if ( statements ) {
                 os << indent << "... with body" << endl << indent+1;