hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enhanced the Sed class with a few more methods

Browse Source
This commit is contained in:
hyung-hwan 2009-05-28 23:00:24 +00:00
parent fb9cdaa1c0
commit 9dfcf671a4
8 changed files with 268 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qse/doc/Doxyfile
View File

@ -725,7 +725,7 @@ USE_HTAGS = NO
# will generate a verbatim copy of the header file for each class for # will generate a verbatim copy of the header file for each class for
# which an include is specified. Set to NO to disable this. # which an include is specified. Set to NO to disable this.
VERBATIM_HEADERS = YES VERBATIM_HEADERS = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# configuration options related to the alphabetical class index # configuration options related to the alphabetical class index
@ -830,7 +830,7 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
# will append .docset to the name. # will append .docset to the name.
DOCSET_BUNDLE_ID = org.doxygen.Project DOCSET_BUNDLE_ID = org.hyunghwan.qse
# If the GENERATE_HTMLHELP tag is set to YES, additional index files # If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the # will be generated that can be used as input for tools like the

5
qse/doc/page/main.doc
View File

@ -17,11 +17,6 @@ Cross compiling for WIN32 with MINGW32
./configure --host=i586-mingw32msvc --target=i586-mingw32msvc --enable-syscall ./configure --host=i586-mingw32msvc --target=i586-mingw32msvc --enable-syscall
make make
@section DOCUMENTATION
Generate the API documents with robodoc.
robodoc --rc doc/robodoc.rc --css doc/robodoc.css --src . --doc ./doc/qse
@section MODULES @section MODULES
QSE includes various modules: QSE includes various modules:
- @ref awk "AWK" - @ref awk "AWK"

275
qse/doc/robodoc.css
View File

@ -1,275 +0,0 @@
body
{
background-color: rgb(255,255,255);
color: rgb(98,84,55);
font-family: Arial, serif;
border-color: rgb(226,199,143);
}
pre
{
font-family: monospace;
margin: 15px;
padding: 5px;
white-space: pre;
color: #000;
}
pre.source
{
background-color: #ffe;
border: dashed #aa9 1px;
}
p
{
margin:15px;
}
p.item_name
{
font-weight: bolder;
margin:5px;
//font-size: 120%;
}
#content
{
font-size: 100%;
color: rgb(0,0,0);
background-color: rgb(255,255,255);
border-left-width: 0px;
border-right-width: 0px;
border-top-width: 0px;
border-bottom-width: 0px;
border-left-style: none;
border-right-style: none;
border-top-style: none;
border-bottom-style: none;
padding: 40px 31px 14px 17px;
border-color: rgb(0,0,0);
text-align: justify;
}
#navigation
{
background-color: rgb(98,84,55);
color: rgb(230,221,202);
//font-family: "Times New Roman", serif;
font-family: Georgia, serif;
font-style: normal;
border-color: rgb(0,0,0);
}
a.menuitem
{
//font-size: 120%;
//font-size: 120%;
background-color: rgb(0,0,0);
color: rgb(195,165,100);
font-variant: normal;
text-transform: none;
font-weight: normal;
padding: 1px 8px 3px 1px;
margin-left: 5px;
margin-right: 5px;
margin-top: 5px;
margin-bottom: 5px;
border-color: rgb(159,126,57);
text-align: right;
}
#logo, #logo a
{
//font-size: 130%;
background-color: rgb(198,178,135);
color: rgb(98,84,55);
font-family: Georgia, serif;
font-style: normal;
font-variant: normal;
text-transform: none;
font-weight: bold;
padding: 20px 18px 20px 18px;
border-color: rgb(255,255,255);
text-align: right;
}
#extra, #extra a
{
//font-size: 128%;
background-color: rgb(0,0,0);
color: rgb(230,221,202);
font-style: normal;
font-variant: normal;
text-transform: none;
font-weight: normal;
border-left-width: 0px;
border-right-width: 0px;
border-top-width: 0px;
border-bottom-width: 0px;
border-left-style: none;
border-right-style: none;
border-top-style: none;
border-bottom-style: none;
padding: 12px 12px 12px 12px;
border-color: rgb(195,165,100);
text-align: center;
}
#content a
{
color: rgb(159,126,57);
text-decoration: none;
}
#content a:hover, #content a:active
{
color: rgb(255,255,255);
background-color: rgb(159,126,57);
}
a.indexitem
{
display: block;
}
h1, h2, h3, h4, h5, h6
{
background-color: rgb(221,221,221);
font-family: Arial, serif;
font-style: normal;
font-variant: normal;
text-transform: none;
font-weight: normal;
}
h1
{
font-size: 151%;
}
h2
{
font-size: 142%;
}
h3
{
font-size: 133%;
}
h4
{
font-size: 124%;
}
h5
{
font-size: 115%;
}
h6
{
font-size: 106%;
}
#navigation a
{
text-decoration: none;
}
.menuitem:hover
{
background-color: rgb(195,165,100);
color: rgb(0,0,0);
}
#extra a
{
text-decoration: none;
}
#logo a
{
text-decoration: none;
}
#extra a:hover
{
}
/* layout */
#navigation
{
width: 22%;
position: relative;
top: 0;
right: 0;
float: right;
text-align: center;
margin-left: 10px;
}
.menuitem {width: auto;}
#content {width: auto;}
.menuitem {display: block;}
div#footer
{
background-color: rgb(198,178,135);
color: rgb(98,84,55);
clear: left;
width: 100%;
font-size: 71%;
}
div#footer a
{
background-color: rgb(198,178,135);
color: rgb(98,84,55);
}
div#footer p
{
margin:0;
padding:5px 10px
}
span.keyword
{
color: #00F;
}
span.comment
{
color: #080;
}
span.quote
{
color: #F00;
}
span.squote
{
color: #F0F;
}
span.sign
{
color: #008B8B;
}
span.line_number
{
color: #808080;
}
@media print
{
#navigation {display: none;}
#content {padding: 0px;}
#content a {text-decoration: underline;}
}

