Changeset 80722d0 for src/Parser/ExpressionNode.cc

Timestamp:

Aug 20, 2016, 7:06:26 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

ab57786, d30790f

Parents:

e6955b1 (diff), 4a7d895 (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 plg2:software/cfa/cfa-cc

File:

• src/Parser/ExpressionNode.cc (modified) (5 diffs)

src/Parser/ExpressionNode.cc

@@ -57 +57 @@
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
 
-Expression *build_constantInteger( std::string & str ) {
+Expression *build_constantInteger( const std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
@@ -123 +123 @@
 } // build_constantInteger
 
-Expression *build_constantFloat( std::string & str ) {
+Expression *build_constantFloat( const std::string & str ) {
         static const BasicType::Kind kind[2][3] = {
                 { BasicType::Float, BasicType::Double, BasicType::LongDouble },
@@ -153 +153 @@
 } // build_constantFloat
 
-Expression *build_constantChar( std::string & str ) {
+Expression *build_constantChar( const std::string & str ) {
         return new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
 } // build_constantChar
 
-ConstantExpr *build_constantStr( std::string & str ) {
+ConstantExpr *build_constantStr( const std::string & str ) {
         // string should probably be a primitive type
         ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( emptyQualifiers, BasicType::Char ),
@@ -213 +213 @@
 }
 Expression *build_sizeOftype( DeclarationNode *decl_node ) {
-        return new SizeofExpr( decl_node->buildType() );
+        Expression* ret = new SizeofExpr( decl_node->buildType() );
+        delete decl_node;
+        return ret;
 }
 Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
@@ -222 +224 @@
 }
 Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
-        return new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
+        Expression* ret = new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
+        delete decl_node;
+        delete member;
+        return ret;
 }