Changeset 0dd18fd

Timestamp:

Aug 18, 2017, 4:01:06 PM (7 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:

5916272

Parents:

8bafacc

Message:

Removed the old LineMark? system.

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (2 diffs)
• CodeGenerator.h (modified) (4 diffs)
• Generate.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 14:20:00 2017
-// Update Count     : 487
+// Last Modified On : Fri Aug 18 15:34:00 2017
+// Update Count     : 488
 //
 #include "CodeGenerator.h"
@@ -77 +77 @@
                 } // for
                 return output;
-        }
-
-        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;
-                }
         }
 

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 13:52:00 2017
-// Update Count     : 55
+// Last Modified On : Fri Aug 18 15:40:00 2017
+// Update Count     : 56
 //
 
@@ -108 +108 @@
                 };
 
-                struct LineMarker {
-                        CodeLocation const & loc;
-                        bool toPrint;
-
-                        LineMarker(CodeLocation const & loc, bool toPrint);
-                };
-
-                LineMarker lineDirective(BaseSyntaxNode const * node);
-
                 void asmName( DeclarationWithType *decl );
 
                 void extension( Expression *expr );
                 void extension( Declaration *decl );
+
+                void updateLocation( BaseSyntaxNode const * to );
           private:
                 Indenter indent;
@@ -132 +125 @@
                 CodeLocation currentLocation;
                 void updateLocation( CodeLocation const & to );
-                void updateLocation( BaseSyntaxNode const * to );
                 void nextLine();
 
@@ -160 +152 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
-
-        std::ostream & operator<<(std::ostream &,
-                CodeGenerator::LineMarker const &);
 } // namespace CodeGen
 

src/CodeGen/Generate.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 19 13:05:00 2017
-// Update Count     : 6
+// Last Modified On : Fri Aug 18 15:39:00 2017
+// Update Count     : 7
 //
 #include "Generate.h"
@@ -33 +33 @@
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
-                                os << cgv.lineDirective(dcl);
+                                cgv.updateLocation( dcl );
                                 dcl->accept(cgv);
                                 if ( doSemicolon( dcl ) ) {