Changeset 6896548 for src/SynTree

Timestamp:

Jun 13, 2019, 3:56:24 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:

6a1dfda

Parents:

d76f32c

Message:

Fixed convert-convert issues with strings, when conversion happens after resolve. Three specific issues fixed.

1. String literals were not roundtripping new-old-new with the original type at the constant level, whereas the resolver changes the expression-level type from array to pointer.
2. String literals were roundtripping with noise on a "--print astexpr" diff, with the char-array's index type coming up signed int (expecting unsigned long long int).
3. Function calls that pass a foo[] variable as argument to a foo* formal were crashing on copy-constructor generation because convert-convert was changing the arg-expression type from foo* (set by the resolver, as expecteed) back to foo[], taken from the variable (switched to foo* taken from convert-src expression).

Location:

src/SynTree

Files:

• Constant.cc (modified) (1 diff)
• Constant.h (modified) (1 diff)

src/SynTree/Constant.cc

@@ -51 +51 @@
 }
 
-Constant Constant::from_string( std::string const & str ) {
-        return Constant(
-                new ArrayType(
-                        noQualifiers,
-                        new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
-                        new ConstantExpr( Constant::from_int( str.size() + 1 /* \0 */ )),
-                        false, false ),
-                std::string("\"") + str + "\"", (unsigned long long int)0 );
+Constant Constant::from_string( std::string const & cEscapedVal, Type *charType ) {
+        assert(cEscapedVal.length() >= 2);
+        assert(cEscapedVal.front() == '"');
+        assert(cEscapedVal.back() == '"');
+        ArrayType * at = new ArrayType( noQualifiers, charType,
+                                                                        new ConstantExpr( Constant::from_ulong( cEscapedVal.size() + 1 - 2 ) ), // +1 for '\0' and -2 for '"'
+                                                                        false, false );
+        return Constant( at, cEscapedVal, (unsigned long long int)0 );
 }
 

src/SynTree/Constant.h

@@ -52 +52 @@
         static Constant from_double( double d );
         /// generates an array of chars constant of the given string
-        static Constant from_string( std::string const & s );
+        static Constant from_string( std::string const & cEscapedVal, Type *charType  );
 
         /// generates a null pointer value for the given type. void * if omitted.