Changeset 8568319

Timestamp:

Jun 5, 2019, 4:57:48 PM (5 years ago)

Author:

Michael Brooks <mlbrooks@…>

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:

3cd5fdd

Parents:

54d4c0e

Message:

fixed string constants getting extra quotes on roundtrip conversion

File:

• src/AST/Convert.cpp (modified) (3 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
                         );
                 }