2008-06-27 00:44:41 +00:00
parent c9a9fb6c85
commit 74b42e112d
37 changed files with 390 additions and 107 deletions
--- a/ase/include/ase/awk/awk.h
+++ b/ase/include/ase/awk/awk.h
@ -1,5 +1,5 @@
 /* 
- * $Id: awk.h 196 2008-06-08 14:04:16Z baconevi $
+ * $Id: awk.h 223 2008-06-26 06:44:41Z baconevi $
 *
 * {License}
 */
@ -15,8 +15,8 @@
 * a AWK interpreter engine.
 */

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>
 #include <ase/cmn/map.h>

 typedef struct ase_awk_t ase_awk_t;
--- a/ase/include/ase/awk/makefile.am
+++ b/ase/include/ase/awk/makefile.am
@ -1,5 +1,4 @@

-pkginclude_HEADERS = awk.h val.h
+pkginclude_HEADERS = awk.h val.h Awk.hpp StdAwk.hpp
 pkgincludedir= $(includedir)/ase/awk
-
 CLEANFILES = *dist
--- a/ase/include/ase/cmn/makefile.am
+++ b/ase/include/ase/cmn/makefile.am
@ -1,10 +1,7 @@

-pkginclude_HEADERS = config.h conf_msw.h conf_vms.h \
-	macros.h map.h mem.h pack.h rex.h str.h types.h unpack.h
+pkginclude_HEADERS = mem.h str.h map.h rex.h 

 pkgincludedir= $(includedir)/ase/cmn

 CLEANFILES = *dist

-install-data-hook:
-	"$(GREP)" -E "#define[ ]+ASE_" "$(pkgincludedir)/config.h" > "/tmp/config.h.$$$$" && mv "/tmp/config.h.$$$$" "$(pkgincludedir)/config.h" || "rm -f /tmp/config.h.$$$$"
--- a/ase/include/ase/cmn/map.h
+++ b/ase/include/ase/cmn/map.h
@ -1,5 +1,5 @@
 /*
- * $Id: map.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: map.h 223 2008-06-26 06:44:41Z baconevi $
 *
 * {License}
 */
@ -7,8 +7,8 @@
 #ifndef _ASE_CMN_MAP_H_
 #define _ASE_CMN_MAP_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 typedef struct ase_map_t ase_map_t;
 typedef struct ase_pair_t ase_pair_t;
--- a/ase/include/ase/cmn/mem.h
+++ b/ase/include/ase/cmn/mem.h
@ -1,5 +1,5 @@
 /*
- * $Id: mem.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: mem.h 223 2008-06-26 06:44:41Z baconevi $
 *
 * {License}
 */
