reorganized files
This commit is contained in:
@ -1,2 +1,2 @@
|
||||
SUBDIRS = cmn utl sed awk lsp
|
||||
SUBDIRS = cmn sed awk lsp utl
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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)
|
||||
/////////////////////////////////
|
||||
|
||||
@ -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_LIBADD = -lqsecmn -lqseutl
|
||||
libqseawk_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
|
||||
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_LIBADD = -lqseawk -lqsecmn -lqseutl
|
||||
libqseawk___la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
|
||||
libqseawk___la_LIBADD = -lqseawk -lqsecmn
|
||||
endif
|
||||
|
||||
@ -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_LIBADD = -lqsecmn -lqseutl
|
||||
libqseawk_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
|
||||
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_LIBADD = -lqseawk -lqsecmn -lqseutl
|
||||
@ENABLE_CXX_TRUE@libqseawk___la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
|
||||
@ENABLE_CXX_TRUE@libqseawk___la_LIBADD = -lqseawk -lqsecmn
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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@
|
||||
|
||||
55
qse/lib/cmn/assert.c
Normal file
55
qse/lib/cmn/assert.c
Normal file
@ -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
|
||||
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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;
|
||||
|
||||
@ -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_LIBADD = -lqsecmn -lqseutl
|
||||
libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn
|
||||
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_LIBADD = -lqsesed -lqsecmn -lqseutl
|
||||
libqsesed___la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
|
||||
libqsesed___la_LIBADD = -lqsesed -lqsecmn
|
||||
endif
|
||||
|
||||
|
||||
@ -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_LIBADD = -lqsecmn -lqseutl
|
||||
libqsesed_la_LDFLAGS = -version-info 1:0:0 -no-undefined -L../cmn
|
||||
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_LIBADD = -lqsesed -lqsecmn -lqseutl
|
||||
@ENABLE_CXX_TRUE@libqsesed___la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
|
||||
@ENABLE_CXX_TRUE@libqsesed___la_LIBADD = -lqsesed -lqsecmn
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
Reference in New Issue
Block a user