Changeset 4ec9513

Timestamp:

Apr 13, 2022, 2:55:51 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

365c8dcb

Parents:

6b06abe

Message:

Converted validate C, including adding DimensionExpr? to the new ast.

Files:

• src/AST/Convert.cpp (modified) (2 diffs)
• src/AST/Expr.hpp (modified) (1 diff)
• src/AST/Fwd.hpp (modified) (1 diff)
• src/AST/Pass.hpp (modified) (1 diff)
• src/AST/Pass.impl.hpp (modified) (3 diffs)
• src/AST/Pass.proto.hpp (modified) (3 diffs)
• src/AST/Print.cpp (modified) (1 diff)
• src/AST/Visitor.hpp (modified) (1 diff)
• src/Common/CodeLocationTools.cpp (modified) (1 diff)
• src/InitTweak/GenInit.cc (modified) (2 diffs)
• src/InitTweak/GenInit.h (modified) (2 diffs)
• src/Validate/GenericParameter.cpp (added)
• src/Validate/GenericParameter.hpp (added)
• src/Validate/ReturnCheck.cpp (added)
• src/Validate/ReturnCheck.hpp (added)
• src/Validate/module.mk (modified) (2 diffs)
• src/main.cc (modified) (6 diffs)
• tests/array-container/.expect/language-dim-mismatch.nast.txt (added)
• tests/array-container/.expect/language-dim-mismatch.oast.txt (moved) (moved from tests/array-container/.expect/language-dim-mismatch.txt)
• tests/errors/.expect/scope.nast.txt (moved) (moved from tests/errors/.expect/scope.txt)
• tests/errors/.expect/scope.oast.txt (added)

src/AST/Convert.cpp

@@ -951 +951 @@
         }
 
