Changes in src/Parser/ExpressionNode.cc [8780e30:1b772749]

File:

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

src/Parser/ExpressionNode.cc

@@ -172 +172 @@
 } // build_constantStr
 
-Expression * build_field_name_FLOATINGconstant( const std::string & str ) {
-        // str is of the form A.B -> separate at the . and return member expression
-        int a, b;
-        char dot;
-        std::stringstream ss( str );
-        ss >> a >> dot >> b;
-        UntypedMemberExpr * ret = new UntypedMemberExpr(
-                new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::SignedInt ), toString( b ) ) ),
-                new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::SignedInt ), toString( a ) ) ) );
-        delete &str;
-        return ret;
-} // build_field_name_FLOATINGconstant
-
-Expression * make_field_name_fraction_constants( Expression * fieldName, Expression * fracts ) {
-        if ( fracts ) {
-                if ( UntypedMemberExpr * memberExpr = dynamic_cast< UntypedMemberExpr * >( fracts ) ) {
-                        memberExpr->set_member( make_field_name_fraction_constants( fieldName, memberExpr->get_aggregate() ) );
-                        return memberExpr;
-                } else {
-                        return new UntypedMemberExpr( fracts, fieldName );
-                }
-        }
-        return fieldName;
-} // make_field_name_fraction_constants
-
-Expression * build_field_name_fraction_constants( Expression * fieldName, ExpressionNode * fracts ) {
-        return make_field_name_fraction_constants( fieldName, maybeMoveBuild< Expression >( fracts ) );
-} // build_field_name_fraction_constants
-
-Expression * build_field_name_REALFRACTIONconstant( const std::string & str ) {
-        assert( str[0] == '.' );
-        Expression * ret = build_constantInteger( *new std::string( str.substr(1) ) );
-        delete &str;
-        return ret;
-} // build_field_name_REALFRACTIONconstant
-
-Expression * build_field_name_REALDECIMALconstant( const std::string & str ) {
-        assert( str[str.size()-1] == '.' );
-        Expression * ret = build_constantInteger( *new std::string( str.substr( 0, str.size()-1 ) ) );
-        delete &str;
-        return ret;
-} // build_field_name_REALDECIMALconstant
-
 NameExpr * build_varref( const string *name, bool labelp ) {
         NameExpr *expr = new NameExpr( *name, nullptr );
@@ -241 +198 @@
 }
 
-Expression *build_fieldSel( ExpressionNode *expr_node, Expression *member ) {
-        UntypedMemberExpr *ret = new UntypedMemberExpr( member, maybeMoveBuild< Expression >(expr_node) );
-        return ret;
-}
-
-Expression *build_pfieldSel( ExpressionNode *expr_node, Expression *member ) {
+Expression *build_fieldSel( ExpressionNode *expr_node, NameExpr *member ) {
+        UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), maybeMoveBuild< Expression >(expr_node) );
+        delete member;
+        return ret;
+}
+
+Expression *build_pfieldSel( ExpressionNode *expr_node, NameExpr *member ) {
         UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
         deref->get_args().push_back( maybeMoveBuild< Expression >(expr_node) );
-        UntypedMemberExpr *ret = new UntypedMemberExpr( member, deref );
+        UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), deref );
+        delete member;
         return ret;
 }