improved line number handling

This commit is contained in:
2009-08-20 08:04:15 +00:00
parent 0f9d553ff8
commit b6ca96214a
12 changed files with 278 additions and 254 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: Awk.hpp 257 2009-08-17 12:10:30Z hyunghwan.chung $
* $Id: Awk.hpp 258 2009-08-19 14:04:15Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -97,10 +97,9 @@ public:
ERR_EXPRNST = QSE_AWK_EEXPRNST,
ERR_LXCHR = QSE_AWK_ELXCHR,
ERR_LXDIG = QSE_AWK_ELXDIG,
ERR_ENDSRC = QSE_AWK_EENDSRC,
ERR_ECMNTNC = QSE_AWK_ECMNTNC,
ERR_ENDSTR = QSE_AWK_EENDSTR,
ERR_ENDREX = QSE_AWK_EENDREX,
ERR_EOF = QSE_AWK_EEOF,
ERR_CMTNC = QSE_AWK_ECMTNC,
ERR_STRNC = QSE_AWK_ESTRNC,
ERR_LBRACE = QSE_AWK_ELBRACE,
ERR_LPAREN = QSE_AWK_ELPAREN,
ERR_RPAREN = QSE_AWK_ERPAREN,

View File

@ -1,5 +1,5 @@
/*
* $Id: StdAwk.hpp 254 2009-08-13 13:26:46Z hyunghwan.chung $
* $Id: StdAwk.hpp 258 2009-08-19 14:04:15Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -22,6 +22,7 @@
#include <qse/awk/Awk.hpp>
/** @file
* Standard AWK Interpreter
*
* @example awk05.cpp
* This program demonstrates how to use QSE::StdAwk::loop().

View File

@ -1,5 +1,5 @@
/*
* $Id: awk.h 257 2009-08-17 12:10:30Z hyunghwan.chung $
* $Id: awk.h 258 2009-08-19 14:04:15Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -651,10 +651,9 @@ enum qse_awk_errnum_t
QSE_AWK_ELXCHR, /**< invalid character '${0}' */
QSE_AWK_ELXDIG, /**< invalid digit '${0}' */
QSE_AWK_EENDSRC, /**< unexpected end of source */
QSE_AWK_ECMNTNC, /**< comment not closed properly */
QSE_AWK_EENDSTR, /**< string or regular expression not closed */
QSE_AWK_EENDREX, /**< unexpected end of regular expression */
QSE_AWK_EEOF, /**< unexpected end of source */
QSE_AWK_ECMTNC, /**< comment not closed properly */
QSE_AWK_ESTRNC, /**< string or regular expression not closed */
QSE_AWK_ELBRACE, /**< left brace expected in place of '${0}' */
QSE_AWK_ELPAREN, /**< left parenthesis expected in place of '${0}' */
QSE_AWK_ERPAREN, /**< right parenthesis expected in place of '${0}' */
@ -1034,7 +1033,7 @@ const qse_char_t* qse_awk_geterrmsg (
/**
* The qse_awk_geterrinf() function copies error information into memory
* pointed to by @a errinf.
* pointed to by @a errinf from @a awk.
*/
void qse_awk_geterrinf (
qse_awk_t* awk, /**< awk object */
@ -1533,11 +1532,21 @@ const qse_char_t* qse_awk_rtx_geterrmsg (
qse_awk_rtx_t* rtx /**< runtime context */
);
/**
* The qse_awk_rtx_geterrinf() function copies error information into memory
* pointed to by @a errinf from a runtime context @a rtx.
*/
void qse_awk_rtx_geterrinf (
qse_awk_rtx_t* rtx, /**< runtime context */
qse_awk_errinf_t* errinf /**< error information */
);
/**
* The qse_awk_rtx_geterror() function retrieves error information from a
* runtime context @rtx. The error number is stored into memory pointed
* to by @a errnum; the error message pointer into memory pointed to by
* @a errmsg; the error line into memory pointed to by @a errlin.
*/
void qse_awk_rtx_geterror (
qse_awk_rtx_t* rtx, /**< runtime context */
qse_awk_errnum_t* errnum, /**< error number */

View File

@ -1,5 +1,5 @@
/*
* $Id: std.h 239 2009-07-18 12:02:24Z hyunghwan.chung $
* $Id: std.h 258 2009-08-19 14:04:15Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -134,11 +134,11 @@ int qse_awk_parsestd (
* the lifetime of the runtime context created.
*/
qse_awk_rtx_t* qse_awk_rtx_openstd (
qse_awk_t* awk,
qse_size_t xtn,
const qse_char_t* id,
const qse_char_t*const* icf,
const qse_char_t*const* ocf
qse_awk_t* awk,
qse_size_t xtn,
const qse_char_t* id,
const qse_char_t** icf,
const qse_char_t** ocf
);
/**

View File

@ -1,5 +1,5 @@
/*
* $Id: Sed.hpp 257 2009-08-17 12:10:30Z hyunghwan.chung $
* $Id: Sed.hpp 258 2009-08-19 14:04:15Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -23,7 +23,7 @@
#include <qse/sed/sed.h>
/** @file
* A stream editor
* Stream Editor
*/
/////////////////////////////////

View File

@ -1,5 +1,5 @@
/*
* $Id: StdSed.hpp 254 2009-08-13 13:26:46Z hyunghwan.chung $
* $Id: StdSed.hpp 258 2009-08-19 14:04:15Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -22,7 +22,7 @@
#include <qse/sed/Sed.hpp>
/** @file
* standard sed
* Standard Stream Editor
*/
/////////////////////////////////