Changeset fe63ae6 for src/SynTree

Timestamp:

Apr 12, 2021, 5:16:45 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a1b9bc3

Parents:

56c8b86 (diff), 73f4d08 (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

Location:

src/SynTree

Files:

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

src/SynTree/Constant.cc

@@ -42 +42 @@
 }
 
+Constant Constant::from_string( const std::string & str ) {
+        Type * charType = new BasicType( noQualifiers, BasicType::Char );
+        // Adjust the length of the string for the terminator.
+        Expression * strSize = new ConstantExpr( Constant::from_ulong( str.size() + 1 ) );
+        Type * strType = new ArrayType( noQualifiers, charType, strSize, false, false );
+        const std::string strValue = "\"" + str + "\"";
+        return Constant( strType, strValue, std::nullopt );
+}
+
 Constant Constant::null( Type * ptrtype ) {
         if ( nullptr == ptrtype ) {

src/SynTree/Constant.h

@@ -47 +47 @@
         /// generates an integer constant of the given unsigned long int
         static Constant from_ulong( unsigned long i );
+        /// generates a string constant from the given string (char type, unquoted string)
+        static Constant from_string( const std::string & string );
 
         /// generates a null pointer value for the given type. void * if omitted.