Changeset d0bacde for src/SynTree/Constant.cc

Timestamp:

Sep 28, 2018, 5:34:46 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

04bdc26

Parents:

bb0f974 (diff), 6c89ecc (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.

Message:

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

File:

• src/SynTree/Constant.cc (modified) (3 diffs)

src/SynTree/Constant.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 14:50:00 2017
-// Update Count     : 29
+// Last Modified On : Fri Spt 28 14:49:00 2018
+// Update Count     : 30
 //
 
@@ -19 +19 @@
 
 #include "Constant.h"
+#include "Expression.h" // for ConstantExpr
 #include "Type.h"    // for BasicType, Type, Type::Qualifiers, PointerType
 
@@ -48 +49 @@
 Constant Constant::from_double( double d ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ), d );
+}
+
+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 );
 }