Changeset a00bc5b for src/AST

Timestamp:

Jan 13, 2021, 3:43:14 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

270bdc8, 402658b1, bb58825

Parents:

97748ee (diff), 101cc3a (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

Location:

src/AST

Files:

• Decl.cpp (modified) (3 diffs)
• Decl.hpp (modified) (2 diffs)

src/AST/Decl.cpp

@@ -10 +10 @@
 // Created On       : Thu May 9 10:00:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 16:23:15 2019
-// Update Count     : 20
+// Last Modified On : Tue Jan 12 16:54:55 2021
+// Update Count     : 23
 //
 
@@ -78 +78 @@
 
 const char * TypeDecl::typeString() const {
-        static const char * kindNames[] = { "sized data type", "sized object type", "sized function type", "sized tuple type" };
-        static_assert( sizeof(kindNames)/sizeof(kindNames[0]) == TypeDecl::NUMBER_OF_KINDS, "typeString: kindNames is out of sync." );
+        static const char * kindNames[] = { "sized data type", "sized data type", "sized object type", "sized function type", "sized tuple type", "sized array length type" };
+        static_assert( sizeof(kindNames) / sizeof(kindNames[0]) == TypeDecl::NUMBER_OF_KINDS, "typeString: kindNames is out of sync." );
         assertf( kind < TypeDecl::NUMBER_OF_KINDS, "TypeDecl kind is out of bounds." );
         return sized ? kindNames[ kind ] : &kindNames[ kind ][ sizeof("sized") ]; // sizeof includes '\0'
@@ -85 +85 @@
 
 const char * TypeDecl::genTypeString() const {
-        static const char * kindNames[] = { "dtype", "otype", "ftype", "ttype" };
-        static_assert( sizeof(kindNames)/sizeof(kindNames[0]) == TypeDecl::NUMBER_OF_KINDS, "genTypeString: kindNames is out of sync." );
+        static const char * kindNames[] = { "T &", "T *", "T", "(*)", "T ...", "[T]" };
+        static_assert( sizeof(kindNames) / sizeof(kindNames[0]) == TypeDecl::NUMBER_OF_KINDS, "genTypeString: kindNames is out of sync." );
         assertf( kind < TypeDecl::NUMBER_OF_KINDS, "TypeDecl kind is out of bounds." );
         return kindNames[ kind ];

src/AST/Decl.hpp

@@ -10 +10 @@
 // Created On       : Thu May 9 10:00:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 17:38:33 2019
-// Update Count     : 29
+// Last Modified On : Mon Jan 11 20:48:38 2021
+// Update Count     : 30
 //
 
@@ -175 +175 @@
 class TypeDecl final : public NamedTypeDecl {
   public:
-        enum Kind { Dtype, Otype, Ftype, Ttype, NUMBER_OF_KINDS };
+        enum Kind { Dtype, DStype, Otype, Ftype, Ttype, ALtype, NUMBER_OF_KINDS };
 
         Kind kind;