Changeset c4f68dc

Timestamp:

Jul 25, 2018, 6:13:42 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:

891790ef

Parents:

bd21af5

git-author:

Peter A. Buhr <pabuhr@…> (07/25/18 18:12:54)

git-committer:

Peter A. Buhr <pabuhr@…> (07/25/18 18:13:42)

Message:

potential changes for ID/TD/TG problem

Location:

src

Files:

• Parser/TypedefTable.cc (modified) (2 diffs)
• Parser/TypedefTable.h (modified) (2 diffs)
• Parser/parser.yy (modified) (3 diffs)
• libcfa/heap.c (added)

src/Parser/TypedefTable.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 13 18:35:54 2018
-// Update Count     : 257
+// Last Modified On : Wed Jul 25 15:32:35 2018
+// Update Count     : 258
 //
 
@@ -49 +49 @@
 bool TypedefTable::exists( const string & identifier ) {
         return kindTable.find( identifier ) != kindTable.end();
+} // TypedefTable::exists
+
+bool TypedefTable::existsCurr( const string & identifier ) {
+        return kindTable.findAt( kindTable.currentScope() - 1, identifier ) != kindTable.end();
 } // TypedefTable::exists
 

src/Parser/TypedefTable.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 10 18:32:23 2018
-// Update Count     : 112
+// Last Modified On : Wed Jul 25 15:33:55 2018
+// Update Count     : 114
 //
 
@@ -31 +31 @@
 
         bool exists( const std::string & identifier );
+        bool existsCurr( const std::string & identifier );
         int isKind( const std::string & identifier ) const;
         void makeTypedef( const std::string & name, int kind = TYPEDEFname );

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 20 11:46:46 2018
-// Update Count     : 3837
+// Last Modified On : Wed Jul 25 15:54:35 2018
+// Update Count     : 3841
 //
 
@@ -2804 +2804 @@
         typedef
                 // hide type name in enclosing scope by variable name
-                { typedefTable.addToEnclosingScope( *$1->name, IDENTIFIER, "ID" ); }
+                {
+                        // if ( ! typedefTable.existsCurr( *$1->name ) ) {
+                                typedefTable.addToEnclosingScope( *$1->name, IDENTIFIER, "ID" );
+                        // } else {
+                        //      SemanticError( yylloc, string("'") + *$1->name + "' redeclared as different kind of symbol." ); $$ = nullptr;
+                        // } // if
+                }
         | '(' paren_type ')'
                 { $$ = $2; }
@@ -2815 +2821 @@
                 { $$ = $3->addPointer( DeclarationNode::newPointer( $2, $1 ) ); }
         | '(' type_ptr ')' attribute_list_opt
-                { $$ = $2->addQualifiers( $4 ); }
+                { $$ = $2->addQualifiers( $4 ); }                               // redundant parenthesis
         ;