Changeset 6a1dfda for src/SynTree

Timestamp:

Jun 13, 2019, 8:41:11 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

c36298d

Parents:

dc5072f (diff), 6896548 (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:

Peter A. Buhr <pabuhr@…> (06/13/19 20:39:34)

git-committer:

Peter A. Buhr <pabuhr@…> (06/13/19 20:41:11)

Message:

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

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.