Changeset 3f7e12cb for src/Parser/ParseNode.h

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/ParseNode.h (modified) (3 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 Sep 14 23:09:39 2017
-// Update Count     : 815
+// Last Modified On : Sat Sep 23 18:11:22 2017
+// Update Count     : 821
 //
 
@@ -47 +47 @@
 #define YYLTYPE_IS_DECLARED 1 /* alert the parser that we have our own definition */
 
-extern char * yyfilename;
-extern int yylineno;
 extern YYLTYPE yylloc;
 
@@ -197 +195 @@
 class DeclarationNode : public ParseNode {
   public:
-        enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, NoBasicType };
+        // These enumerations must harmonize with their names.
+        enum BasicType { Void, Bool, Char, Int, Float, Double, LongDouble, Int128, Float80, Float128, NoBasicType };
+        static const char * basicTypeNames[];
         enum ComplexType { Complex, Imaginary, NoComplexType };
+        static const char * complexTypeNames[];
         enum Signedness { Signed, Unsigned, NoSignedness };
+        static const char * signednessNames[];
         enum Length { Short, Long, LongLong, NoLength };
+        static const char * lengthNames[];
         enum Aggregate { Struct, Union, Trait, Coroutine, Monitor, Thread, NoAggregate };
+        static const char * aggregateNames[];
         enum TypeClass { Otype, Dtype, Ftype, Ttype, NoTypeClass };
+        static const char * typeClassNames[];
         enum BuiltinType { Valist, Zero, One, NoBuiltinType };
-
-        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[];