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

touched up code

Browse Source
This commit is contained in:
hyung-hwan
2009-08-18 06:10:30 +00:00
parent 267a602d4b
commit 0f9d553ff8
35 changed files with 807 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qse/include/qse/Makefile.am
View File

@ -1,5 +1,5 @@
# EXTRA_DIST = README
# EXTRA_DIST =
SUBDIRS = cmn sed awk lsp utl
pkginclude_HEADERS = config.h.in conf_msw.h conf_vms.h types.h macros.h pack1.h unpack.h
@ -8,9 +8,7 @@ if ENABLE_CXX
pkginclude_HEADERS += Types.hpp Mmgr.hpp
endif
pkgincludedir= $(includedir)/qse
CLEANFILES = *dist
pkgincludedir = $(includedir)/qse
install-data-hook:
@$(GREP) -E "#define[ ]+QSE_" "$(srcdir)/config.h" > "$(DESTDIR)$(pkgincludedir)/config.h"

4
qse/include/qse/Makefile.in
View File

@ -210,11 +210,10 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# EXTRA_DIST = README
# EXTRA_DIST =
SUBDIRS = cmn sed awk lsp utl
pkginclude_HEADERS = config.h.in conf_msw.h conf_vms.h types.h \
macros.h pack1.h unpack.h $(am__append_1)
CLEANFILES = *dist
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -487,7 +486,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

19
qse/include/qse/awk/Awk.hpp
View File

