Changeset 66f8528 for src/Parser/TypeData.cc

Timestamp:

Dec 15, 2016, 5:16:42 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

• src/Parser/TypeData.cc (modified) (8 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Sep 24 11:14:26 2016
-// Update Count     : 415
+// Last Modified On : Tue Dec 13 13:40:33 2016
+// Update Count     : 420
 //
 
@@ -215 +215 @@
                 break;
           case Builtin:
-                assert( false );
-                // newtype->builtin = builtin;
+                assert( builtintype == DeclarationNode::Zero || builtintype == DeclarationNode::One );
+                newtype->builtintype = builtintype;
                 break;
         } // switch
@@ -444 +444 @@
                 return buildTypeof( td );
           case TypeData::Builtin:
-                return new VarArgsType( buildQualifiers( td ) );
+                if(td->builtintype == DeclarationNode::Zero) {
+                        return new ZeroType( emptyQualifiers );
+                }
+                else if(td->builtintype == DeclarationNode::One) {
+                        return new OneType( emptyQualifiers );
+                }
+                else {
+                        return new VarArgsType( buildQualifiers( td ) );
+                }
           case TypeData::Symbolic:
           case TypeData::Enum:
@@ -574 +582 @@
                 const_cast<TypeData *>(td)->basictype = DeclarationNode::Int;
                 goto Integral;
+          default:
+                assert(false);
+                return nullptr;
         } // switch
 
@@ -710 +721 @@
 } // buildTypeof
 
-Declaration * buildDecl( const TypeData * td, const string &name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, Initializer * init ) {
+Declaration * buildDecl( const TypeData * td, const string &name, DeclarationNode::StorageClass sc, Expression * bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Spec linkage, ConstantExpr *asmName, Initializer * init ) {
         if ( td->kind == TypeData::Function ) {
                 FunctionDecl * decl;
@@ -732 +743 @@
                 } // for
                 buildList( td->function.oldDeclList, decl->get_oldDecls() );
-                return decl;
+                return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {
                 return buildAggregate( td );
@@ -740 +751 @@
                 return buildSymbolic( td, name, sc );
         } else {
-                return new ObjectDecl( name, sc, linkage, bitfieldWidth, typebuild( td ), init, list< Attribute * >(), isInline, isNoreturn );
+                return (new ObjectDecl( name, sc, linkage, bitfieldWidth, typebuild( td ), init, list< Attribute * >(), isInline, isNoreturn ))->set_asmName( asmName );
         } // if
         return nullptr;
@@ -758 +769 @@
                         break;
                   default:
-                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( buildDecl( td->base,  "", DeclarationNode::NoStorageClass, nullptr, false, false, LinkageSpec::Cforall ) ) );
+                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( buildDecl( td->base,  "", DeclarationNode::NoStorageClass, nullptr, false, false, LinkageSpec::Cforall, nullptr ) ) );
                 } // switch
         } else {