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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qse/Makefile.am
View File

@ -3,14 +3,14 @@ ACLOCAL_AMFLAGS = -I ac/m4
AUTOMAKE_OPTION = foreign
EXTRA_DIST = ac/au ac/m4
SUBDIRS = lib cmd
DIST_SUBDIRS = $(SUBDIRS) include regress samples doc
SUBDIRS = lib cmd include
DIST_SUBDIRS = $(SUBDIRS) regress samples doc
install-data-hook:
cd include && $(MAKE) install
#install-data-hook:
# cd include && $(MAKE) install
uninstall-hook:
cd include && $(MAKE) uninstall
#uninstall-hook:
# cd include && $(MAKE) uninstall
distclean-local:
$(RM) -r autom4te.cache

35
qse/Makefile.in
View File

@ -212,8 +212,8 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ac/m4
AUTOMAKE_OPTION = foreign
EXTRA_DIST = ac/au ac/m4
SUBDIRS = lib cmd
DIST_SUBDIRS = $(SUBDIRS) include regress samples doc
SUBDIRS = lib cmd include
DIST_SUBDIRS = $(SUBDIRS) regress samples doc
all: all-recursive
.SUFFIXES:
@ -588,8 +588,6 @@ info: info-recursive
info-am:
install-data-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-recursive
@ -626,11 +624,9 @@ ps: ps-recursive
ps-am:
uninstall-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-data-am install-strip uninstall-am
install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
@ -639,22 +635,21 @@ uninstall-am:
distclean distclean-generic distclean-libtool distclean-local \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-data-hook install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-hook
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am
install-data-hook:
cd include && $(MAKE) install
#install-data-hook:
# cd include && $(MAKE) install
uninstall-hook:
cd include && $(MAKE) uninstall
#uninstall-hook:
# cd include && $(MAKE) uninstall
distclean-local:
$(RM) -r autom4te.cache

2
qse/cmd/Makefile.am
View File

@ -1,2 +1,2 @@
SUBDIRS = awk lsp utl
SUBDIRS = sed awk lsp utl
DIST_SUBDIRS = $(SUBDIRS)

2
qse/cmd/Makefile.in
View File

@ -194,7 +194,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = awk lsp utl
SUBDIRS = sed awk lsp utl
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive

9
qse/cmd/sed/Makefile.am Normal file
View File

@ -0,0 +1,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = qsesed
qsesed_SOURCES = sed.c
qsesed_LDFLAGS = -L../../lib/sed
qsesed_LDADD = -lqsesed

495
qse/cmd/sed/Makefile.in Normal file
View File

@ -0,0 +1,495 @@
# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = qsesed$(EXEEXT)
subdir = cmd/sed
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/ac/m4/libtool.m4 \
$(top_srcdir)/ac/m4/ltoptions.m4 \
$(top_srcdir)/ac/m4/ltsugar.m4 \
$(top_srcdir)/ac/m4/ltversion.m4 \
$(top_srcdir)/ac/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/qse/config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_qsesed_OBJECTS = sed.$(OBJEXT)
qsesed_OBJECTS = $(am_qsesed_OBJECTS)
qsesed_DEPENDENCIES =
qsesed_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qsesed_LDFLAGS) \
$(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/qse
depcomp = $(SHELL) $(top_srcdir)/ac/au/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(qsesed_SOURCES)
DIST_SOURCES = $(qsesed_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_MODE = @BUILD_MODE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHAR_MODE = @CHAR_MODE@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HAVE_CXX = @HAVE_CXX@
HAVE_OBJC = @HAVE_OBJC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJC = @OBJC@
OBJCDEPMODE = @OBJCDEPMODE@
OBJCFLAGS = @OBJCFLAGS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
QSE_SIZEOF_CHAR = @QSE_SIZEOF_CHAR@
QSE_SIZEOF_DOUBLE = @QSE_SIZEOF_DOUBLE@
QSE_SIZEOF_FLOAT = @QSE_SIZEOF_FLOAT@
QSE_SIZEOF_INT = @QSE_SIZEOF_INT@
QSE_SIZEOF_LONG = @QSE_SIZEOF_LONG@
QSE_SIZEOF_LONG_DOUBLE = @QSE_SIZEOF_LONG_DOUBLE@
QSE_SIZEOF_LONG_LONG = @QSE_SIZEOF_LONG_LONG@
QSE_SIZEOF_SHORT = @QSE_SIZEOF_SHORT@
QSE_SIZEOF_VOID_P = @QSE_SIZEOF_VOID_P@
QSE_SIZEOF_WCHAR_T = @QSE_SIZEOF_WCHAR_T@
RANLIB = @RANLIB@
RM = @RM@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_OBJC = @ac_ct_OBJC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir)/include
qsesed_SOURCES = sed.c
qsesed_LDFLAGS = -L../../lib/sed
qsesed_LDADD = -lqsesed
all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
&& { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign cmd/sed/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign cmd/sed/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
qsesed$(EXEEXT): $(qsesed_OBJECTS) $(qsesed_DEPENDENCIES)
@rm -f qsesed$(EXEEXT)
$(qsesed_LINK) $(qsesed_OBJECTS) $(qsesed_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sed.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
dvi: dvi-am
dvi-am:
html: html-am
info: info-am
info-am:
install-data-am:
install-dvi: install-dvi-am
install-exec-am: install-binPROGRAMS
install-html: install-html-am
install-info: install-info-am
install-man:
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool ctags distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-binPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

0
qse/samples/sed/sed01.c → qse/cmd/sed/sed.c
View File

11
qse/configure vendored
View File

@ -25648,7 +25648,7 @@ QSE_SIZEOF_DOUBLE=$ac_cv_sizeof_double
QSE_SIZEOF_LONG_DOUBLE=$ac_cv_sizeof_long_double
ac_config_files="$ac_config_files Makefile include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/utl/Makefile include/qse/sed/Makefile include/qse/awk/Makefile include/qse/lsp/Makefile lib/Makefile lib/cmn/Makefile lib/utl/Makefile lib/sed/Makefile lib/awk/Makefile lib/lsp/Makefile cmd/Makefile cmd/utl/Makefile cmd/awk/Makefile cmd/lsp/Makefile samples/Makefile samples/cmn/Makefile samples/utl/Makefile samples/sed/Makefile samples/awk/Makefile regress/Makefile regress/awk/Makefile doc/Makefile doc/page/Makefile doc/page.ko/Makefile doc/Doxyfile"
ac_config_files="$ac_config_files Makefile include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/sed/Makefile include/qse/awk/Makefile include/qse/lsp/Makefile include/qse/utl/Makefile lib/Makefile lib/cmn/Makefile lib/sed/Makefile lib/awk/Makefile lib/lsp/Makefile lib/utl/Makefile cmd/Makefile cmd/sed/Makefile cmd/awk/Makefile cmd/lsp/Makefile cmd/utl/Makefile samples/Makefile samples/cmn/Makefile samples/sed/Makefile samples/awk/Makefile samples/utl/Makefile regress/Makefile regress/awk/Makefile doc/Makefile doc/page/Makefile doc/page.ko/Makefile doc/Doxyfile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -26670,25 +26670,26 @@ do
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/qse/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/Makefile" ;;
"include/qse/cmn/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/cmn/Makefile" ;;
"include/qse/utl/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/utl/Makefile" ;;
"include/qse/sed/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/sed/Makefile" ;;
"include/qse/awk/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/awk/Makefile" ;;
"include/qse/lsp/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/lsp/Makefile" ;;
"include/qse/utl/Makefile") CONFIG_FILES="$CONFIG_FILES include/qse/utl/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"lib/cmn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/cmn/Makefile" ;;
"lib/utl/Makefile") CONFIG_FILES="$CONFIG_FILES lib/utl/Makefile" ;;
"lib/sed/Makefile") CONFIG_FILES="$CONFIG_FILES lib/sed/Makefile" ;;
"lib/awk/Makefile") CONFIG_FILES="$CONFIG_FILES lib/awk/Makefile" ;;
"lib/lsp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lsp/Makefile" ;;
"lib/utl/Makefile") CONFIG_FILES="$CONFIG_FILES lib/utl/Makefile" ;;
"cmd/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;;
"cmd/utl/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/utl/Makefile" ;;
"cmd/sed/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/sed/Makefile" ;;
"cmd/awk/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/awk/Makefile" ;;
"cmd/lsp/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lsp/Makefile" ;;
"cmd/utl/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/utl/Makefile" ;;
"samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
"samples/cmn/Makefile") CONFIG_FILES="$CONFIG_FILES samples/cmn/Makefile" ;;
"samples/utl/Makefile") CONFIG_FILES="$CONFIG_FILES samples/utl/Makefile" ;;
"samples/sed/Makefile") CONFIG_FILES="$CONFIG_FILES samples/sed/Makefile" ;;
"samples/awk/Makefile") CONFIG_FILES="$CONFIG_FILES samples/awk/Makefile" ;;
"samples/utl/Makefile") CONFIG_FILES="$CONFIG_FILES samples/utl/Makefile" ;;
"regress/Makefile") CONFIG_FILES="$CONFIG_FILES regress/Makefile" ;;
"regress/awk/Makefile") CONFIG_FILES="$CONFIG_FILES regress/awk/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;

