Changeset 66f8528 for src/Parser/ParseNode.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/ParseNode.h (modified) (5 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct  3 18:03:08 2016
-// Update Count     : 636
+// Last Modified On : Tue Dec 13 15:37:33 2016
+// Update Count     : 643
 //
 
@@ -154 +154 @@
 Expression * build_constantFloat( const std::string &str );
 Expression * build_constantChar( const std::string &str );
+Expression * build_constantZeroOne( const std::string &str );
 ConstantExpr * build_constantStr( const std::string &str );
 Expression * build_field_name_FLOATINGconstant( const std::string & str );
@@ -204 +205 @@
         enum Aggregate { Struct, Union, Trait, NoAggregate };
         enum TypeClass { Otype, Dtype, Ftype, NoTypeClass };
-        enum BuiltinType { Valist };
+        enum BuiltinType { Valist, Zero, One, NoBuiltinType };
 
         static const char * storageName[];
@@ -256 +257 @@
         DeclarationNode * addAssertions( DeclarationNode * );
         DeclarationNode * addName( std::string * );
+        DeclarationNode * addAsmName( ConstantExpr * );
         DeclarationNode * addBitfield( ExpressionNode * size );
         DeclarationNode * addVarArgs();
@@ -308 +310 @@
         TypeData * type;
         StorageClass storageClass;
+        ExpressionNode * bitfieldWidth;
         bool isInline, isNoreturn;
-        std::list< std::string > attributes;
-        ExpressionNode * bitfieldWidth;
         std::unique_ptr<ExpressionNode> enumeratorValue;
-        InitializerNode * initializer;
         bool hasEllipsis;
         LinkageSpec::Spec linkage;
+        ConstantExpr *asmName;
+        std::list< std::string > attributes;
+        InitializerNode * initializer;
         bool extension = false;
         std::string error;