2017-07-24 16:21:14 +03:00
|
|
|
/* $NetBSD: arith_token.c,v 1.6 2017/07/24 13:21:14 kre Exp $ */
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
|
|
|
|
/*-
|
|
|
|
* Copyright (c) 2002
|
|
|
|
* Herbert Xu.
|
|
|
|
* Copyright (c) 1991, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* This code is derived from software contributed to Berkeley by
|
|
|
|
* Kenneth Almquist.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
|
|
|
* From FreeBSD, from dash
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
|
|
|
|
#ifndef lint
|
2017-07-24 16:21:14 +03:00
|
|
|
__RCSID("$NetBSD: arith_token.c,v 1.6 2017/07/24 13:21:14 kre Exp $");
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
#endif /* not lint */
|
|
|
|
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "shell.h"
|
|
|
|
#include "arith_tokens.h"
|
|
|
|
#include "expand.h"
|
|
|
|
#include "error.h"
|
|
|
|
#include "memalloc.h"
|
|
|
|
#include "parser.h"
|
|
|
|
#include "syntax.h"
|
2017-05-30 01:54:07 +03:00
|
|
|
#include "show.h"
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
|
|
|
|
#if ARITH_BOR + ARITH_ASS_GAP != ARITH_BORASS || \
|
|
|
|
ARITH_ASS + ARITH_ASS_GAP != ARITH_EQ
|
|
|
|
#error Arithmetic tokens are out of order.
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Scan next arithmetic token, return its type,
|
|
|
|
* leave its value (when applicable) in (global) a_t_val.
|
|
|
|
*
|
|
|
|
* Input text is in (global) arith_buf which is updated to
|
|
|
|
* refer to the next char after the token returned, except
|
|
|
|
* on error (ARITH_BAD returned) where arith_buf is not altered.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
arith_token(void)
|
|
|
|
{
|
|
|
|
int token;
|
|
|
|
const char *buf = arith_buf;
|
|
|
|
char *end;
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
token = *buf;
|
|
|
|
|
2017-03-20 14:31:00 +03:00
|
|
|
if (isdigit(token)) {
|
|
|
|
/*
|
|
|
|
* Numbers all start with a digit, and nothing
|
|
|
|
* else does, the number ends wherever
|
|
|
|
* strtoimax() stops...
|
|
|
|
*/
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
a_t_val.val = strtoimax(buf, &end, 0);
|
|
|
|
arith_buf = end;
|
2017-05-30 01:54:07 +03:00
|
|
|
VTRACE(DBG_ARITH, ("Arith token ARITH_NUM=%jd\n",
|
|
|
|
a_t_val.val));
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
return ARITH_NUM;
|
|
|
|
|
2017-03-20 16:12:35 +03:00
|
|
|
} else if (is_name(token)) {
|
2017-03-20 14:31:00 +03:00
|
|
|
/*
|
|
|
|
* Variable names all start with an alpha (or '_')
|
|
|
|
* and nothing else does. They continue for the
|
|
|
|
* longest unbroken sequence of alphanumerics ( + _ )
|
|
|
|
*/
|
A better LINENO implementation. This version deletes (well, #if 0's out)
the LINENO hack, and uses the LINENO var for both ${LINENO} and $((LINENO)).
(Code to invert the LINENO hack when required, like when de-compiling the
execution tree to provide the "jobs" command strings, is still included,
that can be deleted when the LINENO hack is completely removed - look for
refs to VSLINENO throughout the code. The var funclinno in parser.c can
also be removed, it is used only for the LINENO hack.)
This version produces accurate results: $((LINENO)) was made as accurate
as the LINENO hack made ${LINENO} which is very good. That's why the
LINENO hack is not yet completely removed, so it can be easily re-enabled.
If you can tell the difference when it is in use, or not in use, then
something has broken (or I managed to miss a case somewhere.)
The way that LINENO works is documented in its own (new) section in the
man page, so nothing more about that, or the new options, etc, here.
This version introduces the possibility of having a "reference" function
associated with a variable, which gets called whenever the value of the
variable is required (that's what implements LINENO). There is just
one function pointer however, so any particular variable gets at most
one of the set function (as used for PATH, etc) or the reference function.
The VFUNCREF bit in the var flags indicates which func the variable in
question uses (if any - the func ptr, as before, can be NULL).
I would not call the results of this perfect yet, but it is close.
2017-06-07 08:08:32 +03:00
|
|
|
arith_var_lno = arith_lno;
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
p = buf;
|
|
|
|
while (buf++, is_in_name(*buf))
|
|
|
|
;
|
|
|
|
a_t_val.name = stalloc(buf - p + 1);
|
|
|
|
memcpy(a_t_val.name, p, buf - p);
|
|
|
|
a_t_val.name[buf - p] = '\0';
|
|
|
|
arith_buf = buf;
|
2017-05-30 01:54:07 +03:00
|
|
|
VTRACE(DBG_ARITH, ("Arith token ARITH_VAR=\"%s\"\n",
|
|
|
|
a_t_val.name));
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
return ARITH_VAR;
|
|
|
|
|
2017-03-20 14:31:00 +03:00
|
|
|
} else switch (token) {
|
|
|
|
/*
|
|
|
|
* everything else must be some kind of
|
|
|
|
* operator, white space, or an error.
|
|
|
|
*/
|
2017-05-30 01:54:07 +03:00
|
|
|
case '\n':
|
A better LINENO implementation. This version deletes (well, #if 0's out)
the LINENO hack, and uses the LINENO var for both ${LINENO} and $((LINENO)).
(Code to invert the LINENO hack when required, like when de-compiling the
execution tree to provide the "jobs" command strings, is still included,
that can be deleted when the LINENO hack is completely removed - look for
refs to VSLINENO throughout the code. The var funclinno in parser.c can
also be removed, it is used only for the LINENO hack.)
This version produces accurate results: $((LINENO)) was made as accurate
as the LINENO hack made ${LINENO} which is very good. That's why the
LINENO hack is not yet completely removed, so it can be easily re-enabled.
If you can tell the difference when it is in use, or not in use, then
something has broken (or I managed to miss a case somewhere.)
The way that LINENO works is documented in its own (new) section in the
man page, so nothing more about that, or the new options, etc, here.
This version introduces the possibility of having a "reference" function
associated with a variable, which gets called whenever the value of the
variable is required (that's what implements LINENO). There is just
one function pointer however, so any particular variable gets at most
one of the set function (as used for PATH, etc) or the reference function.
The VFUNCREF bit in the var flags indicates which func the variable in
question uses (if any - the func ptr, as before, can be NULL).
I would not call the results of this perfect yet, but it is close.
2017-06-07 08:08:32 +03:00
|
|
|
arith_lno++;
|
2017-05-30 01:54:07 +03:00
|
|
|
VTRACE(DBG_ARITH, ("Arith: newline\n"));
|
|
|
|
/* FALLTHROUGH */
|
2017-03-20 14:31:00 +03:00
|
|
|
case ' ':
|
|
|
|
case '\t':
|
|
|
|
buf++;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
default:
|
|
|
|
error("arithmetic: unexpected '%c' (%#x) in expression",
|
|
|
|
token, token);
|
|
|
|
/* NOTREACHED */
|
|
|
|
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
case '=':
|
|
|
|
token = ARITH_ASS;
|
|
|
|
checkeq:
|
|
|
|
buf++;
|
|
|
|
checkeqcur:
|
|
|
|
if (*buf != '=')
|
|
|
|
goto out;
|
|
|
|
token += ARITH_ASS_GAP;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '>':
|
|
|
|
switch (*++buf) {
|
|
|
|
case '=':
|
|
|
|
token = ARITH_GE;
|
|
|
|
break;
|
|
|
|
case '>':
|
|
|
|
token = ARITH_RSHIFT;
|
|
|
|
goto checkeq;
|
|
|
|
default:
|
|
|
|
token = ARITH_GT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '<':
|
|
|
|
switch (*++buf) {
|
|
|
|
case '=':
|
|
|
|
token = ARITH_LE;
|
|
|
|
break;
|
|
|
|
case '<':
|
|
|
|
token = ARITH_LSHIFT;
|
|
|
|
goto checkeq;
|
|
|
|
default:
|
|
|
|
token = ARITH_LT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '|':
|
|
|
|
if (*++buf != '|') {
|
|
|
|
token = ARITH_BOR;
|
|
|
|
goto checkeqcur;
|
|
|
|
}
|
|
|
|
token = ARITH_OR;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '&':
|
|
|
|
if (*++buf != '&') {
|
|
|
|
token = ARITH_BAND;
|
|
|
|
goto checkeqcur;
|
|
|
|
}
|
|
|
|
token = ARITH_AND;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '!':
|
|
|
|
if (*++buf != '=') {
|
|
|
|
token = ARITH_NOT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
token = ARITH_NE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0:
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
case '(':
|
|
|
|
token = ARITH_LPAREN;
|
|
|
|
break;
|
|
|
|
case ')':
|
|
|
|
token = ARITH_RPAREN;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '*':
|
|
|
|
token = ARITH_MUL;
|
|
|
|
goto checkeq;
|
|
|
|
case '/':
|
|
|
|
token = ARITH_DIV;
|
|
|
|
goto checkeq;
|
|
|
|
case '%':
|
|
|
|
token = ARITH_REM;
|
|
|
|
goto checkeq;
|
|
|
|
|
|
|
|
case '+':
|
2017-07-24 16:21:14 +03:00
|
|
|
if (buf[1] == '+') {
|
|
|
|
buf++;
|
|
|
|
token = ARITH_INCR;
|
|
|
|
break;
|
|
|
|
}
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
token = ARITH_ADD;
|
|
|
|
goto checkeq;
|
|
|
|
case '-':
|
2017-07-24 16:21:14 +03:00
|
|
|
if (buf[1] == '-') {
|
|
|
|
buf++;
|
|
|
|
token = ARITH_DECR;
|
|
|
|
break;
|
|
|
|
}
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
token = ARITH_SUB;
|
|
|
|
goto checkeq;
|
|
|
|
case '~':
|
|
|
|
token = ARITH_BNOT;
|
|
|
|
break;
|
|
|
|
case '^':
|
|
|
|
token = ARITH_BXOR;
|
|
|
|
goto checkeq;
|
|
|
|
|
|
|
|
case '?':
|
|
|
|
token = ARITH_QMARK;
|
|
|
|
break;
|
|
|
|
case ':':
|
|
|
|
token = ARITH_COLON;
|
|
|
|
break;
|
2017-07-24 16:21:14 +03:00
|
|
|
case ',':
|
|
|
|
token = ARITH_COMMA;
|
|
|
|
break;
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
buf++;
|
|
|
|
out:
|
|
|
|
arith_buf = buf;
|
2017-05-30 01:54:07 +03:00
|
|
|
VTRACE(DBG_ARITH, ("Arith token: %d\n", token));
|
Finish support for all required $(( )) (shell arithmetic) operators,
closing PR bin/50958
That meant adding the assignment operators ('=', and all of the +=, *= ...)
Currently, ++, --, and ',' are not implemented (none of those are required
by posix) but support for them (most likely ',' first) might be added later.
To do this, I removed the yacc/lex arithmetic parser completely, and
replaced it with a hand written recursive descent parser, that I obtained
from FreeBSD, who earlier had obtained it from dash (Herbert Xu).
While doing the import, I cleaned up the sources (changed some file names
to avoid requiring a clean build, or signifigant surgery to the obj
directories if "build.sh -u" was to be used - "build.sh -u" should work
fine as it is now) removed some dashisms, applied some KNF, ...
2017-03-20 14:26:07 +03:00
|
|
|
return token;
|
|
|
|
}
|