reorganized files

qse/cmd/awk/Awk.cpp

@@ -18,8 +18,8 @@
 
 #include <qse/awk/StdAwk.hpp>
 #include <qse/cmn/str.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
-#include <qse/utl/main.h>
+#include <qse/cmn/main.h>
 
 #include <stdlib.h>
 #include <math.h>

qse/cmd/awk/awk.c

@@ -1,5 +1,5 @@
 /*
- * $Id: awk.c 90 2009-03-01 09:58:19Z hyunghwan.chung $
+ * $Id: awk.c 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -23,8 +23,8 @@
 #include <qse/cmn/chr.h>
 #include <qse/cmn/opt.h>
 
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
-#include <qse/utl/main.h>
+#include <qse/cmn/main.h>
 
 #include <string.h>
 #include <signal.h>

qse/cmd/lsp/lsp.c

@@ -9,8 +9,8 @@
 #include <qse/cmn/str.h>
 #include <qse/cmn/opt.h>
 
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
-#include <qse/utl/main.h>
+#include <qse/cmn/main.h>
 
 #include <string.h>
 #include <stdlib.h>

qse/cmd/utl/tgp.c

@@ -4,8 +4,8 @@
 
 #include <qse/utl/tgp.h>
 
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
-#include <qse/utl/main.h>
+#include <qse/cmn/main.h>
 
 #include <qse/cmn/mem.h>
 #include <qse/cmn/chr.h>

qse/doc/page/main.doc

@@ -95,6 +95,6 @@ on each module.
 - @subpage awk "AWK Interpreter"
 
 @section design_model DESIGN MODEL
-The design of a data structure is usually derived from object-oriented model.
+The design of a data structure is derived from object-oriented model.
 <<MORE>>>
 */

qse/include/qse/cmn/Makefile.am

@@ -1,5 +1,8 @@
 
-pkginclude_HEADERS = mem.h chr.h str.h lda.h map.h rex.h sll.h dll.h opt.h tio.h fio.h pio.h sio.h time.h 
+pkginclude_HEADERS = \
+	mem.h chr.h str.h lda.h map.h \
+	rex.h sll.h dll.h opt.h tio.h \
+	fio.h pio.h sio.h time.h main.h stdio.h
 
 #if ENABLE_CXX
 #pkginclude_HEADERS += 

qse/include/qse/cmn/Makefile.in

@@ -192,7 +192,11 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-pkginclude_HEADERS = mem.h chr.h str.h lda.h map.h rex.h sll.h dll.h opt.h tio.h fio.h pio.h sio.h time.h 
+pkginclude_HEADERS = \
+	mem.h chr.h str.h lda.h map.h \
+	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
 

qse/include/qse/cmn/main.h

@@ -16,8 +16,8 @@
    limitations under the License.
  */
 
-#ifndef _QSE_UTL_MAIN_H_
+#ifndef _QSE_CMN_MAIN_H_
-#define _QSE_UTL_MAIN_H_
+#define _QSE_CMN_MAIN_H_
 
 #include <qse/types.h>
 #include <qse/macros.h>

qse/include/qse/cmn/sio.h

@@ -1,5 +1,5 @@
 /*
- * $Id: sio.h 75 2009-02-22 14:10:34Z hyunghwan.chung $
+ * $Id: sio.h 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -61,6 +61,10 @@ extern qse_sio_t* qse_sio_in;
 extern qse_sio_t* qse_sio_out;
 extern qse_sio_t* qse_sio_err;
 
+#define QSE_SIO_IN  qse_sio_in
+#define QSE_SIO_OUT qse_sio_out
+#define QSE_SIO_ERR qse_sio_err
+
 qse_sio_t* qse_sio_open (
         qse_mmgr_t*       mmgr,
 	qse_size_t        ext,

qse/include/qse/cmn/stdio.h

@@ -1,11 +1,23 @@
 /*
  * $Id: stdio.h 419 2008-10-13 11:32:58Z baconevi $
  * 
- * {License}
+   Copyright 2006-2009 Chung, Hyung-Hwan.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
  */
 
-#ifndef _QSE_UTL_STDIO_H_
+#ifndef _QSE_CMN_STDIO_H_
-#define _QSE_UTL_STDIO_H_
+#define _QSE_CMN_STDIO_H_
 
 #include <qse/types.h>
 #include <qse/macros.h>

qse/include/qse/utl/Makefile.am

@@ -1,5 +1,5 @@
 
