summaryrefslogtreecommitdiffabout
path: root/src
authorSergey Poznyakoff <gray@gnu.org>2018-11-04 08:13:13 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-11-04 08:16:53 (GMT)
commitde948955aba8be2c227a5f585891332181a06688 (patch) (side-by-side diff)
treedd95372fd797e8b904bc80b85168458e7263f380 /src
parentd8b9854a76d69e99bbbddd285a0e0d7727a62e4f (diff)
downloadmailfromd-de948955aba8be2c227a5f585891332181a06688.tar.gz
mailfromd-de948955aba8be2c227a5f585891332181a06688.tar.bz2
Fix indentation of the generated sources
* NEWS: Version 8.6.90 * configure.ac: Version 8.6.90 Check for GNU indent * am/indent.m4: New file. * src/builtin/Makefile.am (EXTRA_DIST): Add indent.pro (.bi.c, .def.h): Use GNU indent if available. * src/builtin/indent.pro: New file. * src/builtin/snarf.m4: Minor change.
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/builtin/Makefile.am15
-rw-r--r--src/builtin/indent.pro36
-rw-r--r--src/builtin/snarf.m42
3 files changed, 49 insertions, 4 deletions
diff --git a/src/builtin/Makefile.am b/src/builtin/Makefile.am
index 7d5db66..bf61f16 100644
--- a/src/builtin/Makefile.am
+++ b/src/builtin/Makefile.am
@@ -64,7 +64,8 @@ EXTRA_DIST = \
builtin.def\
builtin.h\
init.m4\
- snarf.m4
+ snarf.m4\
+ indent.pro
BUILT_SOURCES=\
$(BI_FILES:.bi=.c)\
@@ -87,9 +88,17 @@ SUFFIXES = .bi .c .def .h .mfi .mf
M4=m4
+if COND_GNU_INDENT
+ REINDENT = | INDENT_PROFILE=$(srcdir)/indent.pro $(INDENT)
+else
+ REINDENT =
+endif
+
.bi.c:
- $(AM_V_GEN)$(M4) --prefix -s -DSOURCE="$<" $(top_srcdir)/src/builtin/snarf.m4 $< > $@
+ $(AM_V_GEN)$(M4) --prefix -s -DSOURCE="$<" \
+ $(srcdir)/snarf.m4 $< $(REINDENT) > $@
.def.h:
- $(AM_V_GEN) $(M4) --prefix $(top_srcdir)/src/builtin/init.m4 $(BI_FILES) $< > $@
+ $(AM_V_GEN) $(M4) --prefix \
+ $(srcdir)/init.m4 $(BI_FILES) $< $(REINDENT) > $@
diff --git a/src/builtin/indent.pro b/src/builtin/indent.pro
new file mode 100644
index 0000000..45ac512
--- a/dev/null
+++ b/src/builtin/indent.pro
@@ -0,0 +1,36 @@
+// GNU indent options for formatting files generated -*- fundamental -*-
+// from MFL .bi sources.
+-nbad // don't force blank line after every block of declarations
+-bap // force blank line after every procedure body
+-nbc // don't force newline after each comma in declaration
+-bbo // break long lines before boolean operators
+-hnl // honour (original) newlines
+-br // retain braces on the same line with the conditional
+-brs // retain braces on the same line with struct definitions
+-c33 // column number for comments following the code
+-cd33 // column number for comments following the declaration
+-ncdb // don't place comment delimiters on blank lines
+-ce // 'else' remains on the same line with '}'
+-ci4 // indent level for subsequent lines of a split statement
+-cli0 // case label indent
+-d0 // align separate comments with the enclosing code
+-di1 // place identifiers in a declaration in a first available position
+-nfc1 // don't format comments that begin in column 1
+-i8 // default indentation offset
+-ip0 // indentation for old-style parameter declarations
+-l80 // line length
+-lp // align continuation parameters with the open parenthesis
+-npcs // don't place a space between function name and opening quote
+-nprs // don't delimit parenteses with spaces
+-psl // place type of the function on a separate line
+-sai // space between 'if' and '('
+-saf // space between 'for' and '('
+-saw // space between 'while' and '('
+-ncs // don't force a space after a cast
+-nsc // don't insert asteriscs into multi-line comments
+-sob // swallow optional blank lines
+-nfca // don't format comments starting after the 1st column
+-cp33 // indentation for comments following a preprocessor directive
+-ss // force a newline between 'for (;;)' and ';'
+-ts8 // tabspaces are placed at each 8th column
+-il1 // offset for labels
diff --git a/src/builtin/snarf.m4 b/src/builtin/snarf.m4
index 2a32b02..7eb7458 100644
--- a/src/builtin/snarf.m4
+++ b/src/builtin/snarf.m4
@@ -950,7 +950,7 @@ m4_undefine([<__MF_PRIV_ID__>])m4_dnl
m4_ifdef([<__MF_COND_SYMBOL>],[<#endif /[<>]* __MF_COND_SYMBOL */
>])
void
-MF_MODULE_NAME()_init_builtin()
+MF_MODULE_NAME()_init_builtin(void)
{
m4_ifdef([<__MF_DEBUG>],[<m4_dnl
debug_handle = mu_debug_register_category("MF_SOURCE_DEBUG_NAME(SOURCE)");

Return to:

Send suggestions and report system problems to the System administrator.