From 6d58f297cc45c053f706da991e5b58c5505af7c4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 31 Jul 2022 12:40:32 -0700 Subject: =?UTF-8?q?maint:=20don=E2=80=99t=20use=20\]=20in=20BREs=20and=20E?= =?UTF-8?q?REs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * .travis.yml (jobs): * doc/local.mk ($(top_srcdir)/%D%/bison.help): * tests/regression.at (Web2c Actions, Useless Tokens): * tests/scanner.at (Token numbers: $1): Use plain ], not \], in a POSIX regular expression, as POSIX says the interpretation of \] is undefined. --- .travis.yml | 2 +- doc/local.mk | 2 +- tests/regression.at | 8 ++++---- tests/scanner.at | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a801ea2e..4e6e116f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ jobs: - git submodule update --init --recursive # As of 2021-08, we don't have Autoconf 2.71 on Ubuntu. - - sed -i 's/AC_PREREQ(\[2\.71\])/AC_PREREQ([2.69])/g' configure.ac + - sed -i 's/AC_PREREQ(\[2\.71])/AC_PREREQ([2.69])/g' configure.ac - ./bootstrap - ./configure --enable-gcc-warnings || { cat config.log && false; } - make -j2 diff --git a/doc/local.mk b/doc/local.mk index 1911c2a1..1abe658e 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -114,7 +114,7 @@ $(top_srcdir)/%D%/bison.help: src/bison$(EXEEXT) $(AM_V_at) LC_ALL=C tests/bison --version >%D%/bison.help.tmp $(AM_V_at) LC_ALL=C tests/bison --help | \ ## Avoid depending on the path to Bison. - sed -e 's,^Usage: .*/bison \[OPTION\],Usage: bison [OPTION],g' \ + sed -e 's,^Usage: .*/bison \[OPTION],Usage: bison [OPTION],g' \ ## Avoid variations in the output depending on whether we are ## on a glibc system. -e '/translation bugs/d' >>%D%/bison.help.tmp diff --git a/tests/regression.at b/tests/regression.at index 536df360..89a4649a 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -674,7 +674,7 @@ else: "else" statement; AT_BISON_CHECK([-v -o input.c input.y]) # Check only the tables. -[sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p;/#define YY.*NINF/p' input.c >tables.c] +[sed -n 's/ *$//;/^static const.*\[] =/,/^}/p;/#define YY.*NINF/p' input.c >tables.c] AT_CHECK([[cat tables.c]], 0, [[static const yytype_int8 yytranslate[] = @@ -777,8 +777,8 @@ AT_CLEANUP # # LC_ALL=C /usr/local/stow/bison-3.7.5/bin/bison input.y -o old.c && # LC_ALL=C bison input.y -o new.c && -# sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p' old.c >old.tables && -# sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p' new.c >new.tables && +# sed -n 's/ *$//;/^static const.*\[] =/,/^}/p' old.c >old.tables && +# sed -n 's/ *$//;/^static const.*\[] =/,/^}/p' new.c >new.tables && # diff old.tables new.tables # # The following Ruby script normalizes token and nterm names. @@ -912,7 +912,7 @@ n84: T46 T88 T89; AT_BISON_CHECK([-Wno-other -o input.c input.y]) # Check only the tables. -[sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p;/#define YY.*NINF/p' input.c >tables.c] +[sed -n 's/ *$//;/^static const.*\[] =/,/^}/p;/#define YY.*NINF/p' input.c >tables.c] AT_CHECK([[cat tables.c]], 0, [[static const yytype_int8 yytranslate[] = diff --git a/tests/scanner.at b/tests/scanner.at index 7046914e..1273630c 100644 --- a/tests/scanner.at +++ b/tests/scanner.at @@ -308,7 +308,7 @@ AT_FULL_COMPILE([input]) # lalr1.cc uses 'translate_table' (and yytranslate_). # lalr1.d uses 'byte[] translate_table =' (and yytranslate_). # lalr1.java uses 'byte[] translate_table_ =' (and yytranslate_). -AT_CHECK([[$EGREP -c 'yytranslate\[\]|translate_table\[\]|translate_table =|translate_table_ =' input.]AT_LANG_EXT], +AT_CHECK([[$EGREP -c 'yytranslate\[]|translate_table\[]|translate_table =|translate_table_ =' input.]AT_LANG_EXT], [ignore], [AT_D_IF([AT_TOKEN_RAW_IF([0], [0])], [AT_TOKEN_RAW_IF([0], [1])])[ -- cgit v1.2.1