Changeset c850687

Timestamp:

May 11, 2017, 11:07:58 AM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

8514fe19

Parents:

29cf9c8

Message:

Add -L flag to turn of line marks. Updated the keyword list.

Files:

• doc/LaTeXmacros/common.tex (modified) (1 diff)
• src/CodeGen/CodeGenerator.cc (modified) (7 diffs)
• src/CodeGen/CodeGenerator.h (modified) (6 diffs)
• src/CodeGen/GenType.cc (modified) (8 diffs)
• src/CodeGen/GenType.h (modified) (1 diff)
• src/CodeGen/Generate.cc (modified) (3 diffs)
• src/CodeGen/Generate.h (modified) (1 diff)
• src/CodeGen/LineStream.cc (deleted)
• src/CodeGen/LineStream.h (deleted)
• src/main.cc (modified) (7 diffs)

doc/LaTeXmacros/common.tex

@@ -251 +251 @@
 \lstdefinelanguage{CFA}[ANSI]{C}{
         morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
-                _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
-                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,one_t,otype,restrict,_Static_assert,
-                _Thread_local,throw,throwResume,trait,try,ttype,typeof,__typeof,__typeof__,zero_t},
+                _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,coroutine,disable,dtype,enable,__extension__,
+                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,monitor,mutex,_Noreturn,one_t,otype,restrict,_Static_assert,
+                thread,_Thread_local,throw,throwResume,trait,try,ttype,typeof,__typeof,__typeof__,zero_t},
 }%
 

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus May  9 16:50:00 2017
+// Last Modified On : Wed May 10 14:45:00 2017
 // Update Count     : 484
 //
@@ -41 +41 @@
 namespace CodeGen {
         int CodeGenerator::tabsize = 4;
-
-        // Pseudo Function: output << lineDirective(currentNode);
-    struct lineDirective {
-        CodeLocation const & loc;
-                lineDirective(CodeLocation const & location) : loc(location) {}
-                lineDirective(BaseSyntaxNode const * node) : loc(node->location) {}
-        };
-        std::ostream & operator<<(std::ostream & out, lineDirective const & ld) {
-                if (ld.loc.isSet())
-                        return out << "\n# " << ld.loc.linenumber << " \""
-                                << ld.loc.filename << "\"\n";
-                return out << "\n// Unset Location\n";
-        }
 
         // the kinds of statements that would ideally be followed by whitespace
@@ -102 +89 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ) {}
+        CodeGenerator::LineMarker::LineMarker(
+                        CodeLocation const & loc, bool toPrint) :
+                loc(loc), toPrint(toPrint)
+        {}
+
+        CodeGenerator::LineMarker CodeGenerator::lineDirective(
+                        BaseSyntaxNode const * node) {
+                return LineMarker(node->location, lineMarks);
+        }
+
+        std::ostream & operator<<(std::ostream & out,
+                        CodeGenerator::LineMarker const & marker) {
+                if (marker.toPrint && marker.loc.isSet()) {
+                        return out << "\n# " << marker.loc.linenumber << " \""
+                                << marker.loc.filename << "\"\n";
+                } else if (marker.toPrint) {
+                        return out << "\n/* Missing CodeLocation */\n";
+                } else {
+                return out;
+                }
+        }
+
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -143 +152 @@
         // *** Declarations
         void CodeGenerator::visit( FunctionDecl * functionDecl ) {
-                output << lineDirective( functionDecl );
-
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -168 +175 @@
                 }
 
-                output << lineDirective( objectDecl );
-
                 extension( objectDecl );
                 genAttributes( objectDecl->get_attributes() );
@@ -221 +226 @@
 
         void CodeGenerator::visit( StructDecl * structDecl ) {
-                output << lineDirective( structDecl );
-
                 extension( structDecl );
                 handleAggregate( structDecl, "struct " );
@@ -228 +231 @@
 
         void CodeGenerator::visit( UnionDecl * unionDecl ) {
-                output << lineDirective( unionDecl );
-
                 extension( unionDecl );
                 handleAggregate( unionDecl, "union " );

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  1 16:20:04 2017
-// Update Count     : 50
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 10 10:57:00 2017
+// Update Count     : 51
 //
 
@@ -25 +25 @@
 #include "SymTab/Indexer.h"
 
+#include "Common/utility.h"
+
 namespace CodeGen {
         class CodeGenerator : public Visitor {
@@ -30 +32 @@
                 static int tabsize;
 
-                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false );
+                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false );
                 CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false );
                 CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false );
@@ -110 +112 @@
                 };
 
+                struct LineMarker {
+                        CodeLocation const & loc;
+                        bool toPrint;
+
+                        LineMarker(CodeLocation const & loc, bool toPrint);
+                };
+
+                LineMarker lineDirective(BaseSyntaxNode const * node);
+
                 void asmName( DeclarationWithType *decl );
 
