Changes in / [c298079:bab2917]

Files:

• doc/uC++toCFA/uC++toCFA.tex (modified) (5 diffs)
• src/GenPoly/BoxNew.cpp (modified) (8 diffs)

doc/uC++toCFA/uC++toCFA.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sun Oct 15 23:09:58 2023
-%% Update Count     : 5926
+%% Last Modified On : Sun Sep 17 09:10:12 2023
+%% Update Count     : 5883
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -119 +119 @@
 
 \title{\vspace*{-0.5in}
-\uC to \CFA Cheat Sheet}
+\CC/\uC to \CFA Cheat Sheet}
 %\author{Peter A. Buhr}
 \date{}
@@ -195 +195 @@
 \end{cfa}
 \noindent
-In subsequent code examples, the left example is \uC and the right example is \CFA.
+In subsequent code examples, the left example is \CC/\uC and the right example is \CFA.
+
+
+\section{Looping}
+
+\begin{cquote}
+\begin{tabular}{l|l}
+\begin{uC++}
+for ( ;; ) { ... } / while ( true ) { ... }
+for ( int i = 0; i < 10; i += 1 ) { ... }
+for ( int i = 5; i < 15; i += 2 ) { ... }
+int i = 0
+for ( i = 0; i < 10; i += 1 ) { ... }
+if ( i == 10 ) { ... }
+\end{uC++}
+&
+\begin{cfa}
+for () { ... } / while () { ... }
+for ( 10 ) { ... } / for ( i; 10 ) { ... }
+for ( i; 5~15~2 ) { ... }
+
+for ( i; 10 ) { ... }
+else { ... } // i == 10
+\end{cfa}
+\end{tabular}
+\end{cquote}
+
+
+\section{Exceptions}
+
+Currently, \CFA uses macros @ExceptionDecl@ and @ExceptionInst@ to declare and instantiate an exception.
+\begin{cquote}
+\begin{tabular}{l|ll}
+\begin{uC++}
+
+struct E {              // local or global scope
+        ... // exception fields
+};
+try {
+        ...
+        if ( ... ) _Resume E( /* initialization */ );
+        if ( ... ) _Throw E( /* initialization */ );
+        ...
+} _CatchResume( E & ) { // should be reference
+        ...
+} catch( E & ) {
+        ...
+}
+\end{uC++}
+&
+\begin{cfa}
+#include <Exception.hfa>
+@ExceptionDecl@( E,             // must be global scope
+        ... // exception fields
+);
+try {
+        ...
+        if ( ... ) throwResume @ExceptionInst@( E, /* intialization */ );
+        if ( ... ) throw @ExceptionInst@( E, /* intialization */ );
+        ...
+} catchResume( E * ) { // must be pointer
+        ...
+} catch( E * ) {
+        ...
+}
+\end{cfa}
+\end{tabular}
+\end{cquote}
 
 
@@ -218 +285 @@
 sin | i | d | c;
 sout | i | d | c
