Changeset 64b3cda

Timestamp:

Dec 22, 2022, 4:05:12 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

ea2ed3a

Parents:

019b2d3

Message:

Adjusted -Pasterr so it works while using the new ast. Removed the -Ptree option as it doesn't seem to work and no one uses it.

Location:

src

Files:

• CompilationState.cc (modified) (1 diff)
• CompilationState.h (modified) (1 diff)
• Parser/RunParser.cpp (modified) (1 diff)
• Parser/RunParser.hpp (modified) (1 diff)
• main.cc (modified) (4 diffs)

src/CompilationState.cc

@@ -33 +33 @@
         useNewAST = true,
         nomainp = false,
-        parsep = false,
         resolvep = false,
         resolvprotop = false,

src/CompilationState.h

@@ -32 +32 @@
         useNewAST,
         nomainp,
-        parsep,
         resolvep,
         resolvprotop,

src/Parser/RunParser.cpp

@@ -45 +45 @@
 } // parse
 
-void dumpParseTree( std::ostream & out ) {
-        parseTree->printList( out );
-        delete parseTree;
-        parseTree = nullptr;
-}
-
 ast::TranslationUnit buildUnit(void) {
         std::list<Declaration *> translationUnit;

src/Parser/RunParser.hpp

@@ -31 +31 @@
 void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit = false );
 
-/// Drain the internal accumulator of parsed code and print it to the stream.
-void dumpParseTree( std::ostream & );
-
 /// Drain the internal accumulator of parsed code and build a translation
 /// unit from it.

src/main.cc

@@ -228 +228 @@
         ostream * output = & cout;
         list< Declaration * > translationUnit;
+        ast::TranslationUnit transUnit;
 
         Signal( SIGSEGV, sigSegvBusHandler, SA_SIGINFO );
@@ -294 +295 @@
                 parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, yydebug );
 
-                if ( parsep ) {
-                        dumpParseTree( cout );
-                        return EXIT_SUCCESS;
-                } // if
-
-                auto transUnit = buildUnit();
+                transUnit = buildUnit();
 
                 if ( astp ) {
@@ -467 +463 @@
                 if ( errorp ) {
                         cerr << "---AST at error:---" << endl;
-                        dump( translationUnit, cerr );
+                        // We check which section the errors came from without looking at
+                        // transUnit because std::move means it could look like anything.
+                        if ( !translationUnit.empty() ) {
+                                dump( translationUnit, cerr );
+                        } else {
+                                dump( std::move( transUnit ), cerr );
+                        }
                         cerr << endl << "---End of AST, begin error message:---\n" << endl;
                 } // if
@@ -571 +573 @@
         { "rproto", resolvprotop, true, "resolver-proto instance" },
         { "rsteps", resolvep, true, "print resolver steps" },
-        { "tree", parsep, true, "print parse tree" },
         // code dumps
         { "ast", astp, true, "print AST after parsing" },