diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e5f055f8c4..6865c218b1 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -51,11 +51,12 @@ jobs: - name: Install libraries run: | brew upgrade - brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline + brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline bison working-directory: src - name: Set ENV run: | echo "MAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV + echo "PATH="/usr/local/opt/bison/bin:$PATH"" >> $GITHUB_ENV - run: ./autogen.sh working-directory: src - name: Run configure diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb index b838a78db7..cd85a5da61 100644 --- a/ext/ripper/tools/preproc.rb +++ b/ext/ripper/tools/preproc.rb @@ -47,7 +47,7 @@ def prelude(f, out) when /\A%%/ out << "%%\n" return - when /\A%token/ + when /\A%token/, /\A} / out << line.sub(/<\w+>/, '') when /\A%type/ out << line.sub(/<\w+>/, '') diff --git a/parse.y b/parse.y index f4b4b8f3d1..f6b32d5c97 100644 --- a/parse.y +++ b/parse.y @@ -1140,6 +1140,14 @@ static int looking_at_eol_p(struct parser_params *p); %define api.pure %define parse.error verbose %printer { +#ifndef RIPPER + if ($$) { + rb_parser_printf(p, "%s", ruby_node_name(nd_type($$))); + } +#else +#endif +} +%printer { #ifndef RIPPER rb_parser_printf(p, "%"PRIsVALUE, rb_id2str($$)); #else