-\end{cfa}
-\end{tabular}
-\end{cquote}
-
-
-\section{Looping}
-
-\begin{cquote}
-\begin{tabular}{l|l}
-\begin{uC++}
-for ( @;;@ ) { ... }  /  while ( @true@ ) { ... }
-for ( int i = 0; i < @10@; i += 1 ) { ... }
-for ( int i = @5@; i < @15@; i += @2@ ) { ... }
-for ( int i = -1; i <@=@ 10; i += 3 ) { ... }
-for ( int i = 10; i > 0; i @-@= 1 ) { ... }
-\end{uC++}
-&
-\begin{cfa}
-for () { ... }  /  while () { ... }
-for ( @10@ ) { ... }  /  for ( i; @10@ ) { ... }
-for ( i; @5@ ~ @15@ ~ @2@ ) { ... }
-for ( i; -1 ~@=@ 10 ~ 3 ) { ... }
-for ( i; 0 @-@~ 10 ) { ... }
-\end{cfa}
-\\
-\hline
-\begin{uC++}
-int i = 0
-for ( i = 0; i < 10; i += 1 ) { ... }
-@if ( i == 10 )@ { ... }
-\end{uC++}
-&
-\begin{cfa}
-
-for ( i; 10 ) { ... }
-@else@ { ... } // i == 10
-\end{cfa}
-\\
-\hline
-\begin{uC++}
-L1: for ( ;; ) {
-        L2: for ( ;; ) {
-                ... @break L1@; ... @break L2@; ...
-        }
-}
-\end{uC++}
-&
-\begin{cfa}
-L1: for () {
-        L2: for () {
-                ... @break L1@; ... @break L2@; ...
-        }
-}
-\end{cfa}
-\end{tabular}
-\end{cquote}
-
-
-\section{Exception}
-
-Currently, \CFA uses macros @ExceptionDecl@ and @ExceptionInst@ to declare and instantiate an exception.
-\begin{cquote}
-\begin{tabular}{l|ll}
-\begin{uC++}
-
-@_Exception@ E {        // local or global scope
-        ... // exception fields
-};
-try {
-        ...
-        if ( ... ) @_Resume@ E( /* initialization */ );
-        if ( ... ) @_Throw@ E( /* initialization */ );
-                ...
-} @_CatchResume@( E & ) { // should be reference
-        ...
-} catch( E & ) {
-        ...
-}
-\end{uC++}
-&
-\begin{cfa}
-#include <Exception.hfa>
-@ExceptionDecl@( E,             // must be global scope
-        ... // exception fields
-);
-try {
-        ...
-        if ( ... ) @throwResume@ @ExceptionInst@( E, /* intialization */ );
-        if ( ... ) @throw@ @ExceptionInst@( E, /* intialization */ );
-        ...
-} @catchResume@( E * ) { // must be pointer
-        ...
-} catch( E * ) {
-        ...
-}
-\end{cfa}
-\end{tabular}
-\end{cquote}
-
-
-\section{Non-local Exception}
-
-\begin{cquote}
-\begin{tabular}{l|ll}
-\begin{uC++}
-
-
-void main() {
-        try {
-                _Enable {
-                        ... suspend(); ...
-                }
-        } @_CatchResume@( E & ) { // reference
-                ...
-        } catch( E & ) {
-                ...
-        }
-}
-\end{uC++}
-&
-\begin{cfa}
-#define resumePoll( coroutine ) resume( coroutine ); checked_poll()
-#define suspendPoll suspend; checked_poll()
-void main() {
-        try {
-                enable_ehm();
-                ... suspendPoll ...
-                disable_ehm();
-        } @catchResume@( E * ) { // pointer
-                ...
-        } catch( E & ) {
-                ...
-        }
-}
-\end{cfa}
-\end{tabular}
-\end{cquote}
-
-
-\section{Constructor / Destructor}
-
-\begin{cquote}
-\begin{tabular}{l|l}
-\begin{uC++}
-struct S {
-        ... // fields
-        @S@(...) { ... }
-        @~S@(...) { ... }
-};
-\end{uC++}
-&
-\begin{cfa}
-struct S {
-        ... // fields
-};
-@?{}@( @S & s,@ ...) { ... }
-@^?{}@( @S & s@ ) { ... }
 \end{cfa}
 \end{tabular}
@@ -422 +332 @@
 
 
+\section{Constructor / Destructor}
+
+\begin{cquote}
+\begin{tabular}{l|l}
+\begin{uC++}
+struct S {
+        ... // fields
+        @S@(...) { ... }
+        @~S@(...) { ... }
+};
+\end{uC++}
+&
+\begin{cfa}
+struct S {
+        ... // fields
+};
+@?{}@( @S & s,@ ...) { ... }
+@^?{}@( @S & s@ ) { ... }
+\end{cfa}
+\end{tabular}
+\end{cquote}
+
+
 \section{\texorpdfstring{Structures (object-oriented \protect\vs routine style)}{Structures (object-oriented vs. routine style)}}
 

src/GenPoly/BoxNew.cpp

@@ -386 +386 @@
         // return value.
 
-        /// Passes extra layout arguments for sized polymorphic type parameters.
+        /// Pass the extra type parameters from polymorphic generic arguments or
+        /// return types into a function application.
+        ast::vector<ast::Expr>::iterator passArgTypeVars(
+                ast::ApplicationExpr * expr, ast::Type const * parmType,
+                ast::Type const * argBaseType, ast::vector<ast::Expr>::iterator arg,
+                const TypeVarMap & exprTyVars, std::set<std::string> & seenTypes );
+        /// Passes extra type parameters into a polymorphic function application.
         ast::vector<ast::Expr>::iterator passTypeVars(
                 ast::ApplicationExpr * expr,
-                ast::FunctionType const * funcType );
+                ast::Type const * polyRetType,
+                ast::FunctionType const * funcType,
+                const TypeVarMap & exprTyVars );
         /// Wraps a function application with a new temporary for the
         /// out-parameter return value.
