resumed stx after years of hibernation

qse/cmd/Makefile.am

@@ -1,2 +1,2 @@
-SUBDIRS = awk cut sed scm
+SUBDIRS = awk cut sed stx
 DIST_SUBDIRS = $(SUBDIRS) 

qse/cmd/Makefile.in

@@ -225,7 +225,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = awk cut sed scm
+SUBDIRS = awk cut sed stx
 DIST_SUBDIRS = $(SUBDIRS) 
 all: all-recursive
 

qse/cmd/stx/Makefile.am

@@ -0,0 +1,13 @@
+AUTOMAKE_OPTIONS = nostdinc
+
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
+
+bin_PROGRAMS = qsestx 
+
+qsestx_SOURCES = stx.c
+qsestx_LDFLAGS = -L../../lib/stx  -L$(libdir)
+qsestx_LDADD = -lqsestx $(LIBM)
+

qse/cmd/stx/Makefile.in

@@ -1,19 +1,543 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@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 = qsestx$(EXEEXT)
+subdir = cmd/stx
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/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 =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_qsestx_OBJECTS = stx.$(OBJEXT)
+qsestx_OBJECTS = $(am_qsestx_OBJECTS)
+am__DEPENDENCIES_1 =
+qsestx_DEPENDENCIES = $(am__DEPENDENCIES_1)
+qsestx_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qsestx_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = 
+depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+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 = $(qsestx_SOURCES)
+DIST_SOURCES = $(qsestx_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@
-CFLAGS = @CFLAGS@ -I@abs_top_builddir@
-LDFLAGS = @LDFLAGS@ -L@abs_top_builddir@/xp/bas -L@abs_top_builddir@/xp/stx
-LIBS = @LIBS@ -lxpstx -lxpbas
+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 = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_CXX = @HAVE_CXX@
+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@
+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_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+QSE_PROJECT_AUTHOR = @QSE_PROJECT_AUTHOR@
+QSE_PROJECT_URL = @QSE_PROJECT_URL@
+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@
+RMDIR = @RMDIR@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TRUE = @TRUE@
+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@
+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@
+AUTOMAKE_OPTIONS = nostdinc
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
 
-all: stx parser
+qsestx_SOURCES = stx.c
+qsestx_LDFLAGS = -L../../lib/stx  -L$(libdir)
+qsestx_LDADD = -lqsestx $(LIBM)
+all: all-am
 
-stx: stx.o
-	$(CC) $(LDFLAGS) -o $@.x stx.o $(LIBS)
+.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/stx/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign cmd/stx/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;
 
-parser: parser.o
-	$(CC) $(LDFLAGS) -o $@.x parser.o $(LIBS)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-clean:
-	rm -rf *.x *.o
+$(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
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+qsestx$(EXEEXT): $(qsestx_OBJECTS) $(qsestx_DEPENDENCIES) 
+	@rm -f qsestx$(EXEEXT)
+	$(qsestx_LINK) $(qsestx_OBJECTS) $(qsestx_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stx.Po@am__quote@
 
-.SUFFIXES: .c .o
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(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@	$(am__mv) $(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@	$(am__mv) $(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)
+	set x; \
+	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; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	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)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__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 "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$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)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+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:

qse/cmd/stx/stx.c

@@ -1,113 +1,110 @@
-#include <xp/stx/stx.h>
+#include <qse/stx/stx.h>
+#include <qse/cmn/main.h>
+#include <qse/cmn/stdio.h>
 
-#ifdef _DOS
-	#include <stdio.h>
-	#define xp_printf printf
-#else
-	#include <xp/bas/stdio.h>
-	#include <xp/bas/locale.h>
+#if 0
+#include <qse/stx/bootstrp.h>
+#include <qse/stx/object.h>
+#include <qse/stx/symbol.h>
+#include <qse/stx/context.h>
+#include <qse/stx/class.h>
+#include <qse/stx/dict.h>
 #endif
 
-#include <xp/stx/bootstrp.h>
-#include <xp/stx/object.h>
-#include <xp/stx/symbol.h>
-#include <xp/stx/context.h>
-#include <xp/stx/class.h>
-#include <xp/stx/dict.h>
-
-void print_symbol_names (xp_stx_t* stx, xp_word_t sym, void* unused)
+#if 0
+void print_symbol_names (qse_stx_t* stx, qse_word_t sym, void* unused)
 {
-	xp_printf (XP_TEXT("%lu [%s]\n"), (unsigned long)sym, XP_STX_DATA(stx,sym));
+	qse_printf (QSE_T("%lu [%s]\n"), (unsigned long)sym, QSE_STX_DATA(stx,sym));
 }
 
-void print_symbol_names_2 (xp_stx_t* stx, xp_word_t idx, void* unused)
+void print_symbol_names_2 (qse_stx_t* stx, qse_word_t idx, void* unused)
 {
-	xp_word_t key = XP_STX_WORD_AT(stx,idx,XP_STX_ASSOCIATION_KEY);
-	xp_word_t value = XP_STX_WORD_AT(stx,idx,XP_STX_ASSOCIATION_VALUE);
-	xp_printf (XP_TEXT("%lu [%s] %lu\n"), 
-		(unsigned long)key, XP_STX_DATA(stx,key), (unsigned long)value);
+	qse_word_t key = QSE_STX_WORD_AT(stx,idx,QSE_STX_ASSOCIATION_KEY);
+	qse_word_t value = QSE_STX_WORD_AT(stx,idx,QSE_STX_ASSOCIATION_VALUE);
+	qse_printf (QSE_T("%lu [%s] %lu\n"), 
+		(unsigned long)key, QSE_STX_DATA(stx,key), (unsigned long)value);
 }
 
-void print_superclasses (xp_stx_t* stx, const xp_char_t* name)
+void print_superclasses (qse_stx_t* stx, const qse_char_t* name)
 {
-	xp_word_t n;
-	xp_stx_class_t* obj;
+	qse_word_t n;
+	qse_stx_class_t* obj;
 
-	n = xp_stx_lookup_class (stx, name);
-	xp_printf (XP_TEXT("Class hierarchy for the class '%s'\n"), name);
+	n = qse_stx_lookup_class (stx, name);
+	qse_printf (QSE_T("Class hierarchy for the class '%s'\n"), name);
 
 	while (n != stx->nil) {
-		obj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(stx,n);
-		xp_printf (XP_TEXT("%lu, %s\n"), 
+		obj = (qse_stx_class_t*)QSE_STX_WORD_OBJECT(stx,n);
+		qse_printf (QSE_T("%lu, %s\n"), 
 			(unsigned long)obj->name,
-			XP_STX_DATA(stx, obj->name));
+			QSE_STX_DATA(stx, obj->name));
 		n = obj->superclass;
 	}
 }
 
-void print_metaclass_superclasses (xp_stx_t* stx, const xp_char_t* name)
+void print_metaclass_superclasses (qse_stx_t* stx, const qse_char_t* name)
 {
-	xp_word_t n, x;
-	xp_stx_metaclass_t* obj;
-	xp_stx_class_t* xobj;
+	qse_word_t n, x;
+	qse_stx_metaclass_t* obj;
+	qse_stx_class_t* xobj;
 
-	n = xp_stx_lookup_class (stx, name);
-	n = XP_STX_CLASS(stx,n);
-	xp_printf (XP_TEXT("Class hierarchy for the metaclass '%s class'\n"), name);
+	n = qse_stx_lookup_class (stx, name);
+	n = QSE_STX_CLASS(stx,n);
+	qse_printf (QSE_T("Class hierarchy for the metaclass '%s class'\n"), name);
 
 	while (n != stx->nil) {
 		/*if (n == stx->class_class) break; */
-		if (XP_STX_CLASS(stx,n) != stx->class_metaclass) break;
+		if (QSE_STX_CLASS(stx,n) != stx->class_metaclass) break;
 
-		obj = (xp_stx_metaclass_t*)XP_STX_WORD_OBJECT(stx,n);
+		obj = (qse_stx_metaclass_t*)QSE_STX_WORD_OBJECT(stx,n);
 		x = obj->instance_class;
-		xobj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(stx,x);
-		xp_printf (XP_TEXT("%lu, %s class\n"), 
+		xobj = (qse_stx_class_t*)QSE_STX_WORD_OBJECT(stx,x);
+		qse_printf (QSE_T("%lu, %s class\n"), 
 			(unsigned long)xobj->name,
-			XP_STX_DATA(stx, xobj->name));
+			QSE_STX_DATA(stx, xobj->name));
 		n = obj->superclass;
 	}
 	while (n != stx->nil) {
-		xobj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(stx,n);
-		xp_printf (XP_TEXT("%lu, %s\n"), 
+		xobj = (qse_stx_class_t*)QSE_STX_WORD_OBJECT(stx,n);
+		qse_printf (QSE_T("%lu, %s\n"), 
 			(unsigned long)xobj->name,
-			XP_STX_DATA(stx, xobj->name));
+			QSE_STX_DATA(stx, xobj->name));
 		n = xobj->superclass;
 	}
 }
 
-void print_class_name (xp_stx_t* stx, xp_word_t class, int tabs)
+void print_class_name (qse_stx_t* stx, qse_word_t class, int tabs)
 {
-	xp_stx_class_t* xobj;
-	xobj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(stx,class);
+	qse_stx_class_t* xobj;
+	xobj = (qse_stx_class_t*)QSE_STX_WORD_OBJECT(stx,class);
 
-	while (tabs-- > 0) xp_printf (XP_TEXT("  "));
+	while (tabs-- > 0) qse_printf (QSE_T("  "));
 
-	xp_printf (XP_TEXT("%s [%lu]\n"), 
-		XP_STX_DATA(stx, xobj->name),
+	qse_printf (QSE_T("%s [%lu]\n"), 
+		QSE_STX_DATA(stx, xobj->name),
 		(unsigned long)class);
 }
 
-void print_metaclass_name (xp_stx_t* stx, xp_word_t class, int tabs)
+void print_metaclass_name (qse_stx_t* stx, qse_word_t class, int tabs)
 {
-	xp_stx_metaclass_t* obj;
-	xp_stx_class_t* xobj;
+	qse_stx_metaclass_t* obj;
+	qse_stx_class_t* xobj;
 
-	obj = (xp_stx_metaclass_t*)XP_STX_WORD_OBJECT(stx,class);
-	xobj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(stx,obj->instance_class);
+	obj = (qse_stx_metaclass_t*)QSE_STX_WORD_OBJECT(stx,class);
+	xobj = (qse_stx_class_t*)QSE_STX_WORD_OBJECT(stx,obj->instance_class);
 
-	while (tabs-- > 0) xp_printf (XP_TEXT("  "));
+	while (tabs-- > 0) qse_printf (QSE_T("  "));
 
-	xp_printf (XP_TEXT("%s class [%lu]\n"), 
-		XP_STX_DATA(stx, xobj->name),
+	qse_printf (QSE_T("%s class [%lu]\n"), 
+		QSE_STX_DATA(stx, xobj->name),
 		(unsigned long)class);
 }
 
-void print_subclass_names (xp_stx_t* stx, xp_word_t class, int tabs)
+void print_subclass_names (qse_stx_t* stx, qse_word_t class, int tabs)
 {
-	xp_stx_class_t* obj;
+	qse_stx_class_t* obj;
 
-	obj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(stx,class);
+	obj = (qse_stx_class_t*)QSE_STX_WORD_OBJECT(stx,class);
 	if (obj->header.class == stx->class_metaclass) {
 		print_metaclass_name (stx, class, tabs);
 	}
@@ -116,122 +113,143 @@ void print_subclass_names (xp_stx_t* stx, xp_word_t class, int tabs)
 	}
 
 	if (obj->subclasses != stx->nil) {
-		xp_word_t count = XP_STX_SIZE(stx, obj->subclasses);
+		qse_word_t count = QSE_STX_SIZE(stx, obj->subclasses);
 		while (count-- > 0) {
 			print_subclass_names (stx, 
-				XP_STX_WORD_AT(stx,obj->subclasses,count), tabs + 1);
+				QSE_STX_WORD_AT(stx,obj->subclasses,count), tabs + 1);
 		}
 	}
 }
 
-void print_subclasses (xp_stx_t* stx, const xp_char_t* name)
+void print_subclasses (qse_stx_t* stx, const qse_char_t* name)
 {
-	xp_word_t class;
-	class = xp_stx_lookup_class (stx, name);	
-	xp_printf (XP_TEXT("== NORMAL == \n"));
+	qse_word_t class;
+	class = qse_stx_lookup_class (stx, name);	
+	qse_printf (QSE_T("== NORMAL == \n"));
 	print_subclass_names (stx, class, 0);
-	xp_printf (XP_TEXT("== META == \n"));
-	print_subclass_names (stx, XP_STX_CLASS(stx,class), 0);
+	qse_printf (QSE_T("== META == \n"));
+	print_subclass_names (stx, QSE_STX_CLASS(stx,class), 0);
 }
 
-int xp_main (int argc, xp_char_t* argv[])
+static int stx_main (int argc, qse_char_t* argv[])
 {
-	xp_stx_t stx;
-	//xp_word_t i;
+	qse_stx_t stx;
+	//qse_word_t i;
 
 #ifndef _DOS
-	if (xp_setlocale () == -1) {
+	if (qse_setlocale () == -1) {
 		printf ("cannot set locale\n");
 		return -1;
 	}
 #endif
 
 	if (argc != 2) { /* TODO: argument processing */
-		xp_printf (XP_TEXT("Usage: %s [-f imageFile] MainClass\n"), argv[0]);
+		qse_printf (QSE_T("Usage: %s [-f imageFile] MainClass\n"), argv[0]);
 		return -1;
 	}
 
-	if (xp_stx_open (&stx, 10000) == XP_NULL) {
-		xp_printf (XP_TEXT("cannot open stx\n"));
+	if (qse_stx_open (&stx, 10000) == QSE_NULL) {
+		qse_printf (QSE_T("cannot open stx\n"));
 		return -1;
 	}
 
-	if (xp_stx_bootstrap(&stx) == -1) {
-		xp_stx_close (&stx);
-		xp_printf (XP_TEXT("cannot bootstrap\n"));
+	if (qse_stx_bootstrap(&stx) == -1) {
+		qse_stx_close (&stx);
+		qse_printf (QSE_T("cannot bootstrap\n"));
 		return -1;
 	}	
 
-	xp_printf (XP_TEXT("stx.nil %lu\n"), (unsigned long)stx.nil);
-	xp_printf (XP_TEXT("stx.true %lu\n"), (unsigned long)stx.true);
-	xp_printf (XP_TEXT("stx.false %lu\n"), (unsigned long)stx.false);
-	xp_printf (XP_TEXT("-------------\n"));
+	qse_printf (QSE_T("stx.nil %lu\n"), (unsigned long)stx.nil);
+	qse_printf (QSE_T("stx.true %lu\n"), (unsigned long)stx.true);
+	qse_printf (QSE_T("stx.false %lu\n"), (unsigned long)stx.false);
+	qse_printf (QSE_T("-------------\n"));
 	
 	
-	xp_printf (XP_TEXT(">> SYMBOL_TABLE (%u/%u symbols/slots) <<\n"), 
+	qse_printf (QSE_T(">> SYMBOL_TABLE (%u/%u symbols/slots) <<\n"), 
 		(unsigned int)stx.symtab.size, (unsigned int)stx.symtab.capacity);
-	xp_stx_traverse_symbol_table (&stx, print_symbol_names, XP_NULL);
-	xp_printf (XP_TEXT("-------------\n"));
+	qse_stx_traverse_symbol_table (&stx, print_symbol_names, QSE_NULL);
+	qse_printf (QSE_T("-------------\n"));
 
-	xp_stx_dict_traverse (&stx, stx.smalltalk, print_symbol_names_2, XP_NULL);
-	xp_printf (XP_TEXT("-------------\n"));
+	qse_stx_dict_traverse (&stx, stx.smalltalk, print_symbol_names_2, QSE_NULL);
+	qse_printf (QSE_T("-------------\n"));
 
-	print_superclasses (&stx, XP_TEXT("Array"));
-	xp_printf (XP_TEXT("-------------\n"));
-	print_metaclass_superclasses (&stx, XP_TEXT("Array"));
-	xp_printf (XP_TEXT("-------------\n"));
-	print_superclasses (&stx, XP_TEXT("False"));
-	xp_printf (XP_TEXT("-------------\n"));
-	print_metaclass_superclasses (&stx, XP_TEXT("False"));
-	xp_printf (XP_TEXT("-------------\n"));
-	print_superclasses (&stx, XP_TEXT("Metaclass"));
-	xp_printf (XP_TEXT("-------------\n"));
-	print_metaclass_superclasses (&stx, XP_TEXT("Metaclass"));
-	xp_printf (XP_TEXT("-------------\n"));
-	print_superclasses (&stx, XP_TEXT("Class"));
-	xp_printf (XP_TEXT("-------------\n"));
-	print_metaclass_superclasses (&stx, XP_TEXT("Class"));
-	xp_printf (XP_TEXT("-------------\n"));
+	print_superclasses (&stx, QSE_T("Array"));
+	qse_printf (QSE_T("-------------\n"));
+	print_metaclass_superclasses (&stx, QSE_T("Array"));
+	qse_printf (QSE_T("-------------\n"));
+	print_superclasses (&stx, QSE_T("False"));
+	qse_printf (QSE_T("-------------\n"));
+	print_metaclass_superclasses (&stx, QSE_T("False"));
+	qse_printf (QSE_T("-------------\n"));
+	print_superclasses (&stx, QSE_T("Metaclass"));
+	qse_printf (QSE_T("-------------\n"));
+	print_metaclass_superclasses (&stx, QSE_T("Metaclass"));
+	qse_printf (QSE_T("-------------\n"));
+	print_superclasses (&stx, QSE_T("Class"));
+	qse_printf (QSE_T("-------------\n"));
+	print_metaclass_superclasses (&stx, QSE_T("Class"));
+	qse_printf (QSE_T("-------------\n"));
 
-	print_subclasses (&stx, XP_TEXT("Object"));
-	xp_printf (XP_TEXT("-------------\n"));
+	print_subclasses (&stx, QSE_T("Object"));
+	qse_printf (QSE_T("-------------\n"));
 
 #if 0
 	{
-		xp_word_t method_name;
-		xp_word_t main_class;
-		xp_word_t method, context;
+		qse_word_t method_name;
+		qse_word_t main_class;
+		qse_word_t method, context;
 
-		method_name = xp_stx_new_symbol (&stx,XP_TEXT("main"));
+		method_name = qse_stx_new_symbol (&stx,QSE_T("main"));
 
-		main_class = xp_stx_lookup_class (&stx,argv[1]);
+		main_class = qse_stx_lookup_class (&stx,argv[1]);
 		if (main_class == stx.nil) {
-			xp_printf (XP_TEXT("non-existent class: %s\n"), argv[1]);
+			qse_printf (QSE_T("non-existent class: %s\n"), argv[1]);
 			return -1;
 		}
 
 		/*
-		method = xp_stx_alloc_byte_object (&stx,100);
-		XP_STX_CLASS(&stx,method) = stx.class_method;
+		method = qse_stx_alloc_byte_object (&stx,100);
+		QSE_STX_CLASS(&stx,method) = stx.class_method;
 		*/
-		method = xp_stx_instantiate (&stx, XP_TEXT("Method"));
+		method = qse_stx_instantiate (&stx, QSE_T("Method"));
 
-		XP_STX_BYTEAT(&stx,method,0) = PUSH_OBJECT;
-		XP_STX_BYTEAT(&stx,method,1) = main_class;
-		XP_STX_BYTEAT(&stx,method,2) = SEND_UNARY_MESSAGE;
-		XP_STX_BYTEAT(&stx,method,3) = method_name;
-		XP_STX_BYTEAT(&stx,method,4) = HALT;
+		QSE_STX_BYTEAT(&stx,method,0) = PUSH_OBJECT;
+		QSE_STX_BYTEAT(&stx,method,1) = main_class;
+		QSE_STX_BYTEAT(&stx,method,2) = SEND_UNARY_MESSAGE;
+		QSE_STX_BYTEAT(&stx,method,3) = method_name;
+		QSE_STX_BYTEAT(&stx,method,4) = HALT;
 
 		/*
-		context = xp_stx_new_context (&stx, method, stx.nil, stx.nil);
+		context = qse_stx_new_context (&stx, method, stx.nil, stx.nil);
 		*/
-		context = xp_stx_instantiate (&stx, XP_TEXT("Context"));
-		xp_stx_run_context (&stx, context);
+		context = qse_stx_instantiate (&stx, QSE_T("Context"));
+		qse_stx_run_context (&stx, context);
 	}
 #endif
 
-	xp_stx_close (&stx);
-	xp_printf (XP_TEXT("== End of program ==\n"));
+	qse_stx_close (&stx);
+	qse_printf (QSE_T("== End of program ==\n"));
+	return 0;
+}
+#endif
+
+static int stx_main (int argc, qse_char_t* argv[])
+{
+	qse_stx_t* stx;
+
+	stx = qse_stx_open (QSE_NULL, 0, 1000);
+	if (stx == QSE_NULL)
+	{
+		qse_printf (QSE_T("Cannot open stx\n"));
+		return -1;
+	}
+
+	qse_stx_close (stx);
 	return 0;
 }
 
+int qse_main (int argc, qse_achar_t* argv[])
+{
+	return qse_runmain (argc, argv, stx_main);
+}
+