diff --git a/qse/cmd/awk/awk.c b/qse/cmd/awk/awk.c index 527c960d..953e8f5c 100644 --- a/qse/cmd/awk/awk.c +++ b/qse/cmd/awk/awk.c @@ -1,5 +1,5 @@ /* - * $Id: awk.c 365 2010-10-29 13:54:36Z hyunghwan.chung $ + * $Id: awk.c 436 2011-04-17 15:28:22Z hyunghwan.chung $ * Copyright 2006-2009 Chung, Hyung-Hwan. This file is part of QSE. @@ -41,6 +41,10 @@ # include # include # include +#elif defined(__OS2__) +# define INCL_DOSEXCEPTIONS +# define INCL_ERRORS +# include #else # include # include @@ -91,7 +95,7 @@ static void dprint (const qse_char_t* fmt, ...) } } -#ifdef _WIN32 +#if defined(_WIN32) static BOOL WINAPI stop_run (DWORD ctrl_type) { if (ctrl_type == CTRL_C_EVENT || @@ -103,6 +107,30 @@ static BOOL WINAPI stop_run (DWORD ctrl_type) return FALSE; } +#elif defined(__OS2__) + +static ULONG _System stop_run ( + PEXCEPTIONREPORTRECORD p1, + PEXCEPTIONREGISTRATIONRECORD p2, + PCONTEXTRECORD p3, + PVOID pv) +{ + if (p1->ExceptionNum == XCPT_SIGNAL) + { + if (p1->ExceptionInfo[0] == XCPT_SIGNAL_INTR || + p1->ExceptionInfo[0] == XCPT_SIGNAL_KILLPROC || + p1->ExceptionInfo[0] == XCPT_SIGNAL_BREAK) + { + APIRET rc; + + qse_awk_rtx_stop (app_rtx); + rc = DosAcknowledgeSignalException (p1->ExceptionInfo[0]); + return (rc != NO_ERROR)? 1: XCPT_CONTINUE_EXECUTION; + } + } + + return XCPT_CONTINUE_SEARCH; /* exception not resolved */ +} #else static int setsignal (int sig, void(*handler)(int), int restart) @@ -140,8 +168,15 @@ static void stop_run (int sig) static void set_intr_run (void) { -#ifdef _WIN32 +#if defined(_WIN32) SetConsoleCtrlHandler (stop_run, TRUE); +#elif defined(__OS2__) + EXCEPTIONREGISTRATIONRECORD rr = { 0 }; + APIRET rc; + rr.ExceptionHandler = (ERR)stop_run; +qse_printf (QSE_T("setting....\n")); + rc = DosSetExceptionHandler (&rr); + /*if (rc != NO_ERROR)...*/ #else /*setsignal (SIGINT, stop_run, 1); TO BE MORE COMPATIBLE WITH WIN32*/ setsignal (SIGINT, stop_run, 0); @@ -150,8 +185,14 @@ static void set_intr_run (void) static void unset_intr_run (void) { -#ifdef _WIN32 +#if defined(_WIN32) SetConsoleCtrlHandler (stop_run, FALSE); +#elif defined(__OS2__) + EXCEPTIONREGISTRATIONRECORD rr = { 0 }; + APIRET rc; + rr.ExceptionHandler = (ERR)stop_run; + rc = DosUnsetExceptionHandler (&rr); + /*if (rc != NO_ERROR) ...*/ #else setsignal (SIGINT, SIG_DFL, 1); #endif diff --git a/qse/include/qse/awk/awk.h b/qse/include/qse/awk/awk.h index 23904f1b..4a3a8d98 100644 --- a/qse/include/qse/awk/awk.h +++ b/qse/include/qse/awk/awk.h @@ -1,5 +1,5 @@ /* - * $Id: awk.h 434 2011-04-16 14:55:26Z hyunghwan.chung $ + * $Id: awk.h 436 2011-04-17 15:28:22Z hyunghwan.chung $ * Copyright 2006-2009 Chung, Hyung-Hwan. This file is part of QSE. @@ -741,8 +741,8 @@ enum qse_awk_option_t QSE_AWK_INCLUDE = (1 << 16), /** - * makes #qse_awk_t to behave as compatibly as classical AWK - * implementations + * makes #qse_awk_t to behave compatibly with classical AWK + * implementations */ QSE_AWK_CLASSIC = QSE_AWK_IMPLICIT | QSE_AWK_RIO | QSE_AWK_NEWLINE | QSE_AWK_PABLOCK | diff --git a/qse/lib/awk/awk.c b/qse/lib/awk/awk.c index d3707a59..3fed7763 100644 --- a/qse/lib/awk/awk.c +++ b/qse/lib/awk/awk.c @@ -1,5 +1,5 @@ /* - * $Id: awk.c 365 2010-10-29 13:54:36Z hyunghwan.chung $ + * $Id: awk.c 436 2011-04-17 15:28:22Z hyunghwan.chung $ * Copyright 2006-2009 Chung, Hyung-Hwan. This file is part of QSE. @@ -223,6 +223,10 @@ qse_awk_t* qse_awk_open (qse_mmgr_t* mmgr, qse_size_t xtn, qse_awk_prm_t* prm) qse_lda_setcopier (awk->parse.params, QSE_LDA_COPIER_INLINE); awk->option = QSE_AWK_CLASSIC; +#if defined(_WIN32) || defined(__OS2__) + awk->option |= QSE_AWK_CRLF; +#endif + awk->errinf.num = QSE_AWK_ENOERR; awk->errinf.loc.line = 0; awk->errinf.loc.colm = 0; diff --git a/qse/lib/awk/err.c b/qse/lib/awk/err.c index 951f0514..cc152fd7 100644 --- a/qse/lib/awk/err.c +++ b/qse/lib/awk/err.c @@ -1,5 +1,5 @@ /* - * $Id: err.c 311 2009-12-09 11:35:54Z hyunghwan.chung $ + * $Id: err.c 436 2011-04-17 15:28:22Z hyunghwan.chung $ * Copyright 2006-2009 Chung, Hyung-Hwan. This file is part of QSE. @@ -303,3 +303,4 @@ void qse_awk_rtx_seterror ( if (errloc != QSE_NULL) rtx->errinf.loc = *errloc; } + diff --git a/qse/lib/awk/run.c b/qse/lib/awk/run.c index a60498af..26c5b64c 100644 --- a/qse/lib/awk/run.c +++ b/qse/lib/awk/run.c @@ -1,5 +1,5 @@ /* - * $Id: run.c 365 2010-10-29 13:54:36Z hyunghwan.chung $ + * $Id: run.c 436 2011-04-17 15:28:22Z hyunghwan.chung $ * Copyright 2006-2009 Chung, Hyung-Hwan. This file is part of QSE. @@ -731,14 +731,15 @@ qse_awk_rtx_t* qse_awk_rtx_open ( } /* initialize the run object */ - if (init_rtx (rtx, awk, rio) == -1) + if (init_rtx (rtx, awk, rio) <= -1) { QSE_AWK_FREE (awk, rtx); return QSE_NULL; } - if (init_globals (rtx, arg) == -1) + if (init_globals (rtx, arg) <= -1) { + awk->errinf = rtx->errinf; /* transfer error info */ fini_rtx (rtx, 0); QSE_AWK_FREE (awk, rtx); return QSE_NULL; diff --git a/qse/lib/awk/std.c b/qse/lib/awk/std.c index e624ab17..3093ecc2 100644 --- a/qse/lib/awk/std.c +++ b/qse/lib/awk/std.c @@ -1,5 +1,5 @@ /* - * $Id: std.c 434 2011-04-16 14:55:26Z hyunghwan.chung $ + * $Id: std.c 436 2011-04-17 15:28:22Z hyunghwan.chung $ * Copyright 2006-2009 Chung, Hyung-Hwan. This file is part of QSE. @@ -32,6 +32,24 @@ #include #include +#if defined(_WIN32) +# include +#endif + +#ifndef QSE_HAVE_CONFIG_H +# if defined(__OS2__) || defined(_WIN32) +# define HAVE_POW +# define HAVE_SIN +# define HAVE_COS +# define HAVE_TAN +# define HAVE_ATAN +# define HAVE_ATAN2 +# define HAVE_LOG +# define HAVE_EXP +# define HAVE_SQRT +# endif +#endif + typedef struct xtn_t { struct @@ -914,7 +932,7 @@ static int open_rio_console (qse_awk_rtx_t* rtx, qse_awk_rio_arg_t* riod) } if (qse_awk_rtx_setfilename ( - rtx, file, qse_strlen(file)) == -1) + rtx, file, qse_strlen(file)) <= -1) { if (sio != qse_sio_in) qse_sio_close (sio); qse_awk_rtx_free (rtx, out.u.cpldup.ptr); @@ -986,7 +1004,7 @@ static int open_rio_console (qse_awk_rtx_t* rtx, qse_awk_rio_arg_t* riod) } if (qse_awk_rtx_setofilename ( - rtx, file, qse_strlen(file)) == -1) + rtx, file, qse_strlen(file)) <= -1) { qse_sio_close (sio); return -1; @@ -1094,9 +1112,9 @@ static qse_ssize_t awk_rio_console ( } qse_awk_rtx_t* qse_awk_rtx_openstd ( - qse_awk_t* awk, - qse_size_t xtnsize, - const qse_char_t* id, + qse_awk_t* awk, + qse_size_t xtnsize, + const qse_char_t* id, const qse_char_t*const icf[], const qse_char_t*const ocf[]) { @@ -1176,6 +1194,40 @@ qse_awk_rtx_t* qse_awk_rtx_openstd ( rxtn->c.out.index = 0; rxtn->c.out.count = 0; + if (icf && icf[0]) + { + /* If an explicit console file name is given, + * set FILENAME in advance in case FILENAME printing + * is the first output statement executed. FILENAME + * would be printed as an empty string without this + * as FILENAME is resolved before the I/O handler is + * executed. + */ + if (qse_awk_rtx_setfilename (rtx, icf[0], qse_strlen(icf[0])) <= -1) + { + awk->errinf = rtx->errinf; /* transfer error info */ + qse_awk_rtx_close (rtx); + return QSE_NULL; + } + } + + if (ocf && ocf[0]) + { + /* If an explicit console file name is given, + * set OFILENAME in advance in case OFILENAME printing + * is the first output statement executed. OFILENAME + * would be printed as an empty string without this + * as OFILENAME is resolved before the I/O handler is + * executed. + */ + if (qse_awk_rtx_setofilename (rtx, ocf[0], qse_strlen(ocf[0])) <= -1) + { + awk->errinf = rtx->errinf; /* transfer error info */ + qse_awk_rtx_close (rtx); + return QSE_NULL; + } + } + return rtx; } diff --git a/qse/samples/awk/awk09.c b/qse/samples/awk/awk09.c index 13bdb023..76a10492 100644 --- a/qse/samples/awk/awk09.c +++ b/qse/samples/awk/awk09.c @@ -21,18 +21,13 @@ #include #include -/* this sample produces 8 text files containing multiplication char */ +/* this sample produces 8 text files containing multiplication chart. */ const qse_char_t* src = QSE_T( "BEGIN {" - " printf \"\"; # work around the empty OFILENAME when printed\n" - " # for the first time in the loop below\n" - " # this happens because the console file is opened\n" - " # and OFILENAME is set when the first console output\n" - " # operation is peformed\n" " for (i=2;i<=9;i++)" " {" - " print \"OFILENAME:\" OFILENAME;" + " print \"OFILENAME:\" OFILENAME;" " for (j=1;j<=9;j++)" " print i \"*\" j \"=\" i * j;" " nextofile;" diff --git a/qse/watcom/debug/os2/cmd/awk/qseawk.tgt b/qse/watcom/debug/os2/cmd/awk/qseawk.tgt new file mode 100755 index 00000000..69f3f470 --- /dev/null +++ b/qse/watcom/debug/os2/cmd/awk/qseawk.tgt @@ -0,0 +1,129 @@ +40 +targetIdent +0 +MProject +1 +MComponent +0 +2 +WString +4 +OEXE +3 +WString +5 +oc2eo +1 +0 +1 +4 +MCommand +0 +5 +MCommand +0 +6 +MItem +10 +qseawk.exe +7 +WString +4 +OEXE +8 +WVList +2 +9 +MVState +10 +WString +7 +OS2LINK +11 +WString +28 +?????Library directories(;): +1 +12 +WString +27 +../../lib/cmn ../../lib/awk +0 +13 +MVState +14 +WString +7 +OS2LINK +15 +WString +18 +?????Libraries(,): +1 +16 +WString +13 +qsecmn qseawk +0 +17 +WVList +0 +-1 +1 +1 +0 +18 +WPickList +2 +19 +MItem +3 +*.c +20 +WString +4 +COBJ +21 +WVList +1 +22 +MVState +23 +WString +3 +WCC +24 +WString +25 +o?2??Include directories: +1 +25 +WString +54 +"$(%watcom)/h;$(%watcom)/h/os2;..\..\..\..\..\include" +0 +26 +WVList +0 +-1 +1 +1 +0 +27 +MItem +28 +..\..\..\..\..\cmd\awk\awk.c +28 +WString +4 +COBJ +29 +WVList +0 +30 +WVList +0 +19 +1 +1 +0 diff --git a/qse/watcom/debug/os2/lib/awk/qseawk.tgt b/qse/watcom/debug/os2/lib/awk/qseawk.tgt new file mode 100755 index 00000000..8d33fb7a --- /dev/null +++ b/qse/watcom/debug/os2/lib/awk/qseawk.tgt @@ -0,0 +1,457 @@ +40 +targetIdent +0 +MProject +1 +MComponent +0 +2 +WString +3 +LIB +3 +WString +5 +o_2so +1 +0 +1 +4 +MCommand +0 +5 +MCommand +0 +6 +MItem +10 +qseawk.lib +7 +WString +3 +LIB +8 +WVList +0 +9 +WVList +0 +-1 +1 +1 +0 +10 +WPickList +22 +11 +MItem +3 +*.c +12 +WString +4 +COBJ +13 +WVList +1 +14 +MVState +15 +WString +3 +WCC +16 +WString +25 +o?2??Include directories: +1 +17 +WString +54 +"$(%watcom)/h;$(%watcom)/h/os2;..\..\..\..\..\include" +0 +18 +WVList +0 +-1 +1 +1 +0 +19 +MItem +28 +..\..\..\..\..\lib\awk\awk.c +20 +WString +4 +COBJ +21 +WVList +0 +22 +WVList +0 +11 +1 +1 +0 +23 +MItem +28 +..\..\..\..\..\lib\awk\err.c +24 +WString +4 +COBJ +25 +WVList +0 +26 +WVList +0 +11 +1 +1 +0 +27 +MItem +28 +..\..\..\..\..\lib\awk\fnc.c +28 +WString +4 +COBJ +29 +WVList +0 +30 +WVList +0 +11 +1 +1 +0 +31 +MItem +29 +..\..\..\..\..\lib\awk\misc.c +32 +WString +4 +COBJ +33 +WVList +0 +34 +WVList +0 +11 +1 +1 +0 +35 +MItem +30 +..\..\..\..\..\lib\awk\parse.c +36 +WString +4 +COBJ +37 +WVList +0 +38 +WVList +0 +11 +1 +1 +0 +39 +MItem +28 +..\..\..\..\..\lib\awk\rec.c +40 +WString +4 +COBJ +41 +WVList +0 +42 +WVList +0 +11 +1 +1 +0 +43 +MItem +28 +..\..\..\..\..\lib\awk\rio.c +44 +WString +4 +COBJ +45 +WVList +0 +46 +WVList +0 +11 +1 +1 +0 +47 +MItem +28 +..\..\..\..\..\lib\awk\run.c +48 +WString +4 +COBJ +49 +WVList +0 +50 +WVList +0 +11 +1 +1 +0 +51 +MItem +28 +..\..\..\..\..\lib\awk\std.c +52 +WString +4 +COBJ +53 +WVList +0 +54 +WVList +0 +11 +1 +1 +0 +55 +MItem +29 +..\..\..\..\..\lib\awk\tree.c +56 +WString +4 +COBJ +57 +WVList +0 +58 +WVList +0 +11 +1 +1 +0 +59 +MItem +28 +..\..\..\..\..\lib\awk\val.c +60 +WString +4 +COBJ +61 +WVList +0 +62 +WVList +0 +11 +1 +1 +0 +63 +MItem +3 +*.h +64 +WString +3 +NIL +65 +WVList +0 +66 +WVList +0 +-1 +1 +1 +0 +67 +MItem +28 +..\..\..\..\..\lib\awk\awk.h +68 +WString +3 +NIL +69 +WVList +0 +70 +WVList +0 +63 +1 +1 +0 +71 +MItem +28 +..\..\..\..\..\lib\awk\err.h +72 +WString +3 +NIL +73 +WVList +0 +74 +WVList +0 +63 +1 +1 +0 +75 +MItem +28 +..\..\..\..\..\lib\awk\fnc.h +76 +WString +3 +NIL +77 +WVList +0 +78 +WVList +0 +63 +1 +1 +0 +79 +MItem +29 +..\..\..\..\..\lib\awk\misc.h +80 +WString +3 +NIL +81 +WVList +0 +82 +WVList +0 +63 +1 +1 +0 +83 +MItem +30 +..\..\..\..\..\lib\awk\parse.h +84 +WString +3 +NIL +85 +WVList +0 +86 +WVList +0 +63 +1 +1 +0 +87 +MItem +28 +..\..\..\..\..\lib\awk\rio.h +88 +WString +3 +NIL +89 +WVList +0 +90 +WVList +0 +63 +1 +1 +0 +91 +MItem +28 +..\..\..\..\..\lib\awk\run.h +92 +WString +3 +NIL +93 +WVList +0 +94 +WVList +0 +63 +1 +1 +0 +95 +MItem +29 +..\..\..\..\..\lib\awk\tree.h +96 +WString +3 +NIL +97 +WVList +0 +98 +WVList +0 +63 +1 +1 +0 +99 +MItem +28 +..\..\..\..\..\lib\awk\val.h +100 +WString +3 +NIL +101 +WVList +0 +102 +WVList +0 +63 +1 +1 +0 diff --git a/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt b/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt index df5c3c9e..5cb1be67 100755 --- a/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt +++ b/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt @@ -42,7 +42,7 @@ WVList 0 10 WPickList -56 +58 11 MItem 3 @@ -656,7 +656,7 @@ WVList 147 MItem 33 -..\..\..\..\..\lib\cmn\str_fcpy.c +..\..\..\..\..\lib\cmn\str_excl.c 148 WString 4 @@ -673,8 +673,8 @@ WVList 0 151 MItem -32 -..\..\..\..\..\lib\cmn\str_len.c +33 +..\..\..\..\..\lib\cmn\str_fcpy.c 152 WString 4 @@ -691,8 +691,8 @@ WVList 0 155 MItem -32 -..\..\..\..\..\lib\cmn\str_pac.c +33 +..\..\..\..\..\lib\cmn\str_incl.c 156 WString 4 @@ -709,8 +709,8 @@ WVList 0 159 MItem -33 -..\..\..\..\..\lib\cmn\str_pbrk.c +32 +..\..\..\..\..\lib\cmn\str_len.c 160 WString 4 @@ -728,7 +728,7 @@ WVList 163 MItem 32 -..\..\..\..\..\lib\cmn\str_put.c +..\..\..\..\..\lib\cmn\str_pac.c 164 WString 4 @@ -745,8 +745,8 @@ WVList 0 167 MItem -32 -..\..\..\..\..\lib\cmn\str_rev.c +33 +..\..\..\..\..\lib\cmn\str_pbrk.c 168 WString 4 @@ -764,7 +764,7 @@ WVList 171 MItem 32 -..\..\..\..\..\lib\cmn\str_rot.c +..\..\..\..\..\lib\cmn\str_put.c 172 WString 4 @@ -782,7 +782,7 @@ WVList 175 MItem 32 -..\..\..\..\..\lib\cmn\str_set.c +..\..\..\..\..\lib\cmn\str_rev.c 176 WString 4 @@ -800,7 +800,7 @@ WVList 179 MItem 32 -..\..\..\..\..\lib\cmn\str_spl.c +..\..\..\..\..\lib\cmn\str_rot.c 180 WString 4 @@ -818,7 +818,7 @@ WVList 183 MItem 32 -..\..\..\..\..\lib\cmn\str_spn.c +..\..\..\..\..\lib\cmn\str_set.c 184 WString 4 @@ -836,7 +836,7 @@ WVList 187 MItem 32 -..\..\..\..\..\lib\cmn\str_str.c +..\..\..\..\..\lib\cmn\str_spl.c 188 WString 4 @@ -853,8 +853,8 @@ WVList 0 191 MItem -34 -..\..\..\..\..\lib\cmn\str_subst.c +32 +..\..\..\..\..\lib\cmn\str_spn.c 192 WString 4 @@ -872,7 +872,7 @@ WVList 195 MItem 32 -..\..\..\..\..\lib\cmn\str_tok.c +..\..\..\..\..\lib\cmn\str_str.c 196 WString 4 @@ -889,8 +889,8 @@ WVList 0 199 MItem -32 -..\..\..\..\..\lib\cmn\str_trm.c +34 +..\..\..\..\..\lib\cmn\str_subst.c 200 WString 4 @@ -907,8 +907,8 @@ WVList 0 203 MItem -33 -..\..\..\..\..\lib\cmn\str_word.c +32 +..\..\..\..\..\lib\cmn\str_tok.c 204 WString 4 @@ -925,8 +925,8 @@ WVList 0 207 MItem -29 -..\..\..\..\..\lib\cmn\time.c +32 +..\..\..\..\..\lib\cmn\str_trm.c 208 WString 4 @@ -943,8 +943,8 @@ WVList 0 211 MItem -28 -..\..\..\..\..\lib\cmn\tio.c +33 +..\..\..\..\..\lib\cmn\str_word.c 212 WString 4 @@ -961,8 +961,8 @@ WVList 0 215 MItem -32 -..\..\..\..\..\lib\cmn\tio_get.c +29 +..\..\..\..\..\lib\cmn\time.c 216 WString 4 @@ -979,8 +979,8 @@ WVList 0 219 MItem -32 -..\..\..\..\..\lib\cmn\tio_put.c +28 +..\..\..\..\..\lib\cmn\tio.c 220 WString 4 @@ -997,8 +997,8 @@ WVList 0 223 MItem -28 -..\..\..\..\..\lib\cmn\xma.c +32 +..\..\..\..\..\lib\cmn\tio_get.c 224 WString 4 @@ -1015,44 +1015,44 @@ WVList 0 227 MItem -3 -*.h +32 +..\..\..\..\..\lib\cmn\tio_put.c 228 WString -3 -NIL +4 +COBJ 229 WVList 0 230 WVList 0 --1 +11 1 1 0 231 MItem 28 -..\..\..\..\..\lib\cmn\mem.h +..\..\..\..\..\lib\cmn\xma.c 232 WString -3 -NIL +4 +COBJ 233 WVList 0 234 WVList 0 -227 +11 1 1 0 235 MItem -32 -..\..\..\..\..\lib\cmn\syscall.h +3 +*.h 236 WString 3 @@ -1063,7 +1063,43 @@ WVList 238 WVList 0 -227 +-1 +1 +1 +0 +239 +MItem +28 +..\..\..\..\..\lib\cmn\mem.h +240 +WString +3 +NIL +241 +WVList +0 +242 +WVList +0 +235 +1 +1 +0 +243 +MItem +32 +..\..\..\..\..\lib\cmn\syscall.h +244 +WString +3 +NIL +245 +WVList +0 +246 +WVList +0 +235 1 1 0 diff --git a/qse/watcom/debug/win32/cmd/scm/qsescm.tgt b/qse/watcom/debug/win32/cmd/scm/qsescm.tgt index 34404bf9..9264a18b 100755 --- a/qse/watcom/debug/win32/cmd/scm/qsescm.tgt +++ b/qse/watcom/debug/win32/cmd/scm/qsescm.tgt @@ -67,63 +67,81 @@ qsecmn qsescm psapi 0 17 WVList +1 +18 +ActionStates +19 +WString +5 +&Make +20 +WVList 0 -1 1 1 0 -18 +21 WPickList 2 -19 +22 MItem 3 *.c -20 +23 WString 4 COBJ -21 +24 WVList 1 -22 +25 MVState -23 +26 WString 3 WCC -24 +27 WString 25 n????Include directories: 1 -25 +28 WString 53 "$(%watcom)/h;$(%watcom)/h/nt;..\..\..\..\..\include" 0 -26 +29 +WVList +1 +30 +ActionStates +31 +WString +5 +&Make +32 WVList 0 -1 1 1 0 -27 +33 MItem 28 ..\..\..\..\..\cmd\scm\scm.c -28 +34 WString 4 COBJ -29 +35 WVList 0 -30 +36 WVList 0 -19 +22 1 1 0 diff --git a/qse/watcom/debug/win32/lib/awk/qseawk.tgt b/qse/watcom/debug/win32/lib/awk/qseawk.tgt new file mode 100755 index 00000000..97efb419 --- /dev/null +++ b/qse/watcom/debug/win32/lib/awk/qseawk.tgt @@ -0,0 +1,457 @@ +40 +targetIdent +0 +MProject +1 +MComponent +0 +2 +WString +3 +LIB +3 +WString +5 +n_2so +1 +0 +1 +4 +MCommand +0 +5 +MCommand +0 +6 +MItem +10 +qseawk.lib +7 +WString +3 +LIB +8 +WVList +0 +9 +WVList +0 +-1 +1 +1 +0 +10 +WPickList +22 +11 +MItem +3 +*.c +12 +WString +4 +COBJ +13 +WVList +1 +14 +MVState +15 +WString +3 +WCC +16 +WString +25 +n????Include directories: +1 +17 +WString +53 +"$(%watcom)/h;$(%watcom)/h/nt;..\..\..\..\..\include" +0 +18 +WVList +0 +-1 +1 +1 +0 +19 +MItem +28 +..\..\..\..\..\lib\awk\awk.c +20 +WString +4 +COBJ +21 +WVList +0 +22 +WVList +0 +11 +1 +1 +0 +23 +MItem +28 +..\..\..\..\..\lib\awk\err.c +24 +WString +4 +COBJ +25 +WVList +0 +26 +WVList +0 +11 +1 +1 +0 +27 +MItem +28 +..\..\..\..\..\lib\awk\fnc.c +28 +WString +4 +COBJ +29 +WVList +0 +30 +WVList +0 +11 +1 +1 +0 +31 +MItem +29 +..\..\..\..\..\lib\awk\misc.c +32 +WString +4 +COBJ +33 +WVList +0 +34 +WVList +0 +11 +1 +1 +0 +35 +MItem +30 +..\..\..\..\..\lib\awk\parse.c +36 +WString +4 +COBJ +37 +WVList +0 +38 +WVList +0 +11 +1 +1 +0 +39 +MItem +28 +..\..\..\..\..\lib\awk\rec.c +40 +WString +4 +COBJ +41 +WVList +0 +42 +WVList +0 +11 +1 +1 +0 +43 +MItem +28 +..\..\..\..\..\lib\awk\rio.c +44 +WString +4 +COBJ +45 +WVList +0 +46 +WVList +0 +11 +1 +1 +0 +47 +MItem +28 +..\..\..\..\..\lib\awk\run.c +48 +WString +4 +COBJ +49 +WVList +0 +50 +WVList +0 +11 +1 +1 +0 +51 +MItem +28 +..\..\..\..\..\lib\awk\std.c +52 +WString +4 +COBJ +53 +WVList +0 +54 +WVList +0 +11 +1 +1 +0 +55 +MItem +29 +..\..\..\..\..\lib\awk\tree.c +56 +WString +4 +COBJ +57 +WVList +0 +58 +WVList +0 +11 +1 +1 +0 +59 +MItem +28 +..\..\..\..\..\lib\awk\val.c +60 +WString +4 +COBJ +61 +WVList +0 +62 +WVList +0 +11 +1 +1 +0 +63 +MItem +3 +*.h +64 +WString +3 +NIL +65 +WVList +0 +66 +WVList +0 +-1 +1 +1 +0 +67 +MItem +28 +..\..\..\..\..\lib\awk\awk.h +68 +WString +3 +NIL +69 +WVList +0 +70 +WVList +0 +63 +1 +1 +0 +71 +MItem +28 +..\..\..\..\..\lib\awk\err.h +72 +WString +3 +NIL +73 +WVList +0 +74 +WVList +0 +63 +1 +1 +0 +75 +MItem +28 +..\..\..\..\..\lib\awk\fnc.h +76 +WString +3 +NIL +77 +WVList +0 +78 +WVList +0 +63 +1 +1 +0 +79 +MItem +29 +..\..\..\..\..\lib\awk\misc.h +80 +WString +3 +NIL +81 +WVList +0 +82 +WVList +0 +63 +1 +1 +0 +83 +MItem +30 +..\..\..\..\..\lib\awk\parse.h +84 +WString +3 +NIL +85 +WVList +0 +86 +WVList +0 +63 +1 +1 +0 +87 +MItem +28 +..\..\..\..\..\lib\awk\rio.h +88 +WString +3 +NIL +89 +WVList +0 +90 +WVList +0 +63 +1 +1 +0 +91 +MItem +28 +..\..\..\..\..\lib\awk\run.h +92 +WString +3 +NIL +93 +WVList +0 +94 +WVList +0 +63 +1 +1 +0 +95 +MItem +29 +..\..\..\..\..\lib\awk\tree.h +96 +WString +3 +NIL +97 +WVList +0 +98 +WVList +0 +63 +1 +1 +0 +99 +MItem +28 +..\..\..\..\..\lib\awk\val.h +100 +WString +3 +NIL +101 +WVList +0 +102 +WVList +0 +63 +1 +1 +0 diff --git a/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt b/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt index e05186d1..fe1846b8 100755 --- a/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt +++ b/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt @@ -42,7 +42,7 @@ WVList 0 10 WPickList -56 +58 11 MItem 3 @@ -656,7 +656,7 @@ WVList 147 MItem 33 -..\..\..\..\..\lib\cmn\str_fcpy.c +..\..\..\..\..\lib\cmn\str_excl.c 148 WString 4 @@ -673,8 +673,8 @@ WVList 0 151 MItem -32 -..\..\..\..\..\lib\cmn\str_len.c +33 +..\..\..\..\..\lib\cmn\str_fcpy.c 152 WString 4 @@ -691,8 +691,8 @@ WVList 0 155 MItem -32 -..\..\..\..\..\lib\cmn\str_pac.c +33 +..\..\..\..\..\lib\cmn\str_incl.c 156 WString 4 @@ -709,8 +709,8 @@ WVList 0 159 MItem -33 -..\..\..\..\..\lib\cmn\str_pbrk.c +32 +..\..\..\..\..\lib\cmn\str_len.c 160 WString 4 @@ -728,7 +728,7 @@ WVList 163 MItem 32 -..\..\..\..\..\lib\cmn\str_put.c +..\..\..\..\..\lib\cmn\str_pac.c 164 WString 4 @@ -745,8 +745,8 @@ WVList 0 167 MItem -32 -..\..\..\..\..\lib\cmn\str_rev.c +33 +..\..\..\..\..\lib\cmn\str_pbrk.c 168 WString 4 @@ -764,7 +764,7 @@ WVList 171 MItem 32 -..\..\..\..\..\lib\cmn\str_rot.c +..\..\..\..\..\lib\cmn\str_put.c 172 WString 4 @@ -782,7 +782,7 @@ WVList 175 MItem 32 -..\..\..\..\..\lib\cmn\str_set.c +..\..\..\..\..\lib\cmn\str_rev.c 176 WString 4 @@ -800,7 +800,7 @@ WVList 179 MItem 32 -..\..\..\..\..\lib\cmn\str_spl.c +..\..\..\..\..\lib\cmn\str_rot.c 180 WString 4 @@ -818,7 +818,7 @@ WVList 183 MItem 32 -..\..\..\..\..\lib\cmn\str_spn.c +..\..\..\..\..\lib\cmn\str_set.c 184 WString 4 @@ -836,7 +836,7 @@ WVList 187 MItem 32 -..\..\..\..\..\lib\cmn\str_str.c +..\..\..\..\..\lib\cmn\str_spl.c 188 WString 4 @@ -853,8 +853,8 @@ WVList 0 191 MItem -34 -..\..\..\..\..\lib\cmn\str_subst.c +32 +..\..\..\..\..\lib\cmn\str_spn.c 192 WString 4 @@ -872,7 +872,7 @@ WVList 195 MItem 32 -..\..\..\..\..\lib\cmn\str_tok.c +..\..\..\..\..\lib\cmn\str_str.c 196 WString 4 @@ -889,8 +889,8 @@ WVList 0 199 MItem -32 -..\..\..\..\..\lib\cmn\str_trm.c +34 +..\..\..\..\..\lib\cmn\str_subst.c 200 WString 4 @@ -907,8 +907,8 @@ WVList 0 203 MItem -33 -..\..\..\..\..\lib\cmn\str_word.c +32 +..\..\..\..\..\lib\cmn\str_tok.c 204 WString 4 @@ -925,8 +925,8 @@ WVList 0 207 MItem -29 -..\..\..\..\..\lib\cmn\time.c +32 +..\..\..\..\..\lib\cmn\str_trm.c 208 WString 4 @@ -943,8 +943,8 @@ WVList 0 211 MItem -28 -..\..\..\..\..\lib\cmn\tio.c +33 +..\..\..\..\..\lib\cmn\str_word.c 212 WString 4 @@ -961,8 +961,8 @@ WVList 0 215 MItem -32 -..\..\..\..\..\lib\cmn\tio_get.c +29 +..\..\..\..\..\lib\cmn\time.c 216 WString 4 @@ -979,8 +979,8 @@ WVList 0 219 MItem -32 -..\..\..\..\..\lib\cmn\tio_put.c +28 +..\..\..\..\..\lib\cmn\tio.c 220 WString 4 @@ -997,8 +997,8 @@ WVList 0 223 MItem -28 -..\..\..\..\..\lib\cmn\xma.c +32 +..\..\..\..\..\lib\cmn\tio_get.c 224 WString 4 @@ -1015,44 +1015,44 @@ WVList 0 227 MItem -3 -*.h +32 +..\..\..\..\..\lib\cmn\tio_put.c 228 WString -3 -NIL +4 +COBJ 229 WVList 0 230 WVList 0 --1 +11 1 1 0 231 MItem 28 -..\..\..\..\..\lib\cmn\mem.h +..\..\..\..\..\lib\cmn\xma.c 232 WString -3 -NIL +4 +COBJ 233 WVList 0 234 WVList 0 -227 +11 1 1 0 235 MItem -32 -..\..\..\..\..\lib\cmn\syscall.h +3 +*.h 236 WString 3 @@ -1063,7 +1063,43 @@ WVList 238 WVList 0 -227 +-1 +1 +1 +0 +239 +MItem +28 +..\..\..\..\..\lib\cmn\mem.h +240 +WString +3 +NIL +241 +WVList +0 +242 +WVList +0 +235 +1 +1 +0 +243 +MItem +32 +..\..\..\..\..\lib\cmn\syscall.h +244 +WString +3 +NIL +245 +WVList +0 +246 +WVList +0 +235 1 1 0 diff --git a/qse/watcom/qse.wpj b/qse/watcom/qse.wpj index ba7a9001..6effe965 100755 --- a/qse/watcom/qse.wpj +++ b/qse/watcom/qse.wpj @@ -16,7 +16,7 @@ MCommand 4 MCommand 0 -11 +14 5 WFileName 30 @@ -62,30 +62,26 @@ WFileName 30 debug/win32/cmd/scm/qsescm.tgt 16 -WVList -11 +WFileName +28 +debug/os2/lib/awk/qseawk.tgt 17 -VComponent -18 -WRect -410 -1880 -5700 -4240 -0 -0 -19 WFileName 30 -release/os2/lib/cmn/qsecmn.tgt -36 -40 +debug/win32/lib/awk/qseawk.tgt +18 +WFileName +28 +debug/os2/cmd/awk/qseawk.tgt +19 +WVList +14 20 VComponent 21 WRect -90 -1240 +410 +1880 5700 4240 1 @@ -93,15 +89,15 @@ WRect 22 WFileName 30 -release/os2/lib/sed/qsesed.tgt -0 -0 +release/os2/lib/cmn/qsecmn.tgt +36 +42 23 VComponent 24 WRect -2100 -1400 +90 +1240 5700 4240 1 @@ -109,47 +105,47 @@ WRect 25 WFileName 30 -release/os2/cmd/sed/qsesed.tgt +release/os2/lib/sed/qsesed.tgt +0 0 -1 26 VComponent 27 WRect +2100 +1400 +5700 +4240 +1 +0 +28 +WFileName +30 +release/os2/cmd/sed/qsesed.tgt +0 +1 +29 +VComponent +30 +WRect 590 1080 5700 4240 1 0 -28 +31 WFileName 30 release/os2/lib/scm/qsescm.tgt 0 -2 -29 -VComponent -30 -WRect -100 0 -5700 -4240 -0 -0 -31 -WFileName -28 -debug/os2/lib/cmn/qsecmn.tgt -37 -37 32 VComponent 33 WRect -1050 -2360 +100 +0 5700 4240 1 @@ -157,15 +153,15 @@ WRect 34 WFileName 28 -debug/os2/lib/sed/qsesed.tgt -0 -5 +debug/os2/lib/cmn/qsecmn.tgt +29 +35 35 VComponent 36 WRect +1050 2360 -1280 5700 4240 1 @@ -173,47 +169,47 @@ WRect 37 WFileName 28 -debug/os2/lib/scm/qsescm.tgt +debug/os2/lib/sed/qsesed.tgt 0 -6 +5 38 VComponent 39 WRect -2460 -2400 +2360 +1280 5700 4240 -0 +1 0 40 WFileName 28 +debug/os2/lib/scm/qsescm.tgt +0 +0 +41 +VComponent +42 +WRect +2460 +2413 +5700 +4240 +1 +0 +43 +WFileName +28 debug/os2/cmd/scm/qsescm.tgt 0 1 -41 -VComponent -42 -WRect -980 -1080 -5700 -4240 -0 -0 -43 -WFileName -30 -debug/win32/lib/cmn/qsecmn.tgt -29 -29 44 VComponent 45 WRect -200 -1240 +980 +1080 5700 4240 1 @@ -221,15 +217,15 @@ WRect 46 WFileName 30 -debug/win32/lib/scm/qsescm.tgt -0 -0 +debug/win32/lib/cmn/qsecmn.tgt +29 +29 47 VComponent 48 WRect -3280 -40 +200 +1240 5700 4240 1 @@ -237,7 +233,71 @@ WRect 49 WFileName 30 +debug/win32/lib/scm/qsescm.tgt +0 +0 +50 +VComponent +51 +WRect +3280 +40 +5700 +4240 +1 +0 +52 +WFileName +30 debug/win32/cmd/scm/qsescm.tgt 0 +0 +53 +VComponent +54 +WRect +240 +106 +5700 +4253 +0 +0 +55 +WFileName +28 +debug/os2/lib/awk/qseawk.tgt +8 +16 +56 +VComponent +57 +WRect +830 +2746 +5700 +4253 1 -41 +0 +58 +WFileName +30 +debug/win32/lib/awk/qseawk.tgt +8 +9 +59 +VComponent +60 +WRect +2680 +-133 +5700 +4253 +0 +0 +61 +WFileName +28 +debug/os2/cmd/awk/qseawk.tgt +0 +1 +59 diff --git a/qse/watcom/release/os2/cmd/sed/qsesed.tgt b/qse/watcom/release/os2/cmd/sed/qsesed.tgt index b994b5e6..3a80f381 100755 --- a/qse/watcom/release/os2/cmd/sed/qsesed.tgt +++ b/qse/watcom/release/os2/cmd/sed/qsesed.tgt @@ -109,25 +109,23 @@ WString COBJ 27 WVList -0 +2 28 -WVList -0 --1 -1 -1 -0 +MVState 29 -MItem -28 -../../../../../cmd/sed/sed.c +WString +3 +WCC 30 WString -4 -COBJ +25 +o?2??Include directories: +1 31 -WVList -6 +WString +54 +"$(%watcom)/h;$(%watcom)/h/os2;..\..\..\..\..\include" +0 32 MVState 33 @@ -136,79 +134,33 @@ WString WCC 34 WString -25 -o?2??Include directories: -1 -35 -WString -54 -"$(%watcom)/h;$(%watcom)/h/os2;..\..\..\..\..\include" -0 -36 -MVState -37 -WString -3 -WCC -38 -WString 23 ?????Macro definitions: 1 -39 +35 WString 6 NDEBUG 0 +36 +WVList +0 +-1 +1 +1 +0 +37 +MItem +28 +..\..\..\..\..\cmd\sed\sed.c +38 +WString +4 +COBJ +39 +WVList +0 40 -MRState -41 -WString -3 -WCC -42 -WString -21 -?????No optimizations -1 -0 -43 -MRState -44 -WString -3 -WCC -45 -WString -27 -?????Average space and time -1 -1 -46 -MRState -47 -WString -3 -WCC -48 -WString -29 -?????No debugging information -1 -1 -49 -MRState -50 -WString -3 -WCC -51 -WString -24 -?????Full debugging info -1 -0 -52 WVList 0 25 diff --git a/qse/watcom/release/os2/lib/cmn/qsecmn.tgt b/qse/watcom/release/os2/lib/cmn/qsecmn.tgt index f45cdc63..68050548 100755 --- a/qse/watcom/release/os2/lib/cmn/qsecmn.tgt +++ b/qse/watcom/release/os2/lib/cmn/qsecmn.tgt @@ -42,7 +42,7 @@ WVList 0 10 WPickList -56 +58 11 MItem 3 @@ -720,7 +720,7 @@ WVList 163 MItem 33 -..\..\..\..\..\lib\cmn\str_fcpy.c +..\..\..\..\..\lib\cmn\str_excl.c 164 WString 4 @@ -737,8 +737,8 @@ WVList 0 167 MItem -32 -..\..\..\..\..\lib\cmn\str_len.c +33 +..\..\..\..\..\lib\cmn\str_fcpy.c 168 WString 4 @@ -755,8 +755,8 @@ WVList 0 171 MItem -32 -..\..\..\..\..\lib\cmn\str_pac.c +33 +..\..\..\..\..\lib\cmn\str_incl.c 172 WString 4 @@ -773,8 +773,8 @@ WVList 0 175 MItem -33 -..\..\..\..\..\lib\cmn\str_pbrk.c +32 +..\..\..\..\..\lib\cmn\str_len.c 176 WString 4 @@ -792,7 +792,7 @@ WVList 179 MItem 32 -..\..\..\..\..\lib\cmn\str_put.c +..\..\..\..\..\lib\cmn\str_pac.c 180 WString 4 @@ -809,8 +809,8 @@ WVList 0 183 MItem -32 -..\..\..\..\..\lib\cmn\str_rev.c +33 +..\..\..\..\..\lib\cmn\str_pbrk.c 184 WString 4 @@ -828,7 +828,7 @@ WVList 187 MItem 32 -..\..\..\..\..\lib\cmn\str_rot.c +..\..\..\..\..\lib\cmn\str_put.c 188 WString 4 @@ -846,7 +846,7 @@ WVList 191 MItem 32 -..\..\..\..\..\lib\cmn\str_set.c +..\..\..\..\..\lib\cmn\str_rev.c 192 WString 4 @@ -864,7 +864,7 @@ WVList 195 MItem 32 -..\..\..\..\..\lib\cmn\str_spl.c +..\..\..\..\..\lib\cmn\str_rot.c 196 WString 4 @@ -882,7 +882,7 @@ WVList 199 MItem 32 -..\..\..\..\..\lib\cmn\str_spn.c +..\..\..\..\..\lib\cmn\str_set.c 200 WString 4 @@ -900,7 +900,7 @@ WVList 203 MItem 32 -..\..\..\..\..\lib\cmn\str_str.c +..\..\..\..\..\lib\cmn\str_spl.c 204 WString 4 @@ -917,8 +917,8 @@ WVList 0 207 MItem -34 -..\..\..\..\..\lib\cmn\str_subst.c +32 +..\..\..\..\..\lib\cmn\str_spn.c 208 WString 4 @@ -936,7 +936,7 @@ WVList 211 MItem 32 -..\..\..\..\..\lib\cmn\str_tok.c +..\..\..\..\..\lib\cmn\str_str.c 212 WString 4 @@ -953,8 +953,8 @@ WVList 0 215 MItem -32 -..\..\..\..\..\lib\cmn\str_trm.c +34 +..\..\..\..\..\lib\cmn\str_subst.c 216 WString 4 @@ -971,8 +971,8 @@ WVList 0 219 MItem -33 -..\..\..\..\..\lib\cmn\str_word.c +32 +..\..\..\..\..\lib\cmn\str_tok.c 220 WString 4 @@ -989,8 +989,8 @@ WVList 0 223 MItem -29 -..\..\..\..\..\lib\cmn\time.c +32 +..\..\..\..\..\lib\cmn\str_trm.c 224 WString 4 @@ -1007,8 +1007,8 @@ WVList 0 227 MItem -28 -..\..\..\..\..\lib\cmn\tio.c +33 +..\..\..\..\..\lib\cmn\str_word.c 228 WString 4 @@ -1025,8 +1025,8 @@ WVList 0 231 MItem -32 -..\..\..\..\..\lib\cmn\tio_get.c +29 +..\..\..\..\..\lib\cmn\time.c 232 WString 4 @@ -1043,8 +1043,8 @@ WVList 0 235 MItem -32 -..\..\..\..\..\lib\cmn\tio_put.c +28 +..\..\..\..\..\lib\cmn\tio.c 236 WString 4 @@ -1061,8 +1061,8 @@ WVList 0 239 MItem -28 -..\..\..\..\..\lib\cmn\xma.c +32 +..\..\..\..\..\lib\cmn\tio_get.c 240 WString 4 @@ -1079,44 +1079,44 @@ WVList 0 243 MItem -3 -*.h +32 +..\..\..\..\..\lib\cmn\tio_put.c 244 WString -3 -NIL +4 +COBJ 245 WVList 0 246 WVList 0 --1 +11 1 1 0 247 MItem 28 -..\..\..\..\..\lib\cmn\mem.h +..\..\..\..\..\lib\cmn\xma.c 248 WString -3 -NIL +4 +COBJ 249 WVList 0 250 WVList 0 -243 +11 1 1 0 251 MItem -32 -..\..\..\..\..\lib\cmn\syscall.h +3 +*.h 252 WString 3 @@ -1127,7 +1127,43 @@ WVList 254 WVList 0 -243 +-1 +1 +1 +0 +255 +MItem +28 +..\..\..\..\..\lib\cmn\mem.h +256 +WString +3 +NIL +257 +WVList +0 +258 +WVList +0 +251 +1 +1 +0 +259 +MItem +32 +..\..\..\..\..\lib\cmn\syscall.h +260 +WString +3 +NIL +261 +WVList +0 +262 +WVList +0 +251 1 1 0