Fix style, since this file has just been touched in a major way.

No actual code changes.
This commit is contained in:
Stefan Eßer 2011-07-09 12:20:15 +00:00
parent 6fbe7bf4f2
commit 69759f0829
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=223883

View File

@ -1,6 +1,6 @@
%{ %{
/*- /*-
* Written by Pace Willisson (pace@blitz.com) * Written by Pace Willisson (pace@blitz.com)
* and placed in the public domain. * and placed in the public domain.
* *
* Largely rewritten by J.T. Conklin (jtc@wimsey.com) * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
@ -21,7 +21,7 @@
#include <string.h> #include <string.h>
#include <regex.h> #include <regex.h>
#include <unistd.h> #include <unistd.h>
/* /*
* POSIX specifies a specific error code for syntax errors. We exit * POSIX specifies a specific error code for syntax errors. We exit
* with this code for all errors. * with this code for all errors.
@ -42,7 +42,7 @@ struct val {
char **av; char **av;
int nonposix; int nonposix;
struct val *result; struct val *result;
void assert_to_integer(struct val *); void assert_to_integer(struct val *);
void assert_div(intmax_t, intmax_t); void assert_div(intmax_t, intmax_t);
@ -52,7 +52,7 @@ void assert_times(intmax_t, intmax_t, intmax_t);
int compare_vals(struct val *, struct val *); int compare_vals(struct val *, struct val *);
void free_value(struct val *); void free_value(struct val *);
int is_integer(const char *); int is_integer(const char *);
int isstring(struct val *); int is_string(struct val *);
int is_zero_or_null(struct val *); int is_zero_or_null(struct val *);
struct val *make_integer(intmax_t); struct val *make_integer(intmax_t);
struct val *make_str(const char *); struct val *make_str(const char *);
@ -99,23 +99,22 @@ start: expr { result = $$; }
expr: TOKEN expr: TOKEN
| '(' expr ')' { $$ = $2; } | '(' expr ')' { $$ = $2; }
| expr '|' expr { $$ = op_or ($1, $3); } | expr '|' expr { $$ = op_or($1, $3); }
| expr '&' expr { $$ = op_and ($1, $3); } | expr '&' expr { $$ = op_and($1, $3); }
| expr '=' expr { $$ = op_eq ($1, $3); } | expr '=' expr { $$ = op_eq($1, $3); }
| expr '>' expr { $$ = op_gt ($1, $3); } | expr '>' expr { $$ = op_gt($1, $3); }
| expr '<' expr { $$ = op_lt ($1, $3); } | expr '<' expr { $$ = op_lt($1, $3); }
| expr GE expr { $$ = op_ge ($1, $3); } | expr GE expr { $$ = op_ge($1, $3); }
| expr LE expr { $$ = op_le ($1, $3); } | expr LE expr { $$ = op_le($1, $3); }
| expr NE expr { $$ = op_ne ($1, $3); } | expr NE expr { $$ = op_ne($1, $3); }
| expr '+' expr { $$ = op_plus ($1, $3); } | expr '+' expr { $$ = op_plus($1, $3); }
| expr '-' expr { $$ = op_minus ($1, $3); } | expr '-' expr { $$ = op_minus($1, $3); }
| expr '*' expr { $$ = op_times ($1, $3); } | expr '*' expr { $$ = op_times($1, $3); }
| expr '/' expr { $$ = op_div ($1, $3); } | expr '/' expr { $$ = op_div($1, $3); }
| expr '%' expr { $$ = op_rem ($1, $3); } | expr '%' expr { $$ = op_rem($1, $3); }
| expr ':' expr { $$ = op_colon ($1, $3); } | expr ':' expr { $$ = op_colon($1, $3); }
; ;
%% %%
struct val * struct val *
@ -123,14 +122,13 @@ make_integer(intmax_t i)
{ {
struct val *vp; struct val *vp;
vp = (struct val *) malloc (sizeof (*vp)); vp = (struct val *)malloc(sizeof(*vp));
if (vp == NULL) { if (vp == NULL)
errx(ERR_EXIT, "malloc() failed"); errx(ERR_EXIT, "malloc() failed");
}
vp->type = integer; vp->type = integer;
vp->u.i = i; vp->u.i = i;
return vp; return (vp);
} }
struct val * struct val *
@ -138,28 +136,25 @@ make_str(const char *s)
{ {
struct val *vp; struct val *vp;
vp = (struct val *) malloc (sizeof (*vp)); vp = (struct val *)malloc(sizeof(*vp));
if (vp == NULL || ((vp->u.s = strdup (s)) == NULL)) { if (vp == NULL || ((vp->u.s = strdup(s)) == NULL))
errx(ERR_EXIT, "malloc() failed"); errx(ERR_EXIT, "malloc() failed");
}
if (is_integer(s)) if (is_integer(s))
vp->type = numeric_string; vp->type = numeric_string;
else else
vp->type = string; vp->type = string;
return vp; return (vp);
} }
void void
free_value(struct val *vp) free_value(struct val *vp)
{ {
if (vp->type == string || vp->type == numeric_string) if (vp->type == string || vp->type == numeric_string)
free (vp->u.s); free(vp->u.s);
} }
int int
to_integer(struct val *vp) to_integer(struct val *vp)
{ {
@ -171,7 +166,7 @@ to_integer(struct val *vp)
i = strtoimax(vp->u.s, (char **)NULL, 10); i = strtoimax(vp->u.s, (char **)NULL, 10);
/* just keep as numeric_string, if the conversion fails */ /* just keep as numeric_string, if the conversion fails */
if (errno != ERANGE) { if (errno != ERANGE) {
free (vp->u.s); free(vp->u.s);
vp->u.i = i; vp->u.i = i;
vp->type = integer; vp->type = integer;
} }
@ -179,7 +174,6 @@ to_integer(struct val *vp)
return (vp->type == integer); return (vp->type == integer);
} }
void void
assert_to_integer(struct val *vp) assert_to_integer(struct val *vp)
{ {
@ -212,7 +206,6 @@ to_string(struct val *vp)
vp->u.s = tmp; vp->u.s = tmp;
} }
int int
is_integer(const char *s) is_integer(const char *s)
{ {
@ -231,15 +224,13 @@ is_integer(const char *s)
return (*s == '\0'); return (*s == '\0');
} }
int int
isstring(struct val *vp) is_string(struct val *vp)
{ {
/* only TRUE if this string is not a valid integer */ /* only TRUE if this string is not a valid integer */
return (vp->type == string); return (vp->type == string);
} }
int int
yylex(void) yylex(void)
{ {
@ -250,10 +241,10 @@ yylex(void)
p = *av++; p = *av++;
if (strlen (p) == 1) { if (strlen(p) == 1) {
if (strchr ("|&=<>+-*/%:()", *p)) if (strchr("|&=<>+-*/%:()", *p))
return (*p); return (*p);
} else if (strlen (p) == 2 && p[1] == '=') { } else if (strlen(p) == 2 && p[1] == '=') {
switch (*p) { switch (*p) {
case '>': return (GE); case '>': return (GE);
case '<': return (LE); case '<': return (LE);
@ -261,19 +252,17 @@ yylex(void)
} }
} }
yylval.val = make_str (p); yylval.val = make_str(p);
return (TOKEN); return (TOKEN);
} }
int int
is_zero_or_null(struct val *vp) is_zero_or_null(struct val *vp)
{ {
if (vp->type == integer) { if (vp->type == integer)
return (vp->u.i == 0); return (vp->u.i == 0);
} else {
return (*vp->u.s == 0 || (to_integer (vp) && vp->u.i == 0)); return (*vp->u.s == 0 || (to_integer(vp) && vp->u.i == 0));
}
/* NOTREACHED */
} }
int int
@ -281,23 +270,22 @@ main(int argc, char *argv[])
{ {
int c; int c;
setlocale (LC_ALL, ""); setlocale(LC_ALL, "");
if (getenv("EXPR_COMPAT") != NULL if (getenv("EXPR_COMPAT") != NULL
|| check_utility_compat("expr")) { || check_utility_compat("expr")) {
av = argv + 1; av = argv + 1;
nonposix = 1; nonposix = 1;
} else { } else {
while ((c = getopt(argc, argv, "e")) != -1) while ((c = getopt(argc, argv, "e")) != -1) {
switch (c) { switch (c) {
case 'e': case 'e':
nonposix = 1; nonposix = 1;
break; break;
default: default:
fprintf(stderr, errx(ERR_EXIT,
"usage: expr [-e] expression\n"); "usage: expr [-e] expression\n");
exit(ERR_EXIT);
} }
}
av = argv + optind; av = argv + optind;
} }
@ -317,7 +305,6 @@ yyerror(const char *s __unused)
errx(ERR_EXIT, "syntax error"); errx(ERR_EXIT, "syntax error");
} }
struct val * struct val *
op_or(struct val *a, struct val *b) op_or(struct val *a, struct val *b)
{ {
@ -335,12 +322,12 @@ op_or(struct val *a, struct val *b)
struct val * struct val *
op_and(struct val *a, struct val *b) op_and(struct val *a, struct val *b)
{ {
if (is_zero_or_null (a) || is_zero_or_null (b)) { if (is_zero_or_null(a) || is_zero_or_null(b)) {
free_value (a); free_value(a);
free_value (b); free_value(b);
return (make_integer ((intmax_t)0)); return (make_integer((intmax_t)0));
} else { } else {
free_value (b); free_value(b);
return (a); return (a);
} }
} }
@ -350,7 +337,7 @@ compare_vals(struct val *a, struct val *b)
{ {
int r; int r;
if (isstring(a) || isstring(b)) { if (is_string(a) || is_string(b)) {
to_string(a); to_string(a);
to_string(b); to_string(b);
r = strcoll(a->u.s, b->u.s); r = strcoll(a->u.s, b->u.s);
@ -425,19 +412,17 @@ op_plus(struct val *a, struct val *b)
assert_to_integer(a); assert_to_integer(a);
assert_to_integer(b); assert_to_integer(b);
r = make_integer(a->u.i + b->u.i); r = make_integer(a->u.i + b->u.i);
assert_plus(a->u.i, b->u.i, r->u.i); assert_plus(a->u.i, b->u.i, r->u.i);
free_value (a); free_value(a);
free_value (b); free_value(b);
return r; return (r);
} }
void void
assert_minus(intmax_t a, intmax_t b, intmax_t r) assert_minus(intmax_t a, intmax_t b, intmax_t r)
{ {
/* special case subtraction of INTMAX_MIN */ /* special case subtraction of INTMAX_MIN */
if (b == INTMAX_MIN && a < 0) if (b == INTMAX_MIN && a < 0)
errx(ERR_EXIT, "overflow"); errx(ERR_EXIT, "overflow");
@ -452,13 +437,12 @@ op_minus(struct val *a, struct val *b)
assert_to_integer(a); assert_to_integer(a);
assert_to_integer(b); assert_to_integer(b);
r = make_integer(a->u.i - b->u.i); r = make_integer(a->u.i - b->u.i);
assert_minus(a->u.i, b->u.i, r->u.i); assert_minus(a->u.i, b->u.i, r->u.i);
free_value (a); free_value(a);
free_value (b); free_value(b);
return r; return (r);
} }
void void
@ -479,12 +463,11 @@ op_times(struct val *a, struct val *b)
assert_to_integer(a); assert_to_integer(a);
assert_to_integer(b); assert_to_integer(b);
r = make_integer(a->u.i * b->u.i); r = make_integer(a->u.i * b->u.i);
assert_times(a->u.i, b->u.i, r->u.i); assert_times(a->u.i, b->u.i, r->u.i);
free_value (a); free_value(a);
free_value (b); free_value(b);
return (r); return (r);
} }
@ -505,16 +488,15 @@ op_div(struct val *a, struct val *b)
assert_to_integer(a); assert_to_integer(a);
assert_to_integer(b); assert_to_integer(b);
/* assert based on operands only, not on result */ /* assert based on operands only, not on result */
assert_div(a->u.i, b->u.i); assert_div(a->u.i, b->u.i);
r = make_integer(a->u.i / b->u.i); r = make_integer(a->u.i / b->u.i);
free_value (a); free_value(a);
free_value (b); free_value(b);
return r; return (r);
} }
struct val * struct val *
op_rem(struct val *a, struct val *b) op_rem(struct val *a, struct val *b)
{ {
@ -526,11 +508,11 @@ op_rem(struct val *a, struct val *b)
assert_div(1, b->u.i); assert_div(1, b->u.i);
r = make_integer(a->u.i % b->u.i); r = make_integer(a->u.i % b->u.i);
free_value (a); free_value(a);
free_value (b); free_value(b);
return r; return (r);
} }
struct val * struct val *
op_colon(struct val *a, struct val *b) op_colon(struct val *a, struct val *b)
{ {
@ -545,33 +527,30 @@ op_colon(struct val *a, struct val *b)
to_string(b); to_string(b);
/* compile regular expression */ /* compile regular expression */
if ((eval = regcomp (&rp, b->u.s, 0)) != 0) { if ((eval = regcomp(&rp, b->u.s, 0)) != 0) {
regerror (eval, &rp, errbuf, sizeof(errbuf)); regerror(eval, &rp, errbuf, sizeof(errbuf));
errx(ERR_EXIT, "%s", errbuf); errx(ERR_EXIT, "%s", errbuf);
} }
/* compare string against pattern */ /* compare string against pattern */
/* remember that patterns are anchored to the beginning of the line */ /* remember that patterns are anchored to the beginning of the line */
if (regexec(&rp, a->u.s, (size_t)2, rm, 0) == 0 && rm[0].rm_so == 0) { if (regexec(&rp, a->u.s, (size_t)2, rm, 0) == 0 && rm[0].rm_so == 0)
if (rm[1].rm_so >= 0) { if (rm[1].rm_so >= 0) {
*(a->u.s + rm[1].rm_eo) = '\0'; *(a->u.s + rm[1].rm_eo) = '\0';
v = make_str (a->u.s + rm[1].rm_so); v = make_str(a->u.s + rm[1].rm_so);
} else { } else
v = make_integer ((intmax_t)(rm[0].rm_eo - rm[0].rm_so)); v = make_integer((intmax_t)(rm[0].rm_eo - rm[0].rm_so));
} else
} else { if (rp.re_nsub == 0)
if (rp.re_nsub == 0) { v = make_integer((intmax_t)0);
v = make_integer ((intmax_t)0); else
} else { v = make_str("");
v = make_str ("");
}
}
/* free arguments and pattern buffer */ /* free arguments and pattern buffer */
free_value (a); free_value(a);
free_value (b); free_value(b);
regfree (&rp); regfree(&rp);
return v; return (v);
} }