Changeset 342af53 for src/SynTree

Timestamp:

Jan 14, 2021, 12:23: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:

8e4aa05

Parents:

4468a70 (diff), ec19b21 (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/SynTree

Files:

• Declaration.h (modified) (2 diffs)
• TypeDecl.cc (modified) (3 diffs)

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec 13 23:11:22 2019
-// Update Count     : 157
+// Last Modified On : Mon Jan 11 20:48:39 2021
+// Update Count     : 158
 //
 
@@ -201 +201 @@
         typedef NamedTypeDecl Parent;
   public:
-        enum Kind { Dtype, Otype, Ftype, Ttype, NUMBER_OF_KINDS };
+        enum Kind { Dtype, DStype, Otype, Ftype, Ttype, ALtype, NUMBER_OF_KINDS };
 
         Kind kind;

src/SynTree/TypeDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Oct  8 18:18:55 2020
-// Update Count     : 22
+// Last Modified On : Tue Jan 12 16:07:33 2021
+// Update Count     : 26
 //
 
@@ -33 +33 @@
 
 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 isComplete() ? kindNames[ kind ] : &kindNames[ kind ][ sizeof("sized") ]; // sizeof includes '\0'
@@ -40 +40 @@
 
 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 ];