From d15e5e49e148b253703cdcfad9b66a7fb29d404f Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sat, 22 Sep 2012 19:36:25 +0200 Subject: [PATCH] parser.yy: get along without %code Bison directive to reduce dependencies --- lily/include/lily-lexer.hh | 2 +- lily/parser.yy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh index d27b0d3a50..4c5f9268c2 100644 --- a/lily/include/lily-lexer.hh +++ b/lily/include/lily-lexer.hh @@ -54,7 +54,7 @@ private: public: SCM eval_scm_token (SCM sval) { return eval_scm (sval, '#'); } SCM extra_tokens_; - YYSTYPE *lexval_; + SCM *lexval_; Input *lexloc_; bool is_main_input_; diff --git a/lily/parser.yy b/lily/parser.yy index 981cf40bab..079573648e 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -27,7 +27,7 @@ * inconsistent state of indentation. */ -%code requires { +%{ #define yyerror Lily_parser::parser_error @@ -49,7 +49,7 @@ free (p); \ } while (0) -} +%} %parse-param {Lily_parser *parser} %parse-param {SCM *retval} -- 2.39.2