@@ -692 +700 @@
         // the concrete type's parameters, not the formal type's).
         ast::vector<ast::Expr>::iterator argIt =
-                passTypeVars( mutExpr, function );
+                passTypeVars( mutExpr, concRetType, function, exprTypeVars );
         addInferredParams( mutExpr, argIt, function, exprTypeVars );
 
@@ -804 +812 @@
 }
 
+// arg is an in/out parameter that matches the return value.
+ast::vector<ast::Expr>::iterator CallAdapter::passArgTypeVars(
+                ast::ApplicationExpr * expr, ast::Type const * paramType,
+                ast::Type const * argBaseType, ast::vector<ast::Expr>::iterator arg,
+                const TypeVarMap & exprTypeVars, std::set<std::string> & seenTypes ) {
+        ast::Type const * polyType = isPolyType( paramType, exprTypeVars );
+        if ( !polyType || dynamic_cast<ast::TypeInstType const *>( polyType ) ) {
+                return arg;
+        }
+
+        std::string typeName = Mangle::mangleType( polyType );
+        if ( seenTypes.count( typeName ) ) return arg;
+
+        arg = expr->args.insert( arg,
+                new ast::SizeofExpr( expr->location, ast::deepCopy( argBaseType ) )
+        );
+        arg++;
+        arg = expr->args.insert( arg,
+                new ast::AlignofExpr( expr->location, ast::deepCopy( argBaseType ) )
+        );
+        arg++;
+        if ( dynamic_cast<ast::StructInstType const *>( polyType ) ) {
+                auto argBaseStructType =
+                                dynamic_cast<ast::StructInstType const *>( argBaseType );
+                if ( nullptr == argBaseStructType ) {
+                        SemanticError( expr,
+                                "Cannot pass non-structure type for generic struct: " );
+                }
+
+                // Zero-length arrays are forbidden by C, so don't pass
+                // offset for empty structure.
+                if ( !argBaseStructType->base->members.empty() ) {
+                        arg = expr->args.insert( arg,
+                                new ast::OffsetPackExpr(
+                                        expr->location,
+                                        ast::deepCopy( argBaseStructType ) )
+                        );
+                        arg++;
+                }
+        }
+
+        seenTypes.insert( typeName );
+        return arg;
+}
+
 ast::vector<ast::Expr>::iterator CallAdapter::passTypeVars(
                 ast::ApplicationExpr * expr,
-                ast::FunctionType const * function ) {
+                ast::Type const * polyRetType,
+                ast::FunctionType const * function,
+                const TypeVarMap & exprTypeVars ) {
         assert( typeSubs );
         ast::vector<ast::Expr>::iterator arg = expr->args.begin();
@@ -825 +880 @@
                         new ast::AlignofExpr( expr->location, ast::deepCopy( concrete ) ) );
                 arg++;
+        }
+
+        // Add size/align for generic types to parameter list.
+        if ( !expr->func->result ) return arg;
+        ast::FunctionType const * funcType = getFunctionType( expr->func->result );
+        assert( funcType );
+
+        // This iterator points at first original argument.
+        ast::vector<ast::Expr>::const_iterator funcArg;
+        // Names for generic types we've seen.
+        std::set<std::string> seenTypes;
+
+        // A polymorphic return type may need to be added to the argument list.
+        if ( polyRetType ) {
+                assert( typeSubs );
+                auto concRetType = replaceWithConcrete( polyRetType, *typeSubs );
+                // TODO: This write-back may not be correct.
+                arg = passArgTypeVars( expr, polyRetType, concRetType,
+                                arg, exprTypeVars, seenTypes );
+                // Skip the return parameter in the argument list.
+                funcArg = arg + 1;
+        } else {
+                funcArg = arg;
+        }
+
+        // TODO:
+        // I believe this is (starts as) the number of original arguments to the
+        // function with the args before funcArg all being inserted.
+        ptrdiff_t argsToPass = std::distance( funcArg, expr->args.cend() );
+
+        // Add type information args for presently unseen types in parameter list.
+        ast::vector<ast::Type>::const_iterator funcParam = funcType->params.begin();
+        // assert( funcType->params.size() == argsToPass );
+        for ( ; funcParam != funcType->params.end() && 0 < argsToPass
+                        ; ++funcParam, --argsToPass ) {
+                assert( 0 < argsToPass );
+                assert( argsToPass <= (ptrdiff_t)expr->args.size() );
+                ptrdiff_t index = expr->args.size() - argsToPass;
+                ast::Type const * argType = expr->args[index]->result;
+                if ( nullptr == argType ) continue;
+                arg = passArgTypeVars( expr, *funcParam, argType,
+                                arg, exprTypeVars, seenTypes );
         }
         return arg;
