parser.yy: get along without %code Bison directive to reduce dependencies

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index d27b0d3a50f01484770ca2eb6579b86c9a5afef6..4c5f9268c249b60dd7d1ca97f837ee4ab08a2e3a 100644 (file)
--- 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 981cf40bab5a40570601b3a2b517714b5755c88d..079573648e3c93d251e64760706e137d4819dd45 100644 (file)
--- 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}