[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04-pre-pure-calc.patch
From: |
Akim Demaille |
Subject: |
04-pre-pure-calc.patch |
Date: |
Mon, 21 Oct 2002 09:23:32 +0200 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* tests/calc.at (_AT_DATA_CALC_Y): Define VAL, LOC, LEX_FORMALS,
LEX_PRE_FORMALS, LEX_ARGS, LEX_PRE_ARGS, USE_LEX_ARGS.
Use them to have `calc.y' ready for %pure-parser.
* data/yacc.c (YYLEX): Pass a yylex return type to
b4_c_function_call.
Index: TODO
--- TODO Sat, 19 Oct 2002 15:22:21 +0200 akim
+++ TODO Sat, 19 Oct 2002 15:30:29 +0200 akim
@@ -5,6 +5,13 @@
From Franc,ois: should we keep the directory part in the CPP guard?
+* Yacc.c: CPP Macros
+
+Do some people use YYPURE, YYLSP_NEEDED like we do in the test suite?
+They should not: it is not documented. But if they need to, let's
+find something clean (not like YYLSP_NEEDED...).
+
+
* readpipe
It should be replaced to avoid tmp files and to improve portability.
Index: data/yacc.c
--- data/yacc.c Sat, 19 Oct 2002 15:22:21 +0200 akim
+++ data/yacc.c Sat, 19 Oct 2002 16:38:26 +0200 akim
@@ -503,7 +503,7 @@ m4_define([b4_symbol_actions],
#ifdef YYLEX_PARAM
# define YYLEX yylex (b4_pure_if([&yylval[]b4_location_if([, &yylloc]),
])YYLEX_PARAM)
#else
-# define YYLEX b4_c_function_call([yylex],
+# define YYLEX b4_c_function_call([yylex], [int],
b4_pure_if([[[[]], [[&yylval]]],
b4_location_if([[[], [&yylloc]],])])
m4_fst(b4_lex_param))
Index: tests/calc.at
--- tests/calc.at Sat, 19 Oct 2002 15:22:21 +0200 akim
+++ tests/calc.at Sat, 19 Oct 2002 16:37:35 +0200 akim
@@ -52,12 +52,6 @@ m4_define([_AT_DATA_CALC_Y],
#endif
#include <ctype.h>
-static int power (int base, int exponent);
-static void yyerror (const char *s);
-static int yylex (void);
-static int yygetc (void);
-static void yyungetc (int c);
-
extern void perror (const char *s);
/* Exercise pre-prologue dependency to %union. */
@@ -71,8 +65,44 @@ m4_define([_AT_DATA_CALC_Y],
value_t ival;
};
+%{
+#if YYPURE
+# define LOC (*yylloc)
+# define VAL (*yylval)
+#else
+# define LOC (yylloc)
+# define VAL (yylval)
+#endif
+
+#if YYPURE
+# if YYLSP_NEEDED
+# define LEX_FORMALS YYSTYPE *yylval, YYLTYPE *yylloc
+# define LEX_ARGS yylval, yylloc
+# define USE_LEX_ARGS (void) yylval; (void) yylloc;
+# else
+# define LEX_FORMALS YYSTYPE *yylval
+# define LEX_ARGS yylval
+# define USE_LEX_ARGS (void) yylval
+# endif
+# define LEX_PRE_FORMALS LEX_FORMALS,
+# define LEX_PRE_ARGS LEX_ARGS,
+#else
+# define LEX_FORMALS void
+# define LEX_PRE_FORMALS
+# define LEX_ARGS
+# define LEX_PRE_ARGS
+# define USE_LEX_ARGS
+#endif
+
+static int power (int base, int exponent);
+static void yyerror (const char *s);
+static int yylex (LEX_FORMALS);
+static int yygetc (LEX_FORMALS);
+static void yyungetc (LEX_PRE_FORMALS int c);
+%}
+
/* Bison Declarations */
-%token CALC_EOF 0 "end of file"
+%token CALC_EOF 0 "end of input"
%token <ival> NUM "number"
%type <ival> exp
@@ -92,8 +122,8 @@ input:
;
line:
- '\n' {}
-| exp '\n' {}
+ '\n'
+| exp '\n'
;
exp:
@@ -122,8 +152,8 @@ exp:
{
#if YYLSP_NEEDED
fprintf (stderr, "%d.%d-%d.%d: ",
- yylloc.first_line, yylloc.first_column,
- yylloc.last_line, yylloc.last_column);
+ LOC.first_line, LOC.first_column,
+ LOC.last_line, LOC.last_column);
#endif
fprintf (stderr, "%s\n", s);
}
@@ -133,53 +163,56 @@ exp:
static YYLTYPE last_yylloc;
#endif
static int
-yygetc (void)
+yygetc (LEX_FORMALS)
{
int res = getc (yyin);
+ USE_LEX_ARGS;
#if YYLSP_NEEDED
- last_yylloc = yylloc;
+ last_yylloc = LOC;
if (res == '\n')
{
- yylloc.last_line++;
- yylloc.last_column = 1;
+ LOC.last_line++;
+ LOC.last_column = 1;
}
else
- yylloc.last_column++;
+ LOC.last_column++;
#endif
return res;
}
static void
-yyungetc (int c)
+yyungetc (LEX_PRE_FORMALS int c)
{
+ USE_LEX_ARGS;
#if YYLSP_NEEDED
/* Wrong when C == `\n'. */
- yylloc = last_yylloc;
+ LOC = last_yylloc;
#endif
ungetc (c, yyin);
}
static int
-read_signed_integer (void)
+read_signed_integer (LEX_FORMALS)
{
- int c = yygetc ();
+ int c = yygetc (LEX_ARGS);
int sign = 1;
int n = 0;
+ USE_LEX_ARGS;
if (c == '-')
{
- c = yygetc ();
+ c = yygetc (LEX_ARGS);
sign = -1;
}
while (isdigit (c))
{
n = 10 * n + (c - '0');
- c = yygetc ();
+ c = yygetc (LEX_ARGS);
}
- yyungetc (c);
+ yyungetc (LEX_PRE_ARGS c);
return sign * n;
}
@@ -193,29 +226,39 @@ exp:
`---------------------------------------------------------------*/
static int
-yylex (void)
+yylex (LEX_FORMALS)
{
+ static int init = 1;
int c;
+ if (init)
+ {
+ init = 0;
+#if YYLSP_NEEDED
+ yylloc.last_column = 1;
+ yylloc.last_line = 1;
+#endif
+ }
+
#if YYLSP_NEEDED
- yylloc.first_column = yylloc.last_column;
- yylloc.first_line = yylloc.last_line;
+ LOC.first_column = LOC.last_column;
+ LOC.first_line = LOC.last_line;
#endif
/* Skip white space. */
- while ((c = yygetc ()) == ' ' || c == '\t')
+ while ((c = yygetc (LEX_ARGS)) == ' ' || c == '\t')
{
#if YYLSP_NEEDED
- yylloc.first_column = yylloc.last_column;
- yylloc.first_line = yylloc.last_line;
+ LOC.first_column = LOC.last_column;
+ LOC.first_line = LOC.last_line;
#endif
}
/* process numbers */
if (c == '.' || isdigit (c))
{
- yyungetc (c);
- yylval.ival = read_signed_integer ();
+ yyungetc (LEX_PRE_ARGS c);
+ VAL.ival = read_signed_integer (LEX_ARGS);
return NUM;
}
@@ -257,10 +300,6 @@ exp:
#if YYDEBUG
yydebug = 1;
#endif
-#if YYLSP_NEEDED
- yylloc.last_column = 1;
- yylloc.last_line = 1;
-#endif
yyparse ();
return 0;
}
@@ -412,7 +451,7 @@ m4_define([AT_CHECK_CALC],
[2.1-2.2: parse error, unexpected '+'])
# Exercise error messages with EOF: work on an empty file.
_AT_CHECK_CALC_ERROR([$1], [/dev/null], [4],
- [1.1-1.2: parse error, unexpected "end of file",
expecting "number" or '-' or '\n' or '('])
+ [1.1-1.2: parse error, unexpected "end of input",
expecting "number" or '-' or '\n' or '('])
# Exercise the error token: without it, we die at the first error,
# hence be sure i. to have several errors, ii. to test the action
@@ -457,10 +496,13 @@ m4_define([AT_CHECK_CALC_LALR],
AT_CHECK_CALC_LALR([%error-verbose %locations])
-AT_CHECK_CALC_LALR([%error-verbose --defines %locations --name-prefix=calc
--verbose --yacc])
+AT_CHECK_CALC_LALR([%error-verbose %locations --defines --name-prefix=calc
--verbose --yacc])
AT_CHECK_CALC_LALR([%debug])
-AT_CHECK_CALC_LALR([%error-verbose %debug --defines %locations
--name-prefix=calc --verbose --yacc])
+AT_CHECK_CALC_LALR([%error-verbose %debug %locations --defines
--name-prefix=calc --verbose --yacc])
+
+# FIXME: Not ready yet.
+# AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations --defines
--name-prefix=calc --verbose --yacc])
# ----------------------- #
@@ -488,7 +530,7 @@ m4_define([AT_CHECK_CALC_GLR],
AT_CHECK_CALC_GLR([%error-verbose %locations])
-AT_CHECK_CALC_GLR([%error-verbose --defines %locations --name-prefix=calc
--verbose --yacc])
+AT_CHECK_CALC_GLR([%error-verbose %locations --defines --name-prefix=calc
--verbose --yacc])
AT_CHECK_CALC_GLR([%debug])
-AT_CHECK_CALC_GLR([%error-verbose %debug --defines %locations
--name-prefix=calc --verbose --yacc])
+AT_CHECK_CALC_GLR([%error-verbose %debug %locations --defines
--name-prefix=calc --verbose --yacc])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 04-pre-pure-calc.patch,
Akim Demaille <=