Changeset f980549 for src/Common

Timestamp:

Sep 20, 2017, 12:24:45 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

b18830e

Parents:

764e009 (diff), 47b5b63 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Common

Files:

• CodeLocation.h (modified) (4 diffs)
• PassVisitor.h (modified) (2 diffs)
• PassVisitor.impl.h (modified) (1 diff)
• SemanticError.cc (modified) (1 diff)
• SemanticError.h (modified) (1 diff)

src/Common/CodeLocation.h

@@ -16 +16 @@
 #pragma once
 
+#include <iostream>
 #include <string>
 
 struct CodeLocation {
-        int linenumber;
-        std::string filename;
+        int first_line = -1, first_column = -1, last_line = -1, last_column = -1;
+        std::string filename = "";
 
         /// Create a new unset CodeLocation.
-                CodeLocation()
-                : linenumber( -1 )
-                , filename("")
-        {}
+        CodeLocation() = default;
 
         /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
-                : linenumber( lineno )
+                : first_line( lineno )
                 , filename(filename ? filename : "")
         {}
@@ -37 +35 @@
 
         bool isSet () const {
-                return -1 != linenumber;
+                return -1 != first_line;
         }
 
@@ -44 +42 @@
         }
 
-        void unset () {
-                linenumber = -1;
-                filename = "";
-        }
-
-        // Use field access for set.
-
         bool followedBy( CodeLocation const & other, int seperation ) {
-                return (linenumber + seperation == other.linenumber &&
+                return (first_line + seperation == other.first_line &&
                         filename == other.filename);
         }
@@ -65 +56 @@
 };
 
-inline std::string to_string( const CodeLocation& location ) {
-    // Column number ":1" allows IDEs to parse the error message and position the cursor in the source text.
-    return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + ":1 " : "";
+inline std::ostream & operator<<( std::ostream & out, const CodeLocation & location ) {
+        // Column number ":1" allows IDEs to parse the error message and position the cursor in the source text.
+        return location.isSet() ? out << location.filename << ":" << location.first_line << ":1 " : out;
 }
-

src/Common/PassVisitor.h

@@ -133 +133 @@
         virtual void visit( OneType *oneType ) override final;
 
+        virtual void visit( Designation *designation ) override final;
         virtual void visit( SingleInit *singleInit ) override final;
         virtual void visit( ListInit *listInit ) override final;
@@ -221 +222 @@
         virtual Type* mutate( OneType *oneType ) override final;
 
+        virtual Designation* mutate( Designation *designation ) override final;
         virtual Initializer* mutate( SingleInit *singleInit ) override final;
         virtual Initializer* mutate( ListInit *listInit ) override final;

src/Common/PassVisitor.impl.h

@@ -1926 +1926 @@
 }
 
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( Designation * node ) {
+        VISIT_START( node );
+
+        maybeAccept( node->get_designators(), *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Designation * PassVisitor< pass_type >::mutate( Designation * node ) {
+        MUTATE_START( node );
+
+        maybeMutateRef( node->get_designators(), *this );
+
+        MUTATE_END( Designation, node );
+}
+
 //--------------------------------------------------------------------------
 // SingleInit

src/Common/SemanticError.cc

@@ -45 +45 @@
         using std::to_string;
         for( auto err : errors ) {
-                os << to_string( err.location ) << err.description << std::endl;
+                os << err.location << err.description << std::endl;
         }
 }

src/Common/SemanticError.h

@@ -32 +32 @@
 
         void maybeSet( const CodeLocation & location ) {
-                if( this->location.linenumber < 0 ) {
+                if( this->location.isUnset() ) {
                         this->location = location;
                 }