Changeset 413ad05
- Timestamp:
- Aug 28, 2016, 11:05:45 PM (8 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- 6943a987
- Parents:
- 3f1e68f
- Location:
- src/Parser
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Parser/DeclarationNode.cc
r3f1e68f r413ad05 10 10 // Created On : Sat May 16 12:34:05 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Aug 25 20:42:25201613 // Update Count : 2 3212 // Last Modified On : Sun Aug 28 22:12:44 2016 13 // Update Count : 278 14 14 // 15 15 … … 375 375 } 376 376 377 void DeclarationNode::checkQualifiers( TypeData *src,TypeData *dst ) {377 void DeclarationNode::checkQualifiers( const TypeData *src, const TypeData *dst ) { 378 378 TypeData::Qualifiers qsrc = src->qualifiers, qdst = dst->qualifiers; 379 379 … … 801 801 DeclarationNode *DeclarationNode::extractAggregate() const { 802 802 if ( type ) { 803 TypeData *ret = type ->extractAggregate();803 TypeData *ret = typeextractAggregate( type ); 804 804 if ( ret ) { 805 805 DeclarationNode *newnode = new DeclarationNode; … … 896 896 if ( ! error.empty() ) throw SemanticError( error, this ); 897 897 if ( type ) { 898 return type->buildDecl(name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );898 return buildDecl( type, name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension ); 899 899 } // if 900 900 if ( ! isInline && ! isNoreturn ) { … … 909 909 switch ( type->kind ) { 910 910 case TypeData::Enum: 911 return new EnumInstType( type->buildQualifiers(), type->enumeration->name );911 return new EnumInstType( buildQualifiers( type ), type->enumeration->name ); 912 912 case TypeData::Aggregate: { 913 913 ReferenceToType *ret; 914 914 switch ( type->aggregate->kind ) { 915 915 case DeclarationNode::Struct: 916 ret = new StructInstType( type->buildQualifiers(), type->aggregate->name );916 ret = new StructInstType( buildQualifiers( type ), type->aggregate->name ); 917 917 break; 918 918 case DeclarationNode::Union: 919 ret = new UnionInstType( type->buildQualifiers(), type->aggregate->name );919 ret = new UnionInstType( buildQualifiers( type ), type->aggregate->name ); 920 920 break; 921 921 case DeclarationNode::Trait: 922 ret = new TraitInstType( type->buildQualifiers(), type->aggregate->name );922 ret = new TraitInstType( buildQualifiers( type ), type->aggregate->name ); 923 923 break; 924 924 default: … … 929 929 } 930 930 case TypeData::Symbolic: { 931 TypeInstType *ret = new TypeInstType( type->buildQualifiers(), type->symbolic->name, false );931 TypeInstType *ret = new TypeInstType( buildQualifiers( type ), type->symbolic->name, false ); 932 932 buildList( type->symbolic->actuals, ret->get_parameters() ); 933 933 return ret; 934 934 } 935 935 default: 936 return type ->build();936 return typebuild( type ); 937 937 } // switch 938 938 } -
src/Parser/ParseNode.h
r3f1e68f r413ad05 10 10 // Created On : Sat May 16 13:28:16 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Aug 25 22:46:24201613 // Update Count : 5 6412 // Last Modified On : Sun Aug 28 21:14:51 2016 13 // Update Count : 575 14 14 // 15 15 … … 243 243 244 244 DeclarationNode *addQualifiers( DeclarationNode *); 245 void checkQualifiers( TypeData *,TypeData * );245 void checkQualifiers( const TypeData *, const TypeData * ); 246 246 DeclarationNode *copyStorageClasses( DeclarationNode *); 247 247 DeclarationNode *addType( DeclarationNode *); … … 308 308 309 309 Type *buildType( TypeData *type ); 310 //Type::Qualifiers buildQualifiers( const TypeData::Qualifiers & qualifiers ); 310 311 311 312 static inline Type * maybeMoveBuildType( const DeclarationNode *orig ) { -
src/Parser/TypeData.cc
r3f1e68f r413ad05 10 10 // Created On : Sat May 16 15:12:51 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Wed Aug 24 13:46:55201613 // Update Count : 6912 // Last Modified On : Sun Aug 28 18:28:58 2016 13 // Update Count : 223 14 14 // 15 15 … … 94 94 break; 95 95 } // switch 96 } 96 } // TypeData::TypeData 97 97 98 98 TypeData::~TypeData() { … … 163 163 break; 164 164 } // switch 165 } 166 167 TypeData * TypeData::clone() const {168 TypeData * newtype = new TypeData( kind );165 } // TypeData::~TypeData 166 167 TypeData * TypeData::clone() const { 168 TypeData * newtype = new TypeData( kind ); 169 169 newtype->qualifiers = qualifiers; 170 170 newtype->base = maybeClone( base ); … … 238 238 } // switch 239 239 return newtype; 240 } 240 } // TypeData::clone 241 241 242 242 void TypeData::print( std::ostream &os, int indent ) const { … … 418 418 assert( false ); 419 419 } // switch 420 } 421 422 TypeData *TypeData::extractAggregate( bool toplevel ) const { 423 TypeData *ret = 0; 424 425 switch ( kind ) { 426 case Aggregate: 427 if ( ! toplevel && aggregate->fields ) { 428 ret = clone(); 429 // ret->qualifiers.reset(); 430 } // if 431 break; 432 case Enum: 433 if ( ! toplevel && enumeration->constants ) { 434 ret = clone(); 435 // ret->qualifiers.reset(); 436 } // if 437 break; 438 case AggregateInst: 439 if ( aggInst->aggregate ) { 440 ret = aggInst->aggregate->extractAggregate( false ); 441 } // if 442 break; 443 default: 444 if ( base ) { 445 ret = base->extractAggregate( false ); 446 } // if 447 } // switch 448 return ret; 449 } 450 451 void buildForall( const DeclarationNode *firstNode, std::list< TypeDecl* > &outputList ) { 420 } // TypeData::print 421 422 void buildForall( const DeclarationNode * firstNode, std::list< TypeDecl* > &outputList ) { 452 423 buildList( firstNode, outputList ); 453 424 for ( std::list< TypeDecl* >::iterator i = outputList.begin(); i != outputList.end(); ++i ) { … … 455 426 // add assertion parameters to `type' tyvars in reverse order 456 427 // add dtor: void ^?{}(T *) 457 FunctionType * dtorType = new FunctionType( Type::Qualifiers(), false );428 FunctionType * dtorType = new FunctionType( Type::Qualifiers(), false ); 458 429 dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); 459 430 (*i)->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, 0, false, false ) ); 460 431 461 432 // add copy ctor: void ?{}(T *, T) 462 FunctionType * copyCtorType = new FunctionType( Type::Qualifiers(), false );433 FunctionType * copyCtorType = new FunctionType( Type::Qualifiers(), false ); 463 434 copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); 464 435 copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) ); … … 466 437 467 438 // add default ctor: void ?{}(T *) 468 FunctionType * ctorType = new FunctionType( Type::Qualifiers(), false );439 FunctionType * ctorType = new FunctionType( Type::Qualifiers(), false ); 469 440 ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); 470 441 (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, 0, false, false ) ); 471 442 472 443 // add assignment operator: T * ?=?(T *, T) 473 FunctionType * assignType = new FunctionType( Type::Qualifiers(), false );444 FunctionType * assignType = new FunctionType( Type::Qualifiers(), false ); 474 445 assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); 475 446 assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) ); … … 480 451 } 481 452 482 Declaration *TypeData::buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer *init ) const { 483 if ( kind == TypeData::Function ) { 484 FunctionDecl *decl; 485 if ( function->hasBody ) { 486 if ( function->body ) { 487 Statement *stmt = function->body->build(); 488 CompoundStmt *body = dynamic_cast< CompoundStmt* >( stmt ); 489 assert( body ); 490 decl = new FunctionDecl( name, sc, linkage, buildFunction(), body, isInline, isNoreturn ); 491 } else { 492 // std::list< Label > ls; 493 decl = new FunctionDecl( name, sc, linkage, buildFunction(), new CompoundStmt( std::list< Label >() ), isInline, isNoreturn ); 494 } // if 495 } else { 496 decl = new FunctionDecl( name, sc, linkage, buildFunction(), 0, isInline, isNoreturn ); 497 } // if 498 for ( DeclarationNode *cur = function->idList; cur != 0; cur = dynamic_cast< DeclarationNode* >( cur->get_next() ) ) { 499 if ( cur->get_name() != "" ) { 500 decl->get_oldIdents().insert( decl->get_oldIdents().end(), cur->get_name() ); 501 } // if 502 } // for 503 buildList( function->oldDeclList, decl->get_oldDecls() ); 504 return decl; 505 } else if ( kind == TypeData::Aggregate ) { 506 return buildAggregate(); 507 } else if ( kind == TypeData::Enum ) { 508 return buildEnum(); 509 } else if ( kind == TypeData::Symbolic ) { 510 return buildSymbolic( name, sc ); 511 } else if ( kind == TypeData::Variable ) { 512 return buildVariable(); 513 } else { 514 return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init, std::list< Attribute * >(), isInline, isNoreturn ); 515 } // if 516 return 0; 517 } 518 519 Type *TypeData::build() const { 520 switch ( kind ) { 521 case Unknown: 453 Type * typebuild( const TypeData * td ) { 454 assert( td ); 455 switch ( td->kind ) { 456 case TypeData::Unknown: 522 457 // fill in implicit int 523 return new BasicType( buildQualifiers( ), BasicType::SignedInt );524 case Basic:525 return buildBasicType( );526 case Pointer:527 return buildPointer( );528 case Array:529 return buildArray( );530 case Function:531 return buildFunction( );532 case AggregateInst:533 return buildAggInst( );534 case EnumConstant:458 return new BasicType( buildQualifiers( td ), BasicType::SignedInt ); 459 case TypeData::Basic: 460 return buildBasicType( td ); 461 case TypeData::Pointer: 462 return buildPointer( td ); 463 case TypeData::Array: 464 return buildArray( td ); 465 case TypeData::Function: 466 return buildFunction( td ); 467 case TypeData::AggregateInst: 468 return buildAggInst( td ); 469 case TypeData::EnumConstant: 535 470 // the name gets filled in later -- by SymTab::Validate 536 return new EnumInstType( buildQualifiers( ), "" );537 case SymbolicInst:538 return buildSymbolicInst( );;539 case T uple:540 return buildTuple( );541 case Type of:542 return buildTypeof( );543 case Builtin:544 return new VarArgsType( buildQualifiers( ) );545 case Attr:546 return buildAttr( );547 case Symbolic:548 case Enum:549 case Aggregate:550 case Variable:471 return new EnumInstType( buildQualifiers( td ), "" ); 472 case TypeData::SymbolicInst: 473 return buildSymbolicInst( td );; 474 case TypeData::Tuple: 475 return buildTuple( td ); 476 case TypeData::Typeof: 477 return buildTypeof( td ); 478 case TypeData::Builtin: 479 return new VarArgsType( buildQualifiers( td ) ); 480 case TypeData::Attr: 481 return buildAttr( td ); 482 case TypeData::Symbolic: 483 case TypeData::Enum: 484 case TypeData::Aggregate: 485 case TypeData::Variable: 551 486 assert( false ); 552 487 } // switch 553 488 return 0; 554 } 555 556 Type::Qualifiers TypeData::buildQualifiers() const { 489 } // typebuild 490 491 TypeData * typeextractAggregate( const TypeData * td, bool toplevel ) { 492 TypeData * ret = 0; 493 494 switch ( td->kind ) { 495 case TypeData::Aggregate: 496 if ( ! toplevel && td->aggregate->fields ) { 497 ret = td->clone(); 498 } // if 499 break; 500 case TypeData::Enum: 501 if ( ! toplevel && td->enumeration->constants ) { 502 ret = td->clone(); 503 } // if 504 break; 505 case TypeData::AggregateInst: 506 if ( td->aggInst->aggregate ) { 507 ret = typeextractAggregate( td->aggInst->aggregate, false ); 508 } // if 509 break; 510 default: 511 if ( td->base ) { 512 ret = typeextractAggregate( td->base, false ); 513 } // if 514 } // switch 515 return ret; 516 } // typeextractAggregate 517 518 Type::Qualifiers buildQualifiers( const TypeData * td ) { 557 519 Type::Qualifiers q; 558 q.isConst = qualifiers[ DeclarationNode::Const ];559 q.isVolatile = qualifiers[ DeclarationNode::Volatile ];560 q.isRestrict = qualifiers[ DeclarationNode::Restrict ];561 q.isLvalue = qualifiers[ DeclarationNode::Lvalue ];562 q.isAtomic = qualifiers[ DeclarationNode::Atomic ];;520 q.isConst = td->qualifiers[ DeclarationNode::Const ]; 521 q.isVolatile = td->qualifiers[ DeclarationNode::Volatile ]; 522 q.isRestrict = td->qualifiers[ DeclarationNode::Restrict ]; 523 q.isLvalue = td->qualifiers[ DeclarationNode::Lvalue ]; 524 q.isAtomic = td->qualifiers[ DeclarationNode::Atomic ];; 563 525 return q; 564 } 565 566 Type * TypeData::buildBasicType() const{526 } // buildQualifiers 527 528 Type * buildBasicType( const TypeData * td ) { 567 529 static const BasicType::Kind kindMap[] = { BasicType::Char, BasicType::SignedInt, BasicType::Float, BasicType::Double, 568 530 BasicType::Char /* void */, BasicType::Bool, BasicType::DoubleComplex, … … 573 535 BasicType::Kind ret; 574 536 575 for ( std::list< DeclarationNode::BasicType >::const_iterator i = basic->typeSpec.begin(); i !=basic->typeSpec.end(); ++i ) {537 for ( std::list< DeclarationNode::BasicType >::const_iterator i = td->basic->typeSpec.begin(); i != td->basic->typeSpec.end(); ++i ) { 576 538 if ( ! init ) { 577 539 init = true; 578 540 if ( *i == DeclarationNode::Void ) { 579 if ( basic->typeSpec.size() != 1 || !basic->modifiers.empty() ) {580 throw SemanticError( "invalid type specifier \"void\" in type: ", t his);541 if ( td->basic->typeSpec.size() != 1 || ! td->basic->modifiers.empty() ) { 542 throw SemanticError( "invalid type specifier \"void\" in type: ", td ); 581 543 } else { 582 return new VoidType( buildQualifiers( ) );544 return new VoidType( buildQualifiers( td ) ); 583 545 } // if 584 546 } else { … … 589 551 case DeclarationNode::Float: 590 552 if ( sawDouble ) { 591 throw SemanticError( "invalid type specifier \"float\" in type: ", t his);553 throw SemanticError( "invalid type specifier \"float\" in type: ", td ); 592 554 } else { 593 555 switch ( ret ) { … … 599 561 break; 600 562 default: 601 throw SemanticError( "invalid type specifier \"float\" in type: ", t his);563 throw SemanticError( "invalid type specifier \"float\" in type: ", td ); 602 564 } // switch 603 565 } // if … … 605 567 case DeclarationNode::Double: 606 568 if ( sawDouble ) { 607 throw SemanticError( "duplicate type specifier \"double\" in type: ", t his);569 throw SemanticError( "duplicate type specifier \"double\" in type: ", td ); 608 570 } else { 609 571 switch ( ret ) { … … 612 574 break; 613 575 default: 614 throw SemanticError( "invalid type specifier \"double\" in type: ", t his);576 throw SemanticError( "invalid type specifier \"double\" in type: ", td ); 615 577 } // switch 616 578 } // if … … 625 587 break; 626 588 default: 627 throw SemanticError( "invalid type specifier \"_Complex\" in type: ", t his);589 throw SemanticError( "invalid type specifier \"_Complex\" in type: ", td ); 628 590 } // switch 629 591 break; … … 637 599 break; 638 600 default: 639 throw SemanticError( "invalid type specifier \"_Imaginary\" in type: ", t his);601 throw SemanticError( "invalid type specifier \"_Imaginary\" in type: ", td ); 640 602 } // switch 641 603 break; 642 604 default: 643 throw SemanticError( std::string( "invalid type specifier \"" ) + DeclarationNode::basicTypeName[ *i ] + "\" in type: ", t his);605 throw SemanticError( std::string( "invalid type specifier \"" ) + DeclarationNode::basicTypeName[ *i ] + "\" in type: ", td ); 644 606 } // switch 645 607 } // if … … 649 611 } // for 650 612 651 for ( std::list< DeclarationNode::Modifier >::const_iterator i = basic->modifiers.begin(); i !=basic->modifiers.end(); ++i ) {613 for ( std::list< DeclarationNode::Modifier >::const_iterator i = td->basic->modifiers.begin(); i != td->basic->modifiers.end(); ++i ) { 652 614 switch ( *i ) { 653 615 case DeclarationNode::Long: … … 679 641 break; 680 642 default: 681 throw SemanticError( "invalid type modifier \"long\" in type: ", t his);643 throw SemanticError( "invalid type modifier \"long\" in type: ", td ); 682 644 } // switch 683 645 } // if … … 696 658 break; 697 659 default: 698 throw SemanticError( "invalid type modifier \"short\" in type: ", t his);660 throw SemanticError( "invalid type modifier \"short\" in type: ", td ); 699 661 } // switch 700 662 } // if … … 705 667 ret = BasicType::SignedInt; 706 668 } else if ( sawSigned ) { 707 throw SemanticError( "duplicate type modifer \"signed\" in type: ", t his);669 throw SemanticError( "duplicate type modifer \"signed\" in type: ", td ); 708 670 } else { 709 671 switch ( ret ) { … … 721 683 break; 722 684 default: 723 throw SemanticError( "invalid type modifer \"signed\" in type: ", t his);685 throw SemanticError( "invalid type modifer \"signed\" in type: ", td ); 724 686 } // switch 725 687 } // if … … 730 692 ret = BasicType::UnsignedInt; 731 693 } else if ( sawSigned ) { 732 throw SemanticError( "invalid type modifer \"unsigned\" in type: ", t his);694 throw SemanticError( "invalid type modifer \"unsigned\" in type: ", td ); 733 695 } else { 734 696 switch ( ret ) { … … 749 711 break; 750 712 default: 751 throw SemanticError( "invalid type modifer \"unsigned\" in type: ", t his);713 throw SemanticError( "invalid type modifer \"unsigned\" in type: ", td ); 752 714 } // switch 753 715 } // if … … 760 722 } // for 761 723 762 BasicType * bt;724 BasicType * bt; 763 725 if ( ! init ) { 764 bt = new BasicType( buildQualifiers( ), BasicType::SignedInt );726 bt = new BasicType( buildQualifiers( td ), BasicType::SignedInt ); 765 727 } else { 766 bt = new BasicType( buildQualifiers( ), ret );728 bt = new BasicType( buildQualifiers( td ), ret ); 767 729 } // if 768 buildForall( forall, bt->get_forall() );730 buildForall( td->forall, bt->get_forall() ); 769 731 return bt; 770 } 771 772 773 PointerType *TypeData::buildPointer() const { 774 PointerType *pt; 775 if ( base ) { 776 pt = new PointerType( buildQualifiers(), base->build() ); 732 } // buildBasicType 733 734 PointerType * buildPointer( const TypeData * td ) { 735 PointerType * pt; 736 if ( td->base ) { 737 pt = new PointerType( buildQualifiers( td ), typebuild( td->base ) ); 777 738 } else { 778 pt = new PointerType( buildQualifiers( ), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) );739 pt = new PointerType( buildQualifiers( td ), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ); 779 740 } // if 780 buildForall( forall, pt->get_forall() );741 buildForall( td->forall, pt->get_forall() ); 781 742 return pt; 782 } 783 784 ArrayType * TypeData::buildArray() const{785 ArrayType * at;786 if ( base ) {787 at = new ArrayType( buildQualifiers( ), base->build(), maybeBuild< Expression >(array->dimension ),788 array->isVarLen,array->isStatic );743 } // buildPointer 744 745 ArrayType * buildArray( const TypeData * td ) { 746 ArrayType * at; 747 if ( td->base ) { 748 at = new ArrayType( buildQualifiers( td ), typebuild( td->base ), maybeBuild< Expression >( td->array->dimension ), 749 td->array->isVarLen, td->array->isStatic ); 789 750 } else { 790 at = new ArrayType( buildQualifiers( ), new BasicType( Type::Qualifiers(), BasicType::SignedInt ),791 maybeBuild< Expression >( array->dimension ), array->isVarLen,array->isStatic );751 at = new ArrayType( buildQualifiers( td ), new BasicType( Type::Qualifiers(), BasicType::SignedInt ), 752 maybeBuild< Expression >( td->array->dimension ), td->array->isVarLen, td->array->isStatic ); 792 753 } // if 793 buildForall( forall, at->get_forall() );754 buildForall( td->forall, at->get_forall() ); 794 755 return at; 795 } 796 797 FunctionType *TypeData::buildFunction() const { 798 assert( kind == Function ); 799 bool hasEllipsis = function->params ? function->params->get_hasEllipsis() : true; 800 if ( ! function->params ) hasEllipsis = ! function->newStyle; 801 FunctionType *ft = new FunctionType( buildQualifiers(), hasEllipsis ); 802 buildList( function->params, ft->get_parameters() ); 803 buildForall( forall, ft->get_forall() ); 804 if ( base ) { 805 switch ( base->kind ) { 806 case Tuple: 807 buildList( base->tuple->members, ft->get_returnVals() ); 756 } // buildPointer 757 758 AggregateDecl * buildAggregate( const TypeData * td ) { 759 assert( td->kind == TypeData::Aggregate ); 760 AggregateDecl * at; 761 switch ( td->aggregate->kind ) { 762 case DeclarationNode::Struct: 763 at = new StructDecl( td->aggregate->name ); 764 buildForall( td->aggregate->params, at->get_parameters() ); 765 break; 766 case DeclarationNode::Union: 767 at = new UnionDecl( td->aggregate->name ); 768 buildForall( td->aggregate->params, at->get_parameters() ); 769 break; 770 case DeclarationNode::Trait: 771 at = new TraitDecl( td->aggregate->name ); 772 buildList( td->aggregate->params, at->get_parameters() ); 773 break; 774 default: 775 assert( false ); 776 } // switch 777 778 buildList( td->aggregate->fields, at->get_members() ); 779 at->set_body( td->aggregate->body ); 780 781 return at; 782 } // buildAggregate 783 784 ReferenceToType * buildAggInst( const TypeData * td ) { 785 assert( td->kind == TypeData::AggregateInst ); 786 787 ReferenceToType * ret; 788 if ( td->aggInst->aggregate->kind == TypeData::Enum ) { 789 ret = new EnumInstType( buildQualifiers( td ), td->aggInst->aggregate->enumeration->name ); 790 } else { 791 assert( td->aggInst->aggregate->kind == TypeData::Aggregate ); 792 switch ( td->aggInst->aggregate->aggregate->kind ) { 793 case DeclarationNode::Struct: 794 ret = new StructInstType( buildQualifiers( td ), td->aggInst->aggregate->aggregate->name ); 795 break; 796 case DeclarationNode::Union: 797 ret = new UnionInstType( buildQualifiers( td ), td->aggInst->aggregate->aggregate->name ); 798 break; 799 case DeclarationNode::Trait: 800 ret = new TraitInstType( buildQualifiers( td ), td->aggInst->aggregate->aggregate->name ); 808 801 break; 809 802 default: 810 ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( base->buildDecl( "", DeclarationNode::NoStorageClass, 0, false, false, LinkageSpec::Cforall ) ) ); 803 assert( false ); 804 } // switch 805 } // if 806 buildList( td->aggInst->params, ret->get_parameters() ); 807 buildForall( td->forall, ret->get_forall() ); 808 return ret; 809 } // buildAggInst 810 811 NamedTypeDecl * buildSymbolic( const TypeData * td, const std::string & name, DeclarationNode::StorageClass sc ) { 812 assert( td->kind == TypeData::Symbolic ); 813 NamedTypeDecl * ret; 814 assert( td->base ); 815 if ( td->symbolic->isTypedef ) { 816 ret = new TypedefDecl( name, sc, typebuild( td->base ) ); 817 } else { 818 ret = new TypeDecl( name, sc, typebuild( td->base ), TypeDecl::Any ); 819 } // if 820 buildList( td->symbolic->params, ret->get_parameters() ); 821 buildList( td->symbolic->assertions, ret->get_assertions() ); 822 return ret; 823 } // buildSymbolic 824 825 TypeDecl * buildVariable( const TypeData * td ) { 826 assert( td->kind == TypeData::Variable ); 827 static const TypeDecl::Kind kindMap[] = { TypeDecl::Any, TypeDecl::Ftype, TypeDecl::Dtype }; 828 829 TypeDecl * ret = new TypeDecl( td->variable->name, DeclarationNode::NoStorageClass, 0, kindMap[ td->variable->tyClass ] ); 830 buildList( td->variable->assertions, ret->get_assertions() ); 831 return ret; 832 } // buildSymbolic 833 834 EnumDecl * buildEnum( const TypeData * td ) { 835 assert( td->kind == TypeData::Enum ); 836 EnumDecl * ret = new EnumDecl( td->enumeration->name ); 837 buildList( td->enumeration->constants, ret->get_members() ); 838 std::list< Declaration * >::iterator members = ret->get_members().begin(); 839 for ( const DeclarationNode * cur = td->enumeration-> constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) { 840 if ( cur->has_enumeratorValue() ) { 841 ObjectDecl * member = dynamic_cast< ObjectDecl * >(* members); 842 member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), std::list< Expression * >() ) ); 843 } // if 844 } // for 845 return ret; 846 } // buildEnum 847 848 TypeInstType * buildSymbolicInst( const TypeData * td ) { 849 assert( td->kind == TypeData::SymbolicInst ); 850 TypeInstType * ret = new TypeInstType( buildQualifiers( td ), td->symbolic->name, false ); 851 buildList( td->symbolic->actuals, ret->get_parameters() ); 852 buildForall( td->forall, ret->get_forall() ); 853 return ret; 854 } // buildSymbolicInst 855 856 TupleType * buildTuple( const TypeData * td ) { 857 assert( td->kind == TypeData::Tuple ); 858 TupleType * ret = new TupleType( buildQualifiers( td ) ); 859 buildTypeList( td->tuple->members, ret->get_types() ); 860 buildForall( td->forall, ret->get_forall() ); 861 return ret; 862 } // buildTuple 863 864 TypeofType * buildTypeof( const TypeData * td ) { 865 assert( td->kind == TypeData::Typeof ); 866 assert( td->typeexpr ); 867 assert( td->typeexpr->expr ); 868 return new TypeofType( buildQualifiers( td ), td->typeexpr->expr->build() ); 869 } // buildTypeof 870 871 AttrType * buildAttr( const TypeData * td ) { 872 assert( td->kind == TypeData::Attr ); 873 assert( td->attr ); 874 AttrType * ret; 875 if ( td->attr->expr ) { 876 ret = new AttrType( buildQualifiers( td ), td->attr->name, td->attr->expr->build() ); 877 } else { 878 assert( td->attr->type ); 879 ret = new AttrType( buildQualifiers( td ), td->attr->name, td->attr->type->buildType() ); 880 } // if 881 return ret; 882 } // buildAttr 883 884 Declaration * buildDecl( const TypeData * td, std::string name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer * init ) { 885 if ( td->kind == TypeData::Function ) { 886 FunctionDecl * decl; 887 if ( td->function->hasBody ) { 888 if ( td->function->body ) { 889 Statement * stmt = td->function->body->build(); 890 CompoundStmt * body = dynamic_cast< CompoundStmt* >( stmt ); 891 assert( body ); 892 decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), body, isInline, isNoreturn ); 893 } else { 894 // std::list< Label > ls; 895 decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), new CompoundStmt( std::list< Label >() ), isInline, isNoreturn ); 896 } // if 897 } else { 898 decl = new FunctionDecl( name, sc, linkage, buildFunction( td ), 0, isInline, isNoreturn ); 899 } // if 900 for ( DeclarationNode * cur = td->function->idList; cur != 0; cur = dynamic_cast< DeclarationNode* >( cur->get_next() ) ) { 901 if ( cur->get_name() != "" ) { 902 decl->get_oldIdents().insert( decl->get_oldIdents().end(), cur->get_name() ); 903 } // if 904 } // for 905 buildList( td->function->oldDeclList, decl->get_oldDecls() ); 906 return decl; 907 } else if ( td->kind == TypeData::Aggregate ) { 908 return buildAggregate( td ); 909 } else if ( td->kind == TypeData::Enum ) { 910 return buildEnum( td ); 911 } else if ( td->kind == TypeData::Symbolic ) { 912 return buildSymbolic( td, name, sc ); 913 } else if ( td->kind == TypeData::Variable ) { 914 return buildVariable( td ); 915 } else { 916 return new ObjectDecl( name, sc, linkage, bitfieldWidth, typebuild( td ), init, std::list< Attribute * >(), isInline, isNoreturn ); 917 } // if 918 return 0; 919 } // buildDecl 920 921 FunctionType * buildFunction( const TypeData * td ) { 922 assert( td->kind == TypeData::Function ); 923 bool hasEllipsis = td->function->params ? td->function->params->get_hasEllipsis() : true; 924 if ( ! td->function->params ) hasEllipsis = ! td->function->newStyle; 925 FunctionType * ft = new FunctionType( buildQualifiers( td ), hasEllipsis ); 926 buildList( td->function->params, ft->get_parameters() ); 927 buildForall( td->forall, ft->get_forall() ); 928 if ( td->base ) { 929 switch ( td->base->kind ) { 930 case TypeData::Tuple: 931 buildList( td->base->tuple->members, ft->get_returnVals() ); 932 break; 933 default: 934 ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( buildDecl( td->base, "", DeclarationNode::NoStorageClass, 0, false, false, LinkageSpec::Cforall ) ) ); 811 935 } // switch 812 936 } else { … … 814 938 } // if 815 939 return ft; 816 } 817 818 AggregateDecl *TypeData::buildAggregate() const { 819 assert( kind == Aggregate ); 820 AggregateDecl *at; 821 switch ( aggregate->kind ) { 822 case DeclarationNode::Struct: 823 at = new StructDecl( aggregate->name ); 824 buildForall( aggregate->params, at->get_parameters() ); 825 break; 826 case DeclarationNode::Union: 827 at = new UnionDecl( aggregate->name ); 828 buildForall( aggregate->params, at->get_parameters() ); 829 break; 830 case DeclarationNode::Trait: 831 at = new TraitDecl( aggregate->name ); 832 buildList( aggregate->params, at->get_parameters() ); 833 break; 834 default: 835 assert( false ); 836 } // switch 837 838 buildList( aggregate->fields, at->get_members() ); 839 at->set_body( aggregate->body ); 840 841 return at; 842 } 843 844 ReferenceToType *TypeData::buildAggInst() const { 845 assert( kind == AggregateInst ); 846 847 ReferenceToType *ret; 848 if ( aggInst->aggregate->kind == Enum ) { 849 ret = new EnumInstType( buildQualifiers(), aggInst->aggregate->enumeration->name ); 850 } else { 851 assert( aggInst->aggregate->kind == Aggregate ); 852 switch ( aggInst->aggregate->aggregate->kind ) { 853 case DeclarationNode::Struct: 854 ret = new StructInstType( buildQualifiers(), aggInst->aggregate->aggregate->name ); 855 break; 856 case DeclarationNode::Union: 857 ret = new UnionInstType( buildQualifiers(), aggInst->aggregate->aggregate->name ); 858 break; 859 case DeclarationNode::Trait: 860 ret = new TraitInstType( buildQualifiers(), aggInst->aggregate->aggregate->name ); 861 break; 862 default: 863 assert( false ); 864 } // switch 865 } // if 866 buildList( aggInst->params, ret->get_parameters() ); 867 buildForall( forall, ret->get_forall() ); 868 return ret; 869 } 870 871 NamedTypeDecl *TypeData::buildSymbolic( const std::string &name, DeclarationNode::StorageClass sc ) const { 872 assert( kind == Symbolic ); 873 NamedTypeDecl *ret; 874 if ( symbolic->isTypedef ) { 875 ret = new TypedefDecl( name, sc, maybeBuild< Type >( base ) ); 876 } else { 877 ret = new TypeDecl( name, sc, maybeBuild< Type >( base ), TypeDecl::Any ); 878 } // if 879 buildList( symbolic->params, ret->get_parameters() ); 880 buildList( symbolic->assertions, ret->get_assertions() ); 881 return ret; 882 } 883 884 TypeDecl *TypeData::buildVariable() const { 885 assert( kind == Variable ); 886 static const TypeDecl::Kind kindMap[] = { TypeDecl::Any, TypeDecl::Ftype, TypeDecl::Dtype }; 887 888 TypeDecl *ret = new TypeDecl( variable->name, DeclarationNode::NoStorageClass, 0, kindMap[ variable->tyClass ] ); 889 buildList( variable->assertions, ret->get_assertions() ); 890 return ret; 891 } 892 893 EnumDecl *TypeData::buildEnum() const { 894 assert( kind == Enum ); 895 EnumDecl *ret = new EnumDecl( enumeration->name ); 896 buildList( enumeration->constants, ret->get_members() ); 897 std::list< Declaration * >::iterator members = ret->get_members().begin(); 898 for ( const DeclarationNode *cur = enumeration->constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) { 899 if ( cur->has_enumeratorValue() ) { 900 ObjectDecl *member = dynamic_cast< ObjectDecl * >(*members); 901 member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), std::list< Expression * >() ) ); 902 } // if 903 } // for 904 return ret; 905 } 906 907 TypeInstType *TypeData::buildSymbolicInst() const { 908 assert( kind == SymbolicInst ); 909 TypeInstType *ret = new TypeInstType( buildQualifiers(), symbolic->name, false ); 910 buildList( symbolic->actuals, ret->get_parameters() ); 911 buildForall( forall, ret->get_forall() ); 912 return ret; 913 } 914 915 TupleType *TypeData::buildTuple() const { 916 assert( kind == Tuple ); 917 TupleType *ret = new TupleType( buildQualifiers() ); 918 buildTypeList( tuple->members, ret->get_types() ); 919 buildForall( forall, ret->get_forall() ); 920 return ret; 921 } 922 923 TypeofType *TypeData::buildTypeof() const { 924 assert( kind == Typeof ); 925 assert( typeexpr ); 926 assert( typeexpr->expr ); 927 TypeofType *ret = new TypeofType( buildQualifiers(), typeexpr->expr->build() ); 928 return ret; 929 } 930 931 AttrType *TypeData::buildAttr() const { 932 assert( kind == Attr ); 933 assert( attr ); 934 AttrType *ret; 935 if ( attr->expr ) { 936 ret = new AttrType( buildQualifiers(), attr->name, attr->expr->build() ); 937 } else { 938 assert( attr->type ); 939 ret = new AttrType( buildQualifiers(), attr->name, attr->type->buildType() ); 940 } // if 941 return ret; 942 } 940 } // buildFunction 943 941 944 942 // Local Variables: // -
src/Parser/TypeData.h
r3f1e68f r413ad05 10 10 // Created On : Sat May 16 15:18:36 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Aug 25 17:34:06201613 // Update Count : 2612 // Last Modified On : Sun Aug 28 22:39:00 2016 13 // Update Count : 85 14 14 // 15 15 … … 25 25 enum Kind { Unknown, Basic, Pointer, Array, Function, Aggregate, AggregateInst, 26 26 Enum, EnumConstant, Symbolic, SymbolicInst, Variable, Tuple, Typeof, Builtin, Attr } kind; 27 28 TypeData( Kind k = Unknown );29 ~TypeData();30 void print( std::ostream &, int indent = 0 ) const;31 TypeData * clone() const;32 33 Type * build() const;34 FunctionType * buildFunction() const;35 36 TypeData * base;37 typedef std::bitset< DeclarationNode::NoOfQualifier > Qualifiers;38 Qualifiers qualifiers;39 DeclarationNode * forall;40 27 41 28 struct Basic_t { … … 110 97 }; 111 98 99 TypeData * base; 100 typedef std::bitset< DeclarationNode::NoOfQualifier > Qualifiers; 101 Qualifiers qualifiers; 102 DeclarationNode * forall; 103 112 104 union { 113 105 Basic_t * basic; … … 125 117 }; 126 118 127 TypeData * extractAggregate( bool toplevel = true ) const; 128 // helper function for DeclNodeImpl::build 129 Declaration * buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer * init = 0 ) const; 130 // helper functions for build() 131 Type::Qualifiers buildQualifiers() const; 132 Type * buildBasicType() const; 133 PointerType * buildPointer() const; 134 ArrayType * buildArray() const; 135 AggregateDecl * buildAggregate() const; 136 ReferenceToType * buildAggInst() const; 137 NamedTypeDecl * buildSymbolic( const std::string &name, DeclarationNode::StorageClass sc ) const; 138 TypeDecl* buildVariable() const; 139 EnumDecl* buildEnum() const; 140 TypeInstType * buildSymbolicInst() const; 141 TupleType * buildTuple() const; 142 TypeofType * buildTypeof() const; 143 AttrType * buildAttr() const; 119 TypeData( Kind k = Unknown ); 120 ~TypeData(); 121 void print( std::ostream &, int indent = 0 ) const; 122 TypeData * clone() const; 144 123 }; 124 125 Type * typebuild( const TypeData * ); 126 TypeData * typeextractAggregate( const TypeData * td, bool toplevel = true ); 127 Type::Qualifiers buildQualifiers( const TypeData * td ); 128 Type * buildBasicType( const TypeData * ); 129 PointerType * buildPointer( const TypeData * ); 130 ArrayType * buildArray( const TypeData * ); 131 AggregateDecl * buildAggregate( const TypeData * ); 132 ReferenceToType * buildAggInst( const TypeData * ); 133 NamedTypeDecl * buildSymbolic( const TypeData *, const std::string &name, DeclarationNode::StorageClass sc ); 134 TypeDecl * buildVariable( const TypeData * ); 135 EnumDecl * buildEnum( const TypeData * ); 136 TypeInstType * buildSymbolicInst( const TypeData * ); 137 TupleType * buildTuple( const TypeData * ); 138 TypeofType * buildTypeof( const TypeData * ); 139 AttrType * buildAttr( const TypeData * ); 140 Declaration * buildDecl( const TypeData *, std::string, DeclarationNode::StorageClass, Expression *, bool isInline, bool isNoreturn, LinkageSpec::Spec, Initializer * init = 0 ); 141 FunctionType * buildFunction( const TypeData * ); 145 142 146 143 #endif // TYPEDATA_H -
src/Parser/parser.yy
r3f1e68f r413ad05 10 10 // Created On : Sat Sep 1 20:22:55 2001 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Aug 25 21:24:19201613 // Update Count : 196 312 // Last Modified On : Fri Aug 26 16:45:44 2016 13 // Update Count : 1964 14 14 // 15 15 … … 619 619 | ERassign { $$ = OperKinds::ERAssn; } 620 620 | ORassign { $$ = OperKinds::OrAssn; } 621 ;621 ; 622 622 623 623 tuple: // CFA, tuple
Note: See TracChangeset
for help on using the changeset viewer.