Changeset 3cd5fdd for src/AST

Timestamp:

Jun 5, 2019, 6:07:41 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c6a1e8a, d3b2c32a, dd857bb

Parents:

99d4584 (diff), 8568319 (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.

git-author:

Aaron Moss <a3moss@…> (06/05/19 18:02:23)

git-committer:

Aaron Moss <a3moss@…> (06/05/19 18:07:41)

Message:

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

Location:

src/AST

Files:

• Chain.hpp (added)
• Convert.cpp (modified) (3 diffs)
• Node.cpp (modified) (1 diff)
• Node.hpp (modified) (4 diffs)

src/AST/Convert.cpp

@@ -749 +749 @@
                         break;
                 case ast::ConstantExpr::String:
-                        rslt = new ConstantExpr{Constant::from_string( node->rep )};
+                        rslt = new ConstantExpr{Constant{
+                                get<Type>().accept1( node->result ),
+                                node->rep,
+                                (long long unsigned int)0
+                        }};
                         break;
                 }
@@ -2150 +2154 @@
                                 GET_ACCEPT_1(result, Type),
                                 old->constant.get_value(),
-                                (unsigned long long) old->intValue()
+                                (unsigned long long) old->intValue(),
+                                ast::ConstantExpr::Kind::Integer
                         );
                 } else if (isFloatlikeConstantType(old->result)) {
@@ -2160 +2165 @@
                         );
                 } else if (isStringlikeConstantType(old->result)) {
-                        rslt = ast::ConstantExpr::from_string(
-                                old->location,
-                                old->constant.get_value()
+                        rslt = new ast::ConstantExpr(
+                                old->location,
+                                GET_ACCEPT_1(result, Type),
+                                old->constant.get_value(),
+                                0,
+                                ast::ConstantExpr::Kind::String
                         );
                 }

src/AST/Node.cpp

@@ -34 +34 @@
 template< typename node_t, enum ast::Node::ref_type ref_t >
 void ast::ptr_base<node_t, ref_t>::_dec( const node_t * node ) { node->decrement(ref_t); }
+
+template< typename node_t, enum ast::Node::ref_type ref_t >
+void ast::ptr_base<node_t, ref_t>::_check() const { if(node) assert(node->was_ever_strong == false || node->strong_count > 0); }
 
 template< typename node_t, enum ast::Node::ref_type ref_t >

src/AST/Node.hpp

@@ -46 +46 @@
         };
 
+        bool unique() const { return strong_count == 1; }
+
 private:
         /// Make a copy of this node; should be overridden in subclass with more precise return type
@@ -56 +58 @@
         mutable size_t strong_count = 0;
         mutable size_t weak_count = 0;
+        mutable bool was_ever_strong = false;
 
         void increment(ref_type ref) const {
                 switch (ref) {
-                        case ref_type::strong: strong_count++; break;
+                        case ref_type::strong: strong_count++; was_ever_strong = true; break;
                         case ref_type::weak  : weak_count  ++; break;
                 }
@@ -176 +179 @@
         }
 
-        const node_t * get() const { return  node; }
-        const node_t * operator->() const { return  node; }
-        const node_t & operator* () const { return *node; }
-        explicit operator bool() const { return node; }
-        operator const node_t * () const { return node; }
+        const node_t * get() const { _check(); return  node; }
+        const node_t * operator->() const { _check(); return  node; }
+        const node_t & operator* () const { _check(); return *node; }
+        explicit operator bool() const { _check(); return node; }
+        operator const node_t * () const { _check(); return node; }
 
         /// wrapper for convenient access to dynamic_cast
         template<typename o_node_t>
-        const o_node_t * as() const { return dynamic_cast<const o_node_t *>(node); }
+        const o_node_t * as() const { _check(); return dynamic_cast<const o_node_t *>(node); }
 
         /// wrapper for convenient access to strict_dynamic_cast
@@ -208 +211 @@
         void _inc( const node_t * other );
         void _dec( const node_t * other );
+        void _check() const;
 
 protected: