X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0fe9720964da510a2b359af390a3053aace65f9f..66b03e134fd851db9de1f57f8fe110799375234e:/cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 3036ee85..1939ae47 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -81,10 +81,11 @@ sc_prohibit_tab_based_indentation:
 
 # Prohibit the use of `...` in tests/.  Use $(...) instead.
 # Taken from Coreutils.
-sc_prohibit_test_backticks:
-	@prohibit='`' in_vc_files='^tests/'				\
-	halt='use $$(...), not `...` in tests/'				\
-	  $(_sc_search_regexp)
+# Not ready for Bison yet.
+#sc_prohibit_test_backticks:
+#	@prohibit='`' in_vc_files='^tests/'		\
+#	halt='use $$(...), not `...` in tests/'		\
+#	  $(_sc_search_regexp)
 
 # Enforce recommended preprocessor indentation style.
 # Taken from Coreutils.
@@ -98,7 +99,7 @@ sc_preprocessor_indentation:
 	fi
 
 ###########################################################
-# Taken from the Coreitil
+# Taken from Coreutils.
 _p0 = \([^"'/]\|"\([^\"]\|[\].\)*"\|'\([^\']\|[\].\)*'
 _pre = $(_p0)\|[/][^"'/*]\|[/]"\([^\"]\|[\].\)*"\|[/]'\([^\']\|[\].\)*'\)*
 _pre_anchored = ^\($(_pre)\)
@@ -134,7 +135,7 @@ _sed_rm_comments_q = $(subst ','\'',$(_sed_remove_comments))
 
 _space_before_paren_exempt =? \\n\\$$
 _space_before_paren_exempt = \
-  (^ *\#|\\n\\$$|%s\(to %s|(date|group|character)\(s\))
+  (^ *\#|(LA)?LR\([01]\)|percent_(code|define)|b4_syncline|m4_(define|init)|symbol)
 # Ensure that there is a space before each open parenthesis in C code.
 sc_space_before_open_paren:
 	@if $(VC_LIST_EXCEPT) | grep -l '\.[ch]$$' > /dev/null; then	\
@@ -171,9 +172,9 @@ $(call exclude,								\
   prohibit_doubled_word=^tests/named-refs.at$$                          \
   prohibit_magic_number_exit=^doc/bison.texi$$				\
   prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$	\
-  prohibit_strcmp=^doc/bison\.texi$$					\
+  prohibit_strcmp=^doc/bison\.texi|tests/local\.at$$			\
   prohibit_tab_based_indentation=\.(am|mk)$$|^djgpp/|^\.git		\
   require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$		\
-  space_tab=^tests/(input|c\+\+)\.at$$					\
+  space_before_open_paren=^(data/|djgpp/)                               \
   unmarked_diagnostics=^(djgpp/|doc/bison.texi$$|tests/c\+\+\.at$$)	\
 )