@@ -1426 +1523 @@
 }
 
+ast::ObjectDecl * makePtr(
+                CodeLocation const & location, std::string const & name ) {
+        return new ast::ObjectDecl( location, name,
+                new ast::PointerType( makeSizeAlignType() ),
+                nullptr, ast::Storage::Classes(), ast::Linkage::C, nullptr );
+}
+
 ast::FunctionDecl const * DeclAdapter::previsit( ast::FunctionDecl const * decl ) {
         TypeVarMap localTypeVars = { ast::TypeData() };
@@ -1480 +1584 @@
         mutDecl->assertions.clear();
 
+        // Add size/align for generic parameter types to parameter list.
+        std::set<std::string> seenTypes;
+        ast::vector<ast::DeclWithType> otypeParams;
+        for ( ast::ptr<ast::DeclWithType> & funcParam : mutDecl->params ) {
+                ast::Type const * polyType = isPolyType( funcParam->get_type(), localTypeVars );
+                if ( !polyType || dynamic_cast<ast::TypeInstType const *>( polyType ) ) {
+                        continue;
+                }
+                std::string typeName = Mangle::mangleType( polyType );
+                if ( seenTypes.count( typeName ) ) continue;
+                seenTypes.insert( typeName );
+
+                auto sizeParam = makeObj( funcParam->location, sizeofName( typeName ) );
+                otypeParams.emplace_back( sizeParam );
+
+                auto alignParam = makeObj( funcParam->location, alignofName( typeName ) );
+                otypeParams.emplace_back( alignParam );
+
+                // Zero-length arrays are illegal in C, so empty structs have no
+                // offset array.
+                if ( auto * polyStruct =
+                                dynamic_cast<ast::StructInstType const *>( polyType ) ;
+                                polyStruct && !polyStruct->base->members.empty() ) {
+                        auto offsetParam = makePtr( funcParam->location, offsetofName( typeName ) );
+                        otypeParams.emplace_back( offsetParam );
+                }
+        }
+
         // Prepend each argument group. From last group to first. addAdapters
         // does do the same, it just does it itself and see all other parameters.
         spliceBegin( mutDecl->params, inferredParams );
+        spliceBegin( mutDecl->params, otypeParams );
         spliceBegin( mutDecl->params, layoutParams );
         addAdapters( mutDecl, localTypeVars );
@@ -1682 +1815 @@
         beginGenericScope();
         beginTypeScope( decl->type );
+
+        // TODO: Going though dec->params does not work for some reason.
+        for ( ast::ptr<ast::Type> const & funcParam : decl->type->params ) {
+                // Condition here duplicates that in `DeclAdapter::previsit( FunctionDecl const * )`
+                ast::Type const * polyType = isPolyType( funcParam, scopeTypeVars );
+                if ( polyType && !dynamic_cast<ast::TypeInstType const *>( polyType ) ) {
+                        knownLayouts.insert( Mangle::mangleType( polyType ) );
+                }
+        }
 }
 
@@ -1756 +1898 @@
         // don't mark them as known in this scope.
         expect_func_type = false;
+
+        // Make sure that any type information passed into the function is
+        // accounted for.
+        for ( ast::ptr<ast::Type> const & funcParam : type->params ) {
+                // Condition here duplicates that in `DeclAdapter::previsit( FunctionDecl const * )`
+                ast::Type const * polyType = isPolyType( funcParam, scopeTypeVars );
+                if ( polyType && !dynamic_cast<ast::TypeInstType const *>( polyType ) ) {
+                        knownLayouts.insert( Mangle::mangleType( polyType ) );
+                }
+        }
 }