68
qse/doc/robodoc.rc
View File

@ -1,68 +0,0 @@
items:
NAME
SYNOPSIS
SOURCE
DESCRIPTION
INPUT
INPUTS
OUTPUT
OUTPUTS
RETURN
RETURNS
EXAMPLE
EXAMPLES
NOTE
NOTES
BUGS
SEE ALSO
source items:
SYNOPSIS
item order:
NAME
SYNOPSIS
DESCRIPTION
INPUT
INPUTS
OUTPUT
OUTPUTS
RETURN
RETURNS
EXAMPLE
EXAMPLES
NOTE
NOTES
BUGS
SEE ALSO
SOURCE
remark begin markers:
/*
remark end markers:
*/
ignore files:
autoconf
autom4te.cache
.*
accept files:
*.c
*.h
headertypes:
o "Overview" robo_overview 10
m "Macros" robo_macros 6
t "Types" robo_types 5
e "Enumerations" robo_enumerations 6
s "Structures" robo_structures 5
f "Functions" robo_functions 4
S "Sample Programs" robo_samples 0
options:
--cmode
--nopre
--documenttitle "QSE"
# --source_line_numbers
--tabsize 4
--sections
--toc "no"
--tell
--nosort
--index
--multidoc
--html

179
qse/include/qse/sed/Sed.hpp
View File

