Changeset dfee306


Ignore:
Timestamp:
Jul 13, 2015, 2:43:46 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
9163b9c
Parents:
85c4ef0 (diff), cff1143 (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 /u/cforall/software/cfa/cfa-cc

Location:
src
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • src/CodeGen/FixNames.h

    r85c4ef0 rdfee306  
    2020
    2121namespace CodeGen {
     22        /// mangles object and function names
    2223        void fixNames( std::list< Declaration* > translationUnit );
    2324} // namespace CodeGen
  • src/CodeGen/Generate.h

    r85c4ef0 rdfee306  
    2323
    2424namespace CodeGen {
     25        /// Generates code
    2526        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics );
    2627} // namespace CodeGen
  • src/ControlStruct/CaseRangeMutator.h

    r85c4ef0 rdfee306  
    2222
    2323namespace ControlStruct {
     24        /// expand case ranges and turn fallthru into a null statement
    2425        class CaseRangeMutator : public Mutator {
    2526          public:
  • src/ControlStruct/ChooseMutator.h

    r85c4ef0 rdfee306  
    2222
    2323namespace ControlStruct {
     24        /// transform choose statements into switch statements
    2425        class ChooseMutator : public Mutator {
    2526          public:
  • src/ControlStruct/LabelFixer.h

    r85c4ef0 rdfee306  
    2525
    2626namespace ControlStruct {
     27        /// normalizes label definitions and generates multi-level exit labels
    2728        class LabelFixer : public Visitor {
    2829                typedef Visitor Parent;
  • src/ControlStruct/Mutate.h

    r85c4ef0 rdfee306  
    2323
    2424namespace ControlStruct {
     25        /// Desugars Cforall control structures
    2526        void mutate( std::list< Declaration* > translationUnit );
    2627} // namespace ControlStruct
  • src/GenPoly/Box.cc

    r85c4ef0 rdfee306  
    204204                }
    205205
    206                 DeclarationWithType *
    207                 Pass1::mutate( FunctionDecl *functionDecl ) {
     206                DeclarationWithType *Pass1::mutate( FunctionDecl *functionDecl ) {
    208207                        if ( functionDecl->get_statements() ) {
    209208                                TyVarMap oldtyVars = scopeTyVars;
  • src/GenPoly/Box.h

    r85c4ef0 rdfee306  
    2121
    2222namespace GenPoly {
     23        /// boxes polymorphic function calls
    2324        void box( std::list< Declaration* >& translationUnit );
    2425} // namespace GenPoly
  • src/GenPoly/CopyParams.h

    r85c4ef0 rdfee306  
    2020
    2121namespace GenPoly {
     22        /// Clones by-value parameters which have been passed by-reference for polymorphism
    2223        void copyParams( std::list< Declaration* > &translationUnit );
    2324} // namespace GenPoly
  • src/GenPoly/Lvalue.h

    r85c4ef0 rdfee306  
    2222
    2323namespace GenPoly {
     24        /// replaces return type of `lvalue T` with `T*`, along with appropriate address-of and dereference operators
    2425        void convertLvalue( std::list< Declaration* >& translationUnit );
    2526} // namespace GenPoly
  • src/GenPoly/Specialize.h

    r85c4ef0 rdfee306  
    2222
    2323namespace GenPoly {
     24        /// generates thunks where needed
    2425        void convertSpecializations( std::list< Declaration* >& translationUnit );
    2526} // namespace GenPoly
  • src/InitTweak/RemoveInit.h

    r85c4ef0 rdfee306  
    2525
    2626namespace InitTweak {
     27        /// Adds assignment statements for polymorphic type initializers
    2728        void tweak( std::list< Declaration * > translationUnit );
    2829
  • src/ResolvExpr/Resolver.h

    r85c4ef0 rdfee306  
    2121
    2222namespace ResolvExpr {
     23        /// Checks types and binds syntactic constructs to typed representations
    2324        void resolve( std::list< Declaration * > translationUnit );
    2425        Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer );
  • src/SymTab/FixFunction.h

    r85c4ef0 rdfee306  
    2020
    2121namespace SymTab {
     22        /// Replaces function and array types by equivalent pointer types.
    2223        class FixFunction : public Mutator {
    2324                typedef Mutator Parent;
  • src/SymTab/Validate.cc

    r85c4ef0 rdfee306  
    6060        class HoistStruct : public Visitor {
    6161          public:
     62                /// Flattens nested struct types
    6263                static void hoistStruct( std::list< Declaration * > &translationUnit );
    6364 
     
    8485        };
    8586
     87        /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers
    8688        class Pass1 : public Visitor {
    8789                typedef Visitor Parent;
     
    8991                virtual void visit( FunctionType *func );
    9092        };
    91  
     93
     94        /// Associates forward declarations of aggregates with their definitions
    9295        class Pass2 : public Indexer {
    9396                typedef Indexer Parent;
     
    110113        };
    111114
     115        /// Replaces array and function types in forall lists by appropriate pointer type
    112116        class Pass3 : public Indexer {
    113117                typedef Indexer Parent;
     
    123127        class AddStructAssignment : public Visitor {
    124128          public:
     129                /// Generates assignment operators for aggregate types as required
    125130                static void addStructAssignment( std::list< Declaration * > &translationUnit );
    126131
     
    444449        }
    445450
     451        /// Fix up assertions
    446452        void forallFixer( Type *func ) {
    447                 // Fix up assertions
    448453                for ( std::list< TypeDecl * >::iterator type = func->get_forall().begin(); type != func->get_forall().end(); ++type ) {
    449454                        std::list< DeclarationWithType * > toBeDone, nextRound;
  • src/SymTab/Validate.h

    r85c4ef0 rdfee306  
    2323        class Indexer;
    2424
     25        /// Normalizes struct and function declarations
    2526        void validate( std::list< Declaration * > &translationUnit, bool doDebug = false );
    2627        void validateType( Type *type, const Indexer *indexer );
  • src/SynTree/TypeSubstitution.h

    r85c4ef0 rdfee306  
    157157}
    158158
    159 // helper function
     159/// Instantiate each member of the context given the actual parameters specified, and store the
     160/// instantiations for use by the indexer
    160161template< typename FormalIterator, typename ActualIterator, typename MemberIterator, typename OutputIterator >
    161162void applySubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actual, MemberIterator memberBegin, MemberIterator memberEnd, OutputIterator out ) {
    162         // Instantiate each member of the context given the actual parameters specified, and store the
    163         // instantiations for use by the indexer
    164 
    165163        TypeSubstitution sub = TypeSubstitution( formalBegin, formalEnd, actual );
    166164        for ( std::list< Declaration* >::iterator i = memberBegin; i != memberEnd; ++i ) {
Note: See TracChangeset for help on using the changeset viewer.