@@ -122 +133 @@
                 bool pretty = false;  // pretty print
                 bool genC = false;    // true if output has to be C code
+                bool lineMarks = false;
 
                 void printDesignators( std::list< Expression * > & );
@@ -149 +161 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+
+        std::ostream & operator<<(std::ostream &,
+                CodeGenerator::LineMarker const &);
 } // namespace CodeGen
 

src/CodeGen/GenType.cc

@@ -28 +28 @@
         class GenType : public Visitor {
           public:
-                GenType( const std::string &typeString, bool pretty = false, bool genC = false );
+                GenType( const std::string &typeString, bool pretty = false, bool genC = false, bool lineMarks = false );
                 std::string get_typeString() const { return typeString; }
                 void set_typeString( const std::string &newValue ) { typeString = newValue; }
@@ -54 +54 @@
                 bool pretty = false; // pretty print
                 bool genC = false;   // generating C code?
+                bool lineMarks = false;
         };
 
-        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC ) {
-                GenType gt( baseString, pretty, genC );
+        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
+                GenType gt( baseString, pretty, genC, lineMarks );
                 std::ostringstream os;
 
                 if ( ! type->get_attributes().empty() ) {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         cg.genAttributes( type->get_attributes() );
                 } // if
@@ -73 +74 @@
   }
 
-        GenType::GenType( const std::string &typeString, bool pretty, bool genC ) : typeString( typeString ), pretty( pretty ), genC( genC ) {}
+        GenType::GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks ) : typeString( typeString ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         void GenType::visit( VoidType *voidType ) {
@@ -114 +115 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -168 +169 @@
                         } // if
                 } else {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "(" ;
 
@@ -191 +192 @@
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         std::ostringstream os;
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "forall(";
                         cg.genCommaList( funcType->get_forall().begin(), funcType->get_forall().end() );
@@ -202 +203 @@
                 if ( ! refType->get_parameters().empty() ) {
                         std::ostringstream os;
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "(";
                         cg.genCommaList( refType->get_parameters().begin(), refType->get_parameters().end() );
@@ -242 +243 @@
                 for ( Type * t : *tupleType ) {
                         i++;
-                        os << genType( t, "", pretty, genC ) << (i == tupleType->size() ? "" : ", ");
+                        os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
                 }
                 os << "]";

src/CodeGen/GenType.h

@@ -21 +21 @@
 
 namespace CodeGen {
-        std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false );
+        std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false, bool lineMarks = false );
   std::string genPrettyType( Type * type, const std::string & baseString );
 } // namespace CodeGen

src/CodeGen/Generate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 14:04:25 2015
-// Update Count     : 5
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 19 13:05:00 2017
+// Update Count     : 6
 //
 
@@ -31 +31 @@
 
 namespace CodeGen {
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC ) {
-                CodeGen::CodeGenerator cgv( os, pretty, generateC );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks ) {
+                CodeGen::CodeGenerator cgv( os, pretty, generateC, lineMarks );
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
+                                os << cgv.lineDirective(dcl);
                                 dcl->accept(cgv);
                                 if ( doSemicolon( dcl ) ) {
@@ -48 +49 @@
                         os << CodeGen::genPrettyType( type, "" );
                 } else {
-                        CodeGen::CodeGenerator cgv( os, true, false );
+                        CodeGen::CodeGenerator cgv( os, true, false, false );
                         node->accept( cgv );
                 }

src/CodeGen/Generate.h

@@ -24 +24 @@
 namespace CodeGen {
         /// Generates code. doIntrinsics determines if intrinsic functions are printed, pretty formats output nicely (e.g., uses unmangled names, etc.), generateC is true when the output must consist only of C code (allows some assertions, etc.)
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false , bool lineMarks = false );
 
         /// Generate code for a single node -- helpful for debugging in gdb

src/main.cc

@@ +1 @@
+
 //
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
@@ -9 +10 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 14 14:35:54 2016
-// Update Count     : 436
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 10 14:45:00 2017
+// Update Count     : 437
 //
 
@@ -79 +80 @@
         errorp = false,
         codegenp = false,
-        prettycodegenp = false;
+        prettycodegenp = false,
+        nolinemarks = false;
 
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
@@ -310 +312 @@
 
                 CodeTools::fillLocations( translationUnit );
-                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true );
+                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, ! nolinemarks );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
@@ -336 +338 @@
         } catch ( CompilerError &e ) {
                 cerr << "Compiler Error: " << e.get_what() << endl;
-                cerr << "(please report bugs to " << endl;
+                cerr << "(please report bugs to [REDACTED])" << endl;
                 if ( output != &cout ) {
                         delete output;
@@ -375 +377 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcdefglmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -411 +413 @@
                   case 'l':                                                                             // generate libcfa.c
                         libcfap = true;
+                        break;
+                  case 'L':                                                                             // surpress lines marks
+                        nolinemarks = true;
                         break;
                   case Nopreamble: