Changeset b7d6a36 for src/AST/Convert.cpp

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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' into relaxed_ready

File:

• src/AST/Convert.cpp (modified) (4 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 10 22:20:10 2019
-// Update Count     : 32
+// Last Modified On : Wed Dec 11 21:39:32 2019
+// Update Count     : 33
 //
 
@@ -1223 +1223 @@
                                 cv( node ),
                                 node->name,
-                                node->kind == ast::TypeVar::Ftype,
+                                node->kind == ast::TypeDecl::Ftype,
                                 get<Attribute>().acceptL( node->attributes )
                         };
@@ -1578 +1578 @@
                         { old->storageClasses.val },
                         GET_ACCEPT_1(base, Type),
-                        (ast::TypeVar::Kind)(unsigned)old->kind,
+                        (ast::TypeDecl::Kind)(unsigned)old->kind,
                         old->sized,
                         GET_ACCEPT_1(init, Type)
@@ -2561 +2561 @@
                         ty = new ast::TypeInstType{
                                 old->name,
-                                old->isFtype ? ast::TypeVar::Ftype : ast::TypeVar::Dtype,
+                                old->isFtype ? ast::TypeDecl::Ftype : ast::TypeDecl::Dtype,
                                 cv( old ),
                                 GET_ACCEPT_V( attributes, Attribute )