Changeset 66f8528 for src/Parser/TypeData.h

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.h (modified) (3 diffs)

src/Parser/TypeData.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeData.h -- 
+// TypeData.h --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct  3 12:34:08 2016
-// Update Count     : 142
+// Last Modified On : Tue Dec 13 13:39:39 2016
+// Update Count     : 143
 //
 
@@ -74 +74 @@
         DeclarationNode::Signedness signedness = DeclarationNode::NoSignedness;
         DeclarationNode::Length length = DeclarationNode::NoLength;
+        DeclarationNode::BuiltinType builtintype = DeclarationNode::NoBuiltinType;
         typedef std::bitset< DeclarationNode::NoQualifier > Qualifiers;
         Qualifiers qualifiers;
@@ -110 +111 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
-Declaration * buildDecl( const TypeData *, const std::string &, DeclarationNode::StorageClass, Expression *, bool isInline, bool isNoreturn, LinkageSpec::Spec, Initializer * init = nullptr );
+Declaration * buildDecl( const TypeData *, const std::string &, DeclarationNode::StorageClass, Expression *, bool isInline, bool isNoreturn, LinkageSpec::Spec, ConstantExpr *asmName, Initializer * init = nullptr );
 FunctionType * buildFunction( const TypeData * );