Changeset b3f9a0cb for src/Parser/TypedefTable.cc

Timestamp:

Apr 4, 2016, 1:18:17 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

afc1045

Parents:

89173242 (diff), 3cfe27f (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

File:

• src/Parser/TypedefTable.cc (modified) (2 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 Mar  2 17:25:55 2016
-// Update Count     : 20
+// Last Modified On : Mon Mar 21 18:18:58 2016
+// Update Count     : 23
 //
 
 #include <map>
 #include <list>
+#include <cassert>
 #include "TypedefTable.h"
-#include <cassert>
 using namespace std;
 
@@ -29 +29 @@
 TypedefTable::TypedefTable() : currentScope( 0 ) {}
 
+bool TypedefTable::exists( const string &identifier ) {
+        return table.count( identifier ) > 0;
+}
+
 void TypedefTable::changeKind( const string &identifier, kind_t kind ) {
         tableType::iterator id_pos = table.find( identifier );
-        if ( id_pos == table.end() ) {
-                return;
-        } else {
-                (*((*id_pos ).second.begin())).kind = kind;
-                return;
-        } // if
+        if ( id_pos == table.end() ) return;
+        id_pos->second.begin()->kind = kind;
 }
 
-bool TypedefTable::isKind( const string &identifier, kind_t kind ) const {
+int TypedefTable::isKind( const string &identifier ) const {
         tableType::const_iterator id_pos = table.find( identifier );
-        if ( id_pos == table.end() ) {
-                return true;
-        } else {
-                return (*((*id_pos ).second.begin())).kind == kind;
-        } // if
-}
-
-bool TypedefTable::isIdentifier( const string &identifier ) const {
-        return isKind( identifier, ID );
-}
-
-bool TypedefTable::isTypedef( const string &identifier ) const {
-        return isKind( identifier, TD );
-}
-
-bool TypedefTable::isTypegen( const string &identifier ) const {
-        return isKind( identifier, TG );
+        // Name lookup defaults to identifier, and then the identifier's kind is set by the parser.
+        if ( id_pos == table.end() ) return IDENTIFIER;
+        return id_pos->second.begin()->kind;
 }