Changes in src/AST/Convert.cpp [6355ba7:558d13b]

File:

• src/AST/Convert.cpp (modified) (10 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,
@@ -1384 +1389 @@
         // 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 ) {
@@ -1403 +1402 @@
 
         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() );
@@ -1418 +1417 @@
 
         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 ) {
@@ -1431 +1430 @@
                 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)
@@ -1805 +1806 @@
                         }
 
-                        Label label = old->originalTarget;
                         auto stmt = new ast::BranchStmt(
                                 old->location,
                                 kind,
-                                make_label(&label),
+                                make_label(&old->originalTarget),
                                 GET_LABELS_V(old->labels)
                         );
@@ -2191 +2191 @@
 
         int isStringlikeConstantType(const Type *t) {
+                const Type *referentType = nullptr;
                 if ( const ArrayType * aty = dynamic_cast< const ArrayType * >( t ) ) {
-                        if ( const BasicType * bty = dynamic_cast< const BasicType * >( aty->base ) ) {
+                        referentType = aty->base;
+                } else if ( const PointerType * pty = dynamic_cast< const PointerType * >( t ) ) {
+                        referentType = pty->base;
+                }
+                if (referentType) {
+                        if ( const BasicType * bty = dynamic_cast< const BasicType * >( referentType ) ) {
                            if ( bty->kind == BasicType::Kind::Char ) {
                                    return true;
@@ -2203 +2209 @@
         virtual void visit( ConstantExpr * old ) override final {
                 ast::ConstantExpr *rslt = nullptr;
-                if (isIntlikeConstantType(old->result)) {
+                if (isStringlikeConstantType(old->result)) {
+                        rslt = new ast::ConstantExpr(
+                                old->location,
+                                GET_ACCEPT_1(result, Type),
+                                old->constant.get_value(),
+                                0,
+                                ast::ConstantExpr::Kind::String
+                        );
+                } else if (isIntlikeConstantType(old->result)) {
                         rslt = new ast::ConstantExpr(
                                 old->location,
@@ -2217 +2231 @@
                                 old->constant.get_value(),
                                 (double) old->constant.get_dval()
-                        );
-                } else if (isStringlikeConstantType(old->result)) {
-                        rslt = new ast::ConstantExpr(
-                                old->location,
-                                GET_ACCEPT_1(result, Type),
-                                old->constant.get_value(),
-                                0,
-                                ast::ConstantExpr::Kind::String
                         );
                 }