-pkginclude_HEADERS = http.h main.h stdio.h tgp.h
+pkginclude_HEADERS = http.h tgp.h
 
 pkgincludedir= $(includedir)/qse/utl
 

qse/include/qse/utl/Makefile.in

@@ -188,7 +188,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-pkginclude_HEADERS = http.h main.h stdio.h tgp.h
+pkginclude_HEADERS = http.h tgp.h
 CLEANFILES = *dist
 all: all-am
 

qse/lib/Makefile.am

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

qse/lib/Makefile.in

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

qse/lib/awk/Awk.cpp

@@ -1,5 +1,5 @@
 /*
- * $Id: Awk.cpp 172 2009-06-01 13:33:01Z hyunghwan.chung $
+ * $Id: Awk.cpp 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -21,7 +21,6 @@
 #include "../cmn/mem.h"
 #include "awk.h"
 
-#include <qse/utl/stdio.h>
 /////////////////////////////////
 QSE_BEGIN_NAMESPACE(QSE)
 /////////////////////////////////

qse/lib/awk/Makefile.am

@@ -5,12 +5,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libqseawk.la
 libqseawk_la_SOURCES = awk.c err.c tree.c parse.c run.c rec.c val.c fnc.c misc.c rio.c std.c awk.h rio.h val.h fnc.h misc.h parse.h run.h tree.h 
-libqseawk_la_LDFLAGS = -L../cmn -L../utl -version-info 1:0:0 -no-undefined
+libqseawk_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
-libqseawk_la_LIBADD = -lqsecmn -lqseutl
+libqseawk_la_LIBADD = -lqsecmn 
 
 if ENABLE_CXX
 lib_LTLIBRARIES += libqseawk++.la
 libqseawk___la_SOURCES = Awk.cpp StdAwk.cpp
-libqseawk___la_LDFLAGS = -L. -L../cmn -L../utl -version-info 1:0:0 -no-undefined
+libqseawk___la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
-libqseawk___la_LIBADD = -lqseawk  -lqsecmn -lqseutl
+libqseawk___la_LIBADD = -lqseawk  -lqsecmn 
 endif

qse/lib/awk/Makefile.in

@@ -229,11 +229,11 @@ AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include
 lib_LTLIBRARIES = libqseawk.la $(am__append_1)
 libqseawk_la_SOURCES = awk.c err.c tree.c parse.c run.c rec.c val.c fnc.c misc.c rio.c std.c awk.h rio.h val.h fnc.h misc.h parse.h run.h tree.h 
-libqseawk_la_LDFLAGS = -L../cmn -L../utl -version-info 1:0:0 -no-undefined
+libqseawk_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
-libqseawk_la_LIBADD = -lqsecmn -lqseutl
+libqseawk_la_LIBADD = -lqsecmn 
 @ENABLE_CXX_TRUE@libqseawk___la_SOURCES = Awk.cpp StdAwk.cpp
-@ENABLE_CXX_TRUE@libqseawk___la_LDFLAGS = -L. -L../cmn -L../utl -version-info 1:0:0 -no-undefined
+@ENABLE_CXX_TRUE@libqseawk___la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
-@ENABLE_CXX_TRUE@libqseawk___la_LIBADD = -lqseawk  -lqsecmn -lqseutl
+@ENABLE_CXX_TRUE@libqseawk___la_LIBADD = -lqseawk  -lqsecmn 
 all: all-am
 
 .SUFFIXES:

qse/lib/awk/StdAwk.cpp

@@ -1,5 +1,5 @@
 /*
- * $Id: StdAwk.cpp 158 2009-05-26 13:29:47Z hyunghwan.chung $
+ * $Id: StdAwk.cpp 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -22,7 +22,7 @@
 #include <qse/cmn/fio.h>
 #include <qse/cmn/pio.h>
 #include <qse/cmn/sio.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 #include <stdlib.h>
 #include <math.h>

qse/lib/awk/run.c

@@ -1,5 +1,5 @@
 /*
- * $Id: run.c 171 2009-06-01 09:34:34Z hyunghwan.chung $
+ * $Id: run.c 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -19,7 +19,7 @@
 #include "awk.h"
 
 #ifdef DEBUG_RUN
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 #endif
 
 #define CMP_ERROR -99

qse/lib/awk/std.c

@@ -1,5 +1,5 @@
 /*
- * $Id: std.c 127 2009-05-07 13:15:04Z hyunghwan.chung $
+ * $Id: std.c 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -22,7 +22,7 @@
 #include <qse/cmn/pio.h>
 #include <qse/cmn/str.h>
 #include <qse/cmn/time.h>
-#include <qse/utl/stdio.h> /* TODO: remove dependency on qse_vsprintf */
+#include <qse/cmn/stdio.h> /* TODO: remove dependency on qse_vsprintf */
 
 #include <math.h>
 #include <stdarg.h>