@ -36,15 +36,23 @@ QSE_BEGIN_NAMESPACE(QSE)
class Sed: public Mmgr class Sed: public Mmgr
{ {
public: public:
/// Type sed_t type redefines a stream editor type
typedef qse_sed_t sed_t; typedef qse_sed_t sed_t;
/// The errnum_t type redefines an error number type
typedef qse_sed_errnum_t errnum_t; typedef qse_sed_errnum_t errnum_t;
/// The errstr_t type redefines an error formattering string getter type
typedef qse_sed_errstr_t errstr_t;
/// The io_cmd_t type redefines an IO command type
typedef qse_sed_io_cmd_t io_cmd_t; typedef qse_sed_io_cmd_t io_cmd_t;
/// The io_arg_t type redefines an IO data type
typedef qse_sed_io_arg_t io_arg_t; typedef qse_sed_io_arg_t io_arg_t;
/// The option_t type redefines an option type
typedef qse_sed_option_t option_t;
/** /**
* The Sed() function creates a uninitialized stream editor. * The Sed() function creates an uninitialized stream editor.
*/ */
Sed () throw (): sed (QSE_NULL) {} Sed () throw (): sed (QSE_NULL), dflerrstr (QSE_NULL) {}
/** /**
* The open() function initializes a stream editor and makes it * The open() function initializes a stream editor and makes it
@ -54,7 +62,7 @@ public:
int open () throw (); int open () throw ();
/** /**
* The close() function finalized a stream editor. * The close() function finalizes a stream editor.
*/ */
void close () throw (); void close () throw ();
@ -84,34 +92,48 @@ public:
*/ */
int execute () throw (); int execute () throw ();
/**
* The getOption() function gets the current options.
* @return current option code
*/
int getOption () const throw ();
/**
* The setOption() function sets options for a stream editor.
* The option code @a opt is 0 or OR'ed of #option_t enumerators.
*/
void setOption (
int opt ///< option code
) throw ();
/** /**
* The getErrorMessage() function gets the description of the last * The getErrorMessage() function gets the description of the last
* error occurred. It returns an empty string if the stream editor * error occurred. It returns an empty string if the stream editor
* has not been initialized with the open() function. * has not been initialized with the open() function.
*/ */
const char_t* getErrorMessage() const; const char_t* getErrorMessage() const throw ();
/** /**
* The getErrorLine() function gets the number of the line where * The getErrorLine() function gets the number of the line where
* the last error occurred. It returns 0 if the stream editor has * the last error occurred. It returns 0 if the stream editor has
* not been initialized with the open() function. * not been initialized with the open() function.
*/ */
size_t getErrorLine () const; size_t getErrorLine () const throw ();
/** /**
* The getErrorNumber() function gets the number of the last * The getErrorNumber() function gets the number of the last
* error occurred. It returns 0 if the stream editor has not been * error occurred. It returns QSE_SED_ENOERR if the stream editor
* initialized with the open function. * has not been initialized with the open() function.
*/ */
errnum_t getErrorNumber () const; errnum_t getErrorNumber () const throw ();
protected: protected:
/** /**
* The IO class is a base class for IO operation. It wraps around the * The IOBase class is a base class for IO operation. It wraps around
* qse_sed_io_arg_t type and exposes relevant information to * the primitive Sed::io_arg_t type and exposes relevant information to
* an IO handler * an IO handler
*/ */
class IO class IOBase
{ {
public: public:
/** /**
@ -124,7 +146,7 @@ protected:
}; };
protected: protected:
IO (io_arg_t* arg, Mode mode): arg(arg), mode (mode) {} IOBase (io_arg_t* arg, Mode mode): arg(arg), mode (mode) {}
public: public:
/** /**
@ -168,22 +190,22 @@ protected:
* The Console class inherits the IO class and provides functionality * The Console class inherits the IO class and provides functionality
* for console IO operations. * for console IO operations.
*/ */
class Console: public IO class Console: public IOBase
{ {
protected: protected:
friend class Sed; friend class Sed;
Console (io_arg_t* arg, Mode mode): IO (arg, mode) {} Console (io_arg_t* arg, Mode mode): IOBase (arg, mode) {}
}; };
/** /**
* The File class inherits the IO class and provides functionality * The File class inherits the IO class and provides functionality
* for file IO operations. * for file IO operations.
*/ */
class File: public IO class File: public IOBase
{ {
protected: protected:
friend class Sed; friend class Sed;
File (io_arg_t* arg, Mode mode): IO (arg, mode) {} File (io_arg_t* arg, Mode mode): IOBase (arg, mode) {}
public: public:
/** /**
@ -199,28 +221,131 @@ protected:
/** /**
* The openConsole() function should be implemented by a subclass * The openConsole() function should be implemented by a subclass
* to open a console * to open a console. It can get the mode requested by invoking
* the Console::getMode() function over the console object @a io.
*
* When it comes to the meaning of the return value, 0 may look
* a bit tricky. Easygoers can just return 1 on success and never
* return 0 from openConsole().
* - If 0 is returned for a Console::READ console, the execute()
* function returns success after having calle closeConsole() as it
* has opened a console but has reached EOF.
* - If 0 is returned for a Console::WRITE console and there are any
* following writeConsole() requests, the execute() function
* returns failure after having called closeConsole() as it cannot
* write further on EOF.
*
* @return -1 on failure, 1 on success, 0 on success but reached EOF.
*/ */
virtual int openConsole (Console& io) = 0; virtual int openConsole (
virtual int closeConsole (Console& io) = 0; Console& io ///< a console object
virtual ssize_t readConsole ( ) = 0;
Console& io, char_t* buf, size_t len) = 0;
virtual ssize_t writeConsole (
Console& io, const char_t* data, size_t len) = 0;
virtual int openFile (File& io) = 0; /**
virtual int closeFile (File& io) = 0; * The closeConsole() function should be implemented by a subclass
* to close a console.
*/
virtual int closeConsole (
Console& io ///< a console object
) = 0;
/**
* The readConsole() function should be implemented by a subclass
* to read from a console. It should fill the memory area pointed to
* by @a buf, but at most \a len characters.
* @return the number of characters read on success,
* 0 on EOF, -1 on failure
*/
virtual ssize_t readConsole (
Console& io, ///< a console object
char_t* buf, ///< a buffer pointer
size_t len ///< the size of a buffer
) = 0;
/**
* The writeConsole() function should be implemented by a subclass
* to write to a console. It should write up to @a len characters
* from the memory are pointed to by @a data.
* @return the number of characters written on success
* 0 on EOF, -1 on failure
* @note The number of characters written may be less than @a len.
* But the return value 0 causes execute() to fail as
* writeConsole() is called when there are data to write and
* it has indicated EOF.
*/
virtual ssize_t writeConsole (
Console& io, ///< a console object
const char_t* data, ///< a pointer to data to write
size_t len ///< the length of data
) = 0;
/**
* The openFile() function should be implemented by a subclass
* to open a file. It can get the mode requested by invoking
* the File::getMode() function over the file object @a io.
* @return -1 on failure, 1 on success, 0 on success but reached EOF.
*/
virtual int openFile (
File& io ///< a file object
) = 0;
/**
* The closeFile() function should be implemented by a subclass
* to close a file.
*/
virtual int closeFile (
File& io ///< a file object
) = 0;
/**
* The readFile() function should be implemented by a subclass
* to read from a file. It should fill the memory area pointed to
* by @a buf, but at most \a len characters.
* @return the number of characters read on success,
* 0 on EOF, -1 on failure
*/
virtual ssize_t readFile ( virtual ssize_t readFile (
File& io, char_t* buf, size_t len) = 0; File& io, ///< a file object
char_t* buf, ///< a buffer pointer
size_t len ///< the size of a buffer
) = 0;
/**
* The writeFile() function should be implemented by a subclass
* to write to a file. It should write up to @a len characters
* from the memory are pointed to by @a data.
* @return the number of characters written on success
* 0 on EOF, -1 on failure
* @note The number of characters written may be less than @a len.
* But the return value 0 causes execute() to fail as
* writeFile() is called when there are data to write and
* it has indicated EOF.
*/
virtual ssize_t writeFile ( virtual ssize_t writeFile (
File& io, const char_t* data, size_t len) = 0; File& io, ///< a file object
const char_t* data, ///< a pointer to data to write
size_t len ///< the length of data
) = 0;
/**
* The getErrorString() function returns an error formatting string
* for the error number @a num. A subclass wishing to customize
* an error formatting string may override this function.
*/
virtual const char_t* getErrorString (
errnum_t num ///< an error number
);
protected: protected:
/// handle to a primitive sed object
sed_t* sed; sed_t* sed;
/// default error formatting string getter
errstr_t dflerrstr;
private: private:
static ssize_t xin (sed_t* s, io_cmd_t cmd, io_arg_t* arg) throw (); static ssize_t xin (sed_t* s, io_cmd_t cmd, io_arg_t* arg) throw ();
static ssize_t xout (sed_t* s, io_cmd_t cmd, io_arg_t* arg) throw (); static ssize_t xout (sed_t* s, io_cmd_t cmd, io_arg_t* arg) throw ();
static const char_t* xerrstr (sed_t* s, errnum_t num) throw ();
}; };
///////////////////////////////// /////////////////////////////////

99
qse/include/qse/sed/sed.h
View File

@ -60,48 +60,53 @@ typedef struct qse_sed_t qse_sed_t;
*/ */
enum qse_sed_errnum_t enum qse_sed_errnum_t
{ {
QSE_SED_ENOERR, /**< no error occurred */ QSE_SED_ENOERR, /**< no error */
QSE_SED_ENOMEM, /**< insufficient memory is available */ QSE_SED_ENOMEM, /**< out of memory */
QSE_SED_ECMDNR, /**< a command is not recognized */ QSE_SED_ECMDNR, /**< command '${0}' not recognized */
QSE_SED_ECMDMS, /**< a command is missing */ QSE_SED_ECMDMS, /**< command code missing */
QSE_SED_ECMDIC, /**< a command is incomplete */ QSE_SED_ECMDIC, /**< command '${0}' incomplete */
QSE_SED_EREXIC, /**< regular expression incomplete */ QSE_SED_EREXIC, /**< regular expression '${0}' incomplete */
QSE_SED_EREXBL, /**< regular expression build error */ QSE_SED_EREXBL, /**< failed to compile regular expression '${0}' */
QSE_SED_EREXMA, /**< regular expression match error */ QSE_SED_EREXMA, /**< failed to match regular expression */
QSE_SED_EA1PHB, /**< address 1 prohibited */ QSE_SED_EA1PHB, /**< address 1 prohibited for '${0}' */
QSE_SED_EA2PHB, /**< address 2 prohibited */ QSE_SED_EA2PHB, /**< address 2 prohibited */
QSE_SED_EA2MOI, /**< address 2 missing or invalid */ QSE_SED_EA2MOI, /**< address 2 missing or invalid */
QSE_SED_ENEWLN, /**< a new line is expected */ QSE_SED_ENEWLN, /**< newline expected */
QSE_SED_EBSEXP, /**< \ is expected */ QSE_SED_EBSEXP, /**< backslash expected */
QSE_SED_EBSDEL, /**< \ used a delimiter */ QSE_SED_EBSDEL, /**< backslash used as delimiter */
QSE_SED_EGBABS, /**< garbage after \ */ QSE_SED_EGBABS, /**< garbage after backslash */
QSE_SED_ESCEXP, /**< ; is expected */ QSE_SED_ESCEXP, /**< semicolon expected */
QSE_SED_ELABEM, /**< label name is empty */ QSE_SED_ELABEM, /**< empty label name */
QSE_SED_ELABDU, /**< duplicate label name */ QSE_SED_ELABDU, /**< duplicate label name '${0}' */
QSE_SED_ELABNF, /**< label not found */ QSE_SED_ELABNF, /**< label '${0}' not found */
QSE_SED_EFILEM, /**< file name is empty */ QSE_SED_EFILEM, /**< empty file name */
QSE_SED_EFILIL, /**< illegal file name */ QSE_SED_EFILIL, /**< illegal file name */
QSE_SED_ETSNSL, /**< translation set not the same length*/ QSE_SED_ETSNSL, /**< strings in translation set not the same length*/
QSE_SED_EGRNBA, /**< group brackets not balanced */ QSE_SED_EGRNBA, /**< group brackets not balanced */
QSE_SED_EGRNTD, /**< group nested too deeply */ QSE_SED_EGRNTD, /**< group nesting too deep */
QSE_SED_EOCSDU, /**< multiple occurrence specifiers */ QSE_SED_EOCSDU, /**< multiple occurrence specifiers */
QSE_SED_EOCSZE, /**< occurrence specifier to s is zero */ QSE_SED_EOCSZE, /**< occurrence specifier zero */
QSE_SED_EOCSTL, /**< occurrence specifier too large */ QSE_SED_EOCSTL, /**< occurrence specifier too large */
QSE_SED_EIOFIL, /**< file io error */ QSE_SED_EIOFIL, /**< io error with file '${0}'*/
QSE_SED_EIOUSR /**< user io error */ QSE_SED_EIOUSR /**< error returned by user io handler */
}; };
typedef enum qse_sed_errnum_t qse_sed_errnum_t; typedef enum qse_sed_errnum_t qse_sed_errnum_t;
/** /**
* The qse_sed_errstr_t type defines a prototype for an error string getter. * The qse_sed_errstr_t type defines a error string getter. It should return
* an error formatting string for an error number requested. A new string
* should contain the same number of positional parameters (${X}) as in the
* default error formatting string. You can set a new getter into a stream
* editor with the qse_sed_seterrstr() function to customize an error string.
*/ */
typedef const qse_char_t* (*qse_sed_errstr_t) ( typedef const qse_char_t* (*qse_sed_errstr_t) (
qse_sed_t* sed, qse_sed_errnum_t errnum qse_sed_t* sed, /**< a stream editor */
qse_sed_errnum_t num /**< an error number */
); );
/** /**
* The qse_sed_option_t type defines various option codes for a stream editor. * The qse_sed_option_t type defines various option codes for a stream editor.
* Options can be XOR'ed with each other and be passed to a stream editor with * Options can be OR'ed with each other and be passed to a stream editor with
* the qse_sed_setoption() function. * the qse_sed_setoption() function.
*/ */
enum qse_sed_option_t enum qse_sed_option_t
@ -112,6 +117,7 @@ enum qse_sed_option_t
QSE_SED_QUIET = (1 << 3), /**< do not print pattern space */ QSE_SED_QUIET = (1 << 3), /**< do not print pattern space */
QSE_SED_CLASSIC = (1 << 4) /**< disable extended features */ QSE_SED_CLASSIC = (1 << 4) /**< disable extended features */
}; };
typedef enum qse_sed_option_t qse_sed_option_t;
/** /**
* The qse_sed_io_cmd_t type defines IO command codes. The code indicates * The qse_sed_io_cmd_t type defines IO command codes. The code indicates
@ -131,21 +137,23 @@ typedef enum qse_sed_io_cmd_t qse_sed_io_cmd_t;
*/ */
struct qse_sed_io_arg_t struct qse_sed_io_arg_t
{ {
void* handle; void* handle; /**< IO handle */
const qse_char_t* path; const qse_char_t* path; /**< file path. QSE_NULL for a console */
union union
{ {
/** read buffer */
struct struct
{ {
qse_char_t* buf; qse_char_t* buf; /**< buffer pointer */
qse_size_t len; qse_size_t len; /**< buffer size */
} r; } r;
/** data to write */
struct struct
{ {
const qse_char_t* data; const qse_char_t* data; /**< data pointer */
qse_size_t len; qse_size_t len; /**< data length */
} w; } w;
} u; } u;
}; };
@ -193,7 +201,7 @@ void qse_sed_close (
/** /**
* The qse_sed_getoption() function retrieves the current options set in * The qse_sed_getoption() function retrieves the current options set in
* a stream editor. * a stream editor.
* @return 0 or a number XOR'ed of qse_sed_option_t values * @return 0 or a number OR'ed of qse_sed_option_t values
*/ */
int qse_sed_getoption ( int qse_sed_getoption (
qse_sed_t* sed /**< a stream editor */ qse_sed_t* sed /**< a stream editor */
@ -204,7 +212,7 @@ int qse_sed_getoption (
*/ */
void qse_sed_setoption ( void qse_sed_setoption (
qse_sed_t* sed, /**< a stream editor */ qse_sed_t* sed, /**< a stream editor */
int opt /**< 0 or a number XOR'ed of qse_sed_option_t values */ int opt /**< 0 or a number OR'ed of qse_sed_option_t values */
); );
/** /**
@ -215,7 +223,28 @@ qse_sed_errstr_t qse_sed_geterrstr (
); );
/** /**
* The qse_sed_seterrstr() sets an error string getter. * The qse_sed_seterrstr() sets an error string getter that is called to
* compose an error message when its retrieval is requested.
*
* Here is an example of changing the formatting string for the #QSE_SED_ECMDNR
* error.
* @code
* qse_sed_errstr_t orgerrstr;
*
* const qse_char_t* myerrstr (qse_sed_t* sed, qse_sed_errnum_t num)
* {
* if (num == QSE_SED_ECMDNR) return QSE_T("unrecognized command ${0}");
* return orgerrstr (sed, num);
* }
* int main ()
* {
* qse_sed_t* sed;
* ...
* orgerrstr = qse_sed_geterrstr (sed);
* qse_sed_seterrstr (sed, myerrstr);
* ...
* }
* @endcode
*/ */
void qse_sed_seterrstr ( void qse_sed_seterrstr (
qse_sed_t* sed, /**< a stream editor */ qse_sed_t* sed, /**< a stream editor */

41
qse/lib/sed/Sed.cpp
View File

@ -28,6 +28,10 @@ int Sed::open () throw ()
sed = qse_sed_open (this, QSE_SIZEOF(Sed*)); sed = qse_sed_open (this, QSE_SIZEOF(Sed*));
if (sed == QSE_NULL) return -1; if (sed == QSE_NULL) return -1;
*(Sed**)QSE_XTN(sed) = this; *(Sed**)QSE_XTN(sed) = this;
dflerrstr = qse_sed_geterrstr (sed);
qse_sed_seterrstr (sed, xerrstr);
return 0; return 0;
} }
@ -58,17 +62,29 @@ int Sed::execute () throw ()
return qse_sed_exec (sed, xin, xout); return qse_sed_exec (sed, xin, xout);
} }
const Sed::char_t* Sed::getErrorMessage () const int Sed::getOption() const throw ()
{
QSE_ASSERT (sed != QSE_NULL);
return qse_sed_getoption (sed);
}
void Sed::setOption (int opt) throw ()
{
QSE_ASSERT (sed != QSE_NULL);
qse_sed_setoption (sed, opt);
}
const Sed::char_t* Sed::getErrorMessage () const throw ()
{ {
return (sed == QSE_NULL)? QSE_T(""): qse_sed_geterrmsg (sed); return (sed == QSE_NULL)? QSE_T(""): qse_sed_geterrmsg (sed);
} }
Sed::size_t Sed::getErrorLine () const Sed::size_t Sed::getErrorLine () const throw ()
{ {
return (sed == QSE_NULL)? 0: qse_sed_geterrlin (sed); return (sed == QSE_NULL)? 0: qse_sed_geterrlin (sed);
} }
Sed::errnum_t Sed::getErrorNumber () const Sed::errnum_t Sed::getErrorNumber () const throw ()
{ {
return (sed == QSE_NULL)? QSE_SED_ENOERR: qse_sed_geterrnum (sed); return (sed == QSE_NULL)? QSE_SED_ENOERR: qse_sed_geterrnum (sed);
} }
@ -181,6 +197,25 @@ Sed::ssize_t Sed::xout (sed_t* s, io_cmd_t cmd, io_arg_t* arg) throw ()
} }
} }
const Sed::char_t* Sed::getErrorString (errnum_t num)
{
QSE_ASSERT (dflerrstr != QSE_NULL);
return dflerrstr (sed, num);
}
const Sed::char_t* Sed::xerrstr (sed_t* s, errnum_t num) throw ()
{
Sed* sed = *(Sed**)QSE_XTN(s);
try
{
return sed->getErrorString (num);
}
catch (...)
{
return sed->dflerrstr (s, num);
}
}
///////////////////////////////// /////////////////////////////////
QSE_END_NAMESPACE(QSE) QSE_END_NAMESPACE(QSE)
///////////////////////////////// /////////////////////////////////

