hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
hyung-hwan 2006-11-13 09:02:41 +00:00
parent 2edc5e2413
commit 47787381d7
6 changed files with 323 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ase/awk/awk.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk.h,v 1.139 2006-10-31 14:31:46 bacon Exp $ * $Id: awk.h,v 1.140 2006-11-13 09:02:22 bacon Exp $
*/ */
#ifndef _ASE_AWK_AWK_H_ #ifndef _ASE_AWK_AWK_H_
@ -271,6 +271,7 @@ enum
ASE_AWK_ENEXTFILE, /* nextfile illegal in BEGIN or END block */ ASE_AWK_ENEXTFILE, /* nextfile illegal in BEGIN or END block */
ASE_AWK_EGETLINE, /* getline expected */ ASE_AWK_EGETLINE, /* getline expected */
ASE_AWK_EPRINTFARG, /* printf must have one or more arguments */ ASE_AWK_EPRINTFARG, /* printf must have one or more arguments */
ASE_AWK_EFMTSEQ, /* wrong formatting sequence */
/* run time error */ /* run time error */
ASE_AWK_EDIVBYZERO, /* divide by zero */ ASE_AWK_EDIVBYZERO, /* divide by zero */

3
ase/awk/err.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: err.c,v 1.46 2006-10-31 10:13:14 bacon Exp $ * $Id: err.c,v 1.47 2006-11-13 09:02:23 bacon Exp $
*/ */
#include <ase/awk/awk_i.h> #include <ase/awk/awk_i.h>
@ -81,6 +81,7 @@ const ase_char_t* ase_awk_geterrstr (int errnum)
ASE_T("nextfile illegal in BEGIN or END block"), ASE_T("nextfile illegal in BEGIN or END block"),
ASE_T("getline expected"), ASE_T("getline expected"),
ASE_T("printf requires one or more arguments"), ASE_T("printf requires one or more arguments"),
ASE_T("formatting sequence is wrong"),
ASE_T("divide by zero"), ASE_T("divide by zero"),
ASE_T("invalid operand"), ASE_T("invalid operand"),