9
qse/configure.ac
View File

@ -247,25 +247,26 @@ AC_CONFIG_FILES([
include/Makefile
include/qse/Makefile
include/qse/cmn/Makefile
include/qse/utl/Makefile
include/qse/sed/Makefile
include/qse/awk/Makefile
include/qse/lsp/Makefile
include/qse/utl/Makefile
lib/Makefile
lib/cmn/Makefile
lib/utl/Makefile
lib/sed/Makefile
lib/awk/Makefile
lib/lsp/Makefile
lib/utl/Makefile
cmd/Makefile
cmd/utl/Makefile
cmd/sed/Makefile
cmd/awk/Makefile
cmd/lsp/Makefile
cmd/utl/Makefile
samples/Makefile
samples/cmn/Makefile
samples/utl/Makefile
samples/sed/Makefile
samples/awk/Makefile
samples/utl/Makefile
regress/Makefile
regress/awk/Makefile
doc/Makefile

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)

16
qse/lib/awk/Awk.cpp
View File

@ -1,5 +1,5 @@
/*
* $Id: Awk.cpp 250 2009-08-10 03:29:59Z hyunghwan.chung $
* $Id: Awk.cpp 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -920,14 +920,14 @@ const Awk::char_t* Awk::Run::getErrorMessage () const
return qse_awk_rtx_geterrmsg (this->rtx);
}
void Awk::Run::setError (ErrorNumber code, size_t line, const cstr_t* args)
void Awk::Run::setError (ErrorNumber code, const cstr_t* args, size_t line)
{
QSE_ASSERT (this->rtx != QSE_NULL);
qse_awk_rtx_seterror (this->rtx, (errnum_t)code, line, args);
qse_awk_rtx_seterror (this->rtx, (errnum_t)code, args, line);
}
void Awk::Run::setErrorWithMessage (
ErrorNumber code, size_t line, const char_t* msg)
ErrorNumber code, const char_t* msg, size_t line)
{
QSE_ASSERT (this->rtx != QSE_NULL);
@ -1037,11 +1037,11 @@ const Awk::char_t* Awk::getErrorMessage () const
return this->errinf.msg;
}
void Awk::setError (ErrorNumber code, size_t line, const cstr_t* args)
void Awk::setError (ErrorNumber code, const cstr_t* args, size_t line)
{
if (awk != QSE_NULL)
{
qse_awk_seterror (awk, (errnum_t)code, line, args);
qse_awk_seterror (awk, (errnum_t)code, args, line);
retrieveError ();
}
else
@ -1053,7 +1053,7 @@ void Awk::setError (ErrorNumber code, size_t line, const cstr_t* args)
}
}
void Awk::setErrorWithMessage (ErrorNumber code, size_t line, const char_t* msg)
void Awk::setErrorWithMessage (ErrorNumber code, const char_t* msg, size_t line)
{
if (awk != QSE_NULL)
{
@ -1328,7 +1328,7 @@ int Awk::dispatch_function (Run* run, const cstr_t* name)
pair = qse_map_search (functionMap, name->ptr, name->len);
if (pair == QSE_NULL)
{
run->setError (ERR_FUNNF, 0, name);
run->setError (ERR_FUNNF, name);
return -1;
}

18
qse/lib/awk/StdAwk.cpp
View File

@ -1,5 +1,5 @@
/*
* $Id: StdAwk.cpp 253 2009-08-12 13:39:37Z hyunghwan.chung $
* $Id: StdAwk.cpp 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -467,7 +467,7 @@ int StdAwk::open_console_in (Console& io)
cstr_t arg;
arg.ptr = file;
arg.len = qse_strlen (arg.ptr);
((Run*)io)->setError (ERR_IONMNL, 0, &arg);
((Run*)io)->setError (ERR_IONMNL, &arg);
return -1;
}
@ -516,7 +516,7 @@ int StdAwk::open_console_in (Console& io)
cstr_t arg;
arg.ptr = out.u.cpldup.ptr;
arg.len = qse_strlen (arg.ptr);
((Run*)io)->setError (ERR_IONMNL, 0, &arg);
((Run*)io)->setError (ERR_IONMNL, &arg);
qse_awk_rtx_free (rtx, out.u.cpldup.ptr);
return -1;
}
@ -537,7 +537,7 @@ int StdAwk::open_console_in (Console& io)
cstr_t arg;
arg.ptr = file;
arg.len = qse_strlen (arg.ptr);
((Run*)io)->setError (ERR_OPEN, 0, &arg);
((Run*)io)->setError (ERR_OPEN, &arg);
qse_awk_rtx_free (rtx, out.u.cpldup.ptr);
return -1;
}
@ -599,7 +599,7 @@ int StdAwk::open_console_out (Console& io)
cstr_t arg;
arg.ptr = file;
arg.len = qse_strlen (arg.ptr);
((Run*)io)->setError (ERR_IONMNL, 0, &arg);
((Run*)io)->setError (ERR_IONMNL, &arg);
return -1;
}
@ -617,7 +617,7 @@ int StdAwk::open_console_out (Console& io)
cstr_t arg;
arg.ptr = file;
arg.len = qse_strlen (arg.ptr);
((Run*)io)->setError (ERR_OPEN, 0, &arg);
((Run*)io)->setError (ERR_OPEN, &arg);
return -1;
}
}
@ -803,7 +803,7 @@ int StdAwk::SourceFile::open (Data& io)
qse_cstr_t ea;
ea.ptr = name;
ea.len = qse_strlen(name);
((Awk*)io)->setError (ERR_OPEN, 0, &ea);
((Awk*)io)->setError (ERR_OPEN, &ea);
return -1;
}
@ -862,7 +862,7 @@ int StdAwk::SourceFile::open (Data& io)
qse_cstr_t ea;
ea.ptr = file;
ea.len = qse_strlen(file);
((Awk*)io)->setError (ERR_OPEN, 0, &ea);
((Awk*)io)->setError (ERR_OPEN, &ea);
return -1;
}
}
@ -922,7 +922,7 @@ int StdAwk::SourceString::open (Data& io)
qse_cstr_t ea;
ea.ptr = ioname;
ea.len = qse_strlen(ioname);
((Awk*)io)->setError (ERR_OPEN, 0, &ea);
((Awk*)io)->setError (ERR_OPEN, &ea);
return -1;
}
io.setHandle (sio);

18
qse/lib/awk/err.c
View File

@ -1,5 +1,5 @@
/*
* $Id: err.c 255 2009-08-16 08:08:58Z hyunghwan.chung $
* $Id: err.c 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -193,7 +193,7 @@ void qse_awk_geterrinf (qse_awk_t* awk, qse_awk_errinf_t* errinf)
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)
{
if (errnum != QSE_NULL) *errnum = awk->errinf.num;
if (errlin != QSE_NULL) *errlin = awk->errinf.lin;
@ -208,7 +208,7 @@ void qse_awk_geterror (
void qse_awk_seterrnum (
qse_awk_t* awk, qse_awk_errnum_t errnum, const qse_cstr_t* errarg)
{
qse_awk_seterror (awk, errnum, 0, errarg);
qse_awk_seterror (awk, errnum, errarg, 0);
}
void qse_awk_seterrinf (qse_awk_t* awk, const qse_awk_errinf_t* errinf)
@ -217,8 +217,8 @@ void qse_awk_seterrinf (qse_awk_t* awk, const qse_awk_errinf_t* errinf)
}
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, qse_awk_errnum_t errnum, const qse_cstr_t* errarg,
qse_size_t errlin)
{
const qse_char_t* errfmt;
@ -262,7 +262,7 @@ void qse_awk_rtx_geterrinf (qse_awk_rtx_t* rtx, qse_awk_errinf_t* errinf)
void qse_awk_rtx_geterror (
qse_awk_rtx_t* rtx, qse_awk_errnum_t* errnum,
qse_size_t* errlin, const qse_char_t** errmsg)
const qse_char_t** errmsg, qse_size_t* errlin)
{
if (errnum != QSE_NULL) *errnum = rtx->errinf.num;
if (errlin != QSE_NULL) *errlin = rtx->errinf.lin;
@ -276,7 +276,7 @@ void qse_awk_rtx_geterror (
void qse_awk_rtx_seterrnum (
qse_awk_rtx_t* rtx, qse_awk_errnum_t errnum, const qse_cstr_t* errarg)
{
qse_awk_rtx_seterror (rtx, errnum, 0, errarg);
qse_awk_rtx_seterror (rtx, errnum, errarg, 0);
}
void qse_awk_rtx_seterrinf (qse_awk_rtx_t* rtx, const qse_awk_errinf_t* errinf)
@ -285,8 +285,8 @@ void qse_awk_rtx_seterrinf (qse_awk_rtx_t* rtx, const qse_awk_errinf_t* errinf)
}
void qse_awk_rtx_seterror (
qse_awk_rtx_t* rtx, qse_awk_errnum_t errnum,
qse_size_t errlin, const qse_cstr_t* errarg)
qse_awk_rtx_t* rtx, qse_awk_errnum_t errnum, const qse_cstr_t* errarg,
qse_size_t errlin)
{
const qse_char_t* errfmt;

169
qse/lib/awk/parse.c
View File

@ -1,5 +1,5 @@
/*
* $Id: parse.c 255 2009-08-16 08:08:58Z hyunghwan.chung $
* $Id: parse.c 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -340,7 +340,7 @@ static global_t gtab[] =
do { \
if (qse_str_ccat((token)->name,(c)) == (qse_size_t)-1) \
{ \
qse_awk_seterror (awk, QSE_AWK_ENOMEM, (token)->lin, QSE_NULL); \
qse_awk_seterror (awk, QSE_AWK_ENOMEM, QSE_NULL, (token)->lin); \
return -1; \
} \
} while (0)
@ -349,7 +349,7 @@ static global_t gtab[] =
do { \
if (qse_str_ncat((token)->name,(s),(l)) == (qse_size_t)-1) \
{ \
qse_awk_seterror (awk, QSE_AWK_ENOMEM, (token)->lin, QSE_NULL); \
qse_awk_seterror (awk, QSE_AWK_ENOMEM, QSE_NULL, (token)->lin); \
return -1; \
} \
} while (0)
@ -359,27 +359,23 @@ static global_t gtab[] =
#define CLRERR(awk) qse_awk_seterrnum(awk,QSE_AWK_ENOERR,QSE_NULL)
#define ISNOERR(awk) ((awk)->errinf.num == QSE_AWK_ENOERR)
#define SETERR(awk,code) qse_awk_seterrnum(awk,code,QSE_NULL)
#define SETERRLIN(awk,code,line) qse_awk_seterror(awk,code,line,QSE_NULL);
#define SETERRLIN(awk,code,line) qse_awk_seterror(awk,code,QSE_NULL,line);
#define SETERRTOK(awk,code) \
do { \
qse_cstr_t errarg; \
errarg.len = QSE_STR_LEN((awk)->token.name); \
errarg.ptr = QSE_STR_PTR((awk)->token.name); \
qse_cstr_t __ea; \
__ea.len = QSE_STR_LEN((awk)->token.name); \
__ea.ptr = QSE_STR_PTR((awk)->token.name); \
if (MATCH(awk,TOKEN_EOF)) \
qse_awk_seterror (awk, code, (awk)->ptoken.lin, &errarg); \
qse_awk_seterror (awk, code, &__ea, (awk)->ptoken.lin); \
else \
qse_awk_seterror (awk, code, (awk)->token.lin, &errarg); \
qse_awk_seterror (awk, code, &__ea, (awk)->token.lin); \
} while (0)
#define SETERRARG(awk,code,line,arg) \
qse_awk_seterror ((awk), (code), (line), (arg))
#define SETERRARGL(awk,code,line,arg,leng) \
#define SETERRARGL(awk,code,arg,leng,line) \
do { \
qse_cstr_t errarg; \
errarg.len = (leng); \
errarg.ptr = (arg); \
qse_awk_seterror ((awk), (code), (line), &errarg); \
qse_cstr_t __ea; \
__ea.len = (leng); __ea.ptr = (arg); \
qse_awk_seterror ((awk), (code), &__ea, (line)); \
} while (0)
#define MATCH_TERMINATOR_NORMAL(awk) \
@ -412,7 +408,7 @@ static int get_char (qse_awk_t* awk)
if (n <= -1)
{
if (ISNOERR(awk))
SETERRARGL (awk, QSE_AWK_EREAD, 0, QSE_T("<SIN>"), 5);
SETERRARGL (awk, QSE_AWK_EREAD, QSE_T("<SIN>"), 5, 0);
return -1;
}
@ -493,7 +489,7 @@ static int parse (qse_awk_t* awk)
/* cannot open the source file.
* it doesn't even have to call CLOSE */
if (ISNOERR(awk))
SETERRARGL (awk, QSE_AWK_EOPEN, 0, QSE_T("<SIN>"), 5);
SETERRARGL (awk, QSE_AWK_EOPEN, QSE_T("<SIN>"), 5, 0);
return -1;
}
@ -535,10 +531,11 @@ static int parse (qse_awk_t* awk)
{
/* TODO: set better error no & line */
SETERRARGL (
awk, QSE_AWK_EFUNNF,
*(qse_size_t*)QSE_MAP_VPTR(p),
awk,
QSE_AWK_EFUNNF,
QSE_MAP_KPTR(p),
QSE_MAP_KLEN(p)
QSE_MAP_KLEN(p),
*(qse_size_t*)QSE_MAP_VPTR(p)
);
goto oops;
}
@ -590,7 +587,7 @@ oops:
/* this is to keep the earlier error above
* that might be more critical than this */
if (ISNOERR(awk))
SETERRARGL (awk, QSE_AWK_ECLOSE, 0, QSE_T("<SIN>"), 5);
SETERRARGL (awk, QSE_AWK_ECLOSE, QSE_T("<SIN>"), 5, 0);
ret = -1;
}
}
@ -645,9 +642,9 @@ static int begin_include (qse_awk_t* awk)
SETERRARGL (
awk,
QSE_AWK_EIONMNL,
awk->token.lin,
QSE_STR_PTR(awk->token.name),
qse_strlen(QSE_STR_PTR(awk->token.name))
qse_strlen(QSE_STR_PTR(awk->token.name)),
awk->token.lin
);
return -1;
}
@ -745,7 +742,7 @@ static int end_include (qse_awk_t* awk)
{
/* the failure mentioned above is returned here */
if (ISNOERR(awk))
SETERRARGL (awk, QSE_AWK_ECLOSE, 0, QSE_T("<SIN>"), 5);
SETERRARGL (awk, QSE_AWK_ECLOSE, QSE_T("<SIN>"), 5, 0);
return -1;
}
@ -1025,7 +1022,7 @@ static qse_awk_nde_t* parse_function (qse_awk_t* awk)
/* check if it is a builtin function */
if (qse_awk_getfnc (awk, name, name_len) != QSE_NULL)
{
SETERRARGL (awk, QSE_AWK_EFNCRED, awk->token.lin, name, name_len);
SETERRARGL (awk, QSE_AWK_EFNCRED, name, name_len, awk->token.lin);
return QSE_NULL;
}
@ -1033,18 +1030,14 @@ static qse_awk_nde_t* parse_function (qse_awk_t* awk)
if (qse_map_search (awk->tree.funs, name, name_len) != QSE_NULL)
{
/* the function is defined previously */
SETERRARGL (
awk, QSE_AWK_EFUNRED, awk->token.lin,
name, name_len);
SETERRARGL (awk, QSE_AWK_EFUNRED, name, name_len, awk->token.lin);
return QSE_NULL;
}
/* check if it conflicts with a named variable */
if (qse_map_search (awk->parse.named, name, name_len) != QSE_NULL)
{
SETERRARGL (
awk, QSE_AWK_EVARRED, awk->token.lin,
name, name_len);
SETERRARGL (awk, QSE_AWK_EVARRED, name, name_len, awk->token.lin);
return QSE_NULL;
}
@ -1052,9 +1045,7 @@ static qse_awk_nde_t* parse_function (qse_awk_t* awk)
g = find_global (awk, name, name_len);
if (g != QSE_LDA_NIL)
{
SETERRARGL (
awk, QSE_AWK_EGBLRED, awk->token.lin,
name, name_len);
SETERRARGL (awk, QSE_AWK_EGBLRED, name, name_len, awk->token.lin);
return QSE_NULL;
}
@ -1140,10 +1131,7 @@ static qse_awk_nde_t* parse_function (qse_awk_t* awk)
QSE_AWK_FREE (awk, name_dup);
qse_lda_clear (awk->parse.params);
SETERRARGL (
awk, QSE_AWK_EDUPPAR, awk->token.lin,
param, param_len);
SETERRARGL (awk, QSE_AWK_EDUPPAR, param, param_len, awk->token.lin);
return QSE_NULL;
}
@ -1699,27 +1687,21 @@ static int add_global (
/* check if it is a keyword */
if (classify_ident (awk, name, len) != TOKEN_IDENT)
{
SETERRARGL (
awk, QSE_AWK_EKWRED, awk->token.lin,
name, len);
SETERRARGL (awk, QSE_AWK_EKWRED, name, len, awk->token.lin);
return -1;
}
/* check if it conflict with a builtin function name */
if (qse_awk_getfnc (awk, name, len) != QSE_NULL)
{
SETERRARGL (
awk, QSE_AWK_EFNCRED, awk->token.lin,
name, len);
SETERRARGL (awk, QSE_AWK_EFNCRED, name, len, awk->token.lin);
return -1;
}
/* check if it conflict with a function name */
if (qse_map_search (awk->tree.funs, name, len) != QSE_NULL)
{
SETERRARGL (
awk, QSE_AWK_EFUNRED, line,
name, len);
SETERRARGL (awk, QSE_AWK_EFUNRED, name, len, line);
return -1;
}
@ -1727,16 +1709,14 @@ static int add_global (
* caught in the function call table */
if (qse_map_search (awk->parse.funs, name, len) != QSE_NULL)
{
SETERRARGL (
awk, QSE_AWK_EFUNRED, line,
name, len);
SETERRARGL (awk, QSE_AWK_EFUNRED, name, len, line);
return -1;
}
/* check if it conflicts with other global variable names */
if (find_global (awk, name, len) != QSE_LDA_NIL)
{
SETERRARGL (awk, QSE_AWK_EDUPGBL, line, name, len);
SETERRARGL (awk, QSE_AWK_EDUPGBL, name, len, line);
return -1;
}
@ -1813,7 +1793,7 @@ int qse_awk_delgbl (
QSE_AWK_NUM_STATIC_GBLS, name, len);
if (n == QSE_LDA_NIL)
{
SETERRARGL (awk, QSE_AWK_ENOENT, 0, name, len);
SETERRARGL (awk, QSE_AWK_ENOENT, name, len, 0);
return -1;
}
@ -1918,9 +1898,7 @@ static qse_awk_t* collect_locals (
* function f() { local length; } */
if (qse_awk_getfnc (awk, lcl.ptr, lcl.len) != QSE_NULL)
{
SETERRARGL (
awk, QSE_AWK_EFNCRED, awk->token.lin,
lcl.ptr, lcl.len);
SETERRARGL (awk, QSE_AWK_EFNCRED, lcl.ptr, lcl.len, awk->token.lin);
return QSE_NULL;
}
@ -1933,9 +1911,7 @@ static qse_awk_t* collect_locals (
awk->parse.params, 0, lcl.ptr, lcl.len);
if (n != QSE_LDA_NIL)
{
SETERRARGL (
awk, QSE_AWK_EPARRED, awk->token.lin,
lcl.ptr, lcl.len);
SETERRARGL (awk, QSE_AWK_EPARRED, lcl.ptr, lcl.len, awk->token.lin);
return QSE_NULL;
}
}
@ -1950,10 +1926,7 @@ static qse_awk_t* collect_locals (
awk->tree.cur_fun.ptr,
awk->tree.cur_fun.len) == 0)
{
SETERRARGL (
awk, QSE_AWK_EFUNRED,
awk->token.lin,
lcl.ptr, lcl.len);
SETERRARGL (awk, QSE_AWK_EFUNRED, lcl.ptr, lcl.len, awk->token.lin);
return QSE_NULL;
}
}
@ -1966,9 +1939,7 @@ static qse_awk_t* collect_locals (
lcl.ptr, lcl.len);
if (n != QSE_LDA_NIL)
{
SETERRARGL (
awk, QSE_AWK_EDUPLCL, awk->token.lin,
lcl.ptr, lcl.len);
SETERRARGL (awk, QSE_AWK_EDUPLCL, lcl.ptr, lcl.len, awk->token.lin);
return QSE_NULL;
}
@ -1980,9 +1951,7 @@ static qse_awk_t* collect_locals (
{
/* it is a conflict only if it is one of a
* static global variable */
SETERRARGL (
awk, QSE_AWK_EDUPLCL, awk->token.lin,
lcl.ptr, lcl.len);
SETERRARGL (awk, QSE_AWK_EDUPLCL, lcl.ptr, lcl.len, awk->token.lin);
return QSE_NULL;
}
}
@ -3280,9 +3249,10 @@ static qse_awk_nde_t* parse_primary_nogetline (qse_awk_t* awk, qse_size_t line)
{
SETERRARGL (
awk, QSE_AWK_EEXPRNR,
awk->ptoken.lin,
QSE_STR_PTR(awk->ptoken.name),
QSE_STR_LEN(awk->ptoken.name));
QSE_STR_LEN(awk->ptoken.name),
awk->ptoken.lin
);
}
else SETERRTOK (awk, QSE_AWK_EEXPRNR);
@ -3447,7 +3417,7 @@ static qse_awk_nde_t* parse_primary_ident (qse_awk_t* awk, qse_size_t line)
if (MATCH(awk,TOKEN_LPAREN))
{
/* a local variable is not a function */
SETERRARGL (awk, QSE_AWK_EFUNNAME, line, name_dup, name_len);
SETERRARGL (awk, QSE_AWK_EFUNNAME, name_dup, name_len, line);
QSE_AWK_FREE (awk, name_dup);
return QSE_NULL;
}
@ -3481,7 +3451,7 @@ static qse_awk_nde_t* parse_primary_ident (qse_awk_t* awk, qse_size_t line)
if (MATCH(awk,TOKEN_LPAREN))
{
/* a parameter is not a function */
SETERRARGL (awk, QSE_AWK_EFUNNAME, line, name_dup, name_len);
SETERRARGL (awk, QSE_AWK_EFUNNAME, name_dup, name_len, line);
QSE_AWK_FREE (awk, name_dup);
return QSE_NULL;
}
@ -3515,7 +3485,7 @@ static qse_awk_nde_t* parse_primary_ident (qse_awk_t* awk, qse_size_t line)
if (MATCH(awk,TOKEN_LPAREN))
{
/* a global variable is not a function */
SETERRARGL (awk, QSE_AWK_EFUNNAME, line, name_dup, name_len);
SETERRARGL (awk, QSE_AWK_EFUNNAME, name_dup, name_len, line);
QSE_AWK_FREE (awk, name_dup);
return QSE_NULL;
}
@ -3551,7 +3521,7 @@ static qse_awk_nde_t* parse_primary_ident (qse_awk_t* awk, qse_size_t line)
name_dup, name_len) != QSE_NULL)
{
/* a function call conflicts with a named variable */
SETERRARGL (awk, QSE_AWK_EVARRED, line, name_dup, name_len);
SETERRARGL (awk, QSE_AWK_EVARRED, name_dup, name_len, line);
QSE_AWK_FREE (awk, name_dup);
return QSE_NULL;
}
@ -3583,7 +3553,7 @@ static qse_awk_nde_t* parse_primary_ident (qse_awk_t* awk, qse_size_t line)
/* check if it is a builtin function */
if (qse_awk_getfnc (awk, name_dup, name_len) != QSE_NULL)
{
SETERRARGL (awk, QSE_AWK_EFNCRED, line, name_dup, name_len);
SETERRARGL (awk, QSE_AWK_EFNCRED, name_dup, name_len, line);
goto exit_func;
}
@ -3598,7 +3568,7 @@ static qse_awk_nde_t* parse_primary_ident (qse_awk_t* awk, qse_size_t line)
if (iscur || qse_map_search (awk->tree.funs, name_dup, name_len) != QSE_NULL)
{
/* the function is defined previously */
SETERRARGL (awk, QSE_AWK_EFUNRED, line, name_dup, name_len);
SETERRARGL (awk, QSE_AWK_EFUNRED, name_dup, name_len, line);
goto exit_func;
}
@ -3606,7 +3576,7 @@ static qse_awk_nde_t* parse_primary_ident (qse_awk_t* awk, qse_size_t line)
name_dup, name_len) != QSE_NULL)
{
/* is it one of the function calls found so far? */
SETERRARGL (awk, QSE_AWK_EFUNRED, line, name_dup, name_len);
SETERRARGL (awk, QSE_AWK_EFUNRED, name_dup, name_len, line);
goto exit_func;
}
@ -3631,7 +3601,7 @@ static qse_awk_nde_t* parse_primary_ident (qse_awk_t* awk, qse_size_t line)
}
/* undefined variable */
SETERRARGL (awk, QSE_AWK_EUNDEF, line, name_dup, name_len);
SETERRARGL (awk, QSE_AWK_EUNDEF, name_dup, name_len, line);
exit_func:
QSE_AWK_FREE (awk, name_dup);
@ -3764,7 +3734,7 @@ static qse_awk_nde_t* parse_hashidx (
/* check if it is a builtin function */
if (qse_awk_getfnc (awk, name, name_len) != QSE_NULL)
{
SETERRARGL (awk, QSE_AWK_EFNCRED, line, name, name_len);
SETERRARGL (awk, QSE_AWK_EFNCRED, name, name_len, line);
goto exit_func;
}
@ -3779,7 +3749,7 @@ static qse_awk_nde_t* parse_hashidx (
if (iscur || qse_map_search (awk->tree.funs, name, name_len) != QSE_NULL)
{
/* the function is defined previously */
SETERRARGL (awk, QSE_AWK_EFUNRED, line, name, name_len);
SETERRARGL (awk, QSE_AWK_EFUNRED, name, name_len, line);
goto exit_func;
}
@ -3787,7 +3757,7 @@ static qse_awk_nde_t* parse_hashidx (
awk->parse.funs, name, name_len) != QSE_NULL)
{
/* is it one of the function calls found so far? */
SETERRARGL (awk, QSE_AWK_EFUNRED, line, name, name_len);
SETERRARGL (awk, QSE_AWK_EFUNRED, name, name_len, line);
goto exit_func;
}
@ -3803,7 +3773,7 @@ static qse_awk_nde_t* parse_hashidx (
}
/* undefined variable */
SETERRARGL (awk, QSE_AWK_EUNDEF, line, name, name_len);
SETERRARGL (awk, QSE_AWK_EUNDEF, name, name_len, line);
exit_func:
@ -4857,7 +4827,7 @@ static int get_number (qse_awk_t* awk, qse_awk_token_t* token)
if (c == QSE_T('8') || c == QSE_T('9'))
{
qse_char_t cc = (qse_char_t)c;
SETERRARGL (awk, QSE_AWK_ELXDIG, awk->token.lin, &cc, 1);
SETERRARGL (awk, QSE_AWK_ELXDIG, &cc, 1, awk->token.lin);
return -1;
}
@ -5388,20 +5358,11 @@ retry:
if (get_number (awk, token) <= -1) return -1;
}
else /*if (QSE_AWK_ISSPACE (awk, c) || c == QSE_CHAR_EOF)*/
else
{
SET_TOKEN_TYPE (awk, token, TOKEN_PERIOD);
ADD_TOKEN_CHAR (awk, token, QSE_T('.'));
}
/*
else
{
qse_awk_seterror (
awk, QSE_AWK_ELXCHR, token->lin,
QSE_T("floating point not followed by any valid digits"));
return -1;
}
*/
}
else if (c == QSE_T('_') || QSE_AWK_ISALPHA (awk, c))
{
@ -5435,19 +5396,11 @@ retry:
{
/* not handled yet */
if (c == QSE_T('\0'))
{
SETERRARGL (
awk, QSE_AWK_ELXCHR, token->lin,
QSE_T("<NUL>"), 5
);
}
SETERRARGL (awk, QSE_AWK_ELXCHR, QSE_T("<NUL>"), 5, token->lin);
else
{
qse_char_t cc = (qse_char_t)c;
SETERRARGL (
awk, QSE_AWK_ELXCHR, token->lin,
&cc, 1
);
SETERRARGL (awk, QSE_AWK_ELXCHR, &cc, 1, token->lin);
}
return -1;
}
@ -5612,7 +5565,7 @@ static int deparse (qse_awk_t* awk)
if (op <= -1)
{
if (ISNOERR(awk))
SETERRARGL (awk, QSE_AWK_EOPEN, 0, QSE_T("<SOUT>"), 6);
SETERRARGL (awk, QSE_AWK_EOPEN, QSE_T("<SOUT>"), 6, 0);
return -1;
}
@ -5822,7 +5775,7 @@ exit_deparse:
if (n == 0)
{
if (ISNOERR(awk))
SETERRARGL (awk, QSE_AWK_ECLOSE, 0, QSE_T("<SOUT>"), 6);
SETERRARGL (awk, QSE_AWK_ECLOSE, QSE_T("<SOUT>"), 6, 0);
n = -1;
}
}
@ -5919,7 +5872,7 @@ static int flush_out (qse_awk_t* awk)
if (n <= 0)
{
if (ISNOERR(awk))
SETERRARGL (awk, QSE_AWK_EWRITE, 0, QSE_T("<SOUT>"), 6);
SETERRARGL (awk, QSE_AWK_EWRITE, QSE_T("<SOUT>"), 6, 0);
return -1;
}

