Changeset 1622af5

Timestamp:

Nov 9, 2021, 3:57:11 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

b7fd9daf

Parents:

36a05d7

Message:

Created CandidatePrinter? from AlternativePrinter? (seems to uncover a bug in CandidateFinder?).

Location:

src

Files:

• ResolvExpr/CandidatePrinter.cpp (added)
• ResolvExpr/CandidatePrinter.hpp (added)
• ResolvExpr/module.mk (modified) (1 diff)
• main.cc (modified) (5 diffs)

src/ResolvExpr/module.mk

@@ -61 +61 @@
       ResolvExpr/WidenMode.h
 
+SRC += $(SRC_RESOLVEXPR) \
+        ResolvExpr/AlternativePrinter.cc \
+        ResolvExpr/AlternativePrinter.h \
+        ResolvExpr/CandidatePrinter.cpp \
+        ResolvExpr/CandidatePrinter.hpp
 
-SRC += $(SRC_RESOLVEXPR) ResolvExpr/AlternativePrinter.cc ResolvExpr/AlternativePrinter.h
 SRCDEMANGLE += $(SRC_RESOLVEXPR)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Nov  8 11:42:00 2021
-// Update Count     : 656
+// Last Modified On : Tue Nov  9 11:10:00 2021
+// Update Count     : 657
 //
 
@@ -65 +65 @@
 #include "Parser/TypedefTable.h"            // for TypedefTable
 #include "ResolvExpr/AlternativePrinter.h"  // for AlternativePrinter
+#include "ResolvExpr/CandidatePrinter.hpp"  // for printCandidates
 #include "ResolvExpr/Resolver.h"            // for resolve
 #include "SymTab/Validate.h"                // for validate
@@ -318 +319 @@
                 // add the assignment statement after the initialization of a type parameter
                 PASS( "Validate", SymTab::validate( translationUnit, symtabp ) );
-                if ( symtabp ) {
-                        deleteAll( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                if ( expraltp ) {
-                        PassVisitor<ResolvExpr::AlternativePrinter> printer( cout );
-                        acceptAll( translationUnit, printer );
-                        return EXIT_SUCCESS;
-                } // if
-
-                if ( validp ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
 
                 CodeTools::fillLocations( translationUnit );
@@ -345 +331 @@
                         forceFillCodeLocations( transUnit );
 
+                        if ( symtabp ) {
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( expraltp ) {
+                                ResolvExpr::printCandidates( transUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( validp ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        } // if
+
                         PASS( "Translate Throws", ControlStruct::translateThrows( transUnit ) );
                         PASS( "Fix Labels", ControlStruct::fixLabels( transUnit ) );
@@ -383 +383 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        if ( symtabp ) {
+                                deleteAll( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( expraltp ) {
+                                PassVisitor<ResolvExpr::AlternativePrinter> printer( cout );
+                                acceptAll( translationUnit, printer );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        if ( validp ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
                         PASS( "Translate Throws", ControlStruct::translateThrows( translationUnit ) );
                         PASS( "Fix Labels", ControlStruct::fixLabels( translationUnit ) );