qse/lib/awk/val.c

@@ -1,5 +1,5 @@
 /*
- * $Id: val.c 90 2009-03-01 09:58:19Z hyunghwan.chung $
+ * $Id: val.c 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -19,7 +19,7 @@
 #include "awk.h"
 
 #ifdef DEBUG_VAL
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 #endif
 
 #define CHUNKSIZE QSE_AWK_VAL_CHUNK_SIZE

qse/lib/cmn/Makefile.am

@@ -11,7 +11,10 @@ libqsecmn_la_SOURCES = \
 	tio.c tio_get.c tio_put.c \
 	fio.c pio.c sio.c \
 	time.c \
-	misc.c 
+	misc.c \
+	assert.c \
+	main.c \
+	stdio.c
 libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined
 
 if WIN32 

qse/lib/cmn/Makefile.in

@@ -54,7 +54,7 @@ libqsecmn_la_DEPENDENCIES =
 am_libqsecmn_la_OBJECTS = mem.lo chr.lo chr_cnv.lo rex.lo str_bas.lo \
 	str_cnv.lo str_dyn.lo str_utl.lo lda.lo map.lo sll.lo dll.lo \
 	opt.lo tio.lo tio_get.lo tio_put.lo fio.lo pio.lo sio.lo \
-	time.lo misc.lo
+	time.lo misc.lo assert.lo main.lo stdio.lo
 libqsecmn_la_OBJECTS = $(am_libqsecmn_la_OBJECTS)
 libqsecmn_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -219,7 +219,10 @@ libqsecmn_la_SOURCES = \
 	tio.c tio_get.c tio_put.c \
 	fio.c pio.c sio.c \
 	time.c \
-	misc.c 
+	misc.c \
+	assert.c \
+	main.c \
+	stdio.c
 
 libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined
 @WIN32_TRUE@libqsecmn_la_LIBADD = -lpsapi
@@ -292,11 +295,13 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assert.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chr_cnv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dll.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lda.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
@@ -305,6 +310,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rex.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_bas.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_cnv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_dyn.Plo@am__quote@

qse/lib/cmn/assert.c

@@ -0,0 +1,55 @@
+/*
+ * $Id: assert.c 223 2008-06-26 06:44:41Z baconevi $
+ *
+   Copyright 2006-2009 Chung, Hyung-Hwan.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
+
+#include <qse/types.h>
+#include <qse/macros.h>
+
+#ifndef NDEBUG
+
+#include <qse/cmn/sio.h>
+#include <stdlib.h>
+
+void qse_assert_failed (
+	const qse_char_t* expr, const qse_char_t* desc, 
+	const qse_char_t* file, qse_size_t line)
+{
+	qse_sio_puts (QSE_SIO_ERR, QSE_T("=[ASSERTION FAILURE]============================================================"));
+
+	qse_sio_puts (QSE_SIO_ERR, QSE_T("FILE "));
+	qse_sio_puts (QSE_SIO_ERR, file);
+	qse_sio_puts (QSE_SIO_ERR, QSE_T("LINE "));
+
+/*qse_sio_puts the number */
+
+	qse_sio_puts (QSE_SIO_ERR, QSE_T(": "));
+	qse_sio_puts (QSE_SIO_ERR, expr);
+	qse_sio_puts (QSE_SIO_ERR, QSE_T("\n"));
+
+	if (desc != QSE_NULL)
+	{
+		qse_sio_puts (QSE_SIO_ERR, QSE_T("DESCRIPTION: "));
+		qse_sio_puts (QSE_SIO_ERR, desc);
+		qse_sio_puts (QSE_SIO_ERR, QSE_T("\n"));
+	}
+	qse_sio_puts (QSE_SIO_ERR, QSE_T("================================================================================"));
+
+	abort ();
+}
+
+#endif
+

qse/lib/cmn/main.c

@@ -1,10 +1,22 @@
 /*
  * $Id: main.c 463 2008-12-09 06:52:03Z baconevi $
  *
- * {License}
+   Copyright 2006-2009 Chung, Hyung-Hwan.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
  */
 