157
qse/lib/awk/run.c
View File

@ -1,5 +1,5 @@
/*
* $Id: run.c 256 2009-08-16 13:44:20Z hyunghwan.chung $
* $Id: run.c 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -294,7 +294,8 @@ static int set_global (
qse_awk_rtx_seterror (
run,
QSE_AWK_EMAPTOSCALAR,
var->line, xstr_to_cstr(&var->id.name)
xstr_to_cstr(&var->id.name),
var->line
);
}
else
@ -1710,8 +1711,7 @@ static int run_block (qse_awk_rtx_t* run, qse_awk_nde_blk_t* nde)
if (run->depth.max.block > 0 &&
run->depth.cur.block >= run->depth.max.block)
{
qse_awk_rtx_seterror (
run, QSE_AWK_EBLKNST, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EBLKNST, QSE_NULL, nde->line);
return -1;;
}
@ -2240,9 +2240,8 @@ static int run_foreach (qse_awk_rtx_t* rtx, qse_awk_nde_foreach_t* nde)
if (rv->type != QSE_AWK_VAL_MAP)
{
qse_awk_rtx_refdownval (rtx, rv);
qse_awk_rtx_seterror (
rtx, QSE_AWK_ENOTMAPIN, test->right->line, QSE_NULL);
rtx, QSE_AWK_ENOTMAPIN, QSE_NULL, test->right->line);
return -1;
}
map = ((qse_awk_val_map_t*)rv)->map;
@ -2292,7 +2291,7 @@ static int run_return (qse_awk_rtx_t* run, qse_awk_nde_return_t* nde)
qse_awk_rtx_seterror (
run, QSE_AWK_EMAPNOTALLOWED,
nde->line, QSE_NULL);
QSE_NULL, nde->line);
return -1;
}
}
@ -2339,13 +2338,13 @@ static int run_next (qse_awk_rtx_t* run, qse_awk_nde_next_t* nde)
if (run->active_block == (qse_awk_nde_blk_t*)run->awk->tree.begin)
{
qse_awk_rtx_seterror (
run, QSE_AWK_ERNEXTBEG, nde->line, QSE_NULL);
run, QSE_AWK_ERNEXTBEG, QSE_NULL, nde->line);
return -1;
}
else if (run->active_block == (qse_awk_nde_blk_t*)run->awk->tree.end)
{
qse_awk_rtx_seterror (
run, QSE_AWK_ERNEXTEND, nde->line, QSE_NULL);
run, QSE_AWK_ERNEXTEND, QSE_NULL, nde->line);
return -1;
}
@ -2361,13 +2360,13 @@ static int run_nextinfile (qse_awk_rtx_t* run, qse_awk_nde_nextfile_t* nde)
if (run->active_block == (qse_awk_nde_blk_t*)run->awk->tree.begin)
{
qse_awk_rtx_seterror (
run, QSE_AWK_ERNEXTFBEG, nde->line, QSE_NULL);
run, QSE_AWK_ERNEXTFBEG, QSE_NULL, nde->line);
return -1;
}
else if (run->active_block == (qse_awk_nde_blk_t*)run->awk->tree.end)
{
qse_awk_rtx_seterror (
run, QSE_AWK_ERNEXTFEND, nde->line, QSE_NULL);
run, QSE_AWK_ERNEXTFEND, QSE_NULL, nde->line);
return -1;
}
@ -2536,7 +2535,7 @@ static int run_delete (qse_awk_rtx_t* run, qse_awk_nde_delete_t* nde)
qse_awk_rtx_refdownval (run, tmp);
qse_awk_rtx_seterror (
run, QSE_AWK_ENOMEM, var->line, QSE_NULL);
run, QSE_AWK_ENOMEM, QSE_NULL, var->line);
return -1;
}
@ -2556,7 +2555,7 @@ static int run_delete (qse_awk_rtx_t* run, qse_awk_nde_delete_t* nde)
{
qse_awk_rtx_seterror (
run, QSE_AWK_ENOTDEL,
var->line, xstr_to_cstr(&var->id.name));
xstr_to_cstr(&var->id.name), var->line);
return -1;
}
@ -2643,7 +2642,7 @@ static int run_delete (qse_awk_rtx_t* run, qse_awk_nde_delete_t* nde)
{
qse_awk_rtx_seterror (
run, QSE_AWK_ENOTDEL,
var->line, xstr_to_cstr(&var->id.name));
xstr_to_cstr(&var->id.name), var->line);
return -1;
}
@ -2670,7 +2669,7 @@ static int run_delete (qse_awk_rtx_t* run, qse_awk_nde_delete_t* nde)
"the delete statement cannot be called with other nodes than the variables such as a named variable, a named indexed variable, etc");
qse_awk_rtx_seterror (
run, QSE_AWK_ERDELETE, var->line, QSE_NULL);
run, QSE_AWK_ERDELETE, QSE_NULL, var->line);
return -1;
}
@ -2725,7 +2724,7 @@ static int run_reset (qse_awk_rtx_t* run, qse_awk_nde_reset_t* nde)
"the reset statement can only be called with plain variables");
qse_awk_rtx_seterror (
run, QSE_AWK_ERRESET, var->line, QSE_NULL);
run, QSE_AWK_ERRESET, QSE_NULL, var->line);
return -1;
}
@ -2776,7 +2775,7 @@ static int run_print (qse_awk_rtx_t* run, qse_awk_nde_print_t* nde)
/* the destination name is empty */
QSE_AWK_FREE (run->awk, out);
qse_awk_rtx_seterror (
run, QSE_AWK_EIONMEM, nde->line, QSE_NULL);
run, QSE_AWK_EIONMEM, QSE_NULL, nde->line);
return -1;
}
@ -2786,18 +2785,16 @@ static int run_print (qse_awk_rtx_t* run, qse_awk_nde_print_t* nde)
{
if (out[--len] == QSE_T('\0'))
{
qse_cstr_t errarg;
qse_cstr_t ea;
errarg.ptr = out;
ea.ptr = out;
/* provide length up to one character before
* the first null not to contains a null
* in an error message */
errarg.len = qse_strlen(out);
ea.len = qse_strlen(out);
qse_awk_rtx_seterror (
run, QSE_AWK_EIONMNL,
nde->line, &errarg
);
run, QSE_AWK_EIONMNL, &ea, nde->line);
/* if so, it skips writing */
QSE_AWK_FREE (run->awk, out);
@ -2950,7 +2947,7 @@ static int run_printf (qse_awk_rtx_t* run, qse_awk_nde_print_t* nde)
/* the output destination name is empty. */
QSE_AWK_FREE (run->awk, out);
qse_awk_rtx_seterror (
run, QSE_AWK_EIONMEM, nde->line, QSE_NULL);
run, QSE_AWK_EIONMEM, QSE_NULL, nde->line);
return -1;
}
@ -2958,18 +2955,16 @@ static int run_printf (qse_awk_rtx_t* run, qse_awk_nde_print_t* nde)
{
if (out[--len] == QSE_T('\0'))
{
qse_cstr_t errarg;
qse_cstr_t ea;
errarg.ptr = out;
ea.ptr = out;
/* provide length up to one character before
* the first null not to contains a null
* in an error message */
errarg.len = qse_strlen(out);
ea.len = qse_strlen(out);
qse_awk_rtx_seterror (
run, QSE_AWK_EIONMNL,
nde->line, &errarg
);
run, QSE_AWK_EIONMNL, &ea, nde->line);
/* the output destination name contains a null
* character. */
@ -3120,7 +3115,7 @@ static qse_awk_val_t* eval_expression (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
* whose message contains a formatting
* character. otherwise, the following way of
* setting the error information may not work */
qse_awk_rtx_seterror (run, errnum, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, errnum, QSE_NULL, nde->line);
return QSE_NULL;
}
}
@ -3198,7 +3193,7 @@ static qse_awk_val_t* eval_group (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
/* eval_binop_in evaluates the QSE_AWK_NDE_GRP specially.
* so this function should never be reached. */
QSE_ASSERT (!"should never happen - NDE_GRP only for in");
qse_awk_rtx_seterror (run, QSE_AWK_EINTERN, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EINTERN, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -3326,7 +3321,7 @@ static qse_awk_val_t* do_assignment (
return ret;
exit_on_error:
qse_awk_rtx_seterror (run, errnum, var->line, QSE_NULL);
qse_awk_rtx_seterror (run, errnum, QSE_NULL, var->line);
return QSE_NULL;
}
@ -3355,15 +3350,16 @@ static qse_awk_val_t* do_assignment_scalar (
/* once a variable becomes a map,
* it cannot be changed to a scalar variable */
qse_awk_rtx_seterror (
run, QSE_AWK_EMAPTOSCALAR,
var->line, xstr_to_cstr(&var->id.name));
run, QSE_AWK_EMAPTOSCALAR,
xstr_to_cstr(&var->id.name), var->line);
return QSE_NULL;
}
if (qse_map_upsert (run->named,
var->id.name.ptr, var->id.name.len, val, 0) == QSE_NULL)
{
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, var->line, QSE_NULL);
qse_awk_rtx_seterror (
run, QSE_AWK_ENOMEM, QSE_NULL, var->line);
return QSE_NULL;
}
@ -3387,7 +3383,7 @@ static qse_awk_val_t* do_assignment_scalar (
* it cannot be changed to a scalar variable */
qse_awk_rtx_seterror (
run, QSE_AWK_EMAPTOSCALAR,
var->line, xstr_to_cstr(&var->id.name));
xstr_to_cstr(&var->id.name), var->line);
return QSE_NULL;
}
@ -3404,7 +3400,7 @@ static qse_awk_val_t* do_assignment_scalar (
* it cannot be changed to a scalar variable */
qse_awk_rtx_seterror (
run, QSE_AWK_EMAPTOSCALAR,
var->line, xstr_to_cstr(&var->id.name));
xstr_to_cstr(&var->id.name), var->line);
return QSE_NULL;
}
@ -3477,7 +3473,8 @@ static qse_awk_val_t* do_assignment_map (
qse_awk_rtx_refupval (run, tmp);
qse_awk_rtx_refdownval (run, tmp);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, var->line, QSE_NULL);
qse_awk_rtx_seterror (
run, QSE_AWK_ENOMEM, QSE_NULL, var->line);
return QSE_NULL;
}
@ -3514,7 +3511,7 @@ static qse_awk_val_t* do_assignment_map (
else if (map->type != QSE_AWK_VAL_MAP)
{
/* variable assigned is not a map */
qse_awk_rtx_seterror (run, QSE_AWK_ENOTIDX, var->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOTIDX, QSE_NULL, var->line);
return QSE_NULL;
}
@ -3530,7 +3527,7 @@ static qse_awk_val_t* do_assignment_map (
if (qse_map_upsert (map->map, str, len, val, 0) == QSE_NULL)
{
if (str != idxbuf) QSE_AWK_FREE (run->awk, str);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, var->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, var->line);
return QSE_NULL;
}
@ -3558,13 +3555,13 @@ static qse_awk_val_t* do_assignment_pos (
if (n == -1)
{
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, pos->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, QSE_NULL, pos->line);
return QSE_NULL;
}
if (n == 1) lv = (qse_long_t)rv;
if (!IS_VALID_POSIDX(lv))
{
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, pos->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, QSE_NULL, pos->line);
return QSE_NULL;
}
@ -3810,7 +3807,7 @@ static qse_awk_val_t* eval_binop_in (
{
/* the compiler should have handled this case */
QSE_ASSERT (!"should never happen - it needs a plain variable");
qse_awk_rtx_seterror (run, QSE_AWK_EINTERN, right->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EINTERN, QSE_NULL, right->line);
return QSE_NULL;
}
@ -3856,7 +3853,7 @@ static qse_awk_val_t* eval_binop_in (
if (str != idxbuf) QSE_AWK_FREE (run->awk, str);
qse_awk_rtx_refdownval (run, rv);
qse_awk_rtx_seterror (run, QSE_AWK_ENOTMAPNILIN, right->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOTMAPNILIN, QSE_NULL, right->line);
return QSE_NULL;
}
@ -4786,7 +4783,7 @@ static qse_awk_val_t* eval_binop_match0 (
((qse_awk_val_str_t*)right)->len, &errnum);
if (rex_code == QSE_NULL)
{
qse_awk_rtx_seterror (run, errnum, rline, QSE_NULL);
qse_awk_rtx_seterror (run, errnum, QSE_NULL, rline);
return QSE_NULL;
}
}
@ -4803,7 +4800,7 @@ static qse_awk_val_t* eval_binop_match0 (
if (rex_code == QSE_NULL)
{
QSE_AWK_FREE (run->awk, out.u.cpldup.ptr);
qse_awk_rtx_seterror (run, errnum, rline, QSE_NULL);
qse_awk_rtx_seterror (run, errnum, QSE_NULL, rline);
return QSE_NULL;
}
@ -4825,7 +4822,7 @@ static qse_awk_val_t* eval_binop_match0 (
if (right->type != QSE_AWK_VAL_REX)
QSE_AWK_FREE (run->awk, rex_code);
qse_awk_rtx_seterror (run, errnum, lline, QSE_NULL);
qse_awk_rtx_seterror (run, errnum, QSE_NULL, lline);
return QSE_NULL;
}
@ -4864,7 +4861,7 @@ static qse_awk_val_t* eval_binop_match0 (
if (right->type != QSE_AWK_VAL_REX)
QSE_AWK_FREE (run->awk, rex_code);
qse_awk_rtx_seterror (run, errnum, lline, QSE_NULL);
qse_awk_rtx_seterror (run, errnum, QSE_NULL, lline);
return QSE_NULL;
}
@ -4973,7 +4970,7 @@ static qse_awk_val_t* eval_incpre (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
/*exp->left->type > QSE_AWK_NDE_ARGIDX) XXX */
exp->left->type > QSE_AWK_NDE_POS)
{
qse_awk_rtx_seterror (run, QSE_AWK_EOPERAND, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EOPERAND, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5105,7 +5102,7 @@ static qse_awk_val_t* eval_incpre (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
{
QSE_ASSERT (!"should never happen - invalid opcode");
qse_awk_rtx_refdownval (run, left);
qse_awk_rtx_seterror (run, QSE_AWK_EINTERN, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EINTERN, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5134,7 +5131,7 @@ static qse_awk_val_t* eval_incpst (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
/*exp->left->type > QSE_AWK_NDE_ARGIDX) XXX */
exp->left->type > QSE_AWK_NDE_POS)
{
qse_awk_rtx_seterror (run, QSE_AWK_EOPERAND, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EOPERAND, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5358,7 +5355,7 @@ static qse_awk_val_t* eval_incpst (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
{
QSE_ASSERT (!"should never happen - invalid opcode");
qse_awk_rtx_refdownval (run, left);
qse_awk_rtx_seterror (run, QSE_AWK_EINTERN, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EINTERN, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5402,13 +5399,13 @@ static qse_awk_val_t* eval_fnc (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
/* intrinsic function */
if (call->nargs < call->what.fnc.arg.min)
{
qse_awk_rtx_seterror (run, QSE_AWK_EARGTF, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EARGTF, QSE_NULL, nde->line);
return QSE_NULL;
}
if (call->nargs > call->what.fnc.arg.max)
{
qse_awk_rtx_seterror (run, QSE_AWK_EARGTM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EARGTM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5431,7 +5428,7 @@ static qse_awk_val_t* eval_fun_ex (
{
qse_awk_rtx_seterror (
run, QSE_AWK_EFUNNF,
nde->line, xstr_to_cstr(&call->what.fun.name));
xstr_to_cstr(&call->what.fun.name), nde->line);
return QSE_NULL;
}
@ -5443,7 +5440,7 @@ static qse_awk_val_t* eval_fun_ex (
/* TODO: is this correct? what if i want to
* allow arbitarary numbers of arguments? */
qse_awk_rtx_seterror (
run, QSE_AWK_EARGTM, nde->line, QSE_NULL);
run, QSE_AWK_EARGTM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5549,14 +5546,14 @@ static qse_awk_val_t* __eval_call (
#endif
if (__raw_push(run,(void*)run->stack_base) == -1)
{
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
if (__raw_push(run,(void*)saved_stack_top) == -1)
{
__raw_pop (run);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5565,7 +5562,7 @@ static qse_awk_val_t* __eval_call (
{
__raw_pop (run);
__raw_pop (run);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5575,7 +5572,7 @@ static qse_awk_val_t* __eval_call (
__raw_pop (run);
__raw_pop (run);
__raw_pop (run);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5599,7 +5596,7 @@ static qse_awk_val_t* __eval_call (
if (__raw_push(run,qse_awk_val_nil) == -1)
{
UNWIND_RTX_STACK (run, nargs);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -5649,8 +5646,8 @@ static qse_awk_val_t* __eval_call (
* fix it */
qse_awk_rtx_seterror (
run, QSE_AWK_EFNCIMPL,
nde->line,
xstr_to_cstr(&call->what.fnc.oname)
xstr_to_cstr(&call->what.fnc.oname),
nde->line
);
}
else
@ -5756,7 +5753,7 @@ static qse_size_t push_arg_from_vals (
qse_awk_rtx_refdownval (rtx, pafv->args[nargs]);
UNWIND_RTX_STACK_ARG (rtx, nargs);
qse_awk_rtx_seterror (rtx, QSE_AWK_ENOMEM, call->line, QSE_NULL);
qse_awk_rtx_seterror (rtx, QSE_AWK_ENOMEM, QSE_NULL, call->line);
return (qse_size_t)-1;
}
@ -5827,7 +5824,7 @@ static qse_size_t push_arg_from_nde (
qse_awk_rtx_refdownval (rtx, v);
UNWIND_RTX_STACK_ARG (rtx, nargs);
qse_awk_rtx_seterror (rtx, QSE_AWK_ENOMEM, call->line, QSE_NULL);
qse_awk_rtx_seterror (rtx, QSE_AWK_ENOMEM, QSE_NULL, call->line);
return (qse_size_t)-1;
}
@ -5872,7 +5869,7 @@ static int get_reference (
tgt->id.name.len, qse_awk_val_nil, 0);
if (pair == QSE_NULL)
{
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return -1;
}
}
@ -5912,7 +5909,7 @@ static int get_reference (
tgt->id.name.len, qse_awk_val_nil, 0);
if (pair == QSE_NULL)
{
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return -1;
}
}
@ -5965,13 +5962,13 @@ static int get_reference (
if (n == -1)
{
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, QSE_NULL, nde->line);
return -1;
}
if (n == 1) lv = (qse_long_t)rv;
if (!IS_VALID_POSIDX(lv))
{
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, QSE_NULL, nde->line);
return -1;
}
@ -5979,7 +5976,7 @@ static int get_reference (
return 0;
}
qse_awk_rtx_seterror (run, QSE_AWK_ENOTREF, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOTREF, QSE_NULL, nde->line);
return -1;
}
@ -6010,7 +6007,7 @@ static qse_awk_val_t** get_reference_indexed (
}
else if ((*val)->type != QSE_AWK_VAL_MAP)
{
qse_awk_rtx_seterror (run, QSE_AWK_ENOTMAP, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOTMAP, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -6029,7 +6026,7 @@ static qse_awk_val_t** get_reference_indexed (
if (pair == QSE_NULL)
{
if (str != idxbuf) QSE_AWK_FREE (run->awk, str);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -6156,7 +6153,7 @@ static qse_awk_val_t* eval_indexed (
}
else if ((*val)->type != QSE_AWK_VAL_MAP)
{
qse_awk_rtx_seterror (run, QSE_AWK_ENOTMAP, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOTMAP, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -6185,7 +6182,7 @@ static qse_awk_val_t* eval_namedidx (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
tgt->id.name.ptr, tgt->id.name.len, qse_awk_val_nil, 0);
if (pair == QSE_NULL)
{
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -6229,14 +6226,14 @@ static qse_awk_val_t* eval_pos (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
qse_awk_rtx_refdownval (run, v);
if (n == -1)
{
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, QSE_NULL, nde->line);
return QSE_NULL;
}
if (n == 1) lv = (qse_long_t)rv;
if (lv < 0)
{
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_EPOSIDX, QSE_NULL, nde->line);
return QSE_NULL;
}
if (lv == 0) v = run->inrec.d0;
@ -6320,7 +6317,7 @@ static qse_awk_val_t* eval_getline (qse_awk_rtx_t* run, qse_awk_nde_t* nde)
if (qse_str_init (&buf, MMGR(run), DEF_BUF_CAPA) == QSE_NULL)
{
if (in != QSE_NULL) QSE_AWK_FREE (run->awk, in);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -6618,7 +6615,7 @@ static qse_char_t* idxnde_to_str (
if (qse_str_init (&idxstr, MMGR(run), DEF_BUF_CAPA) == QSE_NULL)
{
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}
@ -6641,7 +6638,7 @@ static qse_char_t* idxnde_to_str (
qse_awk_rtx_refdownval (run, idx);
qse_str_fini (&idxstr);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, nde->line, QSE_NULL);
qse_awk_rtx_seterror (run, QSE_AWK_ENOMEM, QSE_NULL, nde->line);
return QSE_NULL;
}

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

@ -1,5 +1,5 @@
/*
* $Id: Sed.cpp 235 2009-07-15 10:43:31Z hyunghwan.chung $
* $Id: Sed.cpp 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -101,10 +101,10 @@ Sed::errnum_t Sed::getErrorNumber () const
return (sed == QSE_NULL)? QSE_SED_ENOERR: qse_sed_geterrnum (sed);
}
void Sed::setError (errnum_t err, size_t lin, const cstr_t* args)
void Sed::setError (errnum_t err, const cstr_t* args, size_t lin)
{
QSE_ASSERT (sed != QSE_NULL);
qse_sed_seterror (sed, err, lin, args);
qse_sed_seterror (sed, err, args, lin);
}
Sed::size_t Sed::getConsoleLine ()

13
qse/lib/sed/err.c
View File

@ -1,5 +1,5 @@
/*
* $Id: err.c 207 2009-06-22 13:01:28Z hyunghwan.chung $
* $Id: err.c 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -97,16 +97,15 @@ void qse_sed_geterror (
}
}
void qse_sed_seterrnum (qse_sed_t* sed, qse_sed_errnum_t errnum)
void qse_sed_seterrnum (
qse_sed_t* sed, qse_sed_errnum_t errnum, const qse_cstr_t* errarg)
{
sed->errnum = errnum;
sed->errlin = 0;
sed->errmsg[0] = QSE_T('\0');
qse_sed_seterror (sed, errnum, errarg, 0);
}
void qse_sed_seterrmsg (
qse_sed_t* sed, qse_sed_errnum_t errnum,
qse_size_t errlin, const qse_char_t* errmsg)
const qse_char_t* errmsg, qse_size_t errlin)
{
sed->errnum = errnum;
sed->errlin = errlin;
@ -115,7 +114,7 @@ void qse_sed_seterrmsg (
void qse_sed_seterror (
qse_sed_t* sed, qse_sed_errnum_t errnum,
qse_size_t errlin, const qse_cstr_t* errarg)
const qse_cstr_t* errarg, qse_size_t errlin)
{
const qse_char_t* errfmt;

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

@ -1,5 +1,5 @@
/*
* $Id: sed.c 207 2009-06-22 13:01:28Z hyunghwan.chung $
* $Id: sed.c 257 2009-08-17 12:10:30Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -30,13 +30,13 @@ static qse_sed_t* qse_sed_init (qse_sed_t* sed, qse_mmgr_t* mmgr);
static void qse_sed_fini (qse_sed_t* sed);
#define SETERR0(sed,num,line) \
do { qse_sed_seterror (sed, num, line, QSE_NULL); } while (0)
do { qse_sed_seterror (sed, num, QSE_NULL, line); } while (0)
#define SETERR1(sed,num,line,argp,argl) \
do { \
qse_cstr_t __qse__err__arg__; \
__qse__err__arg__.ptr = argp; __qse__err__arg__.len = argl; \
qse_sed_seterror (sed, num, line, &__qse__err__arg__); \
qse_cstr_t __ea__; \
__ea__.ptr = argp; __ea__.len = argl; \
qse_sed_seterror (sed, num, &__ea__, line); \
} while (0)
qse_sed_t* qse_sed_open (qse_mmgr_t* mmgr, qse_size_t xtn)

4
qse/samples/sed/Makefile.am
View File

@ -1,12 +1,10 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
bin_PROGRAMS = sed01
bin_PROGRAMS =
LDFLAGS = -L../../lib/cmn -L../../lib/sed
LDADD = -lqsesed -lqsecmn $(LIBM)
sed01_SOURCES = sed01.c
if ENABLE_CXX
bin_PROGRAMS += sed02 sed03

50
qse/samples/sed/Makefile.in
View File

@ -32,7 +32,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = sed01$(EXEEXT) $(am__EXEEXT_1)
bin_PROGRAMS = $(am__EXEEXT_1)
@ENABLE_CXX_TRUE@am__append_1 = sed02 sed03
subdir = samples/sed
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@ -51,14 +51,10 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_sed01_OBJECTS = sed01.$(OBJEXT)
sed01_OBJECTS = $(am_sed01_OBJECTS)
sed01_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
sed01_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__sed02_SOURCES_DIST = sed02.cpp
@ENABLE_CXX_TRUE@am_sed02_OBJECTS = sed02.$(OBJEXT)
sed02_OBJECTS = $(am_sed02_OBJECTS)
am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@ENABLE_CXX_TRUE@sed02_DEPENDENCIES = $(am__DEPENDENCIES_2)
am__sed03_SOURCES_DIST = sed03.cpp
@ -68,15 +64,6 @@ sed03_OBJECTS = $(am_sed03_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/qse
depcomp = $(SHELL) $(top_srcdir)/ac/au/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@ -86,9 +73,8 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(sed01_SOURCES) $(sed02_SOURCES) $(sed03_SOURCES)
DIST_SOURCES = $(sed01_SOURCES) $(am__sed02_SOURCES_DIST) \
$(am__sed03_SOURCES_DIST)
SOURCES = $(sed02_SOURCES) $(sed03_SOURCES)
DIST_SOURCES = $(am__sed02_SOURCES_DIST) $(am__sed03_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -230,7 +216,6 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = -lqsesed -lqsecmn $(LIBM)
sed01_SOURCES = sed01.c
@ENABLE_CXX_TRUE@sed02_SOURCES = sed02.cpp
@ENABLE_CXX_TRUE@sed02_LDADD = -lqsesed++ $(LDADD)
@ENABLE_CXX_TRUE@sed03_SOURCES = sed03.cpp
@ -238,7 +223,7 @@ sed01_SOURCES = sed01.c
all: all-am
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
.SUFFIXES: .cpp .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@ -296,9 +281,6 @@ clean-binPROGRAMS:
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
sed01$(EXEEXT): $(sed01_OBJECTS) $(sed01_DEPENDENCIES)
@rm -f sed01$(EXEEXT)
$(LINK) $(sed01_OBJECTS) $(sed01_LDADD) $(LIBS)
sed02$(EXEEXT): $(sed02_OBJECTS) $(sed02_DEPENDENCIES)
@rm -f sed02$(EXEEXT)
$(CXXLINK) $(sed02_OBJECTS) $(sed02_LDADD) $(LIBS)
@ -312,31 +294,9 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sed01.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sed02.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sed03.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po