Changes in src/AST/Label.hpp [e0115286:14cebb7a]

File:

• src/AST/Label.hpp (modified) (1 diff)

src/AST/Label.hpp

@@ -25 +25 @@
 namespace ast {
 
-class Attribute;
+        class Attribute;
 
-/// Named labels for statements
-class Label {
-public:
-        CodeLocation location;
-        std::string name;
-        std::vector< ptr<Attribute> > attributes;
+        /// Named labels for statements
+        class Label {
+        public:
+                CodeLocation location;
+                std::string name;
+                std::vector< ptr<Attribute> > attributes;
 
-        Label( CodeLocation loc, const std::string& name = "",
-                const std::vector<ptr<Attribute>>& attrs = std::vector<ptr<Attribute>>{} )
-        : location( loc ), name( name ), attributes( attrs ) {}
+                Label( CodeLocation loc, const std::string& name = "",
+                        const std::vector<ptr<Attribute>>& attrs = std::vector<ptr<Attribute>>{} )
+                : location( loc ), name( name ), attributes( attrs ) {}
 
-        operator std::string () const { return name; }
-        bool empty() { return name.empty(); }
-};
+                operator std::string () const { return name; }
+                bool empty() { return name.empty(); }
+        };
 
-inline bool operator== ( const Label& l1, const Label& l2 ) { return l1.name == l2.name; }
-inline bool operator!= ( const Label& l1, const Label& l2 ) { return !(l1 == l2); }
-inline bool operator<  ( const Label& l1, const Label& l2 ) { return l1.name < l2.name; }
+        inline bool operator== ( const Label& l1, const Label& l2 ) { return l1.name == l2.name; }
+        inline bool operator!= ( const Label& l1, const Label& l2 ) { return !(l1 == l2); }
+        inline bool operator<  ( const Label& l1, const Label& l2 ) { return l1.name < l2.name; }
 
-inline std::ostream& operator<< ( std::ostream& out, const Label& l ) { return out << l.name; }
-
-
-//=================================================================================================
-/// This disgusting and giant piece of boiler-plate is here to solve a cyclic dependency
-/// remove only if there is a better solution
-/// The problem is that ast::ptr< ... > uses increment/decrement which won't work well with
-/// forward declarations
-inline void increment( const class Label * node, Node::ref_type ref ) { node->increment( ref ); }
-inline void decrement( const class Label * node, Node::ref_type ref ) { node->decrement( ref ); }
+        inline std::ostream& operator<< ( std::ostream& out, const Label& l ) { return out << l.name; }
 
 }