Changeset 26ef3b2

Timestamp:

Jul 13, 2018, 6:33:05 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

dffaeac

Parents:

8f91c9ae

Message:

fix bug or-ing flags for typedef/typegen

Location:

src/Parser

Files:

• TypedefTable.cc (modified) (2 diffs)
• parser.yy (modified) (4 diffs)

src/Parser/TypedefTable.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 11 11:47:47 2018
-// Update Count     : 255
+// Last Modified On : Thu Jul 12 16:16:24 2018
+// Update Count     : 256
 //
 
@@ -100 +100 @@
 void TypedefTable::up( bool forall ) {
         level += 1;
-        kindTable.getNote( kindTable.currentScope() ) = (Note){ level, forall | getEnclForall() };
+        kindTable.getNote( kindTable.currentScope() ) = (Note){ level, forall || getEnclForall() };
         debugPrint( cerr << "Up " << " level " << level << " note " << kindTable.getNote( level ).level << ", " << kindTable.getNote( level ).forall << endl; );
 } // TypedefTable::up

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 13:47:44 2018
-// Update Count     : 3755
+// Last Modified On : Thu Jul 12 16:16:25 2018
+// Update Count     : 3756
 //
 
@@ -1866 +1866 @@
         | aggregate_key attribute_list_opt no_attr_identifier fred
                 {
-                        typedefTable.makeTypedef( *$3, forall | typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
+                        typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
                         forall = false;                                                         // reset
                 }
@@ -1874 +1874 @@
                 {
                         // for type_name can be a qualified type name S.T, in which case only the last name in the chain needs a typedef (other names in the chain should already have one)
-                        typedefTable.makeTypedef( *$3->type->leafName(), forall | typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
+                        typedefTable.makeTypedef( *$3->type->leafName(), forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
                         forall = false;                                                         // reset
                 }
@@ -1892 +1892 @@
         aggregate_key attribute_list_opt no_attr_identifier fred
                 {
-                        typedefTable.makeTypedef( *$3, forall | typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname );
+                        typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname );
                         forall = false;                                                         // reset
                         $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );