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
|
|
|
/* $NetBSD: arith_tokens.h,v 1.2 2017/06/07 05:08:32 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) 1993
|
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
|
* Copyright (c) 2007
|
|
|
|
|
* Herbert Xu <herbert@gondor.apana.org.au>. 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 who obtained it from dash (modified both times.)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Tokens returned from arith_token()
|
|
|
|
|
*
|
|
|
|
|
* Caution, values are not arbitrary.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define ARITH_BAD 0
|
|
|
|
|
|
|
|
|
|
#define ARITH_ASS 1
|
|
|
|
|
|
|
|
|
|
#define ARITH_OR 2
|
|
|
|
|
#define ARITH_AND 3
|
|
|
|
|
#define ARITH_NUM 5
|
|
|
|
|
#define ARITH_VAR 6
|
|
|
|
|
#define ARITH_NOT 7
|
|
|
|
|
|
|
|
|
|
#define ARITH_BINOP_MIN 8
|
|
|
|
|
|
|
|
|
|
#define ARITH_LE 8
|
|
|
|
|
#define ARITH_GE 9
|
|
|
|
|
#define ARITH_LT 10
|
|
|
|
|
#define ARITH_GT 11
|
|
|
|
|
#define ARITH_EQ 12 /* Must be ARITH_ASS + ARITH_ASS_GAP */
|
|
|
|
|
|
|
|
|
|
#define ARITH_ASS_BASE 13
|
|
|
|
|
|
|
|
|
|
#define ARITH_REM 13
|
|
|
|
|
#define ARITH_BAND 14
|
|
|
|
|
#define ARITH_LSHIFT 15
|
|
|
|
|
#define ARITH_RSHIFT 16
|
|
|
|
|
#define ARITH_MUL 17
|
|
|
|
|
#define ARITH_ADD 18
|
|
|
|
|
#define ARITH_BOR 19
|
|
|
|
|
#define ARITH_SUB 20
|
|
|
|
|
#define ARITH_BXOR 21
|
|
|
|
|
#define ARITH_DIV 22
|
|
|
|
|
|
|
|
|
|
#define ARITH_NE 23
|
|
|
|
|
|
|
|
|
|
#define ARITH_BINOP_MAX 24
|
|
|
|
|
|
|
|
|
|
#define ARITH_ASS_MIN ARITH_BINOP_MAX
|
|
|
|
|
#define ARITH_ASS_GAP (ARITH_ASS_MIN - ARITH_ASS_BASE)
|
|
|
|
|
|
|
|
|
|
#define ARITH_REMASS (ARITH_ASS_GAP + ARITH_REM)
|
|
|
|
|
#define ARITH_BANDASS (ARITH_ASS_GAP + ARITH_BAND)
|
|
|
|
|
#define ARITH_LSHIFTASS (ARITH_ASS_GAP + ARITH_LSHIFT)
|
|
|
|
|
#define ARITH_RSHIFTASS (ARITH_ASS_GAP + ARITH_RSHIFT)
|
|
|
|
|
#define ARITH_MULASS (ARITH_ASS_GAP + ARITH_MUL)
|
|
|
|
|
#define ARITH_ADDASS (ARITH_ASS_GAP + ARITH_ADD)
|
|
|
|
|
#define ARITH_BORASS (ARITH_ASS_GAP + ARITH_BOR)
|
|
|
|
|
#define ARITH_SUBASS (ARITH_ASS_GAP + ARITH_SUB)
|
|
|
|
|
#define ARITH_BXORASS (ARITH_ASS_GAP + ARITH_BXOR)
|
|
|
|
|
#define ARITH_DIVASS (ARITH_ASS_GAP + ARITH_BXOR)
|
|
|
|
|
|
|
|
|
|
#define ARITH_ASS_MAX 34
|
|
|
|
|
|
|
|
|
|
#define ARITH_LPAREN 34
|
|
|
|
|
#define ARITH_RPAREN 35
|
|
|
|
|
#define ARITH_BNOT 36
|
|
|
|
|
#define ARITH_QMARK 37
|
|
|
|
|
#define ARITH_COLON 38
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Globals shared between arith parser, and lexer
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
extern const char *arith_buf;
|
|
|
|
|
|
|
|
|
|
union a_token_val {
|
|
|
|
|
intmax_t val;
|
|
|
|
|
char *name;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern union a_token_val a_t_val;
|
|
|
|
|
|
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
|
|
|
extern int arith_lno, arith_var_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
|
|
|
int arith_token(void);
|