Mercurial > hg > octave-jordi

comparison src/oct-stream.cc @ 5279:bd32f770c09a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-04-12 21:55:31 by jwe]
author jwe
date Tue, 12 Apr 2005 21:55:31 +0000
parents 23b37da9fd5b
children db290db95b33
comparison
equal deleted inserted replaced
5278:fe23ec6763b7 5279:bd32f770c09a
1946 mval.resize (final_nr, final_nc, 0.0); 1946 mval.resize (final_nr, final_nc, 0.0);
1947 1947
1948 retval = mval; 1948 retval = mval;
1949 1949
1950 if (all_char_conv) 1950 if (all_char_conv)
1951 retval = retval.convert_to_str (); 1951 retval = retval.convert_to_str (false, true);
1952 } 1952 }
1953 1953
1954 return retval; 1954 return retval;
1955 } 1955 }
1956 1956
3581 retval = rep->scanf (fmt, size, count, who); 3581 retval = rep->scanf (fmt, size, count, who);
3582 3582
3583 return retval; 3583 return retval;
3584 } 3584 }
3585 3585
3586 octave_value
3587 octave_stream::scanf (const octave_value& fmt, const Array<double>& size,
3588 int& count, const std::string& who)
3589 {
3590 octave_value retval = Matrix ();
3591
3592 if (fmt.is_string ())
3593 {
3594 std::string sfmt = fmt.string_value ();
3595
3596 if (fmt.is_sq_string ())
3597 sfmt = do_string_escapes (sfmt);
3598
3599 retval = scanf (sfmt, size, count, who);
3600 }
3601 else
3602 {
3603 // Note that this is not ::error () !
3604
3605 error (who + ": format must be a string");
3606 }
3607
3608 return retval;
3609 }
3610
3586 octave_value_list 3611 octave_value_list
3587 octave_stream::oscanf (const std::string& fmt, const std::string& who) 3612 octave_stream::oscanf (const std::string& fmt, const std::string& who)
3588 { 3613 {
3589 octave_value_list retval; 3614 octave_value_list retval;
3590 3615
3591 if (stream_ok (who)) 3616 if (stream_ok (who))
3592 retval = rep->oscanf (fmt, who); 3617 retval = rep->oscanf (fmt, who);
3618
3619 return retval;
3620 }
3621
3622 octave_value_list
3623 octave_stream::oscanf (const octave_value& fmt, const std::string& who)
3624 {
3625 octave_value_list retval;
3626
3627 if (fmt.is_string ())
3628 {
3629 std::string sfmt = fmt.string_value ();
3630
3631 if (fmt.is_sq_string ())
3632 sfmt = do_string_escapes (sfmt);
3633
3634 retval = oscanf (sfmt, who);
3635 }
3636 else
3637 {
3638 // Note that this is not ::error () !
3639
3640 error (who + ": format must be a string");
3641 }
3593 3642
3594 return retval; 3643 return retval;
3595 } 3644 }
3596 3645
3597 int 3646 int
3605 3654
3606 return retval; 3655 return retval;
3607 } 3656 }
3608 3657
3609 int 3658 int
3659 octave_stream::printf (const octave_value& fmt, const octave_value_list& args,
3660 const std::string& who)
3661 {
3662 int retval = 0;
3663
3664 if (fmt.is_string ())
3665 {
3666 std::string sfmt = fmt.string_value ();
3667
3668 if (fmt.is_sq_string ())
3669 sfmt = do_string_escapes (sfmt);
3670
3671 retval = printf (sfmt, args, who);
3672 }
3673 else
3674 {
3675 // Note that this is not ::error () !
3676
3677 error (who + ": format must be a string");
3678 }
3679
3680 return retval;
3681 }
3682
3683 int
3610 octave_stream::puts (const std::string& s, const std::string& who) 3684 octave_stream::puts (const std::string& s, const std::string& who)
3611 { 3685 {
3612 int retval = -1; 3686 int retval = -1;
3613 3687
3614 if (stream_ok (who)) 3688 if (stream_ok (who))
3625 int retval = -1; 3699 int retval = -1;
3626 3700
3627 if (tc_s.is_string ()) 3701 if (tc_s.is_string ())
3628 { 3702 {
3629 std::string s = tc_s.string_value (); 3703 std::string s = tc_s.string_value ();
3630 retval = rep->puts (s, who); 3704 retval = puts (s, who);
3631 } 3705 }
3632 else 3706 else
3633 { 3707 {
3634 // Note that this is not ::error () ! 3708 // Note that this is not ::error () !
3635 3709