Changes in src/Parser/ParseNode.h [68cd1ce:5f2f2d7]

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 : Sat Jun 13 07:24:22 2015
-// Update Count     : 79
+// Last Modified On : Sun Jun  7 22:02:00 2015
+// Update Count     : 65
 //
 
@@ -22 +22 @@
 
 #include "utility.h"
-#include "Parser/LinkageSpec.h"
 #include "SynTree/Type.h"
-//#include "SynTree/Declaration.h"
+#include "SynTree/Declaration.h"
 #include "UniqueName.h"
 
@@ -266 +265 @@
   public:
         enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, Attribute };
-        enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran, Noreturn, Threadlocal, NoStorageClass, };
+        enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran };
         enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
-        enum Modifier  { Signed, Unsigned, Short, Long };
-        enum Aggregate { Struct, Union, Context };
+        enum Modifier { Signed, Unsigned, Short, Long };
+        enum TyCon { Struct, Union, Context };
         enum TypeClass { Type, Dtype, Ftype };
 
-        static const char *storageName[];  
         static const char *qualifierName[];
         static const char *basicTypeName[];
         static const char *modifierName[];
-        static const char *aggregateName[];
+        static const char *tyConName[];
         static const char *typeClassName[];
 
@@ -287 +285 @@
         static DeclarationNode *newForall( DeclarationNode *);
         static DeclarationNode *newFromTypedef( std::string *);
-        static DeclarationNode *newAggregate( Aggregate kind, std::string *name, DeclarationNode *formals, ExpressionNode *actuals, DeclarationNode *fields );
+        static DeclarationNode *newAggregate( TyCon kind, std::string *name, DeclarationNode *formals, ExpressionNode *actuals, DeclarationNode *fields );
         static DeclarationNode *newEnum( std::string *name, DeclarationNode *constants );
         static DeclarationNode *newEnumConstant( std::string *name, ExpressionNode *constant );
@@ -346 +344 @@
         ~DeclarationNode();
   private:
-        StorageClass buildStorageClass() const;
+        Declaration::StorageClass buildStorageClass() const;
         bool buildInline() const;