21
qse/lib/sed/sed.c
View File

@ -52,11 +52,11 @@ static const qse_char_t* dflerrstr (qse_sed_t* sed, qse_sed_errnum_t errnum)
QSE_T("address 1 prohibited for '${0}'"), QSE_T("address 1 prohibited for '${0}'"),
QSE_T("address 2 prohibited"), QSE_T("address 2 prohibited"),
QSE_T("address 2 missing or invalid"), QSE_T("address 2 missing or invalid"),
QSE_T("a new line expected"), QSE_T("newline expected"),
QSE_T("a backslash expected"), QSE_T("backslash expected"),
QSE_T("a backslash used as a delimiter"), QSE_T("backslash used as delimiter"),
QSE_T("garbage after a backslash"), QSE_T("garbage after backslash"),
QSE_T("a semicolon expected"), QSE_T("semicolon expected"),
QSE_T("empty label name"), QSE_T("empty label name"),
QSE_T("duplicate label name '${0}'"), QSE_T("duplicate label name '${0}'"),
QSE_T("label '${0}' not found"), QSE_T("label '${0}' not found"),
@ -65,8 +65,8 @@ static const qse_char_t* dflerrstr (qse_sed_t* sed, qse_sed_errnum_t errnum)
QSE_T("strings in translation set not the same length"), QSE_T("strings in translation set not the same length"),
QSE_T("group brackets not balanced"), QSE_T("group brackets not balanced"),
QSE_T("group nesting too deep"), QSE_T("group nesting too deep"),
QSE_T("multiple occurrence specifier"), QSE_T("multiple occurrence specifiers"),
QSE_T("occurrence specifier is zero"), QSE_T("occurrence specifier zero"),
QSE_T("occurrence specifier too large"), QSE_T("occurrence specifier too large"),
QSE_T("io error with file '${0}'"), QSE_T("io error with file '${0}'"),
QSE_T("error returned by user io handler") QSE_T("error returned by user io handler")
@ -998,7 +998,7 @@ oops:
return -1; return -1;
} }
static int command (qse_sed_t* sed) static int get_command (qse_sed_t* sed)
{ {
qse_cint_t c; qse_cint_t c;
qse_sed_cmd_t* cmd = sed->cmd.cur; qse_sed_cmd_t* cmd = sed->cmd.cur;
@ -1304,7 +1304,7 @@ int qse_sed_comp (qse_sed_t* sed, const qse_char_t* sptr, qse_size_t slen)
} }
n = command (sed); n = get_command (sed);
if (n <= -1) if (n <= -1)
{ {
free_address (sed, cmd); free_address (sed, cmd);
@ -1734,7 +1734,8 @@ static int write_str_to_file (
if (n == 0) if (n == 0)
{ {
/* EOF is returned upon opening a write stream. /* EOF is returned upon opening a write stream.
* it is also an error as it can't write any more */ * it is also an error as it can't write
* a requested string */
sed->e.out.fun (sed, QSE_SED_IO_CLOSE, ap); sed->e.out.fun (sed, QSE_SED_IO_CLOSE, ap);
ap->handle = QSE_NULL; ap->handle = QSE_NULL;
SETERR1 (sed, QSE_SED_EIOFIL, cmd->lnum, path, plen); SETERR1 (sed, QSE_SED_EIOFIL, cmd->lnum, path, plen);