Changeset 6e1e2d0 for src/Parser/TypedefTable.cc

Timestamp:

May 1, 2023, 4:19:09 PM (17 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.cc (modified) (2 diffs)

src/Parser/TypedefTable.cc

@@ -16 +16 @@
 
 #include "TypedefTable.h"
-#include <cassert>                                                                              // for assert
-#include <iostream>
+
+#include <cassert>                                // for assert
+#include <string>                                 // for string
+#include <iostream>                               // for iostream
+
+#include "ExpressionNode.h"                       // for LabelNode
+#include "ParserTypes.h"                          // for Token
+#include "StatementNode.h"                        // for CondCtl, ForCtrl
+// This (generated) header must come late as it is missing includes.
+#include "parser.hh"              // for IDENTIFIER, TYPEDEFname, TYPEGENname
+
 using namespace std;
 
 #if 0
 #define debugPrint( code ) code
+
+static const char *kindName( int kind ) {
+        switch ( kind ) {
+        case IDENTIFIER: return "identifier";
+        case TYPEDIMname: return "typedim";
+        case TYPEDEFname: return "typedef";
+        case TYPEGENname: return "typegen";
+        default:
+                cerr << "Error: cfa-cpp internal error, invalid kind of identifier" << endl;
+                abort();
+        } // switch
+} // kindName
 #else
 #define debugPrint( code )
 #endif
-
-using namespace std;                                                                    // string, iostream
-
-debugPrint(
-        static const char *kindName( int kind ) {
-                switch ( kind ) {
-                case IDENTIFIER: return "identifier";
-                case TYPEDIMname: return "typedim";
-                case TYPEDEFname: return "typedef";
-                case TYPEGENname: return "typegen";
-                default:
-                        cerr << "Error: cfa-cpp internal error, invalid kind of identifier" << endl;
-                        abort();
-                } // switch
-        } // kindName
-);
 
 TypedefTable::~TypedefTable() {
@@ -78 +83 @@
                 typedefTable.addToEnclosingScope( name, kind, "MTD" );
         } // if
+} // TypedefTable::makeTypedef
+
+void TypedefTable::makeTypedef( const string & name ) {
+        return makeTypedef( name, TYPEDEFname );
 } // TypedefTable::makeTypedef