@ -7,8 +7,8 @@
 #ifndef _ASE_CMN_MEM_H_
 #define _ASE_CMN_MEM_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 #ifdef __cplusplus
 extern "C" {
--- a/ase/include/ase/cmn/rex.h
+++ b/ase/include/ase/cmn/rex.h
@ -1,5 +1,5 @@
 /*
- * $Id: rex.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: rex.h 223 2008-06-26 06:44:41Z baconevi $
 *
 * {License}
 */
@ -7,8 +7,8 @@
 #ifndef _ASE_CMN_REX_H_
 #define _ASE_CMN_REX_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 /*
 * Regular Esseression Syntax
--- a/ase/include/ase/cmn/str.h
+++ b/ase/include/ase/cmn/str.h
@ -1,5 +1,5 @@
 /*
- * $Id: str.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: str.h 223 2008-06-26 06:44:41Z baconevi $
 *
 * {License}
 */
@ -7,8 +7,8 @@
 #ifndef _ASE_CMN_STR_H_
 #define _ASE_CMN_STR_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 #define ASE_STR_LEN(x)      ((x)->size)
 #define ASE_STR_SIZE(x)     ((x)->size + 1)
--- a/ase/include/ase/cmn/conf_msw.h
+++ b/ase/include/ase/cmn/conf_msw.h
@ -1,5 +1,5 @@
 /*
- * $Id: conf_msw.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: conf_msw.h 214 2008-06-19 09:54:58Z baconevi $
 *
 * {License}
 */
--- a/ase/include/ase/cmn/conf_vms.h
+++ b/ase/include/ase/cmn/conf_vms.h
@ -1,5 +1,5 @@
 /*
- * $Id: conf_vms.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: conf_vms.h 214 2008-06-19 09:54:58Z baconevi $
 *
 * {License}
 */
--- a/ase/include/ase/config.h
+++ b/ase/include/ase/config.h
@ -0,0 +1,170 @@
+/* include/ase/config.h.  Generated from config.h.in by configure.  */
+/* include/ase/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* char is mchar */
+/* #undef ASE_CHAR_IS_MCHAR */
+
+/* char is wchar */
+#define ASE_CHAR_IS_WCHAR 
+
+/* Big Endian */
+/* #undef ASE_ENDIAN_BIG */
+
+/* Little Endian */
+#define ASE_ENDIAN_LITTLE 
+
+/* Unknown Endian */
+/* #undef ASE_ENDIAN_UNKNOWN */
+
+/* author's email address */
+#define ASE_PKGAUTHOR "bacon@abiyo.net"
+
+/* package name */
+#define ASE_PKGNAME "ase"
+
+/* package version */
+#define ASE_PKGVERSION "0.5.0"
+
+/* sizeof(char) */
+#define ASE_SIZEOF_CHAR 1
+
+/* sizeof(double) */
+#define ASE_SIZEOF_DOUBLE 8
+
+/* sizeof(float) */
+#define ASE_SIZEOF_FLOAT 4
+
+/* sizeof(int) */
+#define ASE_SIZEOF_INT 4
+
+/* sizeof(long) */
+#define ASE_SIZEOF_LONG 8
+
+/* sizeof(long double) */
+#define ASE_SIZEOF_LONG_DOUBLE 16
+
+/* sizeof(long long) */
+#define ASE_SIZEOF_LONG_LONG 8
+
+/* sizeof(short) */
+#define ASE_SIZEOF_SHORT 2
+
+/* sizeof(void*) */
+#define ASE_SIZEOF_VOID_P 8
+
+/* sizeof(wchar_t) */
+#define ASE_SIZEOF_WCHAR_T 4
+
+/* sizeof(__int128) */
+#define ASE_SIZEOF___INT128 0
+
+/* sizeof(__int16) */
+#define ASE_SIZEOF___INT16 0
+
+/* sizeof(__int32) */
+#define ASE_SIZEOF___INT32 0
+
+/* sizeof(__int64) */
+#define ASE_SIZEOF___INT64 0
+
+/* sizeof(__int8) */
+#define ASE_SIZEOF___INT8 0
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "ase"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "bacon@abiyo.net"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "ase"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "ase 0.5.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "ase"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.5.0"
+
+/* The size of `char', as computed by sizeof. */
+#define SIZEOF_CHAR 1
+
+/* The size of `double', as computed by sizeof. */
+#define SIZEOF_DOUBLE 8
+
+/* The size of `float', as computed by sizeof. */
+#define SIZEOF_FLOAT 4
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 8
+
+/* The size of `long double', as computed by sizeof. */
+#define SIZEOF_LONG_DOUBLE 16
+
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 8
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 4
+
+/* The size of `__int128', as computed by sizeof. */
+#define SIZEOF___INT128 0
+
+/* The size of `__int16', as computed by sizeof. */
+#define SIZEOF___INT16 0
+
+/* The size of `__int32', as computed by sizeof. */
+#define SIZEOF___INT32 0
+
+/* The size of `__int64', as computed by sizeof. */
+#define SIZEOF___INT64 0
+
+/* The size of `__int8', as computed by sizeof. */
+#define SIZEOF___INT8 0
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.5.0"
--- a/ase/include/ase/cmn/config.h.in
+++ b/ase/include/ase/cmn/config.h.in
@ -1,4 +1,4 @@
-/* include/ase/cmn/config.h.in.  Generated from configure.ac by autoheader.  */
+/* include/ase/config.h.in.  Generated from configure.ac by autoheader.  */

 /* char is mchar */
 #undef ASE_CHAR_IS_MCHAR
--- a/ase/include/ase/lsp/lsp.h
+++ b/ase/include/ase/lsp/lsp.h
@ -7,8 +7,8 @@
 #ifndef _ASE_LSP_LSP_H_
 #define _ASE_LSP_LSP_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 typedef struct ase_lsp_t ase_lsp_t;
 typedef struct ase_lsp_obj_t ase_lsp_obj_t;
--- a/ase/include/ase/lsp/makefile.in
+++ b/ase/include/ase/lsp/makefile.in
@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/include/ase/cmn/config.h
+CONFIG_HEADER = $(top_builddir)/include/ase/config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
@ -122,6 +122,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+RM = @RM@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
--- a/ase/include/ase/cmn/macros.h
+++ b/ase/include/ase/cmn/macros.h
@ -1,11 +1,11 @@
 /*
- * $Id: macros.h 196 2008-06-08 14:04:16Z baconevi $
+ * $Id: macros.h 214 2008-06-19 09:54:58Z baconevi $
 *
 * {License}
 */

-#ifndef _ASE_CMN_MACROS_H_
-#define _ASE_CMN_MACROS_H_
+#ifndef _ASE_MACROS_H_
+#define _ASE_MACROS_H_

 /**
 * @file macros.h
@ -15,7 +15,7 @@
 * data type manipulation, etc.
 */

-#include <ase/cmn/types.h>
+#include <ase/types.h>

 #ifdef __cplusplus
 	/*#define ASE_NULL ((ase_uint_t)0)*/
--- a/ase/include/ase/makefile.am
+++ b/ase/include/ase/makefile.am
@ -1,5 +1,13 @@

-AUTOMAKE_OPTIONS = no-dependencies
-
 # EXTRA_DIST = README
 SUBDIRS = cmn awk lsp utl
+
+pkginclude_HEADERS = config.h.in conf_msw.h conf_vms.h types.h macros.h pack1.h unpack.h
+
+pkgincludedir= $(includedir)/ase
+
+CLEANFILES = *dist
+
+install-data-hook:
+	@"$(GREP)" -E "#define[ ]+ASE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h" 
+	@"$(RM)" -f "$(pkgincludedir)/config.h.in"
--- a/ase/include/ase/cmn/pack.h
+++ b/ase/include/ase/cmn/pack.h
@ -1,5 +1,5 @@
 /*
- * $Id: pack.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: pack.h 214 2008-06-19 09:54:58Z baconevi $
 *
 * {License}
 */
--- a/ase/include/ase/cmn/types.h
+++ b/ase/include/ase/cmn/types.h
@ -4,8 +4,8 @@
 * {License}
 */

-#ifndef _ASE_CMN_TYPES_H_
-#define _ASE_CMN_TYPES_H_
+#ifndef _ASE_TYPES_H_
+#define _ASE_TYPES_H_

 /**
 * @file types.h
@ -16,9 +16,9 @@
 */

 #if defined(_WIN32)
-	#include <ase/cmn/conf_msw.h>
+	#include <ase/conf_msw.h>
 #elif defined(vms) || defined(__vms)
-	#include <ase/cmn/conf_vms.h>
+	#include <ase/conf_vms.h>
 #elif defined(__unix__) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || (defined(__APPLE__) && defined(__MACH__))  || defined(__SPU__)
 	#if !defined(__unix__)
 		#define __unix__
@ -26,7 +26,7 @@
 	#if !defined(__unix)
 		#define __unix
 	#endif
-	#include <ase/cmn/config.h>
+	#include <ase/config.h>
 #else
 	#error unsupported operating system
 #endif
--- a/ase/include/ase/cmn/unpack.h
+++ b/ase/include/ase/cmn/unpack.h
@ -1,5 +1,5 @@
 /*
- * $Id: unpack.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: unpack.h 214 2008-06-19 09:54:58Z baconevi $
 *
 * {License}
 */
--- a/ase/include/ase/utl/ctype.h
+++ b/ase/include/ase/utl/ctype.h
@ -1,12 +1,12 @@
 /*
- * $Id: ctype.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: ctype.h 223 2008-06-26 06:44:41Z baconevi $
 */

 #ifndef _ASE_UTL_CTYPE_H_
 #define _ASE_UTL_CTYPE_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 #ifdef __cplusplus
 extern "C" {
--- a/ase/include/ase/utl/getopt.h
+++ b/ase/include/ase/utl/getopt.h
@ -1,5 +1,5 @@
 /*
- * $Id: getopt.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: getopt.h 223 2008-06-26 06:44:41Z baconevi $
 *
 * {License}
 */
@ -7,8 +7,8 @@
 #ifndef _ASE_UTL_GETOPT_H_
 #define _ASE_UTL_GETOPT_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 typedef struct ase_opt_t ase_opt_t;

--- a/ase/include/ase/utl/http.h
+++ b/ase/include/ase/utl/http.h
@ -1,5 +1,5 @@
 /*
- * $Id: http.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: http.h 223 2008-06-26 06:44:41Z baconevi $
 *
 * {License}
 */
@ -7,8 +7,8 @@
 #ifndef _ASE_UTL_HTTP_H_
 #define _ASE_UTL_HTTP_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 /* returns the type of http method */
 typedef struct ase_http_req_t ase_http_req_t;
--- a/ase/include/ase/utl/main.h
+++ b/ase/include/ase/utl/main.h
@ -1,5 +1,5 @@
 /*
- * $Id: main.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: main.h 223 2008-06-26 06:44:41Z baconevi $
 * 
 * {License}
 */
@ -7,8 +7,8 @@
 #ifndef _ASE_UTL_MAIN_H_
 #define _ASE_UTL_MAIN_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 #if defined(_WIN32)
 	#include <tchar.h>
--- a/ase/include/ase/utl/stdio.h
+++ b/ase/include/ase/utl/stdio.h
@ -1,5 +1,5 @@
 /*
- * $Id: stdio.h 194 2008-06-06 13:00:39Z baconevi $
+ * $Id: stdio.h 223 2008-06-26 06:44:41Z baconevi $
 * 
 * {License}
 */
@ -7,8 +7,8 @@
 #ifndef _ASE_UTL_STDIO_H_
 #define _ASE_UTL_STDIO_H_

-#include <ase/cmn/types.h>
-#include <ase/cmn/macros.h>
+#include <ase/types.h>
+#include <ase/macros.h>

 #include <stdio.h>
 #include <stdarg.h>