Changeset 6e1e2d0 for src/Parser/TypedefTable.h

Timestamp:

May 1, 2023, 4:19:09 PM (14 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c083c3d

Parents:

a50fdfb (diff), 985b624 (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:

resolved merge conflicts

File:

• src/Parser/TypedefTable.h (modified) (2 diffs)

src/Parser/TypedefTable.h

@@ -19 +19 @@
 
 #include "Common/ScopedMap.h"                                                   // for ScopedMap
-#include "ParserTypes.h"
-#include "parser.hh"                                                                    // for IDENTIFIER, TYPEDEFname, TYPEGENname
 
 class TypedefTable {
         struct Note { size_t level; bool forall; };
         typedef ScopedMap< std::string, int, Note > KindTable;
-        KindTable kindTable;    
+        KindTable kindTable;
         unsigned int level = 0;
   public:
@@ -33 +31 @@
         bool existsCurr( const std::string & identifier ) const;
         int isKind( const std::string & identifier ) const;
-        void makeTypedef( const std::string & name, int kind = TYPEDEFname );
+        void makeTypedef( const std::string & name, int kind );
+        void makeTypedef( const std::string & name );
         void addToScope( const std::string & identifier, int kind, const char * );
         void addToEnclosingScope( const std::string & identifier, int kind, const char * );