parser.y: GLR -> LALR

NixOS · Jul 20, 2024 · 6da99c3 · 6da99c3
1 parent abe6928
commit 6da99c3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
@@ -1,4 +1,4 @@
-%glr-parser
+%define api.location.type { ::nix::ParserLocation }
 %define api.pure
 %locations
 %define parse.error verbose
@@ -9,7 +9,6 @@
 %lex-param { void * scanner }
 %lex-param { nix::ParserState * state }
 %expect 0
-%expect-rr 0
 
 %code requires {
 
@@ -27,7 +26,7 @@
 #include "eval-settings.hh"
 #include "parser-state.hh"
 
-#define YYLTYPE ::nix::ParserLocation
+#define YYLTYPE_IS_TRIVIAL 1
 #define YY_DECL int yylex \
     (YYSTYPE * yylval_param, YYLTYPE * yylloc_param, yyscan_t yyscanner, nix::ParserState * state)
 
@@ -77,7 +76,7 @@ YY_DECL;
 
 using namespace nix;
 
-#define CUR_POS state->at(*yylocp)
+#define CUR_POS state->at(yyloc)
 
 
 void yyerror(YYLTYPE * loc, yyscan_t scanner, ParserState * state, const char * error)