-#include <qse/utl/main.h>
+#include <qse/cmn/main.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

qse/lib/cmn/stdio.c

@@ -1,10 +1,22 @@
 /*
  * $Id: stdio.c 463 2008-12-09 06:52:03Z baconevi $
  *
- * {License}
+   Copyright 2006-2009 Chung, Hyung-Hwan.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
  */
 
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 #include <qse/cmn/chr.h>
 
 #include <wchar.h>

qse/lib/lsp/mem.c

@@ -326,7 +326,7 @@ static void __mark_objs_in_use (qse_lsp_mem_t* mem)
 	if (mem->macro  != QSE_NULL) __mark_obj (mem->lsp, mem->macro);
 }
 
-//#include <qse/utl/stdio.h>
+//#include <qse/cmn/stdio.h>
 static void __sweep_unmarked_objs (qse_lsp_mem_t* mem)
 {
 	qse_lsp_obj_t* obj, * prev, * next;

qse/lib/sed/Makefile.am

@@ -3,13 +3,13 @@ AM_CPPFLAGS = -I$(top_builddir)/include
 
 lib_LTLIBRARIES = libqsesed.la
 libqsesed_la_SOURCES = sed.c err.c sed.h
-libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn -L../utl
+libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn 
-libqsesed_la_LIBADD = -lqsecmn -lqseutl
+libqsesed_la_LIBADD = -lqsecmn 
 
 if ENABLE_CXX
 lib_LTLIBRARIES += libqsesed++.la
 libqsesed___la_SOURCES = Sed.cpp StdSed.cpp
-libqsesed___la_LDFLAGS = -L. -L../cmn -L../utl -version-info 1:0:0 -no-undefined
+libqsesed___la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
-libqsesed___la_LIBADD = -lqsesed  -lqsecmn -lqseutl
+libqsesed___la_LIBADD = -lqsesed  -lqsecmn 
 endif
 

qse/lib/sed/Makefile.in

@@ -227,11 +227,11 @@ top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_builddir)/include
 lib_LTLIBRARIES = libqsesed.la $(am__append_1)
 libqsesed_la_SOURCES = sed.c err.c sed.h
-libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn -L../utl
+libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn 
-libqsesed_la_LIBADD = -lqsecmn -lqseutl
+libqsesed_la_LIBADD = -lqsecmn 
 @ENABLE_CXX_TRUE@libqsesed___la_SOURCES = Sed.cpp StdSed.cpp
-@ENABLE_CXX_TRUE@libqsesed___la_LDFLAGS = -L. -L../cmn -L../utl -version-info 1:0:0 -no-undefined
+@ENABLE_CXX_TRUE@libqsesed___la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
-@ENABLE_CXX_TRUE@libqsesed___la_LIBADD = -lqsesed  -lqsecmn -lqseutl
+@ENABLE_CXX_TRUE@libqsesed___la_LIBADD = -lqsesed  -lqsecmn 
 all: all-am
 
 .SUFFIXES:

qse/lib/utl/Makefile.am

@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include
 
 lib_LTLIBRARIES = libqseutl.la
 libqseutl_la_SOURCES = \
-	assert.c http.c main.c stdio.c \
+	http.c \
 	tgp.c \
 	tgp.h
 libqseutl_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn

qse/lib/utl/Makefile.in

@@ -51,7 +51,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libqseutl_la_DEPENDENCIES =
-am_libqseutl_la_OBJECTS = assert.lo http.lo main.lo stdio.lo tgp.lo
+am_libqseutl_la_OBJECTS = http.lo tgp.lo
 libqseutl_la_OBJECTS = $(am_libqseutl_la_OBJECTS)
 libqseutl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -208,7 +208,7 @@ top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_builddir)/include
 lib_LTLIBRARIES = libqseutl.la
 libqseutl_la_SOURCES = \
-	assert.c http.c main.c stdio.c \
+	http.c \
 	tgp.c \
 	tgp.h
 
@@ -283,10 +283,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assert.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tgp.Plo@am__quote@
 
 .c.o:

qse/lib/utl/assert.c