5
ase/awk/misc.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: misc.c,v 1.36 2006-10-31 10:13:14 bacon Exp $ * $Id: misc.c,v 1.37 2006-11-13 09:02:23 bacon Exp $
*/ */
#include <ase/awk/awk_i.h> #include <ase/awk/awk_i.h>
@ -612,7 +612,8 @@ ase_char_t* ase_awk_strdup (ase_awk_t* awk, const ase_char_t* str)
return tmp; return tmp;
} }
ase_char_t* ase_awk_strxdup (ase_awk_t* awk, const ase_char_t* str, ase_size_t len) ase_char_t* ase_awk_strxdup (
ase_awk_t* awk, const ase_char_t* str, ase_size_t len)
{ {
ase_char_t* tmp; ase_char_t* tmp;

4
ase/awk/parse.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: parse.c,v 1.200 2006-11-01 04:41:01 bacon Exp $ * $Id: parse.c,v 1.201 2006-11-13 09:02:23 bacon Exp $
*/ */
#include <ase/awk/awk_i.h> #include <ase/awk/awk_i.h>
@ -3810,6 +3810,7 @@ static int __get_number (ase_awk_t* awk)
return 0; return 0;
} }
#if 0
else if (c == ASE_T('b') || c == ASE_T('B')) else if (c == ASE_T('b') || c == ASE_T('B'))
{ {
/* binary number */ /* binary number */
@ -3822,6 +3823,7 @@ static int __get_number (ase_awk_t* awk)
return 0; return 0;
} }
#endif
else if (c != '.') else if (c != '.')
{ {
/* octal number */ /* octal number */

478
ase/awk/run.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: run.c,v 1.256 2006-11-12 15:09:15 bacon Exp $ * $Id: run.c,v 1.257 2006-11-13 09:02:23 bacon Exp $
*/ */
#include <ase/awk/awk_i.h> #include <ase/awk/awk_i.h>
@ -2431,7 +2431,7 @@ static int __formatted_output (
ase_awk_run_t* run, int out_type, const ase_char_t* dst, ase_awk_run_t* run, int out_type, const ase_char_t* dst,
const ase_char_t* fmt, ase_size_t fmt_len, ase_awk_nde_t* args) const ase_char_t* fmt, ase_size_t fmt_len, ase_awk_nde_t* args)
{ {
ase_size_t i; ase_size_t i, j;
#define FLUSH() \ #define FLUSH() \
do { \ do { \
@ -2449,6 +2449,20 @@ static int __formatted_output (
ase_countof(run->format.out.buf)) FLUSH (); \ ase_countof(run->format.out.buf)) FLUSH (); \
} while (0) } while (0)
#define ADD_TO_FMTBUF(c) \
do { \
if (run->format.fmt.len < ase_countof(run->format.fmt.buf)-1) \
{ \
run->format.fmt.buf[run->format.fmt.len++] = (c); \
run->format.fmt.buf[run->format.fmt.len] = ASE_T('\0'); \
} \
else \
{ \
run->errnum = ASE_AWK_EFMTSEQ; \
return -1; \
} \
} while (0)
run->format.out.len = 0; run->format.out.len = 0;
run->format.fmt.len = 0; run->format.fmt.len = 0;
@ -2464,14 +2478,15 @@ static int __formatted_output (
continue; continue;
} }
#if 0 while (i < fmt_len &&
if (fmt[i] == ASE_T('-')) (fmt[i] == ASE_T(' ') || fmt[i] == ASE_T('#') ||
fmt[i] == ASE_T('0') || fmt[i] == ASE_T('+') ||
fmt[i] == ASE_T('-')))
{ {
ADD_TO_FMTBUF (fmt[i]); i++;
} }
#endif
/*if (fmt[i] == ASE_T('c')) if (i < fmt_len && fmt[i] == ASE_T('*'))
else*/ if (fmt[i] == ASE_T('d') || fmt[i] == ASE_T('i'))
{ {
ase_awk_val_t* v; ase_awk_val_t* v;
ase_long_t l; ase_long_t l;
@ -2485,17 +2500,118 @@ static int __formatted_output (
return -1; return -1;
} }
/* TODO: length check of fmt.buf */ v = __eval_expression (run, args);
run->format.fmt.buf[run->format.fmt.len++] = ASE_T('l'); if (v == ASE_NULL) return -1;
run->format.fmt.buf[run->format.fmt.len++] = ASE_T('l');
run->format.fmt.buf[run->format.fmt.len++] = ASE_T('d'); ase_awk_refupval (v);
run->format.fmt.buf[run->format.fmt.len] = ASE_T('\0'); n = ase_awk_valtonum (run, v, &l, &r);
ase_awk_refdownval (run, v);
if (n == -1) return -1;
if (n == 1) l = (ase_long_t)r;
run->awk->syscas.sprintf (
run->format.buf,
ase_countof(run->format.buf),
ASE_T("%lld"), (long long)l);
p = run->format.buf;
while (*p != ASE_T('\0'))
{
ADD_TO_FMTBUF (*p);
p++;
}
args = args->next;
i++;
}
else
{
while (i < fmt_len && ASE_AWK_ISDIGIT(run->awk, fmt[i]))
{
ADD_TO_FMTBUF (fmt[i]); i++;
}
}
if (i < fmt_len && fmt[i] == ASE_T('.'))
{
ADD_TO_FMTBUF (fmt[i]); i++;
}
if (i < fmt_len && fmt[i] == ASE_T('*'))
{
ase_awk_val_t* v;
ase_long_t l;
ase_real_t r;
ase_char_t* p;
int n;
if (args == ASE_NULL)
{
run->errnum = ASE_AWK_EPRINTFARG;
return -1;
}
v = __eval_expression (run, args); v = __eval_expression (run, args);
if (v == ASE_NULL) return -1; if (v == ASE_NULL) return -1;
ase_awk_refupval (v); ase_awk_refupval (v);
n = ase_awk_valtonum (run, args, &l, &r); n = ase_awk_valtonum (run, v, &l, &r);
ase_awk_refdownval (run, v);
if (n == -1) return -1;
if (n == 1) l = (ase_long_t)r;
run->awk->syscas.sprintf (
run->format.buf,
ase_countof(run->format.buf),
ASE_T("%lld"), (long long)l);
p = run->format.buf;
while (*p != ASE_T('\0'))
{
ADD_TO_FMTBUF (*p);
p++;
}
args = args->next;
i++;
}
else
{
while (i < fmt_len && ASE_AWK_ISDIGIT(run->awk, fmt[i]))
{
ADD_TO_FMTBUF (fmt[i]); i++;
}
}
if (i >= fmt_len) break;
if (fmt[i] == ASE_T('d') || fmt[i] == ASE_T('i') ||
fmt[i] == ASE_T('x') || fmt[i] == ASE_T('X') ||
fmt[i] == ASE_T('o'))
{
ase_awk_val_t* v;
ase_long_t l;
ase_real_t r;
ase_char_t* p;
int n;
if (args == ASE_NULL)
{
run->errnum = ASE_AWK_EPRINTFARG;
return -1;
}
ADD_TO_FMTBUF (ASE_T('l'));
ADD_TO_FMTBUF (ASE_T('l'));
ADD_TO_FMTBUF (fmt[i]);
v = __eval_expression (run, args);
if (v == ASE_NULL) return -1;
ase_awk_refupval (v);
n = ase_awk_valtonum (run, v, &l, &r);
ase_awk_refdownval (run, v); ase_awk_refdownval (run, v);
if (n == -1) return -1; if (n == -1) return -1;
@ -2514,15 +2630,179 @@ static int __formatted_output (
p++; p++;
} }
} }
/*else if (fmt[i] == ASE_T('e')) else if (fmt[i] == ASE_T('e') || fmt[i] == ASE_T('E') ||
else if (fmt[i] == ASE_T('f')) fmt[i] == ASE_T('g') || fmt[i] == ASE_T('G') ||
else if (fmt[i] == ASE_T('g')) fmt[i] == ASE_T('f'))
else if (fmt[i] == ASE_T('o')) {
ase_awk_val_t* v;
ase_long_t l;
ase_real_t r;
ase_char_t* p;
int n;
if (args == ASE_NULL)
{
run->errnum = ASE_AWK_EPRINTFARG;
return -1;
}
ADD_TO_FMTBUF (ASE_T('L'));
ADD_TO_FMTBUF (fmt[i]);
v = __eval_expression (run, args);
if (v == ASE_NULL) return -1;
ase_awk_refupval (v);
n = ase_awk_valtonum (run, v, &l, &r);
ase_awk_refdownval (run, v);
if (n == -1) return -1;
if (n == 0) r = (ase_real_t)l;
/* TODO: check the return value of syscas.sprintf and handle an error */
run->awk->syscas.sprintf (
run->format.buf,
ase_countof(run->format.buf),
run->format.fmt.buf, (long double)r);
p = run->format.buf;
while (*p != ASE_T('\0'))
{
OUTPUT_CHAR (*p);
p++;
}
}
else if (fmt[i] == ASE_T('c'))
{
ase_awk_val_t* v;
ase_char_t* p;
if (args == ASE_NULL)
{
run->errnum = ASE_AWK_EPRINTFARG;
return -1;
}
ADD_TO_FMTBUF (fmt[i]);
v = __eval_expression (run, args);
if (v == ASE_NULL) return -1;
ase_awk_refupval (v);
if (v->type == ASE_AWK_VAL_NIL)
{
run->format.buf[0] = ASE_T('\0');
}
else if (v->type == ASE_AWK_VAL_INT)
{
run->awk->syscas.sprintf (
run->format.buf,
ase_countof(run->format.buf),
run->format.fmt.buf,
(int)((ase_awk_val_int_t*)v)->val);
}
else if (v->type == ASE_AWK_VAL_REAL)
{
run->awk->syscas.sprintf (
run->format.buf,
ase_countof(run->format.buf),
run->format.fmt.buf,
(int)((ase_awk_val_real_t*)v)->val);
}
else if (v->type == ASE_AWK_VAL_STR)
{
ase_awk_val_str_t* str = (ase_awk_val_str_t*)v;
if (str->len > 0)
{
run->awk->syscas.sprintf (
run->format.buf,
ase_countof(run->format.buf),
run->format.fmt.buf, str->buf[0]);
}
else run->format.buf[0] = ASE_T('\0');
}
else
{
ase_awk_refdownval (run, v);
run->errnum = ASE_AWK_EVALTYPE;
return -1;
}
ase_awk_refdownval (run, v);
p = run->format.buf;
while (*p != ASE_T('\0'))
{
OUTPUT_CHAR (*p);
p++;
}
}
else if (fmt[i] == ASE_T('s')) else if (fmt[i] == ASE_T('s'))
else if (fmt[i] == ASE_T('x')) {
else if (fmt[i] == ASE_T('X'))*/ ase_awk_val_t* v;
ase_char_t* p;
if (args == ASE_NULL)
{
run->errnum = ASE_AWK_EPRINTFARG;
return -1;
}
ADD_TO_FMTBUF (fmt[i]);
v = __eval_expression (run, args);
if (v == ASE_NULL) return -1;
ase_awk_refupval (v);
if (v->type == ASE_AWK_VAL_NIL)
{
run->format.buf[0] = ASE_T('\0');
}
else if (v->type == ASE_AWK_VAL_STR)
{
/* TODO: handle a string contailing null characters */
/* TODO: handle error conditions of sprintf */
run->awk->syscas.sprintf (
run->format.buf,
ase_countof(run->format.buf),
run->format.fmt.buf,
((ase_awk_val_str_t*)v)->buf);
}
else
{
ase_char_t* str;
ase_size_t len;
str = ase_awk_valtostr (run, v, ASE_AWK_VALTOSTR_CLEAR, ASE_NULL, &len);
if (str == ASE_NULL)
{
ase_awk_refdownval (run, v);
return -1;
}
run->awk->syscas.sprintf (
run->format.buf,
ase_countof(run->format.buf),
run->format.fmt.buf, str);
ASE_AWK_FREE (run->awk, str);
}
ase_awk_refdownval (run, v);
p = run->format.buf;
while (*p != ASE_T('\0'))
{
OUTPUT_CHAR (*p);
p++;
}
}
else /*if (fmt[i] == ASE_T('%'))*/ else /*if (fmt[i] == ASE_T('%'))*/
{ {
for (j = 0; j < run->format.fmt.len; j++)
OUTPUT_CHAR (run->format.fmt.buf[j]);
OUTPUT_CHAR (fmt[i]); OUTPUT_CHAR (fmt[i]);
} }
@ -2530,163 +2810,13 @@ static int __formatted_output (
run->format.fmt.len = 0; run->format.fmt.len = 0;
} }
FLUSH (); if (run->format.fmt.len > 0)
#if 0
const ase_char_t* end = fmt + fmt_len;
const ase_char_t* s;
int modifier;
ase_char_t ch;
while (fmt < end)
{ {
while (*fmt != ASE_T('\0') && *fmt != ASE_T('%')) /* flush uncompleted formatting sequence */
{ for (j = 0; j < run->format.fmt.len; j++)
ADDC (str, *fmt++); OUTPUT_CHAR (run->format.fmt.buf[j]);
}
if (fmt < end) break;
ASE_AWK_ASSERTX (run->awk, *fmt == ASE_T('%'),
"the current character must be % as all characters "
"except % have been skippe.d");
s = fmt++; /* remember the position of % */
/* flags */
while (fmt < end)
{
ch = *fmt;
if (ch != ASE_T(' ') &&
ch != ASE_T('+') &&
ch != ASE_T('-') &&
ch != ASE_T('#') &&
ch != ASE_T('0')) break;
fmt++;
}
/* flags */
while (1)
{
if (ch == ASE_T(' ') || ch == ASE_T('+') ||
ch == ASE_T('-') || ch == ASE_T('#'))
{
ADDC (str, ch);
ch = *fmt++;
}
else
{
if (ch == ASE_T('0'))
{
ADDC (str, ch);
ch = *fmt++;
}
break;
}
}
/* check the width */
if (ch == ASE_T('*'))
{
ADDC (str, ch);
ch = *fmt++;
}
else
{
while (ASE_AWK_ISDIGIT (run->awk, ch))
{
ADDC (str, ch);
ch = *fmt++;
}
}
/* precision */
if (ch == ASE_T('.'))
{
ADDC (str, ch);
ch = *fmt++;
if (ch == ASE_T('*'))
{
ADDC (str, ch);
ch = *fmt++;
}
else
{
while (ASE_AWK_ISDIGIT (run->awk, ch))
{
ADDC (str, ch);
ch = *fmt++;
}
}
}
/* modifier */
for (modifier = 0;;)
{
if (ch == ASE_T('h')) modifier = MOD_SHORT;
else if (ch == ASE_T('l'))
{
modifier = (modifier == MOD_LONG)? MOD_LONGLONG: MOD_LONG;
}
else break;
ch = *fmt++;
}
/* type */
if (ch == ASE_T('%')) ADDC (str, ch);
else if (ch == ASE_T('c') || ch == ASE_T('s'))
{
#if !defined(ASE_T_IS_MCHAR) && !defined(_WIN32)
ADDC (str, 'l');
#endif
ADDC (str, ch);
}
else if (ch == ASE_T('C') || ch == ASE_T('S'))
{
#ifdef _WIN32
ADDC (str, ch);
#else
#ifdef ASE_T_IS_MCHAR
ADDC (str, 'l');
#endif
ADDC (str, ase_ttolower(ch));
#endif
}
else if (ch == ASE_T('d') || ch == ASE_T('i') ||
ch == ASE_T('o') || ch == ASE_T('u') ||
ch == ASE_T('x') || ch == ASE_T('X'))
{
if (modifier == MOD_SHORT)
{
ADDC (str, 'h');
}
else if (modifier == MOD_LONG)
{
ADDC (str, 'l');
}
else if (modifier == MOD_LONGLONG)
{
#if defined(_WIN32) && !defined(__LCC__)
ADDC (str, 'I');
ADDC (str, '6');
ADDC (str, '4');
#else
ADDC (str, 'l');
ADDC (str, 'l');
#endif
}
ADDC (str, ch);
}
else if (ch == ASE_T('\0')) break;
else ADDC (str, ch);
} }
FLUSH ();
#endif
return 0;
} }
static ase_awk_val_t* __eval_expression (ase_awk_run_t* run, ase_awk_nde_t* nde) static ase_awk_val_t* __eval_expression (ase_awk_run_t* run, ase_awk_nde_t* nde)

9
ase/test/awk/arg.awk
View File

@ -21,5 +21,12 @@ BEGIN {
# i;;) print "[" i "]"; # i;;) print "[" i "]";
#printf 10, 20, 30; #printf 10, 20, 30;
if (ARGC >= 0) printf "ARGC %d is positive\n", 10; if (ARGC >= 0) printf ("ARGC [%++#10.10i] is positive\n", 10);
if (ARGC >= 0) printf ("ARGC [%++#10.10f] is positive\n", 10);
if (ARGC >= 0) printf ("ARGC [%++#10.10E] is positive\n", 10124.1123);
if (ARGC >= 0) printf ("ARGC [%++#10.10G] is positive\n", 10124.1123);
if (ARGC >= 0) printf ("ARGC [%++#10.10g] is positive\n", 10124.1123);
if (ARGC >= 0) printf ("ARGC [%++#10.10f] is positive\n", 10124.1123);
printf ("[%d], [%f], [%s]\n", 10124.1123, 10124.1123, 10124.1123);
printf ("[%-10c] [% 0*.*d]\n", 65, 45, 48, -1);
} }