From 7202159bf9d6c12ee490f5ee12b91ff9d18571e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Wed, 29 Apr 1998 23:32:36 -0700
Subject: [PATCH] F_OFFSET is now in langauge.yacc instead of configure.in
Rev: src/acconfig.h:1.21
Rev: src/configure.in:1.180
Rev: src/language.yacc:1.94
---
src/acconfig.h | 5 +----
src/configure.in | 31 +------------------------------
src/language.yacc | 3 ++-
3 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/src/acconfig.h b/src/acconfig.h
index 8e856a1838..887898b195 100644
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -1,5 +1,5 @@
/*
- * $Id: acconfig.h,v 1.20 1998/04/13 14:14:41 grubba Exp $
+ * $Id: acconfig.h,v 1.21 1998/04/30 06:32:36 hubbe Exp $
*/
#ifndef MACHINE_H
#define MACHINE_H
@@ -133,9 +133,6 @@
/* Number of possible filedesriptors */
#define MAX_OPEN_FILEDESCRIPTORS 1024
-/* Value of first constant defined by byacc/bison/yacc or whatever you use. */
-#define F_OFFSET 257
-
/* define this if #include <time.h> provides an external int timezone */
#undef HAVE_EXTERNAL_TIMEZONE
diff --git a/src/configure.in b/src/configure.in
index 5e8e2111c2..9aa4f35a88 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.179 1998/04/29 00:30:49 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.180 1998/04/30 06:32:36 hubbe Exp $")
AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h)
@@ -651,35 +651,6 @@ fi
#############################################################################
-AC_MSG_CHECKING(first yacc define)
-AC_CACHE_VAL(pike_cv_yacc_first,
-[
-cat >conftest.y <<\EOF
-%token GURKA
-%%
-all: GURKA
-%%
-EOF
-pike_cv_yacc_first=257;
-if $YACC -d conftest.y 1>&5 2>&5; then
- if test -f y.tab.h; then
- pike_cv_yacc_first=`egrep GURKA y.tab.h | sed 's/^#[^0-9]*\([0-9]*\)[^0-9]*$/\1/'`
- echo $pike_cv_yacc_first >conftest.out
- if egrep '^(0|1|2|3|4|5|6|7|8|9)+$' conftest.out >/dev/null 2>&1; then
- echo >/dev/null
- else
- pike_cv_yacc_first=257
- fi
- fi
-fi
-])
-AC_MSG_RESULT($pike_cv_yacc_first)
-AC_DEFINE_UNQUOTED(F_OFFSET,$pike_cv_yacc_first)
-
-rm -rf conftest.y y.tab.c y.tab.h conftest.out
-
-#############################################################################
-
AC_HEADER_TIME
AC_HEADER_STDC
AC_CHECK_HEADERS(sys/rusage.h time.h sys/time.h sys/types.h unistd.h stdlib.h \
diff --git a/src/language.yacc b/src/language.yacc
index 38ddec8e0d..0e7cda94d7 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -8,6 +8,7 @@
* These values are used by the stack machine, and can not be directly
* called from Pike.
*/
+%token F_OFFSET
%token F_PREFIX_256 F_PREFIX_512 F_PREFIX_768 F_PREFIX_1024
%token F_PREFIX_CHARX256 F_PREFIX_WORDX256 F_PREFIX_24BITX256
%token F_POP_VALUE F_POP_N_ELEMS F_MARK F_MARK2 F_MARK_X F_LDA
@@ -176,7 +177,7 @@
/* This is the grammar definition of Pike. */
#include "global.h"
-RCSID("$Id: language.yacc,v 1.93 1998/04/28 15:46:27 grubba Exp $");
+RCSID("$Id: language.yacc,v 1.94 1998/04/30 06:32:36 hubbe Exp $");
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
--
GitLab