Changes in src/Parser/ExpressionNode.cc [7f5566b:1869adf]

File:

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

src/Parser/ExpressionNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 30 14:53:23 2015
-// Update Count     : 188
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 24 16:20:00 2015
+// Update Count     : 158
 // 
 
@@ -42 +42 @@
 }
 
-ExpressionNode * ExpressionNode::set_argName( const std::string *aName ) {
+ExpressionNode * ExpressionNode::set_asArgName( const std::string *aName ) {
         argName = new VarRefNode( aName );
         return this;
 }
 
-ExpressionNode * ExpressionNode::set_argName( ExpressionNode *aDesignator ) {
+ExpressionNode * ExpressionNode::set_asArgName( ExpressionNode *aDesignator ) {
         argName = aDesignator;
         return this;
@@ -210 +210 @@
         assert( type == String );
 
-        // "abc" "def" "ghi" => "abcdefghi", remove new text from quotes and insert before last quote in old string.
+        // "abc" "def" "ghi" => "abcdefghi", so remove new text from quotes and insert before last quote in old string.
         value.insert( value.length() - 1, newValue->substr( 1, newValue->length() - 2 ) );
         
@@ -330 +330 @@
 //##############################################################################
 
-CompositeExprNode::CompositeExprNode() : ExpressionNode(), function( 0 ), arguments( 0 ) {
+CompositeExprNode::CompositeExprNode( void ) : ExpressionNode(), function( 0 ), arguments( 0 ) {
 }
 
@@ -541 +541 @@
                 {
                         assert( args.size() == 3);
-                        std::list< Expression * >::const_iterator i = args.begin();
+                        std::list< Expression* >::const_iterator i = args.begin();
                         Expression *arg1 = notZeroExpr( *i++ );
                         Expression *arg2 = *i++;
@@ -552 +552 @@
                 {
                         assert( args.size() == 2);
-                        std::list< Expression * >::const_iterator i = args.begin();
+                        std::list< Expression* >::const_iterator i = args.begin();
                         Expression *ret = *i++;
                         while ( i != args.end() ) {
@@ -617 +617 @@
                 set_args( arg );
 }
-
-//##############################################################################
-
-Expression *AsmExprNode::build() const {
-        return new AsmExpr( maybeBuild< Expression >( inout ), (ConstantExpr *)constraint->build(), operand->build() );
-}
-
-void AsmExprNode::print( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' ) << "Assembler Expression:" << endl;
-        if ( inout ) {
-                os << string( indent, ' ' ) << "inout: " << std::endl;
-                inout->print( os, indent + 2 );
-        } // if
-        if ( constraint ) {
-                os << string( indent, ' ' ) << "constraint: " << std::endl;
-                constraint->print( os, indent + 2 );
-        } // if
-        if ( operand ) {
-                os << string( indent, ' ' ) << "operand: " << std::endl;
-                operand->print( os, indent + 2 );
-        } // if
-}
-
-void AsmExprNode::printOneLine( std::ostream &os, int indent ) const {
-        printDesignation( os );
-        os << "( ";
-        if ( inout ) inout->printOneLine( os, indent + 2 );
-        os << ", ";
-        if ( constraint ) constraint->printOneLine( os, indent + 2 );
-        os << ", ";
-        if ( operand ) operand->printOneLine( os, indent + 2 );
-        os << ") ";
-}
-
-//##############################################################################
-
-void LabelNode::print( std::ostream &os, int indent ) const {}
-
-void LabelNode::printOneLine( std::ostream &os, int indent ) const {}
 
 //##############################################################################