+        const ast::Expr * visit( const ast::DimensionExpr * node ) override final {
+                auto expr = visitBaseExpr( node, new DimensionExpr( node->name ) );
+                this->node = expr;
+                return nullptr;
+        }
+
         const ast::Expr * visit( const ast::AsmExpr * node ) override final {
                 auto expr = visitBaseExpr( node,
@@ -2463 +2469 @@
 
         virtual void visit( const DimensionExpr * old ) override final {
-                // DimensionExpr gets desugared away in Validate.
-                // As long as new-AST passes don't use it, this cheap-cheerful error
-                // detection helps ensure that these occurrences have been compiled
-                // away, as expected.  To move the DimensionExpr boundary downstream
-                // or move the new-AST translation boundary upstream, implement
-                // DimensionExpr in the new AST and implement a conversion.
-                (void) old;
-                assert(false && "DimensionExpr should not be present at new-AST boundary");
+                this->node = visitBaseExpr( old,
+                        new ast::DimensionExpr( old->location, old->name )
+                );
         }
 

src/AST/Expr.hpp

@@ -604 +604 @@
 };
 
+class DimensionExpr final : public Expr {
+public:
+        std::string name;
+
+        DimensionExpr( const CodeLocation & loc, std::string name )
+        : Expr( loc ), name( name ) {}
+
+        const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
+        DimensionExpr * clone() const override { return new DimensionExpr{ *this }; }
+        MUTATE_FRIEND
+};
+
 /// A GCC "asm constraint operand" used in an asm statement, e.g. `[output] "=f" (result)`.
 /// https://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Machine-Constraints.html#Machine-Constraints

src/AST/Fwd.hpp

@@ -84 +84 @@
 class CommaExpr;
 class TypeExpr;
+class DimensionExpr;
 class AsmExpr;
 class ImplicitCopyCtorExpr;

src/AST/Pass.hpp

@@ -184 +184 @@
         const ast::Expr *             visit( const ast::CommaExpr            * ) override final;
         const ast::Expr *             visit( const ast::TypeExpr             * ) override final;
+        const ast::Expr *             visit( const ast::DimensionExpr        * ) override final;
         const ast::Expr *             visit( const ast::AsmExpr              * ) override final;
         const ast::Expr *             visit( const ast::ImplicitCopyCtorExpr * ) override final;

src/AST/Pass.impl.hpp

@@ -575 +575 @@
                         __pass::symtab::addId( core, 0, func );
                         if ( __visit_children() ) {
-                                // parameter declarations
+                                maybe_accept( node, &FunctionDecl::type_params );
+                                maybe_accept( node, &FunctionDecl::assertions );
                                 maybe_accept( node, &FunctionDecl::params );
                                 maybe_accept( node, &FunctionDecl::returns );
-                                // type params and assertions
-                                maybe_accept( node, &FunctionDecl::type_params );
-                                maybe_accept( node, &FunctionDecl::assertions );
+                                maybe_accept( node, &FunctionDecl::type );
                                 // First remember that we are now within a function.
                                 ValueGuard< bool > oldInFunction( inFunction );
@@ -1522 +1521 @@
 
 //--------------------------------------------------------------------------
+// DimensionExpr
+template< typename core_t >
+const ast::Expr * ast::Pass< core_t >::visit( const ast::DimensionExpr * node ) {
+        VISIT_START( node );
+
+        if ( __visit_children() ) {
+                guard_symtab guard { *this };
+                maybe_accept( node, &DimensionExpr::result );
+        }
+
+        VISIT_END( Expr, node );
+}
+
+//--------------------------------------------------------------------------
 // AsmExpr
 template< typename core_t >
@@ -1859 +1872 @@
 
         if ( __visit_children() ) {
-                // xxx - should PointerType visit/mutate dimension?
+                maybe_accept( node, &PointerType::dimension );
                 maybe_accept( node, &PointerType::base );
         }

src/AST/Pass.proto.hpp

@@ -26 +26 @@
 
 struct PureVisitor;
+
+template<typename node_t>
+node_t * deepCopy( const node_t * localRoot );
 
 namespace __pass {
@@ -396 +399 @@
                 static inline auto addStructFwd( core_t & core, int, const ast::StructDecl * decl ) -> decltype( core.symtab.addStruct( decl ), void() ) {
                         ast::StructDecl * fwd = new ast::StructDecl( decl->location, decl->name );
-                        fwd->params = decl->params;
+                        for ( const auto & param : decl->params ) {
+                                fwd->params.push_back( deepCopy( param.get() ) );
+                        }
                         core.symtab.addStruct( fwd );
                 }
@@ -405 +410 @@
                 template<typename core_t>
                 static inline auto addUnionFwd( core_t & core, int, const ast::UnionDecl * decl ) -> decltype( core.symtab.addUnion( decl ), void() ) {
-                        UnionDecl * fwd = new UnionDecl( decl->location, decl->name );
-                        fwd->params = decl->params;
+                        ast::UnionDecl * fwd = new ast::UnionDecl( decl->location, decl->name );
+                        for ( const auto & param : decl->params ) {
+                                fwd->params.push_back( deepCopy( param.get() ) );
+                        }
                         core.symtab.addUnion( fwd );
                 }

src/AST/Print.cpp

@@ -1101 +1101 @@
         }
 
+        virtual const ast::Expr * visit( const ast::DimensionExpr * node ) override final {
+                os << "Type-Sys Value: " << node->name;
+                postprint( node );
+
+                return node;
+        }
+
         virtual const ast::Expr * visit( const ast::AsmExpr * node ) override final {
                 os << "Asm Expression:" << endl;

src/AST/Visitor.hpp

@@ -76 +76 @@
     virtual const ast::Expr *             visit( const ast::CommaExpr            * ) = 0;
     virtual const ast::Expr *             visit( const ast::TypeExpr             * ) = 0;
+    virtual const ast::Expr *             visit( const ast::DimensionExpr        * ) = 0;
     virtual const ast::Expr *             visit( const ast::AsmExpr              * ) = 0;
     virtual const ast::Expr *             visit( const ast::ImplicitCopyCtorExpr * ) = 0;

src/Common/CodeLocationTools.cpp

@@ -147 +147 @@
     macro(CommaExpr, Expr) \
     macro(TypeExpr, Expr) \
+    macro(DimensionExpr, Expr) \
     macro(AsmExpr, Expr) \
     macro(ImplicitCopyCtorExpr, Expr) \

src/InitTweak/GenInit.cc

@@ -402 +402 @@
                                         retVal->location, "?{}", retVal, stmt->expr );
                                 assertf( ctorStmt,
-                                        "ReturnFixer: genCtorDtor returned nllptr: %s / %s",
+                                        "ReturnFixer: genCtorDtor returned nullptr: %s / %s",
                                         toString( retVal ).c_str(),
                                         toString( stmt->expr ).c_str() );
-                                        stmtsToAddBefore.push_back( ctorStmt );
+                                stmtsToAddBefore.push_back( ctorStmt );
 
                                 // Return the retVal object.
@@ -421 +421 @@
         void genInit( ast::TranslationUnit & transUnit ) {
                 ast::Pass<HoistArrayDimension_NoResolve_New>::run( transUnit );
+                ast::Pass<ReturnFixer_New>::run( transUnit );
+        }
+
+        void fixReturnStatements( ast::TranslationUnit & transUnit ) {
                 ast::Pass<ReturnFixer_New>::run( transUnit );
         }

src/InitTweak/GenInit.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 22 16:08:00 2021
-// Update Count     : 6
+// Last Modified On : Fri Mar 18 14:22:00 2022
+// Update Count     : 7
 //
 
@@ -31 +31 @@
         /// Converts return statements into copy constructor calls on the hidden return variable
         void fixReturnStatements( std::list< Declaration * > & translationUnit );
+        void fixReturnStatements( ast::TranslationUnit & translationUnit );
 
         /// generates a single ctor/dtor statement using objDecl as the 'this' parameter and arg as the optional argument

src/Validate/module.mk

@@ -22 +22 @@
         Validate/ForallPointerDecay.cpp \
         Validate/ForallPointerDecay.hpp \
+        Validate/GenericParameter.cpp \
+        Validate/GenericParameter.hpp \
         Validate/HandleAttributes.cc \
         Validate/HandleAttributes.h \
@@ -28 +30 @@
         Validate/LabelAddressFixer.cpp \
         Validate/LabelAddressFixer.hpp \
+        Validate/ReturnCheck.cpp \
+        Validate/ReturnCheck.hpp \
         Validate/FindSpecialDeclsNew.cpp \
         Validate/FindSpecialDecls.cc \

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Mar 11 10:39:00 2022
-// Update Count     : 671
+// Last Modified On : Wed Apr 13 11:11:00 2022
+// Update Count     : 672
 //
 
@@ -75 +75 @@
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
 #include "Validate/Autogen.hpp"             // for autogenerateRoutines
+#include "Validate/GenericParameter.hpp"    // for fillGenericParameters, tr...
 #include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
 #include "Validate/ForallPointerDecay.hpp"  // for decayForallPointers
@@ -80 +81 @@
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
+#include "Validate/ReturnCheck.hpp"         // for checkReturnStatements
 #include "Virtual/ExpandCasts.h"            // for expandCasts
 
@@ -327 +329 @@
                 PASS( "Validate-A", SymTab::validate_A( translationUnit ) );
                 PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
-                PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
 
                 CodeTools::fillLocations( translationUnit );
@@ -341 +342 @@
 
                         forceFillCodeLocations( transUnit );
+
+                        // Check as early as possible. Can't happen before
+                        // LinkReferenceToType, observed failing when attempted
+                        // before eliminateTypedef
+                        PASS( "Validate Generic Parameters", Validate::fillGenericParameters( transUnit ) );
+
+                        PASS( "Translate Dimensions", Validate::translateDimensionParameters( transUnit ) );
+                        PASS( "Check Function Returns", Validate::checkReturnStatements( transUnit ) );
+
+                        // Must happen before Autogen.
+                        PASS( "Fix Return Statements", InitTweak::fixReturnStatements( transUnit ) );
 
                         PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords( transUnit ) );
@@ -426 +438 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
                         PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
                         PASS( "Validate-E", SymTab::validate_E( translationUnit ) );