@@ -1,32 +0,0 @@
-/*
- * $Id: assert.c 223 2008-06-26 06:44:41Z baconevi $
- */
-
-#include <qse/types.h>
-#include <qse/macros.h>
-
-#ifndef NDEBUG
-
-#include <qse/utl/stdio.h>
-#include <stdlib.h>
-
-void qse_assert_failed (
-	const qse_char_t* expr, const qse_char_t* desc, 
-	const qse_char_t* file, qse_size_t line)
-{
-	qse_fprintf (QSE_STDERR, QSE_T("=[ASSERTION FAILURE]============================================================"));
-	qse_fprintf (QSE_STDERR, QSE_T("FILE %s LINE %lu: %s\n"),
-		file, (unsigned long)line, expr);
-
-	if (desc != QSE_NULL)
-	{
-		qse_fprintf (QSE_STDERR, QSE_T("DESCRIPTION: %s\n"),
-			file, (unsigned long)line, expr, desc);
-	}
-	qse_fprintf (QSE_STDERR, QSE_T("================================================================================"));
-
-	abort ();
-}
-
-#endif
-

qse/test/Makefile.am

@@ -1 +1 @@
-SUBDIRS = cmn utl sed awk 
+SUBDIRS = cmn sed awk utl

qse/test/Makefile.in

@@ -187,7 +187,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = cmn utl sed awk 
+SUBDIRS = cmn sed awk utl
 all: all-recursive
 
 .SUFFIXES:

qse/test/awk/Makefile.am

@@ -2,8 +2,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = awk01 awk02 awk03 awk04
 
-LDFLAGS = -L../../lib/cmn -L../../lib/utl -L../../lib/awk
+LDFLAGS = -L../../lib/cmn -L../../lib/awk
-LDADD = -lqseawk -lqseutl -lqsecmn $(LIBM)
+LDADD = -lqseawk -lqsecmn $(LIBM)
 
 awk01_SOURCES = awk01.c
 awk02_SOURCES = awk02.c

qse/test/awk/Makefile.in

@@ -121,7 +121,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
-LDFLAGS = -L../../lib/cmn -L../../lib/utl -L../../lib/awk
+LDFLAGS = -L../../lib/cmn -L../../lib/awk
 LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -215,7 +215,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-LDADD = -lqseawk -lqseutl -lqsecmn $(LIBM)
+LDADD = -lqseawk -lqsecmn $(LIBM)
 awk01_SOURCES = awk01.c
 awk02_SOURCES = awk02.c
 awk03_SOURCES = awk03.c

qse/test/awk/awk01.c

