Changeset a62749f

Timestamp:

Jun 10, 2019, 12:08:15 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

6e3e0717

Parents:

61c7239

Message:

Better support for loose labels.

File:

• src/AST/Convert.cpp (modified) (7 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 06 19:51:00 2019
-// Update Count     : 10
+// Last Modified On : Man Jun 10 11:51:00 2019
+// Update Count     : 11
 //
 
@@ -92 +92 @@
 
         Label makeLabel(Statement * labelled, const ast::Label& label) {
+                // This probably will leak memory, but only until we get rid of the old tree.
+                if ( nullptr == labelled && label.location.isSet() ) {
+                        labelled = new NullStmt();
+                        labelled->location = label.location;
+                }
                 return Label(
                         label.name,
@@ -1390 +1395 @@
         // Local Utilities:
 
-        #define construct(T, key, ...) ({ \
-                void * data = ::operator new(sizeof(T)); \
-                cache.emplace( key, (T*)data ); \
-                new (data) T( __VA_ARGS__ ); \
-        })
-
         template<typename NewT, typename OldT>
         NewT * getAccept1( OldT old ) {
@@ -1409 +1408 @@
 
         template<typename NewT, typename OldC>
-        std::vector< ast::ptr<NewT> > getAcceptV( OldC& old ) {
+        std::vector< ast::ptr<NewT> > getAcceptV( const OldC& old ) {
                 std::vector< ast::ptr<NewT> > ret;
                 ret.reserve( old.size() );
@@ -1422 +1421 @@
 #       define GET_ACCEPT_V(child, type) \
                 getAcceptV< ast::type, decltype( old->child ) >( old->child )
-        
+
         template<typename NewT, typename OldC>
-        std::deque< ast::ptr<NewT> > getAcceptD( OldC& old ) {
+        std::deque< ast::ptr<NewT> > getAcceptD( const OldC& old ) {
                 std::deque< ast::ptr<NewT> > ret;
                 for ( auto a : old ) {
@@ -1437 +1436 @@
                 getAcceptD< ast::type, decltype( old->child ) >( old->child )
 
-        ast::Label make_label(Label* old) {
+        ast::Label make_label(const Label* old) {
+                CodeLocation const & location =
+                    ( old->labelled ) ? old->labelled->location : CodeLocation();
                 return ast::Label(
-                        old->labelled->location,
+                        location,
                         old->name,
                         GET_ACCEPT_V(attributes, Attribute)
@@ -1827 +1828 @@
                         }
 
-                        Label label = old->originalTarget;
                         auto stmt = new ast::BranchStmt(
                                 old->location,
                                 kind,
-                                make_label(&label),
+                                make_label(&old->originalTarget),
                                 GET_LABELS_V(old->labels)
                         );