Changes in / [7e23d0a:02ec390]
- Location:
- src
- Files:
-
- 28 edited
-
GenPoly/Box.cc (modified) (16 diffs)
-
GenPoly/Box.h (modified) (1 diff)
-
GenPoly/GenPoly.cc (modified) (2 diffs)
-
GenPoly/GenPoly.h (modified) (2 diffs)
-
Parser/LinkageSpec.cc (modified) (2 diffs)
-
Parser/LinkageSpec.h (modified) (2 diffs)
-
ResolvExpr/CastCost.cc (modified) (3 diffs)
-
ResolvExpr/PtrsAssignable.cc (modified) (2 diffs)
-
ResolvExpr/PtrsCastable.cc (modified) (2 diffs)
-
ResolvExpr/Unify.cc (modified) (6 diffs)
-
SymTab/IdTable.cc (modified) (5 diffs)
-
SymTab/Mangler.cc (modified) (5 diffs)
-
SymTab/Mangler.h (modified) (4 diffs)
-
SymTab/Validate.cc (modified) (14 diffs)
-
SynTree/Mutator.h (modified) (2 diffs)
-
SynTree/ObjectDecl.cc (modified) (2 diffs)
-
SynTree/Type.h (modified) (4 diffs)
-
examples/Makefile.am (modified) (2 diffs)
-
examples/Makefile.in (modified) (2 diffs)
-
examples/fstream.c (modified) (5 diffs)
-
examples/hello.c (modified) (2 diffs)
-
examples/iostream.c (modified) (4 diffs)
-
examples/iostream.h (modified) (2 diffs)
-
examples/iterator.c (modified) (1 diff)
-
examples/iterator.h (modified) (3 diffs)
-
examples/vector_test.c (modified) (2 diffs)
-
libcfa/prelude.cf (modified) (1 diff)
-
main.cc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/GenPoly/Box.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Mon May 18 07:44:20 2015 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : T hu Nov 19 17:40:51201513 // Update Count : 13311 // Last Modified By : Rob Schluntz 12 // Last Modified On : Tue Aug 11 16:22:35 2015 13 // Update Count : 89 14 14 // 15 15 … … 47 47 namespace { 48 48 const std::list<Label> noLabels; 49 50 FunctionType *makeAdapterType( FunctionType *adaptee, const TyVarMap &tyVars );51 49 52 50 class Pass1 : public PolyMutator { … … 80 78 ObjectDecl *makeTemporary( Type *type ); 81 79 82 typedef std::map< std::string, DeclarationWithType*> AdapterMap;80 typedef std::map< std::string, FunctionDecl *> AdapterMap; 83 81 std::map< std::string, DeclarationWithType *> assignOps; 84 82 std::stack< AdapterMap > adapters; … … 146 144 } 147 145 146 bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars ) { 147 bool doTransform = false; 148 if ( ! function->get_returnVals().empty() ) { 149 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType *>( function->get_returnVals().front()->get_type() ) ) { 150 151 // figure out if the return type is specified by a type parameter 152 for ( std::list< TypeDecl *>::const_iterator tyVar = function->get_forall().begin(); tyVar != function->get_forall().end(); ++tyVar ) { 153 if ( (*tyVar)->get_name() == typeInst->get_name() ) { 154 doTransform = true; 155 name = typeInst->get_name(); 156 break; 157 } // if 158 } // for 159 if ( ! doTransform && otherTyVars.find( typeInst->get_name() ) != otherTyVars.end() ) { 160 doTransform = true; 161 } // if 162 } // if 163 } // if 164 return doTransform; 165 } 166 167 bool isPolyRet( FunctionType *function, std::string &name ) { 168 TyVarMap dummyTyVars; 169 return isPolyRet( function, name, dummyTyVars ); 170 } 171 172 bool isPolyRet( FunctionType *function, const TyVarMap &otherTyVars ) { 173 std::string dummyString; 174 return isPolyRet( function, dummyString, otherTyVars ); 175 } 176 148 177 Pass1::Pass1() 149 178 : useRetval( false ), tempNamer( "_temp" ) { 150 adapters.push(AdapterMap());151 179 } 152 180 … … 182 210 183 211 DeclarationWithType *Pass1::mutate( FunctionDecl *functionDecl ) { 184 if ( functionDecl->get_statements() ) { // empty routine body ? 185 doBeginScope(); 212 if ( functionDecl->get_statements() ) { 186 213 TyVarMap oldtyVars = scopeTyVars; 187 214 DeclarationWithType *oldRetval = retval; 188 215 bool oldUseRetval = useRetval; 189 190 // process polymorphic return value 216 191 217 retval = 0; 192 218 std::string typeName; … … 201 227 } // if 202 228 203 FunctionType *functionType = functionDecl->get_functionType(); 229 scopeTyVars.clear(); 230 /// std::cerr << "clear\n"; 204 231 makeTyVarMap( functionDecl->get_functionType(), scopeTyVars ); 205 232 findAssignOps( functionDecl->get_functionType()->get_forall() ); 206 207 std::list< DeclarationWithType *> ¶mList = functionType->get_parameters();208 std::list< FunctionType *> functions;209 for ( std::list< TypeDecl *>::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) {210 for ( std::list< DeclarationWithType *>::iterator assert = (*tyVar)->get_assertions().begin(); assert != (*tyVar)->get_assertions().end(); ++assert ) {211 findFunction( (*assert)->get_type(), functions, scopeTyVars, needsAdapter );212 } // for213 } // for214 for ( std::list< DeclarationWithType *>::iterator arg = paramList.begin(); arg != paramList.end(); ++arg ) {215 findFunction( (*arg)->get_type(), functions, scopeTyVars, needsAdapter );216 } // for217 AdapterMap & adapters = Pass1::adapters.top();218 for ( std::list< FunctionType *>::iterator funType = functions.begin(); funType != functions.end(); ++funType ) {219 std::string mangleName = SymTab::Mangler::mangle( *funType );220 if ( isPolyRet( *funType, scopeTyVars ) ) {221 // if the return type involved polymorphic types, then the adapter will need to take those222 // polymorphic types as pointers. Therefore, there can be two different functions with the same223 // mangled name, so we need the mangled names to be different.224 mangleName += "polyret_";225 } // if226 if ( adapters.find( mangleName ) == adapters.end() ) {227 std::string adapterName = makeAdapterName( mangleName );228 adapters.insert( std::pair< std::string, DeclarationWithType *>( mangleName, new ObjectDecl( adapterName, DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), makeAdapterType( *funType, scopeTyVars ) ), 0 ) ) );229 } // if230 } // for231 232 233 functionDecl->set_statements( functionDecl->get_statements()->acceptMutator( *this ) ); 233 234 234 235 scopeTyVars = oldtyVars; 235 //std::cerr << "end FunctionDecl: ";236 //for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) {237 //std::cerr << i->first << " ";238 //}239 //std::cerr << "\n";236 /// std::cerr << "end FunctionDecl: "; 237 /// for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) { 238 /// std::cerr << i->first << " "; 239 /// } 240 /// std::cerr << "\n"; 240 241 retval = oldRetval; 241 242 useRetval = oldUseRetval; 242 doEndScope();243 // doEndScope(); 243 244 } // if 244 245 return functionDecl; … … 348 349 } // if 349 350 std::string mangleName = SymTab::Mangler::mangle( function ); 350 if ( isPolyRet( function, tyVars ) ) {351 mangleName += "polyret_";352 } // if353 351 std::string adapterName = makeAdapterName( mangleName ); 354 352 … … 459 457 /// return new CastExpr( new VariableExpr( param ), arg->get_type()->clone() ); 460 458 /// } else { 461 if ( dynamic_cast<TypeInstType *>(arg->get_type()) == NULL ) { 462 UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) ); 463 deref->get_args().push_back( new CastExpr( new VariableExpr( param ), new PointerType( Type::Qualifiers(), arg->get_type()->clone() ) ) ); 464 deref->get_results().push_back( arg->get_type()->clone() ); 465 return deref; 466 } // if 459 UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) ); 460 deref->get_args().push_back( new CastExpr( new VariableExpr( param ), new PointerType( Type::Qualifiers(), arg->get_type()->clone() ) ) ); 461 deref->get_results().push_back( arg->get_type()->clone() ); 462 return deref; 467 463 /// } 468 464 } // if … … 548 544 } // for 549 545 550 // parameter function types for which an appropriate adapter has been generated. we cannot use the types 551 // after applying substitutions, since two different parameter types may be unified to the same type 546 // parameter function types for which an appropriate adapter has been generated. 547 // we cannot use the types after applying substitutions, since two different 548 // parameter types may be unified to the same type 552 549 std::set< std::string > adaptersDone; 553 550 … … 557 554 std::string mangleName = SymTab::Mangler::mangle( realFunction ); 558 555 559 // only attempt to create an adapter or pass one as a parameter if we haven't already done so for this560 // pre-substitution parameter function type.556 // only attempt to create an adapter or pass one as a parameter if we haven't 557 // already done so for this pre-substitution parameter function type. 561 558 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) { 559 std::string mangleName = SymTab::Mangler::mangle( realFunction ); 562 560 adaptersDone.insert( adaptersDone.begin(), mangleName ); 563 561 564 // apply substitution to type variables to figure out what the adapter's type should look like 562 // apply substitution to type variables to figure out what the 563 // adapter's type should look like 565 564 assert( env ); 566 565 env->apply( realFunction ); 567 566 mangleName = SymTab::Mangler::mangle( realFunction ); 568 567 569 if ( isPolyRet( originalFunction, exprTyVars ) ) { 570 mangleName += "polyret_"; 568 if ( needsAdapter( realFunction, exprTyVars, true ) ) { 569 // the function still contains type variables, which means we are in a polymorphic 570 // context and the adapter function is a parameter - call the parameter and don't 571 // create a new adapter. 572 appExpr->get_args().push_front( new NameExpr( makeAdapterName ( mangleName ) ) ); 573 } else { 574 if ( isPolyRet( originalFunction, exprTyVars ) ) { 575 // if the return type involved polymorphic types, then 576 // the adapter will need to take those polymorphic types 577 // as pointers. Therefore, there can be two different 578 // functions with the same mangled name, so we need two adapter map 579 // stacks and also we need the mangled names to be different. 580 mangleName += "polyret_"; 581 } 582 583 AdapterMap & adapters = Pass1::adapters.top(); 584 AdapterMap::iterator adapter = adapters.find( mangleName ); 585 if ( adapter == adapters.end() ) { 586 // adapter has not been created yet in the current scope, so define it 587 FunctionDecl *newAdapter = makeAdapter( *funType, realFunction, mangleName, exprTyVars ); 588 adapter = adapters.insert( adapters.begin(), std::pair< std::string, FunctionDecl *>( mangleName, newAdapter ) ); 589 stmtsToAdd.push_back( new DeclStmt( noLabels, newAdapter ) ); 590 } // if 591 assert( adapter != adapters.end() ); 592 593 // add the appropriate adapter as a parameter 594 appExpr->get_args().push_front( new VariableExpr( adapter->second ) ); 571 595 } // if 572 573 AdapterMap & adapters = Pass1::adapters.top();574 AdapterMap::iterator adapter = adapters.find( mangleName );575 if ( adapter == adapters.end() ) {576 // adapter has not been created yet in the current scope, so define it577 FunctionDecl *newAdapter = makeAdapter( *funType, realFunction, mangleName, exprTyVars );578 adapter = adapters.insert( adapters.begin(), std::pair< std::string, DeclarationWithType *>( mangleName, newAdapter ) );579 stmtsToAdd.push_back( new DeclStmt( noLabels, newAdapter ) );580 } // if581 assert( adapter != adapters.end() );582 583 // add the appropriate adapter as a parameter584 appExpr->get_args().push_front( new VariableExpr( adapter->second ) );585 596 } // if 586 597 } // for 587 } // passAdapters598 } 588 599 589 600 TypeInstType *isPolyPtr( Type *type, const TypeSubstitution *env, const TyVarMap &tyVars ) { … … 758 769 759 770 Expression *Pass1::mutate( ApplicationExpr *appExpr ) { 760 //std::cerr << "mutate appExpr: ";761 //for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) {762 //std::cerr << i->first << " ";763 //}764 //std::cerr << "\n";771 /// std::cerr << "mutate appExpr: "; 772 /// for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) { 773 /// std::cerr << i->first << " "; 774 /// } 775 /// std::cerr << "\n"; 765 776 bool oldUseRetval = useRetval; 766 777 useRetval = false; … … 788 799 ret = addPolyRetParam( appExpr, function, typeName, arg ); 789 800 } else if ( needsAdapter( function, scopeTyVars ) ) { 790 //std::cerr << "needs adapter: ";791 //for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) {792 //std::cerr << i->first << " ";793 //}794 //std::cerr << "\n";801 /// std::cerr << "needs adapter: "; 802 /// for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) { 803 /// std::cerr << i->first << " "; 804 /// } 805 /// std::cerr << "\n"; 795 806 // change the application so it calls the adapter rather than the passed function 796 807 ret = applyAdapter( appExpr, function, arg, scopeTyVars ); … … 902 913 // actually, maybe this could (should?) push 903 914 // a copy of the current map 904 adapters.push( adapters.top());915 adapters.push(AdapterMap()); 905 916 } 906 917 … … 924 935 for ( std::list< FunctionType *>::iterator funType = functions.begin(); funType != functions.end(); ++funType ) { 925 936 std::string mangleName = SymTab::Mangler::mangle( *funType ); 926 if ( isPolyRet( *funType, scopeTyVars ) ) {927 mangleName += "polyret_";928 } // if929 937 if ( adaptersDone.find( mangleName ) == adaptersDone.end() ) { 930 938 std::string adapterName = makeAdapterName( mangleName ); … … 992 1000 for ( std::list< TypeDecl *>::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) { 993 1001 ObjectDecl *thisParm; 994 // add all size parameters to parameter list995 1002 if ( (*tyParm)->get_kind() == TypeDecl::Any ) { 996 1003 thisParm = newObj->clone(); … … 999 1006 ++last; 1000 1007 } 1001 // move all assertions into parameter list1002 1008 for ( std::list< DeclarationWithType *>::iterator assert = (*tyParm)->get_assertions().begin(); assert != (*tyParm)->get_assertions().end(); ++assert ) { 1003 1009 /// *assert = (*assert)->acceptMutator( *this ); -
src/GenPoly/Box.h
r7e23d0a r02ec390 10 10 // Created On : Mon May 18 07:44:20 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : T hu Nov 19 17:24:01201513 // Update Count : 512 // Last Modified On : Tue May 19 07:32:33 2015 13 // Update Count : 2 14 14 // 15 15 -
src/GenPoly/GenPoly.cc
r7e23d0a r02ec390 10 10 // Created On : Mon May 18 07:44:20 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : T hu Nov 19 17:23:44201513 // Update Count : 1 012 // Last Modified On : Tue May 19 07:37:46 2015 13 // Update Count : 1 14 14 // 15 15 … … 21 21 22 22 namespace GenPoly { 23 // A function needs an adapter if it returns a polymorphic value or if any of its 24 // parameters have polymorphic type 25 bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) { 26 if ( ! adaptee->get_returnVals().empty() && isPolyVal( adaptee->get_returnVals().front()->get_type(), tyVars ) ) { 27 return true; 28 } // if 29 for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) { 30 if ( isPolyVal( (*innerArg)->get_type(), tyVars ) ) { 23 // interface functions 24 bool isPolyVal( Type *type, const TyVarMap &tyVars ) { 25 return isPolyVal( type, tyVars, false ); 26 } 27 28 bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars ) { 29 return needsAdapter( adaptee, tyVars, false ); 30 } 31 32 bool isPolyVal( Type *type, const TyVarMap &tyVars, bool considerAllTyVars ) { 33 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( type ) ) { 34 if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) { 31 35 return true; 32 36 } // if 33 } // for 37 return considerAllTyVars; 38 } // if 34 39 return false; 35 40 } 36 41 37 bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars ) { 38 bool doTransform = false; 39 if ( ! function->get_returnVals().empty() ) { 40 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType *>( function->get_returnVals().front()->get_type() ) ) { 41 42 // figure out if the return type is specified by a type parameter 43 for ( std::list< TypeDecl *>::const_iterator tyVar = function->get_forall().begin(); tyVar != function->get_forall().end(); ++tyVar ) { 44 if ( (*tyVar)->get_name() == typeInst->get_name() ) { 45 doTransform = true; 46 name = typeInst->get_name(); 47 break; 48 } // if 49 } // for 50 if ( ! doTransform && otherTyVars.find( typeInst->get_name() ) != otherTyVars.end() ) { 51 doTransform = true; 52 } // if 42 // A function needs an adapter if it returns a polymorphic value or if any of its 43 // parameters have polymorphic type 44 bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars, bool considerAllTyVars ) { 45 bool needsAdapter = false; 46 if ( ! adaptee->get_returnVals().empty() && isPolyVal( adaptee->get_returnVals().front()->get_type(), tyVars, considerAllTyVars ) ) { 47 needsAdapter = true; 48 } // if 49 for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); ! needsAdapter && innerArg != adaptee->get_parameters().end(); ++innerArg ) { 50 if ( isPolyVal( (*innerArg)->get_type(), tyVars, considerAllTyVars ) ) { 51 needsAdapter = true; 53 52 } // if 54 } // if 55 return doTransform; 56 } 57 58 bool isPolyRet( FunctionType *function, std::string &name ) { 59 TyVarMap dummyTyVars; 60 return isPolyRet( function, name, dummyTyVars ); 61 } 62 63 bool isPolyRet( FunctionType *function, const TyVarMap &otherTyVars ) { 64 std::string dummyString; 65 return isPolyRet( function, dummyString, otherTyVars ); 66 } 67 68 bool isPolyVal( Type *type, const TyVarMap &tyVars ) { 69 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) { 70 if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) { 71 return true; 72 } // if 73 } // if 74 return false; 53 } // for 54 return needsAdapter; 75 55 } 76 56 -
src/GenPoly/GenPoly.h
r7e23d0a r02ec390 10 10 // Created On : Mon May 18 07:44:20 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : T hu Nov 19 17:24:03201513 // Update Count : 412 // Last Modified On : Tue May 19 07:38:34 2015 13 // Update Count : 1 14 14 // 15 15 … … 25 25 typedef std::map< std::string, TypeDecl::Kind > TyVarMap; 26 26 27 // considerAllTyVars allows ignoring the contents of the TyVarMap parameter, for the situations where 28 // it is important only that a TypeInstType node exists. 29 27 30 bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVarr ); 28 bool isPolyRet( FunctionType *function, std::string &name, const TyVarMap &otherTyVars ); 29 bool isPolyRet( FunctionType *function, std::string &name ); 30 bool isPolyRet( FunctionType *function, const TyVarMap &otherTyVars ); 31 // bool isPolyFun( FunctionType *fun, const TyVarMap &tyVars ); 31 bool needsAdapter( FunctionType *adaptee, const TyVarMap &tyVars, bool considerAllTyVars ); 32 bool isPolyFun( FunctionType *fun, const TyVarMap &tyVars ); 32 33 bool isPolyVal( Type *type, const TyVarMap &tyVars ); 34 bool isPolyVal( Type *type, const TyVarMap &tyVars, bool considerAllTyVars ); 33 35 void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap ); 34 36 } // namespace GenPoly -
src/Parser/LinkageSpec.cc
r7e23d0a r02ec390 9 9 // Author : Rodolfo G. Esteves 10 10 // Created On : Sat May 16 13:22:09 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Wed Aug 19 15:53:05201513 // Update Count : 511 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Sat May 16 13:23:21 2015 13 // Update Count : 2 14 14 // 15 15 … … 79 79 } 80 80 81 82 bool LinkageSpec::isOverridable( Type t ) {83 switch ( t ) {84 case Intrinsic:85 case AutoGen:86 return true;87 case Cforall:88 case C:89 case Compiler:90 return false;91 }92 assert( false );93 return false;94 }95 96 81 bool LinkageSpec::isBuiltin( Type t ) { 97 82 switch ( t ) { -
src/Parser/LinkageSpec.h
r7e23d0a r02ec390 9 9 // Author : Rodolfo G. Esteves 10 10 // Created On : Sat May 16 13:24:28 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Tue Aug 18 14:11:55201513 // Update Count : 511 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Sat May 16 13:26:14 2015 13 // Update Count : 3 14 14 // 15 15 … … 34 34 static bool isGeneratable( Type ); 35 35 static bool isOverloadable( Type ); 36 static bool isOverridable( Type );37 36 static bool isBuiltin( Type ); 38 37 }; -
src/ResolvExpr/CastCost.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 06:57:43 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Mon Oct 05 14:48:45201513 // Update Count : 511 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Sun May 17 06:59:10 2015 13 // Update Count : 2 14 14 // 15 15 … … 56 56 return Cost::infinity; 57 57 } else { 58 // xxx - why are we adding cost 0 here?59 58 return converter.get_cost() + Cost( 0, 0, 0 ); 60 59 } // if … … 83 82 newEnv.add( pointerType->get_forall() ); 84 83 newEnv.add( pointerType->get_base()->get_forall() ); 85 int castResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );86 if ( castResult > 0 ) {84 int assignResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer ); 85 if ( assignResult > 0 ) { 87 86 cost = Cost( 0, 0, 1 ); 88 } else if ( castResult < 0 ) {87 } else if ( assignResult < 0 ) { 89 88 cost = Cost( 1, 0, 0 ); 90 89 } // if -
src/ResolvExpr/PtrsAssignable.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 11:44:11 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Mon Sep 21 14:34:58201513 // Update Count : 711 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Sun May 17 11:47:36 2015 13 // Update Count : 2 14 14 // 15 15 … … 106 106 void PtrsAssignable::visit( TypeInstType *inst ) { 107 107 EqvClass eqvClass; 108 if ( env.lookup( inst->get_name(), eqvClass ) && eqvClass.type) {108 if ( env.lookup( inst->get_name(), eqvClass ) ) { 109 109 result = ptrsAssignable( eqvClass.type, dest, env ); 110 110 } else { -
src/ResolvExpr/PtrsCastable.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 11:48:00 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Mon Oct 05 14:49:12201513 // Update Count : 711 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Sun May 17 11:51:17 2015 13 // Update Count : 2 14 14 // 15 15 … … 133 133 134 134 void PtrsCastable::visit(TypeInstType *inst) { 135 result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0? 1 : -1;135 result = objectCast( inst, env, indexer ) && objectCast( dest, env, indexer ) ? 1 : -1; 136 136 } 137 137 -
src/ResolvExpr/Unify.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 12:27:10 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Wed Sep 02 14:43:22201513 // Update Count : 3611 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Fri Jun 26 14:57:05 2015 13 // Update Count : 7 14 14 // 15 15 … … 28 28 29 29 30 // 30 //#define DEBUG 31 31 32 32 namespace ResolvExpr { … … 81 81 bool typesCompatible( Type *first, Type *second, const SymTab::Indexer &indexer, const TypeEnvironment &env ) { 82 82 TypeEnvironment newEnv; 83 OpenVarSet openVars , closedVars; // added closedVars83 OpenVarSet openVars; 84 84 AssertionSet needAssertions, haveAssertions; 85 85 Type *newFirst = first->clone(), *newSecond = second->clone(); 86 86 env.apply( newFirst ); 87 87 env.apply( newSecond ); 88 89 // do we need to do this? Seems like we do, types should be able to be compatible if they90 // have free variables that can unify91 findOpenVars( newFirst, openVars, closedVars, needAssertions, haveAssertions, false );92 findOpenVars( newSecond, openVars, closedVars, needAssertions, haveAssertions, true );93 94 88 bool result = unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ); 95 89 delete newFirst; … … 432 426 433 427 void Unify::visit(ArrayType *arrayType) { 428 // XXX -- compare array dimension 434 429 ArrayType *otherArray = dynamic_cast< ArrayType* >( type2 ); 435 // to unify, array types must both be VLA or both not VLA 436 // and must both have a dimension expression or not have a dimension 437 if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() 438 && ((arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0) 439 || (arrayType->get_dimension() == 0 && otherArray->get_dimension() == 0))) { 440 441 // not positive this is correct in all cases, but it's needed for typedefs 442 if ( arrayType->get_isVarLen() || otherArray->get_isVarLen() ) { 443 return; 444 } 445 446 if ( ! arrayType->get_isVarLen() && ! otherArray->get_isVarLen() && 447 arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0 ) { 448 ConstantExpr * ce1 = dynamic_cast< ConstantExpr * >( arrayType->get_dimension() ); 449 ConstantExpr * ce2 = dynamic_cast< ConstantExpr * >( otherArray->get_dimension() ); 450 assert(ce1 && ce2); 451 452 Constant * c1 = ce1->get_constant(); 453 Constant * c2 = ce2->get_constant(); 454 455 if ( c1->get_value() != c2->get_value() ) { 456 // does not unify if the dimension is different 457 return; 458 } 459 } 460 430 if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() ) { 461 431 result = unifyExact( arrayType->get_base(), otherArray->get_base(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ); 462 432 } // if … … 466 436 bool unifyDeclList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, const SymTab::Indexer &indexer ) { 467 437 for ( ; list1Begin != list1End && list2Begin != list2End; ++list1Begin, ++list2Begin ) { 468 // Type * commonType;469 // if ( ! unifyInexact( (*list1Begin)->get_type(), (*list2Begin)->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode( true, true ), indexer, commonType ) ) {470 438 if ( ! unifyExact( (*list1Begin)->get_type(), (*list2Begin)->get_type(), env, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer ) ) { 471 439 return false; … … 482 450 FunctionType *otherFunction = dynamic_cast< FunctionType* >( type2 ); 483 451 if ( otherFunction && functionType->get_isVarArgs() == otherFunction->get_isVarArgs() ) { 484 452 485 453 if ( unifyDeclList( functionType->get_parameters().begin(), functionType->get_parameters().end(), otherFunction->get_parameters().begin(), otherFunction->get_parameters().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) { 486 454 -
src/SymTab/IdTable.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 17:04:02 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Wed Oct 07 12:21:13 201513 // Update Count : 7311 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Sun May 17 17:07:43 2015 13 // Update Count : 3 14 14 // 15 15 … … 37 37 for ( InnerTableType::iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) { 38 38 std::stack< DeclEntry >& entry = inner->second; 39 // xxx - should be while?40 39 if ( ! entry.empty() && entry.top().second == scopeLevel ) { 41 40 entry.pop(); … … 53 52 if ( decl->get_linkage() == LinkageSpec::C ) { 54 53 manglename = name; 55 } else if ( LinkageSpec::isOverridable( decl->get_linkage() ) ) {56 // mangle the name without including the appropriate suffix57 // this will make it so that overridable routines are placed58 // into the same "bucket" as their user defined versions.59 manglename = Mangler::mangle( decl, false );60 54 } else { 61 55 manglename = Mangler::mangle( decl ); … … 66 60 67 61 if ( it == declTable.end() ) { 68 // first time this name mangling has been defined69 62 declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) ); 70 63 } else { 71 64 std::stack< DeclEntry >& entry = it->second; 72 65 if ( ! entry.empty() && entry.top().second == scopeLevel ) { 73 // if we're giving the same name mangling to things of 74 // different types then there is something wrong 75 Declaration *old = entry.top().first; 76 assert( (dynamic_cast<ObjectDecl*>( decl ) && dynamic_cast<ObjectDecl*>( old ) ) 77 || (dynamic_cast<FunctionDecl*>( decl ) && dynamic_cast<FunctionDecl*>( old ) ) ); 78 79 if ( LinkageSpec::isOverridable( old->get_linkage() ) ) { 80 // new definition shadows the autogenerated one, even at the same scope 81 declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) ); 82 } else if ( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) { 83 // typesCompatible doesn't really do the right thing here. When checking compatibility of function types, 84 // we should ignore outermost pointer qualifiers, except _Atomic? 66 if ( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) { 85 67 FunctionDecl *newentry = dynamic_cast< FunctionDecl* >( decl ); 86 FunctionDecl *oldentry = dynamic_cast< FunctionDecl* >( old ); 87 if ( newentry && oldentry ) { 88 if ( newentry->get_statements() && oldentry->get_statements() ) { 89 throw SemanticError( "duplicate function definition for 1 ", decl ); 90 } // if 68 FunctionDecl *old = dynamic_cast< FunctionDecl* >( entry.top().first ); 69 if ( newentry && old && newentry->get_statements() && old->get_statements() ) { 70 throw SemanticError( "duplicate function definition for ", decl ); 91 71 } else { 92 // two objects with the same mangled name defined in the same scope.93 // both objects must be marked extern or both must be intrinsic for this to be okay94 // xxx - perhaps it's actually if either is intrinsic then this is okay?95 // might also need to be same storage class?96 72 ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( decl ); 97 ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( old);98 if ( newobj->get_storageClass() != DeclarationNode::Extern && oldobj->get_storageClass() != DeclarationNode::Extern) {99 throw SemanticError( "duplicate definition for 3", decl );73 ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( entry.top().first ); 74 if ( newobj && oldobj && newobj->get_init() && oldobj->get_init() ) { 75 throw SemanticError( "duplicate definition for ", decl ); 100 76 } // if 101 77 } // if … … 104 80 } // if 105 81 } else { 106 // new scope level - shadow existing definition107 82 declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) ); 108 83 } // if 109 84 } // if 110 // this ensures that no two declarations with the same unmangled name both have C linkage85 // ensure the set of routines with C linkage cannot be overloaded 111 86 for ( InnerTableType::iterator i = declTable.begin(); i != declTable.end(); ++i ) { 112 87 if ( ! i->second.empty() && i->second.top().first->get_linkage() == LinkageSpec::C && declTable.size() > 1 ) { -
src/SymTab/Mangler.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 21:40:29 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Wed Aug 19 15:52:24201513 // Update Count : 1911 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Mon Jun 8 15:12:12 2015 13 // Update Count : 8 14 14 // 15 15 … … 30 30 31 31 namespace SymTab { 32 Mangler::Mangler( bool mangleOverridable ) : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ) {32 Mangler::Mangler() : nextVarNum( 0 ), isTopLevel( true ) { 33 33 } 34 34 … … 41 41 nextVarNum = rhs.nextVarNum; 42 42 isTopLevel = rhs.isTopLevel; 43 mangleOverridable = rhs.mangleOverridable;44 43 } 45 44 … … 60 59 mangleName << "__"; 61 60 maybeAccept( declaration->get_type(), *this ); 62 if ( mangleOverridable && LinkageSpec::isOverridable( declaration->get_linkage() ) ) {63 // want to be able to override autogenerated and intrinsic routines,64 // so they need a different name mangling65 if ( declaration->get_linkage() == LinkageSpec::AutoGen ) {66 mangleName << "autogen__";67 } else if ( declaration->get_linkage() == LinkageSpec::Intrinsic ) {68 mangleName << "intrinsic__";69 } else {70 // if we add another kind of overridable function, this has to change71 assert( false );72 } // if73 }74 61 isTopLevel = wasTopLevel; 75 62 } … … 227 214 varNums[ (*i )->get_name() ] = std::pair< int, int >( nextVarNum++, (int )(*i )->get_kind() ); 228 215 for ( std::list< DeclarationWithType* >::iterator assert = (*i )->get_assertions().begin(); assert != (*i )->get_assertions().end(); ++assert ) { 229 Mangler sub_mangler ( mangleOverridable );216 Mangler sub_mangler; 230 217 sub_mangler.nextVarNum = nextVarNum; 231 218 sub_mangler.isTopLevel = false; -
src/SymTab/Mangler.h
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 21:44:03 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Wed Aug 19 15:48:46201513 // Update Count : 1411 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Mon Jun 8 14:47:14 2015 13 // Update Count : 5 14 14 // 15 15 … … 25 25 public: 26 26 template< typename SynTreeClass > 27 static std::string mangle( SynTreeClass *decl , bool mangleOverridable = true); // interface to clients27 static std::string mangle( SynTreeClass *decl ); // interface to clients 28 28 29 29 /// using Visitor::visit; … … 50 50 int nextVarNum; 51 51 bool isTopLevel; 52 bool mangleOverridable;53 52 54 Mangler( bool mangleOverridable);53 Mangler(); 55 54 Mangler( const Mangler & ); 56 55 … … 62 61 63 62 template< typename SynTreeClass > 64 std::string Mangler::mangle( SynTreeClass *decl , bool mangleOverridable) {65 Mangler mangler ( mangleOverridable );63 std::string Mangler::mangle( SynTreeClass *decl ) { 64 Mangler mangler; 66 65 maybeAccept( decl, mangler ); 67 66 return mangler.get_mangleName(); -
src/SymTab/Validate.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 21:50:04 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Fri Nov 20 16:33:52201513 // Update Count : 20111 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Tue Aug 11 16:59:35 2015 13 // Update Count : 196 14 14 // 15 15 … … 54 54 #include "MakeLibCfa.h" 55 55 #include "TypeEquality.h" 56 #include "ResolvExpr/typeops.h"57 56 58 57 #define debugPrint( x ) if ( doDebug ) { std::cout << x; } … … 126 125 }; 127 126 128 class A utogenerateRoutines: public Visitor {127 class AddStructAssignment : public Visitor { 129 128 public: 130 129 /// Generates assignment operators for aggregate types as required 131 static void a utogenerateRoutines( std::list< Declaration * > &translationUnit );130 static void addStructAssignment( std::list< Declaration * > &translationUnit ); 132 131 133 132 std::list< Declaration * > &get_declsToAdd() { return declsToAdd; } … … 152 151 virtual void visit( CatchStmt *catchStmt ); 153 152 154 A utogenerateRoutines() : functionNesting( 0 ) {}153 AddStructAssignment() : functionNesting( 0 ) {} 155 154 private: 156 155 template< typename StmtClass > void visitStatement( StmtClass *stmt ); … … 196 195 acceptAll( translationUnit, pass1 ); 197 196 acceptAll( translationUnit, pass2 ); 198 AutogenerateRoutines::autogenerateRoutines( translationUnit ); 197 // need to collect all of the assignment operators prior to 198 // this point and only generate assignment operators if one doesn't exist 199 AddStructAssignment::addStructAssignment( translationUnit ); 199 200 acceptAll( translationUnit, pass3 ); 200 201 } … … 500 501 static const std::list< std::string > noLabels; 501 502 502 void A utogenerateRoutines::autogenerateRoutines( std::list< Declaration * > &translationUnit ) {503 A utogenerateRoutinesvisitor;503 void AddStructAssignment::addStructAssignment( std::list< Declaration * > &translationUnit ) { 504 AddStructAssignment visitor; 504 505 acceptAndAdd( translationUnit, visitor, false ); 505 506 } … … 703 704 } 704 705 705 void A utogenerateRoutines::visit( EnumDecl *enumDecl ) {706 void AddStructAssignment::visit( EnumDecl *enumDecl ) { 706 707 if ( ! enumDecl->get_members().empty() ) { 707 708 EnumInstType *enumInst = new EnumInstType( Type::Qualifiers(), enumDecl->get_name() ); … … 712 713 } 713 714 714 void A utogenerateRoutines::visit( StructDecl *structDecl ) {715 void AddStructAssignment::visit( StructDecl *structDecl ) { 715 716 if ( ! structDecl->get_members().empty() && structsDone.find( structDecl->get_name() ) == structsDone.end() ) { 716 717 StructInstType *structInst = new StructInstType( Type::Qualifiers(), structDecl->get_name() ); … … 721 722 } 722 723 723 void A utogenerateRoutines::visit( UnionDecl *unionDecl ) {724 void AddStructAssignment::visit( UnionDecl *unionDecl ) { 724 725 if ( ! unionDecl->get_members().empty() ) { 725 726 UnionInstType *unionInst = new UnionInstType( Type::Qualifiers(), unionDecl->get_name() ); … … 729 730 } 730 731 731 void A utogenerateRoutines::visit( TypeDecl *typeDecl ) {732 void AddStructAssignment::visit( TypeDecl *typeDecl ) { 732 733 CompoundStmt *stmts = 0; 733 734 TypeInstType *typeInst = new TypeInstType( Type::Qualifiers(), typeDecl->get_name(), false ); … … 757 758 } 758 759 759 void A utogenerateRoutines::visit( FunctionType *) {760 void AddStructAssignment::visit( FunctionType *) { 760 761 // ensure that we don't add assignment ops for types defined as part of the function 761 762 } 762 763 763 void A utogenerateRoutines::visit( PointerType *) {764 void AddStructAssignment::visit( PointerType *) { 764 765 // ensure that we don't add assignment ops for types defined as part of the pointer 765 766 } 766 767 767 void A utogenerateRoutines::visit( ContextDecl *) {768 void AddStructAssignment::visit( ContextDecl *) { 768 769 // ensure that we don't add assignment ops for types defined as part of the context 769 770 } 770 771 771 772 template< typename StmtClass > 772 inline void A utogenerateRoutines::visitStatement( StmtClass *stmt ) {773 inline void AddStructAssignment::visitStatement( StmtClass *stmt ) { 773 774 std::set< std::string > oldStructs = structsDone; 774 775 addVisit( stmt, *this ); … … 776 777 } 777 778 778 void A utogenerateRoutines::visit( FunctionDecl *functionDecl ) {779 void AddStructAssignment::visit( FunctionDecl *functionDecl ) { 779 780 maybeAccept( functionDecl->get_functionType(), *this ); 780 781 acceptAll( functionDecl->get_oldDecls(), *this ); … … 784 785 } 785 786 786 void A utogenerateRoutines::visit( CompoundStmt *compoundStmt ) {787 void AddStructAssignment::visit( CompoundStmt *compoundStmt ) { 787 788 visitStatement( compoundStmt ); 788 789 } 789 790 790 void A utogenerateRoutines::visit( IfStmt *ifStmt ) {791 void AddStructAssignment::visit( IfStmt *ifStmt ) { 791 792 visitStatement( ifStmt ); 792 793 } 793 794 794 void A utogenerateRoutines::visit( WhileStmt *whileStmt ) {795 void AddStructAssignment::visit( WhileStmt *whileStmt ) { 795 796 visitStatement( whileStmt ); 796 797 } 797 798 798 void A utogenerateRoutines::visit( ForStmt *forStmt ) {799 void AddStructAssignment::visit( ForStmt *forStmt ) { 799 800 visitStatement( forStmt ); 800 801 } 801 802 802 void A utogenerateRoutines::visit( SwitchStmt *switchStmt ) {803 void AddStructAssignment::visit( SwitchStmt *switchStmt ) { 803 804 visitStatement( switchStmt ); 804 805 } 805 806 806 void A utogenerateRoutines::visit( ChooseStmt *switchStmt ) {807 void AddStructAssignment::visit( ChooseStmt *switchStmt ) { 807 808 visitStatement( switchStmt ); 808 809 } 809 810 810 void A utogenerateRoutines::visit( CaseStmt *caseStmt ) {811 void AddStructAssignment::visit( CaseStmt *caseStmt ) { 811 812 visitStatement( caseStmt ); 812 813 } 813 814 814 void A utogenerateRoutines::visit( CatchStmt *cathStmt ) {815 void AddStructAssignment::visit( CatchStmt *cathStmt ) { 815 816 visitStatement( cathStmt ); 816 817 } … … 856 857 Type * t1 = tyDecl->get_base(); 857 858 Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base(); 858 if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer()) ) {859 if ( ! typeEquals( t1, t2, true ) ) { 859 860 throw SemanticError( "cannot redefine typedef: " + tyDecl->get_name() ); 860 861 } -
src/SynTree/Mutator.h
r7e23d0a r02ec390 10 10 // Created On : Mon May 18 07:44:20 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Nov 19 22:26:16201513 // Update Count : 812 // Last Modified On : Thu Jul 23 23:24:18 2015 13 // Update Count : 7 14 14 // 15 15 #include <cassert> … … 103 103 inline TreeType *maybeMutate( TreeType *tree, MutatorType &mutator ) { 104 104 if ( tree ) { 105 TreeType *newnode = dynamic_cast< TreeType 105 TreeType *newnode = dynamic_cast< TreeType* >( tree->acceptMutator( mutator ) ); 106 106 assert( newnode ); 107 107 return newnode; -
src/SynTree/ObjectDecl.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Mon May 18 07:44:20 2015 11 // Last Modified By : Rob Schluntz12 // Last Modified On : Tue Sep 29 14:13:01201513 // Update Count : 1 811 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Mon Jul 13 18:08:27 2015 13 // Update Count : 16 14 14 // 15 15 … … 52 52 get_type()->print( os, indent ); 53 53 } else { 54 os << " 54 os << "untyped entity "; 55 55 } // if 56 56 57 57 if ( init ) { 58 os << " 58 os << "with initializer "; 59 59 init->print( os, indent ); 60 60 } // if 61 61 62 62 if ( bitfieldWidth ) { 63 os << " 63 os << "with bitfield width "; 64 64 bitfieldWidth->print( os ); 65 65 } // if -
src/SynTree/Type.h
r7e23d0a r02ec390 10 10 // Created On : Mon May 18 07:44:20 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Fri Nov 20 12:54:09201513 // Update Count : 1 512 // Last Modified On : Thu Jul 9 16:46:15 2015 13 // Update Count : 14 14 14 // 15 15 … … 201 201 std::list<DeclarationWithType*> parameters; 202 202 203 // Does the function accept a variable number of arguments following the arguments specified in the parameters list.204 // This could be because of203 // does the function accept a variable number of arguments following the arguments 204 // specified in the parameters list. This could be because of 205 205 // - an ellipsis in a prototype declaration 206 206 // - an unprototyped declaration … … 239 239 240 240 /// Accesses generic parameters of base struct (NULL if none such) 241 std::list<TypeDecl*> 241 std::list<TypeDecl*>* get_baseParameters(); 242 242 243 243 /// Looks up the members of this struct named "name" and places them into "foundDecls". … … 266 266 267 267 /// Accesses generic parameters of base union (NULL if none such) 268 std::list<TypeDecl*> 268 std::list<TypeDecl*>* get_baseParameters(); 269 269 270 270 /// looks up the members of this union named "name" and places them into "foundDecls" -
src/examples/Makefile.am
r7e23d0a r02ec390 11 11 ## Created On : Sun May 31 09:08:15 2015 12 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Fri Nov 20 16:03:46201514 ## Update Count : 2 413 ## Last Modified On : Thu Jun 4 23:13:10 2015 14 ## Update Count : 22 15 15 ############################################################################### 16 16 … … 19 19 CC = @CFA_BINDIR@/cfa 20 20 21 noinst_PROGRAMS = fstream_test vector_test # build but do not install22 fstream_test_SOURCES = iostream.c fstream.c fstream_test.c iterator.c21 noinst_PROGRAMS = fstream_test vector_test 22 fstream_test_SOURCES = iostream.c fstream.c fstream_test.c 23 23 vector_test_SOURCES = vector_int.c fstream.c iostream.c array.c iterator.c vector_test.c -
src/examples/Makefile.in
r7e23d0a r02ec390 49 49 PROGRAMS = $(noinst_PROGRAMS) 50 50 am_fstream_test_OBJECTS = iostream.$(OBJEXT) fstream.$(OBJEXT) \ 51 fstream_test.$(OBJEXT) iterator.$(OBJEXT)51 fstream_test.$(OBJEXT) 52 52 fstream_test_OBJECTS = $(am_fstream_test_OBJECTS) 53 53 fstream_test_LDADD = $(LDADD) … … 176 176 top_builddir = @top_builddir@ 177 177 top_srcdir = @top_srcdir@ 178 fstream_test_SOURCES = iostream.c fstream.c fstream_test.c iterator.c178 fstream_test_SOURCES = iostream.c fstream.c fstream_test.c 179 179 vector_test_SOURCES = vector_int.c fstream.c iostream.c array.c iterator.c vector_test.c 180 180 all: all-am -
src/examples/fstream.c
r7e23d0a r02ec390 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Nov 19 22:43:31201513 // Update Count : 412 // Last Modified On : Wed May 27 18:12:33 2015 13 // Update Count : 2 14 14 // 15 15 … … 30 30 fwrite( data, size, 1, os->file ); 31 31 os->fail = ferror( os->file ); 32 } // if32 } 33 33 return os; 34 } // write34 } 35 35 36 36 int fail( ofstream *os ) { 37 37 return os->fail; 38 } // fail38 } 39 39 40 40 static ofstream *make_ofstream() { … … 42 42 new_stream->fail = 0; 43 43 return new_stream; 44 } // make_ofstream44 } 45 45 46 46 ofstream *ofstream_stdout() { … … 48 48 stdout_stream->file = stdout; 49 49 return stdout_stream; 50 } // ofstream_stdout50 } 51 51 52 52 ofstream *ofstream_stderr() { … … 54 54 stderr_stream->file = stderr; 55 55 return stderr_stream; 56 } // ofstream_stderr56 } 57 57 58 58 ofstream *ofstream_fromfile( const char *name ) { -
src/examples/hello.c
r7e23d0a r02ec390 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Fri Nov 20 16:02:50201513 // Update Count : 312 // Last Modified On : Wed May 27 18:14:58 2015 13 // Update Count : 1 14 14 // 15 15 … … 28 28 // Local Variables: // 29 29 // tab-width: 4 // 30 // compile-command: "cfa hello.c fstream.o iostream.o iterator.o" //30 // compile-command: "cfa hello.c fstream.o iostream.o" // 31 31 // End: // -
src/examples/iostream.c
r7e23d0a r02ec390 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Fri Nov 20 13:19:19201513 // Update Count : 912 // Last Modified On : Wed May 27 18:18:13 2015 13 // Update Count : 2 14 14 // 15 15 … … 17 17 extern "C" { 18 18 #include <stdio.h> 19 #include <string.h> // strlen 19 //#include <string.h> 20 //#include <ctype.h> 21 typedef long unsigned int size_t; 22 size_t strlen(const char *s); 20 23 } 21 24 … … 23 26 ostype * ?<<?( ostype *os, char c ) { 24 27 return write( os, &c, 1 ); 25 } // ?<<?28 } 26 29 27 30 forall( dtype ostype | ostream( ostype ) ) 28 31 ostype * ?<<?( ostype *os, int i ) { 29 char buffer[ 32];// larger than the largest integer32 char buffer[20]; // larger than the largest integer 30 33 sprintf( buffer, "%d", i ); 31 34 return write( os, buffer, strlen( buffer ) ); 32 } // ?<<?35 } 33 36 34 37 forall( dtype ostype | ostream( ostype ) ) 35 38 ostype * ?<<?( ostype *os, double d ) { 36 char buffer[32]; 39 char buffer[32]; // larger than the largest double 37 40 sprintf( buffer, "%g", d ); 38 41 return write( os, buffer, strlen( buffer ) ); 39 } // ?<<?42 } 40 43 41 44 forall( dtype ostype | ostream( ostype ) ) 42 45 ostype * ?<<?( ostype *os, const char *cp ) { 43 46 return write( os, cp, strlen( cp ) ); 44 } // ?<<? 45 46 forall( dtype ostype | ostream( ostype ) ) 47 ostype * ?<<?( ostype *os, const void *p ) { 48 char buffer[32]; // larger than the largest pointer 49 sprintf( buffer, "%p", p ); 50 return write( os, buffer, strlen( buffer ) ); 51 } // ?<<? 52 53 forall( type elt_type | writeable( elt_type ), 54 type iterator_type | iterator( iterator_type, elt_type ), 55 dtype os_type | ostream( os_type ) ) 56 void write( iterator_type begin, iterator_type end, os_type *os ) { 57 void print( elt_type i ) { 58 os << i << ' '; 59 } 60 for_each( begin, end, print ); 61 } // ?<<? 62 63 forall( type elt_type | writeable( elt_type ), 64 type iterator_type | iterator( iterator_type, elt_type ), 65 dtype os_type | ostream( os_type ) ) 66 void write_reverse( iterator_type begin, iterator_type end, os_type *os ) { 67 void print( elt_type i ) { 68 os << i << ' '; 69 } 70 for_each_reverse( begin, end, print ); 71 } // ?<<? 72 47 } 73 48 74 49 forall( dtype istype | istream( istype ) ) 75 50 istype * ?>>?( istype *is, char *cp ) { 76 51 return read( is, cp, 1 ); 77 } // ?>>?52 } 78 53 79 54 forall( dtype istype | istream( istype ) ) … … 97 72 unread( is, cur ); 98 73 return is; 99 } // ?>>?74 } 100 75 101 76 // Local Variables: // -
src/examples/iostream.h
r7e23d0a r02ec390 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Nov 19 17:56:51201513 // Update Count : 512 // Last Modified On : Wed May 27 18:18:46 2015 13 // Update Count : 1 14 14 // 15 15 16 16 #ifndef IOSTREAM_H 17 17 #define IOSTREAM_H 18 19 #include "iterator.h"20 18 21 19 typedef unsigned long streamsize_type; … … 36 34 forall( dtype ostype | ostream( ostype ) ) ostype * ?<<?( ostype *, double ); 37 35 forall( dtype ostype | ostream( ostype ) ) ostype * ?<<?( ostype *, const char * ); 38 forall( dtype ostype | ostream( ostype ) ) ostype * ?<<?( ostype *, void * );39 40 // writes the range [begin, end) to the given stream41 forall( type elt_type | writeable( elt_type ),42 type iterator_type | iterator( iterator_type, elt_type ),43 dtype os_type | ostream( os_type ) )44 void write( iterator_type begin, iterator_type end, os_type *os );45 46 forall( type elt_type | writeable( elt_type ),47 type iterator_type | iterator( iterator_type, elt_type ),48 dtype os_type | ostream( os_type ) )49 void write_reverse( iterator_type begin, iterator_type end, os_type *os );50 36 51 37 -
src/examples/iterator.c
r7e23d0a r02ec390 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Nov 19 17:54:37201513 // Update Count : 2412 // Last Modified On : Wed May 27 18:41:41 2015 13 // Update Count : 3 14 14 // 15 15 16 16 #include "iterator.h" 17 17 18 forall( type iterator_type, type elt_type | iterator( iterator_type, elt_type ) ) 19 void for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) { 20 for ( iterator_type i = begin; i != end; ++i ) { 21 func( *i ); 18 /// forall( type iterator_type, type elt_type | iterator( iterator_type, elt_type ) ) 19 /// void 20 /// for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) 21 /// { 22 /// iterator_type i; 23 /// for ( i = begin; i != end; ++i ) { 24 /// func( *i ); 25 /// } 26 /// } 27 28 forall( type elt_type | writeable( elt_type ), 29 type iterator_type | iterator( iterator_type, elt_type ), 30 dtype os_type | ostream( os_type ) ) 31 void write_all( iterator_type begin, iterator_type end, os_type *os ) { 32 iterator_type i; 33 for ( i = begin; i != end; ++i ) { 34 os << *i << ' '; 22 35 } 23 36 } 24 37 25 forall( type iterator_type, type elt_type | iterator( iterator_type, elt_type ) ) 26 void for_each_reverse( iterator_type begin, iterator_type end, void (*func)( elt_type ) ) { 27 for ( iterator_type i = end; i != begin; ) { 38 forall( type elt_type | writeable( elt_type ), 39 type iterator_type | iterator( iterator_type, elt_type ), 40 dtype os_type | ostream( os_type ) ) 41 void write_reverse( iterator_type begin, iterator_type end, os_type *os ) { 42 iterator_type i; // "= end;" does not work 43 i = end; 44 do { 28 45 --i; 29 func( *i );30 } 46 os << *i << ' '; 47 } while ( i != begin ); 31 48 } 32 49 -
src/examples/iterator.h
r7e23d0a r02ec390 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Nov 19 17:58:28201513 // Update Count : 612 // Last Modified On : Wed May 27 18:41:57 2015 13 // Update Count : 3 14 14 // 15 15 16 16 #ifndef ITERATOR_H 17 17 #define ITERATOR_H 18 19 #include "iostream.h" 18 20 19 21 // An iterator can be used to traverse a data structure. … … 32 34 }; 33 35 34 context iterator_for ( type iterator_type, type collection_type, type elt_type | iterator( iterator_type, elt_type ) ) {36 context iterator_for ( type iterator_type, type collection_type, type elt_type | iterator( iterator_type, elt_type ) ) { 35 37 // [ iterator_type begin, iterator_type end ] get_iterators( collection_type ); 36 38 iterator_type begin( collection_type ); … … 41 43 void for_each( iterator_type begin, iterator_type end, void (*func)( elt_type ) ); 42 44 43 forall( type iterator_type, type elt_type | iterator( iterator_type, elt_type ) ) 44 void for_each_reverse( iterator_type begin, iterator_type end, void (*func)( elt_type ) ); 45 // writes the range [begin, end) to the given stream 46 forall( type elt_type | writeable( elt_type ), 47 type iterator_type | iterator( iterator_type, elt_type ), 48 dtype os_type | ostream( os_type ) ) 49 void write_all( iterator_type begin, iterator_type end, os_type *os ); 50 51 forall( type elt_type | writeable( elt_type ), 52 type iterator_type | iterator( iterator_type, elt_type ), 53 dtype os_type | ostream( os_type ) ) 54 void write_reverse( iterator_type begin, iterator_type end, os_type *os ); 45 55 46 56 #endif // ITERATOR_H -
src/examples/vector_test.c
r7e23d0a r02ec390 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Nov 19 17:54:34201513 // Update Count : 912 // Last Modified On : Wed May 27 18:42:55 2015 13 // Update Count : 2 14 14 // 15 15 … … 29 29 sout << "enter N elements and C-d on a separate line:\n"; 30 30 for ( ;; ) { 31 31 sin >> # 32 32 if ( fail( sin ) || eof( sin ) ) break; 33 33 append( &vec, num ); 34 34 } 35 35 // write out the numbers 36 36 37 37 sout << "Array elements:\n"; 38 write( begin( vec ), end( vec ), sout ); 38 // write_all( begin( vec ), end( vec ), sout ); 39 // sout << "\n"; 40 for ( int index = 0; index <= last( vec ); index += 1 ) { 41 sout << vec[ index ] << " "; 42 } 39 43 sout << "\n"; 40 44 #if 1 41 45 sout << "Array elements reversed:\n"; 42 46 write_reverse( begin( vec ), end( vec ), sout ); 43 47 sout << "\n"; 48 #endif 44 49 } 50 51 // ../bin/cfa vector_test.c fstream.o iostream.o vector_int.o iterator.o array.o 45 52 46 53 // Local Variables: // -
src/libcfa/prelude.cf
r7e23d0a r02ec390 7 7 // Author : Glen Ditchfield 8 8 // Created On : Sat Nov 29 07:23:41 2014 9 // Last Modified By : Rob Schluntz10 // Last Modified On : T hu Nov 19 11:09:47 201511 // Update Count : 7 69 // Last Modified By : Peter A. Buhr 10 // Last Modified On : Tue Jun 9 14:43:47 2015 11 // Update Count : 75 12 12 // 13 13 -
src/main.cc
r7e23d0a r02ec390 9 9 // Author : Richard C. Bilson 10 10 // Created On : Fri May 15 23:12:02 2015 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Thu Nov 19 22:31:40201513 // Update Count : 16 811 // Last Modified By : Rob Schluntz 12 // Last Modified On : Thu Jul 30 16:08:18 2015 13 // Update Count : 167 14 14 // 15 15 … … 227 227 } // if 228 228 229 // add the assignment statement after the initialization of a type parameter 229 // add the assignment statement after the 230 // initialization of a type parameter 230 231 OPTPRINT( "validate" ) 231 232 SymTab::validate( translationUnit, symtabp );
Note:
See TracChangeset
for help on using the changeset viewer.