@ -1,5 +1,5 @@
/*
* $Id: Awk.hpp 254 2009-08-13 13:26:46Z hyunghwan.chung $
* $Id: Awk.hpp 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -240,14 +240,14 @@ public:
*/
void setError (
ErrorNumber code,
size_t line = 0,
const cstr_t* args = QSE_NULL
const cstr_t* args = QSE_NULL,
size_t line = 0
);
void setErrorWithMessage (
ErrorNumber code,
size_t line,
const char_t* msg
const char_t* msg,
size_t line
);
/** clears error information */
@ -749,12 +749,15 @@ public:
void setError (
ErrorNumber code,
size_t line = 0,
const cstr_t* args = QSE_NULL
const cstr_t* args = QSE_NULL,
size_t line = 0
);
void setErrorWithMessage (
ErrorNumber code, size_t line, const char_t* msg);
ErrorNumber code,
const char_t* msg,
size_t line
);
/**
* Sets the value of a global variable identified by @a id

1
qse/include/qse/awk/Makefile.am
View File

@ -6,4 +6,3 @@ pkginclude_HEADERS += Awk.hpp StdAwk.hpp
endif
pkgincludedir = $(includedir)/qse/awk
CLEANFILES = *dist

2
qse/include/qse/awk/Makefile.in
View File

@ -199,7 +199,6 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkginclude_HEADERS = awk.h std.h $(am__append_1)
CLEANFILES = *dist
all: all-am
.SUFFIXES:
@ -353,7 +352,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

24
qse/include/qse/awk/awk.h
View File

@ -1,5 +1,5 @@
/*
* $Id: awk.h 255 2009-08-16 08:08:58Z hyunghwan.chung $
* $Id: awk.h 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -769,8 +769,8 @@ typedef enum qse_awk_errnum_t qse_awk_errnum_t;
struct qse_awk_errinf_t
{
qse_awk_errnum_t num; /**< error number */
qse_size_t lin; /**< line number where an error occurred */
qse_char_t msg[256]; /**< error message */
qse_size_t lin; /**< line number where an error occurred */
};
typedef struct qse_awk_errinf_t qse_awk_errinf_t;
@ -1061,18 +1061,18 @@ void qse_awk_seterrinf (
void qse_awk_geterror (
qse_awk_t* awk,
qse_awk_errnum_t* errnum,
qse_size_t* errlin,
const qse_char_t** errmsg
const qse_char_t** errmsg,
qse_size_t* errlin
);
/**
* The qse_awk_seterror() functon sets error information.
*/
void qse_awk_seterror (
qse_awk_t* awk,
qse_awk_errnum_t errnum,
qse_size_t errlin,
const qse_cstr_t* errarg
qse_awk_t* awk, /**< awk object */
qse_awk_errnum_t errnum, /**< error number */
const qse_cstr_t* errarg, /**< argument array for formatting error message */
qse_size_t errlin /**< line number */
);
int qse_awk_getoption (
@ -1541,8 +1541,8 @@ void qse_awk_rtx_geterrinf (
void qse_awk_rtx_geterror (
qse_awk_rtx_t* rtx, /**< runtime context */
qse_awk_errnum_t* errnum, /**< error number */
qse_size_t* errlin, /**< error line */
const qse_char_t** errmsg /**< error message */
const qse_char_t** errmsg, /**< error message */
qse_size_t* errlin /**< error line */
);
void qse_awk_rtx_seterrnum (
@ -1559,8 +1559,8 @@ void qse_awk_rtx_seterrinf (
void qse_awk_rtx_seterror (
qse_awk_rtx_t* rtx, /**< runtime context */
qse_awk_errnum_t errnum, /**< error number */
qse_size_t errlin, /**< error line */
const qse_cstr_t* errarg /**< error message formatting argument */
const qse_cstr_t* errarg, /**< argument array for formatting error message */
qse_size_t errlin /**< error line */
);
/**

2
qse/include/qse/cmn/Makefile.am
View File

@ -10,5 +10,3 @@ pkginclude_HEADERS = \
pkgincludedir = $(includedir)/qse/cmn
CLEANFILES = *dist

2
qse/include/qse/cmn/Makefile.in
View File

@ -205,7 +205,6 @@ pkginclude_HEADERS = \
rex.h sll.h dll.h opt.h tio.h \
fio.h pio.h sio.h time.h main.h stdio.h
CLEANFILES = *dist
all: all-am
.SUFFIXES:
@ -359,7 +358,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

2
qse/include/qse/lsp/Makefile.am
View File

@ -1,5 +1,3 @@
pkginclude_HEADERS = lsp.h
pkgincludedir= $(includedir)/qse/lsp
CLEANFILES = *dist

2
qse/include/qse/lsp/Makefile.in
View File

@ -197,7 +197,6 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkginclude_HEADERS = lsp.h
CLEANFILES = *dist
all: all-am
.SUFFIXES:
@ -351,7 +350,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

8
qse/include/qse/sed/Makefile.am
View File

@ -1,6 +1,8 @@
pkginclude_HEADERS = sed.h Sed.hpp StdSed.hpp
pkginclude_HEADERS = sed.h
if ENABLE_CXX
pkginclude_HEADERS += Sed.hpp StdSed.hpp
endif
pkgincludedir= $(includedir)/qse/sed
CLEANFILES = *dist

8
qse/include/qse/sed/Makefile.in
View File

@ -31,8 +31,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@ENABLE_CXX_TRUE@am__append_1 = Sed.hpp StdSed.hpp
subdir = include/qse/sed
DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
DIST_COMMON = $(am__pkginclude_HEADERS_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/ac/m4/libtool.m4 \
@ -47,6 +48,7 @@ CONFIG_HEADER = $(top_builddir)/include/qse/config.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
am__pkginclude_HEADERS_DIST = sed.h Sed.hpp StdSed.hpp
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@ -196,8 +198,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkginclude_HEADERS = sed.h Sed.hpp StdSed.hpp
CLEANFILES = *dist
pkginclude_HEADERS = sed.h $(am__append_1)
all: all-am
.SUFFIXES:
@ -351,7 +352,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

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

@ -1,5 +1,5 @@
/*
* $Id: Sed.hpp 254 2009-08-13 13:26:46Z hyunghwan.chung $
* $Id: Sed.hpp 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -155,9 +155,9 @@ public:
* The setError() function sets information on an error occurred.
*/
void setError (
errnum_t err, ///< an error number
size_t lin = 0, ///< a line number
const cstr_t* args = QSE_NULL ///< strings for formatting an error message
errnum_t err, ///< an error number
const cstr_t* args = QSE_NULL, ///< strings for formatting an error message
size_t lin = 0 ///< a line number
);
/**

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

@ -1,5 +1,5 @@
/*
* $Id: sed.h 212 2009-06-25 07:39:27Z hyunghwan.chung $
* $Id: sed.h 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -103,7 +103,7 @@ typedef enum qse_sed_errnum_t qse_sed_errnum_t;
* editor with the qse_sed_seterrstr() function to customize an error string.
*/
typedef const qse_char_t* (*qse_sed_errstr_t) (
qse_sed_t* sed, /**< a stream editor */
qse_sed_t* sed, /**< stream editor */
qse_sed_errnum_t num /**< an error number */
);
@ -212,7 +212,7 @@ qse_sed_t* qse_sed_open (
* The qse_sed_close() function destroys a stream editor.
*/
void qse_sed_close (
qse_sed_t* sed /**< a stream editor */
qse_sed_t* sed /**< stream editor */
);
/**
@ -221,14 +221,14 @@ void qse_sed_close (
* @return 0 or a number OR'ed of #qse_sed_option_t values
*/
int qse_sed_getoption (
qse_sed_t* sed /**< a stream editor */
qse_sed_t* sed /**< stream editor */
);
/**
* The qse_sed_setoption() function sets the option code.
*/
void qse_sed_setoption (
qse_sed_t* sed, /**< a stream editor */
qse_sed_t* sed, /**< stream editor */
int opt /**< 0 or a number OR'ed of #qse_sed_option_t values */
);
@ -236,7 +236,7 @@ void qse_sed_setoption (
* The qse_sed_getmaxdepth() gets the maximum processing depth.
*/
qse_size_t qse_sed_getmaxdepth (
qse_sed_t* sed, /**< a stream editor */
qse_sed_t* sed, /**< stream editor */
qse_sed_depth_t id /**< one of qse_sed_depth_t values */
);
@ -244,7 +244,7 @@ qse_size_t qse_sed_getmaxdepth (
* The qse_sed_setmaxdepth() sets the maximum processing depth.
*/
void qse_sed_setmaxdepth (
qse_sed_t* sed, /**< a stream editor */
qse_sed_t* sed, /**< stream editor */
int ids, /**< 0 or a number OR'ed of #qse_sed_depth_t values */
qse_size_t depth /**< maximum depth level */
);
@ -253,7 +253,7 @@ void qse_sed_setmaxdepth (
* The qse_sed_geterrstr() gets an error string getter.
*/
qse_sed_errstr_t qse_sed_geterrstr (
qse_sed_t* sed /**< a stream editor */
qse_sed_t* sed /**< stream editor */
);
/**
@ -281,7 +281,7 @@ qse_sed_errstr_t qse_sed_geterrstr (
* @endcode
*/
void qse_sed_seterrstr (
qse_sed_t* sed, /**< a stream editor */
qse_sed_t* sed, /**< stream editor */
qse_sed_errstr_t errstr /**< an error string getter */
);
@ -290,7 +290,7 @@ void qse_sed_seterrstr (
* @return the number of the last error
*/
qse_sed_errnum_t qse_sed_geterrnum (
qse_sed_t* sed /**< a stream editor */
qse_sed_t* sed /**< stream editor */
);
/**
@ -299,7 +299,7 @@ qse_sed_errnum_t qse_sed_geterrnum (
* @return the line number of the last error
*/
qse_size_t qse_sed_geterrlin (
qse_sed_t* sed /**< a stream editor */
qse_sed_t* sed /**< stream editor */
);
/**
@ -307,7 +307,7 @@ qse_size_t qse_sed_geterrlin (
* @return a pointer to an error message
*/
const qse_char_t* qse_sed_geterrmsg (
qse_sed_t* sed /**< a stream editor */
qse_sed_t* sed /**< stream editor */
);
/**
@ -316,10 +316,31 @@ const qse_char_t* qse_sed_geterrmsg (
* each parameter.
*/
void qse_sed_geterror (
qse_sed_t* sed, /**< a stream editor */
qse_sed_errnum_t* errnum, /**< a pointer to an error number holder */
qse_size_t* errlin, /**< a pointer to an error line holder */
const qse_char_t** errmsg /**< a pointer to an error message */
qse_sed_t* sed, /**< stream editor */
qse_sed_errnum_t* errnum, /**< pointer to an error number holder */
qse_size_t* errlin, /**< pointer to an error line holder */
const qse_char_t** errmsg /**< pointer to an error message */
);
/**
* The qse_sed_seterrnum() function sets error information omitting error
* location.
*/
void qse_sed_seterrnum (
qse_sed_t* sed, /**< stream editor */
qse_sed_errnum_t errnum, /**< error number */
const qse_cstr_t* errarg /**< argument for formatting error message */
);
/**
* The qse_sed_seterrmsg() function sets error information with a customized
* message for a given error number.
*/
void qse_sed_seterrmsg (
qse_sed_t* sed, /**< stream editor */
qse_sed_errnum_t errnum, /**< error number */
const qse_char_t* errmsg, /**< error message */
qse_size_t errlin /**< error line */
);
/**
@ -328,10 +349,10 @@ void qse_sed_geterror (
* and an array of formatting parameters.
*/
void qse_sed_seterror (
qse_sed_t* sed, /**< a stream editor */
qse_sed_errnum_t errnum, /**< an error number */
qse_size_t errlin, /**< an error line */
const qse_cstr_t* errarg /**< a string array for formatting an error message */
qse_sed_t* sed, /**< stream editor */
qse_sed_errnum_t errnum, /**< error number */
const qse_cstr_t* errarg, /**< argument array for formatting error message */
qse_size_t errlin /**< error line */
);
/**
@ -339,8 +360,8 @@ void qse_sed_seterror (
* @return 0 on success, -1 on error
*/
int qse_sed_comp (
qse_sed_t* sed, /**< a stream editor */
const qse_char_t* ptr, /**< a pointer to a string containing commands */
qse_sed_t* sed, /**< stream editor */
const qse_char_t* ptr, /**< pointer to a string containing commands */
qse_size_t len /**< the number of characters in the string */
);
@ -349,7 +370,7 @@ int qse_sed_comp (
* @return 0 on success, -1 on error
*/
int qse_sed_exec (
qse_sed_t* sed, /**< a stream editor */
qse_sed_t* sed, /**< stream editor */
qse_sed_io_fun_t inf, /**< stream reader */
qse_sed_io_fun_t outf /**< stream writer */
);
@ -359,14 +380,14 @@ int qse_sed_exec (
* @return current input line number
*/
qse_size_t qse_sed_getlinnum (
qse_sed_t* sed /**< a stream editor */
qse_sed_t* sed /**< stream editor */
);
/**
* The qse_sed_setlinnum() function changes the current input line number.
*/
void qse_sed_setlinnum (
qse_sed_t* sed, /**< a stream editor */
qse_sed_t* sed, /**< stream editor */
qse_size_t num /**< a line number */
);

1
qse/include/qse/utl/Makefile.am
View File

@ -3,4 +3,3 @@ pkginclude_HEADERS = http.h tgp.h
pkgincludedir= $(includedir)/qse/utl
CLEANFILES = *dist

2
qse/include/qse/utl/Makefile.in
View File

@ -197,7 +197,6 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkginclude_HEADERS = http.h tgp.h
CLEANFILES = *dist
all: all-am
.SUFFIXES:
@ -351,7 +350,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)