Changes in src/Parser/ParseNode.h [6a0d4d61:dd020c0]

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 : Thu Feb 23 15:22:10 2017
-// Update Count     : 662
+// Last Modified On : Fri Mar  3 21:34:27 2017
+// Update Count     : 704
 //
 
@@ -19 +19 @@
 #include <string>
 #include <list>
+#include <bitset>
 #include <iterator>
 #include <memory>
@@ -203 +204 @@
         // These must remain in the same order as the corresponding DeclarationNode names.
 
-        // enum StorageClass { Extern, Static, Auto, Register, NoStorageClass };
-        // enum FunctionSpec { Inline, Fortran, Noreturn, NoFunctionSpec };
-        // enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, Threadlocal, Mutex, NoQualifier };
-
-        enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran, Noreturn, Threadlocal, NoStorageClass, };
-        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, NoQualifier };
+        enum StorageClass { Extern, Static, Auto, Register, Threadlocal, NoStorageClass };
+        enum FuncSpecifier { Inline, Noreturn, Fortran, NoFuncSpecifier,
+                                        InlineSpec = 1 << Inline, NoreturnSpec = 1 << Noreturn, FortranSpec = 1 << Fortran };
+        enum TypeQualifier { Const, Restrict, Volatile, Lvalue, Atomic, NoTypeQualifier };
         enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, NoBasicType };
         enum ComplexType { Complex, Imaginary, NoComplexType };
@@ -217 +216 @@
         enum BuiltinType { Valist, Zero, One, NoBuiltinType };
 
-        static const char * storageName[];
-        static const char * qualifierName[];
-        static const char * basicTypeName[];
-        static const char * complexTypeName[];
-        static const char * signednessName[];
-        static const char * lengthName[];
-        static const char * aggregateName[];
-        static const char * typeClassName[];
-        static const char * builtinTypeName[];
-
-        static DeclarationNode * newFunction( std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body, bool newStyle = false );
-        static DeclarationNode * newQualifier( Qualifier );
-        static DeclarationNode * newForall( DeclarationNode * );
+        static const char * storageClassNames[];
+        static const char * funcSpecifierNames[];
+        static const char * typeQualifierNames[];
+        static const char * basicTypeNames[];
+        static const char * complexTypeNames[];
+        static const char * signednessNames[];
+        static const char * lengthNames[];
+        static const char * aggregateNames[];
+        static const char * typeClassNames[];
+        static const char * builtinTypeNames[];
+
         static DeclarationNode * newStorageClass( StorageClass );
+        static DeclarationNode * newFuncSpecifier( FuncSpecifier );
+        static DeclarationNode * newTypeQualifier( TypeQualifier );
         static DeclarationNode * newBasicType( BasicType );
         static DeclarationNode * newComplexType( ComplexType );
-        static DeclarationNode * newSignedNess( Signedness sn );
-        static DeclarationNode * newLength( Length lnth );
+        static DeclarationNode * newSignedNess( Signedness );
+        static DeclarationNode * newLength( Length );
         static DeclarationNode * newBuiltinType( BuiltinType );
+        static DeclarationNode * newForall( DeclarationNode * );
         static DeclarationNode * newFromTypedef( std::string * );
+        static DeclarationNode * newFunction( std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body, bool newStyle = false );
         static DeclarationNode * newAggregate( Aggregate kind, const std::string * name, ExpressionNode * actuals, DeclarationNode * fields, bool body );
         static DeclarationNode * newEnum( std::string * name, DeclarationNode * constants, bool body );
@@ -324 +325 @@
         TypeData * type;
         StorageClass storageClass;
+
+        typedef std::bitset< DeclarationNode::NoFuncSpecifier > FuncSpec;
+        FuncSpec funcSpec;
+        static void print_FuncSpec( std::ostream & output, FuncSpec funcSpec );
+
         ExpressionNode * bitfieldWidth;
-        bool isInline, isNoreturn;
         std::unique_ptr<ExpressionNode> enumeratorValue;
         bool hasEllipsis;