@@ -1,5 +1,5 @@
 /*
- * $Id: awk01.c 151 2009-05-21 06:50:02Z hyunghwan.chung $ 
+ * $Id: awk01.c 182 2009-06-03 21:50:32Z hyunghwan.chung $ 
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -18,7 +18,7 @@
 
 #include <qse/awk/awk.h>
 #include <qse/awk/std.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 const qse_char_t* src = QSE_T(
 	"BEGIN {"

qse/test/awk/awk02.c

@@ -1,5 +1,5 @@
 /*
- * $Id: awk02.c 151 2009-05-21 06:50:02Z hyunghwan.chung $ 
+ * $Id: awk02.c 182 2009-06-03 21:50:32Z hyunghwan.chung $ 
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -19,7 +19,7 @@
 #include <qse/awk/awk.h>
 #include <qse/awk/std.h>
 #include <qse/cmn/mem.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 static const qse_char_t* src = QSE_T(
 	"BEGIN {"

qse/test/awk/awk03.c

@@ -1,5 +1,5 @@
 /*
- * $Id: awk03.c 151 2009-05-21 06:50:02Z hyunghwan.chung $
+ * $Id: awk03.c 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -18,7 +18,7 @@
 
 #include <qse/awk/awk.h>
 #include <qse/awk/std.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 static const qse_char_t* src = QSE_T(
 	"function init() { a = 20; return a; }"

qse/test/awk/awk04.c

@@ -1,5 +1,5 @@
 /*
- * $Id: awk04.c 90 2009-03-01 09:58:19Z hyunghwan.chung $
+ * $Id: awk04.c 182 2009-06-03 21:50:32Z hyunghwan.chung $
  *
    Copyright 2006-2009 Chung, Hyung-Hwan.
 
@@ -26,7 +26,7 @@
 
 #include <qse/awk/awk.h>
 #include <qse/awk/std.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 static const qse_char_t* src = QSE_T(
 	"function pow(x,y) { return x ** y; }"

qse/test/cmn/Makefile.am

@@ -2,8 +2,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = chr str sll map lda fio pio sio time
 
-LDFLAGS = -L../../lib/cmn -L../../lib/utl
+LDFLAGS = -L../../lib/cmn 
-LDADD = -lqseutl -lqsecmn 
+LDADD = -lqsecmn 
 
 chr_SOURCES = chr.c
 str_SOURCES = str.c

qse/test/cmn/Makefile.in

@@ -143,7 +143,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
-LDFLAGS = -L../../lib/cmn -L../../lib/utl
+LDFLAGS = -L../../lib/cmn 
 LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -237,7 +237,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-LDADD = -lqseutl -lqsecmn 
+LDADD = -lqsecmn 
 chr_SOURCES = chr.c
 str_SOURCES = str.c
 sll_SOURCES = sll.c

qse/test/cmn/chr.c

@@ -2,7 +2,7 @@
 #include <qse/cmn/chr.h>
 #include <qse/cmn/str.h>
 #include <qse/cmn/map.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 #include <string.h>
 #include <locale.h>

qse/test/cmn/fio.c

@@ -1,5 +1,5 @@
 #include <qse/cmn/fio.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 #include <string.h>
 #include <locale.h>

qse/test/cmn/lda.c

@@ -1,7 +1,7 @@
 #include <qse/cmn/mem.h>
 #include <qse/cmn/str.h>
 #include <qse/cmn/lda.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 
 #define R(f) \

qse/test/cmn/map.c

@@ -2,7 +2,7 @@
 #include <qse/cmn/chr.h>
 #include <qse/cmn/str.h>
 #include <qse/cmn/map.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 #define R(f) \
 	do { \

qse/test/cmn/pio.c

@@ -1,5 +1,5 @@
 #include <qse/cmn/pio.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 #include <string.h>
 #include <locale.h>

qse/test/cmn/sll.c

@@ -1,7 +1,7 @@
 #include <qse/cmn/mem.h>
 #include <qse/cmn/str.h>
 #include <qse/cmn/sll.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 
 #define R(f) \

qse/test/cmn/str.c

@@ -1,6 +1,6 @@
 #include <qse/cmn/mem.h>
 #include <qse/cmn/str.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 #include <locale.h>
 #include <wchar.h>

qse/test/cmn/time.c

@@ -1,5 +1,5 @@
 #include <qse/cmn/time.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 #include <locale.h>
 
 #include <sys/time.h>

qse/test/sed/Makefile.am

@@ -2,8 +2,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 bin_PROGRAMS = sed01
 
-LDFLAGS = -L../../lib/cmn -L../../lib/utl -L../../lib/sed
+LDFLAGS = -L../../lib/cmn -L../../lib/sed
-LDADD = -lqsesed -lqseutl -lqsecmn $(LIBM)
+LDADD = -lqsesed -lqsecmn $(LIBM)
 
 sed01_SOURCES = sed01.c
 

qse/test/sed/Makefile.in

@@ -127,7 +127,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
-LDFLAGS = -L../../lib/cmn -L../../lib/utl -L../../lib/sed
+LDFLAGS = -L../../lib/cmn -L../../lib/sed
 LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -221,7 +221,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-LDADD = -lqsesed -lqseutl -lqsecmn $(LIBM)
+LDADD = -lqsesed -lqsecmn $(LIBM)
 sed01_SOURCES = sed01.c
 @ENABLE_CXX_TRUE@sed02_SOURCES = sed02.cpp
 @ENABLE_CXX_TRUE@sed02_LDADD = -lqsesed++ $(LDADD)

qse/test/sed/sed01.c

@@ -17,8 +17,8 @@
  */
 
 #include <qse/sed/sed.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
-#include <qse/utl/main.h>
+#include <qse/cmn/main.h>
 #include <qse/cmn/str.h>
 #include <qse/cmn/chr.h>
 

qse/test/sed/sed02.cpp

@@ -17,8 +17,8 @@
  */
 
 #include <qse/sed/StdSed.hpp>
-#include <qse/utl/main.h>
+#include <qse/cmn/main.h>
-#include <qse/utl/stdio.h>
+#include <qse/cmn/stdio.h>
 
 int sed_main (int argc, qse_char_t* argv[])
 {

qse/test/sed/sed03.cpp

@@ -17,7 +17,7 @@
  */
 
 #include <qse/sed/StdSed.hpp>
-#include <qse/utl/main.h>
+#include <qse/cmn/main.h>
 
 #include <string>
 #include <iostream>