[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] tests: synclines: style changes.
From: |
Akim Demaille |
Subject: |
[PATCH 2/3] tests: synclines: style changes. |
Date: |
Wed, 1 Aug 2012 10:34:16 +0200 |
* tests/synclines.at (AT_TEST_SYNCLINE): Rename as...
(AT_TEST): this.
Use pushdef/popdef.
Formatting changes.
Use '+' instead of '*' where appropriate.
---
tests/synclines.at | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/tests/synclines.at b/tests/synclines.at
index 1bda1c4..61f274a 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -65,21 +65,21 @@ m4_define([AT_SYNCLINES_COMPILE],
# distcc[35882] Warning: failed to distribute input.c to chrisimac/4,
running locally instead
AT_CHECK([[perl -p -0777 - stderr <<\EOF
- s/^distcc\[\d+\] .*\n//gm;
- s/^([^:]*:\d+)[.:][^:]*:(.*)$/$][1:$][2/gm;
- s/^([^:]*:\d+:)[^#]*( #error)/$][1$][2/gm;
- s/^[^:]*: In function '[^']*':\n//gm;
- s/^\ +#error.*\n\ *\^\n//gm;
+ s/^distcc\[\d+\] .*\n//gm;
+ s/^([^:]+:\d+)[.:][^:]+:(.+)$/$][1:$][2/gm;
+ s/^([^:]+:\d+):[^#]*( #error)/$][1:$][2/gm;
+ s/^[^:]*: In function '[^']+':\n//gm;
+ s/^\ +#error.*\n\ *\^\n//gm;
EOF
]],
- 0, [stdout])
+ 0, [stdout])
])
-# AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG)
-# -----------------------------------------
+# AT_TEST(TITLE, INPUT, ERROR-MSG)
+# --------------------------------
# Check that compiling the parser produced from INPUT cause GCC
# to issue ERROR-MSG.
-m4_define([AT_TEST_SYNCLINE],
+m4_pushdef([AT_TEST],
[AT_SETUP([$1])
AT_BISON_OPTION_PUSHDEFS
# It seems impossible to find a generic scheme to check the location
@@ -121,7 +121,7 @@ AT_CLEANUP
## --------------------- ##
-AT_TEST_SYNCLINE([Prologue synch line],
+AT_TEST([Prologue synch line],
[[%{
#error "2"
]AT_YYERROR_DECLARE_EXTERN[
@@ -139,7 +139,7 @@ exp: '0';
## %union synch line. ##
## ------------------- ##
-AT_TEST_SYNCLINE([%union synch line],
+AT_TEST([%union synch line],
[[%union {
#error "2"
char dummy;
@@ -160,7 +160,7 @@ exp: '0';
## Postprologue synch line. ##
## ------------------------- ##
-AT_TEST_SYNCLINE([Postprologue synch line],
+AT_TEST([Postprologue synch line],
[[%{
]AT_YYERROR_DECLARE_EXTERN[
]AT_YYLEX_DECLARE_EXTERN[
@@ -184,7 +184,7 @@ exp: '0';
## Action synch line. ##
## ------------------- ##
-AT_TEST_SYNCLINE([Action synch line],
+AT_TEST([Action synch line],
[[%{
]AT_YYERROR_DECLARE_EXTERN[
]AT_YYLEX_DECLARE_EXTERN[
@@ -203,7 +203,7 @@ exp:
## Epilogue synch line. ##
## --------------------- ##
-AT_TEST_SYNCLINE([Epilogue synch line],
+AT_TEST([Epilogue synch line],
[[%{
]AT_YYERROR_DECLARE_EXTERN[
]AT_YYLEX_DECLARE_EXTERN[
@@ -215,3 +215,5 @@ exp: '0';
]],
[input.y:8: #error "8"
])
+
+m4_popdef([AT_TEST])
--
1.7.11.3