Changeset 12bc63a for src/Parser/ParseNode.h

Timestamp:

Sep 15, 2016, 3:49:22 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:

3c13c03

Parents:

4ab9536 (diff), fc4a0fa (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/Parser/parser.cc

File:

• src/Parser/ParseNode.h (modified) (4 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 : Sat Sep 10 17:14:37 2016
-// Update Count     : 589
+// Last Modified On : Mon Sep 12 08:00:05 2016
+// Update Count     : 603
 //
 
@@ -196 +196 @@
 class DeclarationNode : public ParseNode {
   public:
-        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, NoOfQualifier };
+        // These must remain in the same order as the corresponding DeclarationNode names.
         enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran, Noreturn, Threadlocal, NoStorageClass, };
-        enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
-        enum Modifier  { Signed, Unsigned, Short, Long };
+        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, NoQualifier };
+        enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, NoBasicType };
+        enum ComplexType { Complex, Imaginary, NoComplexType };
+        enum Signedness { Signed, Unsigned, NoSignedness };
+        enum Length { Short, Long, LongLong, NoLength };
         enum Aggregate { Struct, Union, Trait };
-        enum TypeClass { Type, Dtype, Ftype };
+        enum TypeClass { Otype, Dtype, Ftype };
         enum BuiltinType { Valist };
 
+        static const char * storageName[];
         static const char * qualifierName[];
-        static const char * storageName[];
         static const char * basicTypeName[];
-        static const char * modifierName[];
+        static const char * complexTypeName[];
+        static const char * signednessName[];
+        static const char * lengthName[];
         static const char * aggregateName[];
         static const char * typeClassName[];
@@ -217 +222 @@
         static DeclarationNode * newStorageClass( StorageClass );
         static DeclarationNode * newBasicType( BasicType );
-        static DeclarationNode * newModifier( Modifier );
+        static DeclarationNode * newComplexType( ComplexType );
+        static DeclarationNode * newSignedNess( Signedness sn );
+        static DeclarationNode * newLength( Length lnth );
         static DeclarationNode * newBuiltinType( BuiltinType );
         static DeclarationNode * newFromTypedef( std::string *);
@@ -309 +316 @@
         TypeData * type;
         std::string name;
-        // std::list< StorageClass > storageClasses;
         StorageClass storageClass;
         bool isInline, isNoreturn;