Changeset 58fe85a for src/Parser/DeclarationNode.cc

Timestamp:

Jan 7, 2021, 3:27:00 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:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (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 park_unpark

File:

• src/Parser/DeclarationNode.cc (modified) (6 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 16 15:32:22 2019
-// Update Count     : 1133
+// Last Modified On : Thu Oct  8 08:03:38 2020
+// Update Count     : 1135
 //
 
@@ -1016 +1016 @@
                         if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
                                 dwt->location = cur->location;
-                                * out++ = dwt;
+                                *out++ = dwt;
                         } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
                                 // e.g., int foo(struct S) {}
@@ -1022 +1022 @@
                                 auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
                                 obj->location = cur->location;
-                                * out++ = obj;
+                                *out++ = obj;
                                 delete agg;
                         } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
@@ -1029 +1029 @@
                                 auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
                                 obj->location = cur->location;
-                                * out++ = obj;
+                                *out++ = obj;
                         } else if ( EnumDecl * agg = dynamic_cast< EnumDecl * >( decl ) ) {
                                 // e.g., int foo(enum E) {}
@@ -1035 +1035 @@
                                 auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
                                 obj->location = cur->location;
-                                * out++ = obj;
+                                *out++ = obj;
                         } // if
                 } catch( SemanticErrorException & e ) {
@@ -1115 +1115 @@
         // SUE's cannot have function specifiers, either
         //
-        //    inlne _Noreturn struct S { ... };         // disallowed
-        //    inlne _Noreturn enum   E { ... };         // disallowed
+        //    inline _Noreturn struct S { ... };                // disallowed
+        //    inline _Noreturn enum   E { ... };                // disallowed
         if ( funcSpecs.any() ) {
                 SemanticError( this, "invalid function specifier for " );