octave: libinterp/corefcn/oct-stdstrm.h annotate

annotate libinterp/corefcn/oct-stdstrm.h @ 26703:29ea2369971d

Add basic backend for encodings in file streams (bug #55452). * oct-stream.h (base_stream): Store encoding in class. * oct-stream.cc (do_scanf_conv): Convert strings from encoding. (do_printf_string): Convert strings to encoding. (base_stream::printf): Convert format string to encoding. * oct-stdstrm.h (octave_stdiostream, octave_tstdiostream, octave_zstdiostream, create): Pass encoding through to base_stream. * oct-prcstrm.[cc,h] (octave_iprocstream, octave_oprocstream, create): Pass encoding through to octave_stdiostream. * oct-strstrm.[cc,h] (octave_istrstream, octave_ostrstream, create): Pass encoding through to base_stream.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Sat, 09 Feb 2019 16:43:11 +0100
parents	00f796120a6d
children	92ba3434f0b0

rev	line source
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	1 /*
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25438 diff changeset	3 Copyright (C) 1996-2019 John W. Eaton
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	4
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23795 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23795 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	16
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5775 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23795 diff changeset	19 <https://www.gnu.org/licenses/>.
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	20
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	21 */
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	22
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19697 diff changeset	23 #if ! defined (octave_oct_stdstrm_h)
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17787 diff changeset	24 #define octave_oct_stdstrm_h 1
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	25
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 20791 diff changeset	26 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 20791 diff changeset	27
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	28 #include <iomanip>
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	29
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	30 #include "oct-stream.h"
3630 8fbe6931e709 [project @ 2000-03-23 07:42:55 by jwe] jwe parents: 3611 diff changeset	31 #include "c-file-ptr-stream.h"
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	32
5325 ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	33 template <typename BUF_T, typename STREAM_T, typename FILE_T>
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	34 class
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	35 octave_tstdiostream : public octave::base_stream
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	36 {
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	37 public:
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	38
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	39 octave_tstdiostream (const std::string& n, FILE_T f = 0, int fid = 0,
21662 5b9868c2e212 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21244 diff changeset	40 std::ios::openmode m = std::ios::in \| std::ios::out,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	41 octave::mach_info::float_format ff
c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	42 = octave::mach_info::native_float_format (),
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	43 const std::string& encoding = "utf-8",
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10288 diff changeset	44 typename BUF_T::close_fcn cf = BUF_T::file_close)
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	45 : octave::base_stream (m, ff, encoding), nm (n), md (m),
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	46 s (f ? new STREAM_T (f, cf) : nullptr), fnum (fid)
5325 ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	47 { }
4327 c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	48
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	49 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	50
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	51 octave_tstdiostream (const octave_tstdiostream&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	52
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	53 octave_tstdiostream& operator = (const octave_tstdiostream&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	54
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	55 // Position a stream at OFFSET relative to ORIGIN.
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	56
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	57 int seek (off_t offset, int origin)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	58 { return s ? s->seek (offset, origin) : -1; }
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	59
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	60 // Return current stream position.
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	61
16011 8122286c69a9 initial large file support for 32-bit systems John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	62 off_t tell (void) { return s ? s->tell () : -1; }
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	63
18812 9ac2357f19bc doc: Replace "non-zero" with "nonzero" to match existing usage. Rik <rik@octave.org> parents: 17822 diff changeset	64 // Return nonzero if EOF has been reached on this stream.
4327 c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	65
c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	66 bool eof (void) const { return s ? s->eof () : true; }
c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	67
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	68 // The name of the file.
e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	69
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3340 diff changeset	70 std::string name (void) const { return nm; }
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	71
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	72 std::istream * input_stream (void) { return (md & std::ios::in) ? s : nullptr; }
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	73
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	74 std::ostream * output_stream (void) { return (md & std::ios::out) ? s : nullptr; }
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	75
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	76 // FIXME: should not have to cast away const here.
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	77 BUF_T * rdbuf (void) const
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	78 { return s ? (const_cast<STREAM_T *> (s))->rdbuf () : nullptr; }
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	79
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	80 int file_number (void) const { return fnum; }
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	81
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	82 bool bad (void) const { return s ? s->bad () : true; }
1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	83
4327 c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	84 void clear (void) { if (s) s->clear (); }
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	85
10288 5e972e2deffe avoid some possible gnulib #defines John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	86 void do_close (void) { if (s) s->stream_close (); }
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	87
1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	88 protected:
1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	89
4327 c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	90 std::string nm;
c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	91
c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	92 std::ios::openmode md;
c29c382a5b4b [project @ 2003-02-16 03:24:26 by jwe] jwe parents: 4326 diff changeset	93
5325 ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	94 STREAM_T *s;
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	95
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	96 // The file number associated with this file.
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	97 int fnum;
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	98
5325 ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	99 ~octave_tstdiostream (void) { delete s; }
ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	100 };
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	101
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	102 class
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	103 octave_stdiostream
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	104 : public octave_tstdiostream<c_file_ptr_buf, io_c_file_ptr_stream, FILE *>
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	105 {
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	106 public:
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	107
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	108 octave_stdiostream (const std::string& n, FILE *f = nullptr,
21662 5b9868c2e212 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21244 diff changeset	109 std::ios::openmode m = std::ios::in \| std::ios::out,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	110 octave::mach_info::float_format ff
c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	111 = octave::mach_info::native_float_format (),
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	112 const std::string& encoding = "utf-8",
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	113 c_file_ptr_buf::close_fcn cf = c_file_ptr_buf::file_close)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	114 : octave_tstdiostream<c_file_ptr_buf, io_c_file_ptr_stream, FILE *>
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	115 (n, f, f ? fileno (f) : -1, m, ff, encoding, cf) { }
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	116
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	117 static octave::stream
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	118 create (const std::string& n, FILE *f = nullptr,
21662 5b9868c2e212 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21244 diff changeset	119 std::ios::openmode m = std::ios::in \| std::ios::out,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	120 octave::mach_info::float_format ff
c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	121 = octave::mach_info::native_float_format (),
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	122 const std::string& encoding = "utf-8",
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	123 c_file_ptr_buf::close_fcn cf = c_file_ptr_buf::file_close)
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	124 {
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	125 return octave::stream (new octave_stdiostream (n, f, m, ff, encoding, cf));
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	126 }
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	127
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	128 // No copying!
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	129
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	130 octave_stdiostream (const octave_stdiostream&) = delete;
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	131
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	132 octave_stdiostream& operator = (const octave_stdiostream&) = delete;
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	133
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	134 protected:
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	135
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	136 ~octave_stdiostream (void) = default;
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	137 };
5325 ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	138
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21662 diff changeset	139 #if defined (HAVE_ZLIB)
5325 ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	140
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	141 class
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	142 octave_zstdiostream
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	143 : public octave_tstdiostream<c_zfile_ptr_buf, io_c_zfile_ptr_stream, gzFile>
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	144 {
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	145 public:
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	146
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	147 octave_zstdiostream (const std::string& n, gzFile f = nullptr, int fid = 0,
21662 5b9868c2e212 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21244 diff changeset	148 std::ios::openmode m = std::ios::in \| std::ios::out,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	149 octave::mach_info::float_format ff
c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	150 = octave::mach_info::native_float_format (),
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	151 const std::string& encoding = "utf-8",
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	152 c_zfile_ptr_buf::close_fcn cf
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	153 = c_zfile_ptr_buf::file_close)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	154 : octave_tstdiostream<c_zfile_ptr_buf, io_c_zfile_ptr_stream, gzFile>
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	155 (n, f, fid, m, ff, encoding, cf) { }
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	156
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22869 diff changeset	157 static octave::stream
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	158 create (const std::string& n, gzFile f = nullptr, int fid = 0,
21662 5b9868c2e212 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21244 diff changeset	159 std::ios::openmode m = std::ios::in \| std::ios::out,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	160 octave::mach_info::float_format ff
c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	161 = octave::mach_info::native_float_format (),
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	162 const std::string& encoding = "utf-8",
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	163 c_zfile_ptr_buf::close_fcn cf = c_zfile_ptr_buf::file_close)
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	164 {
26703 29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	165 return octave::stream (new octave_zstdiostream (n, f, fid, m, ff, encoding,
29ea2369971d Add basic backend for encodings in file streams (bug #55452). Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	166 cf));
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	167 }
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	168
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	169 // No copying!
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	170
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	171 octave_zstdiostream (const octave_zstdiostream&) = delete;
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	172
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	173 octave_zstdiostream& operator = (const octave_zstdiostream&) = delete;
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	174
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	175 protected:
594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	176
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	177 ~octave_zstdiostream (void) = default;
11004 594adb99a25e cache file id in octave_tstdiostream class John W. Eaton <jwe@octave.org> parents: 10313 diff changeset	178 };
5325 ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	179
ecbe4aa87e51 [project @ 2005-04-29 20:48:35 by jwe] jwe parents: 5307 diff changeset	180 #endif
4326 1cae4472c624 [project @ 2003-02-15 23:14:47 by jwe] jwe parents: 3951 diff changeset	181
2081 e9ec222a53e1 [project @ 1996-04-25 03:17:36 by jwe] jwe parents: diff changeset	182 #endif

Mercurial > octave

annotate libinterp/corefcn/oct-stdstrm.h @ 26703:29ea2369971d