Changeset fc95df3

Timestamp:

Jul 12, 2023, 7:26:16 AM (17 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

71a422a

Parents:

bdbb448

Message:

add additional debug printing

Location:

src/Parser

Files:

• TypedefTable.cc (modified) (6 diffs)
• TypedefTable.h (modified) (3 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 : Tue Feb 15 08:27:24 2022
-// Update Count     : 275
+// Last Modified On : Wed Jul 12 06:11:28 2023
+// Update Count     : 276
 //
 
@@ -17 +17 @@
 #include "TypedefTable.h"
 
-#include <cassert>                                // for assert
-#include <string>                                 // for string
-#include <iostream>                               // for 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
+#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
+#include "parser.hh"                                                                    // for IDENTIFIER, TYPEDEFname, TYPEGENname
 
 using namespace std;
@@ -72 +72 @@
 // "struct". Only generate the typedef, if the name is not in use. The typedef is implicitly (silently) removed if the
 // name is explicitly used.
-void TypedefTable::makeTypedef( const string & name, int kind ) {
+void TypedefTable::makeTypedef( const string & name, int kind, const char * locn __attribute__((unused)) ) {
 //    Check for existence is necessary to handle:
 //        struct Fred {};
@@ -80 +80 @@
 //           Fred();
 //        }
+        debugPrint( cerr << "Make typedef at " << locn << " \"" << name << "\" as " << kindName( kind ) << " scope " << kindTable.currentScope() << endl );
         if ( ! typedefTable.exists( name ) ) {
                 typedefTable.addToEnclosingScope( name, kind, "MTD" );
@@ -85 +86 @@
 } // TypedefTable::makeTypedef
 
-void TypedefTable::makeTypedef( const string & name ) {
-        return makeTypedef( name, TYPEDEFname );
+void TypedefTable::makeTypedef( const string & name, const char * locn __attribute__((unused)) ) {
+        debugPrint( cerr << "Make typedef at " << locn << " \"" << name << " scope " << kindTable.currentScope() << endl );
+        return makeTypedef( name, TYPEDEFname, "makeTypede" );
 } // TypedefTable::makeTypedef
 
 void TypedefTable::addToScope( const string & identifier, int kind, const char * locn __attribute__((unused)) ) {
         KindTable::size_type scope = kindTable.currentScope();
-        debugPrint( cerr << "Adding current at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << endl );
+        debugPrint( cerr << "Adding current at " << locn << " \"" << identifier << "\" as " << kindName( kind ) << " scope " << scope << endl );
         kindTable.insertAt( scope, identifier, kind );
 } // TypedefTable::addToScope
@@ -98 +100 @@
         KindTable::size_type scope = kindTable.currentScope() - 1 - kindTable.getNote( kindTable.currentScope() - 1 ).level;
 //      size_type scope = level - kindTable.getNote( kindTable.currentScope() - 1 ).level;
-        debugPrint( cerr << "Adding enclosing at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << " level " << level << " note " << kindTable.getNote( kindTable.currentScope() - 1 ).level << endl );
+        debugPrint( cerr << "Adding enclosing at " << locn << " \"" << identifier << "\" as " << kindName( kind ) << " scope " << scope << " level " << level << " note " << kindTable.getNote( kindTable.currentScope() - 1 ).level << endl );
         pair< KindTable::iterator, bool > ret = kindTable.insertAt( scope, identifier, kind );
         if ( ! ret.second ) ret.first->second = kind;           // exists => update

src/Parser/TypedefTable.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 15 08:06:37 2020
-// Update Count     : 117
+// Last Modified On : Wed Jul 12 06:09:37 2023
+// Update Count     : 118
 //
 
@@ -21 +21 @@
 
 class TypedefTable {
-        struct Note { size_t level; bool forall; };
+        struct Note {
+                size_t level;
+                bool forall;
+        };
         typedef ScopedMap< std::string, int, Note > KindTable;
         KindTable kindTable;
@@ -31 +34 @@
         bool existsCurr( const std::string & identifier ) const;
         int isKind( const std::string & identifier ) const;
-        void makeTypedef( const std::string & name, int kind );
-        void makeTypedef( const std::string & name );
+        void makeTypedef( const std::string & name, int kind, const char * );
+        void makeTypedef( const std::string & name, const char * );
         void addToScope( const std::string & identifier, int kind, const char * );
         void addToEnclosingScope( const std::string & identifier, int kind, const char * );