Ignore:
Timestamp:
Jul 29, 2015, 12:07:38 PM (9 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc
Children:
093f1a0
Parents:
1e8f143 (diff), 51b986f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from origin

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/TypeData.cc

    r1e8f143 rb29f8f3  
    1010// Created On       : Sat May 16 15:12:51 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Jun 26 07:30:06 2015
    13 // Update Count     : 26
     12// Last Modified On : Tue Jul 14 14:57:23 2015
     13// Update Count     : 32
    1414//
    1515
     
    397397                } // if
    398398                break;
     399          default:
     400                os << "internal error: TypeData::print " << kind  << endl;
     401                assert( false );
    399402        } // switch
    400403}
     
    474477                return buildVariable();
    475478        } else {
    476                 if ( isInline || isNoreturn ) {
    477                         throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", this );
    478                 } else {
    479                         return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init );
    480                 } // if
     479                return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init, isInline, isNoreturn );
    481480        } // if
    482481        return 0;
     
    536535                  case DeclarationNode::Atomic:
    537536                        q.isAtomic = true;
    538                         break;
    539                   case DeclarationNode::Attribute:
    540                         q.isAttribute = true;
    541537                        break;
    542538                } // switch
Note: See TracChangeset for help on using the changeset viewer.