summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1996-05-30 20:52:26 +0000
committerphk <phk@FreeBSD.org>1996-05-30 20:52:26 +0000
commita81e9f20dc40905b6464a5693bfcc0acafcc4194 (patch)
treed334720e9d0fc51ccc7cc6ba26607e58456a0237 /bin
parent8ed246fa9a32cd3117399666e266ff30de8bc63a (diff)
downloadFreeBSD-src-a81e9f20dc40905b6464a5693bfcc0acafcc4194.zip
FreeBSD-src-a81e9f20dc40905b6464a5693bfcc0acafcc4194.tar.gz
Use new yacc rules. (I'm fixing the tree as fast as I can :-)
Diffstat (limited to 'bin')
-rw-r--r--bin/sh/Makefile9
-rw-r--r--bin/sh/arith_lex.l4
2 files changed, 7 insertions, 6 deletions
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index b52b94d..32c3b4d 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,12 +1,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-# $Id: Makefile,v 1.8 1995/08/27 20:26:40 joerg Exp $
+# $Id: Makefile,v 1.9 1996/02/03 13:27:54 joerg Exp $
PROG= sh
-SRCS= alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \
+SRCS= alias.c arith.y arith_lex.l builtins.c cd.c echo.c error.c eval.c \
+ exec.c expand.c \
histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \
mystring.c nodes.c options.c parser.c printf.c redir.c show.c \
signames.c syntax.c trap.c output.c var.c
-OBJS+= init.o arith.o arith_lex.o
+OBJS+= init.o
DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
LDADD= -ll -ledit -ltermcap
LFLAGS= -8 # 8-bit lex scanner for arithmetic
@@ -17,7 +18,7 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR}
CLEANFILES+=\
builtins.c builtins.h init.c mkinit mknodes mksignames mksyntax \
nodes.c nodes.h signames.c signames.h syntax.c syntax.h token.def \
- y.tab.h
+ arith.tab.h
.depend parser.o: token.def
token.def: mktokens
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index c50463f..5a94576 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -34,14 +34,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: arith_lex.l,v 1.2 1994/09/24 02:57:22 davidg Exp $
*/
#ifndef lint
static char sccsid[] = "@(#)arith_lex.l 8.1 (Berkeley) 5/31/93";
#endif /* not lint */
-#include "y.tab.h"
+#include "arith.tab.h"
extern yylval;
extern char *arith_buf, *arith_startbuf;
OpenPOWER on IntegriCloud