Changeset 3b3491b

Timestamp:

Sep 12, 2018, 4:59:56 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

b181639

Parents:

67982887

Message:

Add first draft of resolver prototype dumper

Files:

• libcfa/configure (modified) (1 diff)
• src/CodeTools/ResolvProtoDump.cc (added)
• src/CodeTools/ResolvProtoDump.h (added)
• src/CodeTools/module.mk (modified) (1 diff)
• src/CompilationState.cc (modified) (1 diff)
• src/CompilationState.h (modified) (1 diff)
• src/Makefile.in (modified) (4 diffs)
• src/main.cc (modified) (6 diffs)

libcfa/configure

@@ -1959 +1959 @@
 
 
+
 am__api_version='1.15'
 

src/CodeTools/module.mk

@@ -16 +16 @@
 
 SRC += CodeTools/DeclStats.cc \
+        CodeTools/ResolvProtoDump.cc \
         CodeTools/TrackLoc.cc

src/CompilationState.cc

@@ -30 +30 @@
         parsep = false,
         resolvep = false,
+        resolvprotop = false,
         symtabp = false,
         treep = false,

src/CompilationState.h

@@ -31 +31 @@
         parsep,
         resolvep,
+        resolvprotop,
         symtabp,
         treep,

src/Makefile.in

@@ -221 +221 @@
         CodeGen/FixNames.$(OBJEXT) CodeGen/FixMain.$(OBJEXT) \
         CodeGen/OperatorTable.$(OBJEXT) CodeTools/DeclStats.$(OBJEXT) \
+        CodeTools/ResolvProtoDump.$(OBJEXT) \
         CodeTools/TrackLoc.$(OBJEXT) Concurrency/Keywords.$(OBJEXT) \
         Concurrency/Waitfor.$(OBJEXT) Common/SemanticError.$(OBJEXT) \
@@ -520 +521 @@
         CodeGen/FixNames.cc CodeGen/FixMain.cc \
         CodeGen/OperatorTable.cc CodeTools/DeclStats.cc \
-        CodeTools/TrackLoc.cc Concurrency/Keywords.cc \
-        Concurrency/Waitfor.cc Common/SemanticError.cc \
-        Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
-        Common/Heap.cc Common/Eval.cc ControlStruct/LabelGenerator.cc \
+        CodeTools/ResolvProtoDump.cc CodeTools/TrackLoc.cc \
+        Concurrency/Keywords.cc Concurrency/Waitfor.cc \
+        Common/SemanticError.cc Common/UniqueName.cc \
+        Common/DebugMalloc.cc Common/Assert.cc Common/Heap.cc \
+        Common/Eval.cc ControlStruct/LabelGenerator.cc \
         ControlStruct/LabelFixer.cc ControlStruct/MLEMutator.cc \
         ControlStruct/Mutate.cc ControlStruct/ForExprMutator.cc \
@@ -999 +1001 @@
 CodeTools/DeclStats.$(OBJEXT): CodeTools/$(am__dirstamp) \
         CodeTools/$(DEPDIR)/$(am__dirstamp)
+CodeTools/ResolvProtoDump.$(OBJEXT): CodeTools/$(am__dirstamp) \
+        CodeTools/$(DEPDIR)/$(am__dirstamp)
 CodeTools/TrackLoc.$(OBJEXT): CodeTools/$(am__dirstamp) \
         CodeTools/$(DEPDIR)/$(am__dirstamp)
@@ -1101 +1105 @@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeGen/$(DEPDIR)/OperatorTable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/DeclStats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/ResolvProtoDump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@CodeTools/$(DEPDIR)/TrackLoc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/Assert.Po@am__quote@

src/main.cc

@@ -34 +34 @@
 #include "CodeGen/Generate.h"               // for generate
 #include "CodeTools/DeclStats.h"            // for printDeclStats
+#include "CodeTools/ResolvProtoDump.h"      // for dumpAsResolvProto
 #include "CodeTools/TrackLoc.h"             // for fillLocations
 #include "Common/CompilerError.h"           // for CompilerError
@@ -271 +272 @@
                 CodeTools::fillLocations( translationUnit );
 
+                if ( resolvprotop ) {
+                        CodeTools::dumpAsResolvProto( translationUnit );
+                        return 0;
+                }
+
                 PASS( "resolve", ResolvExpr::resolve( translationUnit ) );
                 if ( exprp ) {
@@ -376 +382 @@
 
 void parse_cmdline( int argc, char * argv[], const char *& filename ) {
-        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, PreludeDir, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
+        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, PreludeDir, Prototypes, Resolver, ResolvProto, Symbol, Tree, TupleExpansion, Validate, };
 
         static struct option long_opts[] = {
@@ -395 +401 @@
                 { "no-prototypes", no_argument, 0, Prototypes },
                 { "resolver", no_argument, 0, Resolver },
+                { "resolv-proto", no_argument, 0, ResolvProto },
                 { "symbol", no_argument, 0, Symbol },
                 { "tree", no_argument, 0, Tree },
@@ -407 +414 @@
         bool Wsuppress = false, Werror = false;
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrRstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -479 +486 @@
                   case 'r':                                                                             // print resolver steps
                         resolvep = true;
+                        break;
+                        case 'R':                                                                               // dump resolv-proto instance
+                        resolvprotop = true;
                         break;
                   case Symbol: