[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/5] style: space clean up
From: |
Akim Demaille |
Subject: |
[PATCH 4/5] style: space clean up |
Date: |
Sat, 12 Jan 2019 09:41:30 +0100 |
* data/skeletons/d.m4, examples/d/calc.y, src/output.c,
* src/parse-gram.y:
No tab, no trailing spaces.
Reported by syntax-check.
---
data/skeletons/d.m4 | 40 ++++++++++++++++++++--------------------
examples/d/calc.y | 1 -
src/output.c | 4 ++--
src/parse-gram.y | 2 +-
4 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/data/skeletons/d.m4 b/data/skeletons/d.m4
index 738ca07b..946f0135 100644
--- a/data/skeletons/d.m4
+++ b/data/skeletons/d.m4
@@ -29,7 +29,7 @@ m4_define([b4_comment], [/* m4_bpatsubst([$1], [
# ----------------------
# Join two lists with a comma if necessary.
m4_define([b4_list2],
- [$1[]m4_ifval(m4_quote($1), [m4_ifval(m4_quote($2), [[, ]])])[]$2])
+ [$1[]m4_ifval(m4_quote($1), [m4_ifval(m4_quote($2), [[, ]])])[]$2])
# b4_percent_define_get3(DEF, PRE, POST, NOT)
@@ -37,8 +37,8 @@ m4_define([b4_list2],
# Expand to the value of DEF surrounded by PRE and POST if it's %define'ed,
# otherwise NOT.
m4_define([b4_percent_define_get3],
- [m4_ifval(m4_quote(b4_percent_define_get([$1])),
- [$2[]b4_percent_define_get([$1])[]$3], [$4])])
+ [m4_ifval(m4_quote(b4_percent_define_get([$1])),
+ [$2[]b4_percent_define_get([$1])[]$3], [$4])])
# b4_flag_value(BOOLEAN-FLAG)
@@ -110,7 +110,7 @@ m4_define([b4_identification],
m4_define([b4_int_type],
[m4_if(b4_ints_in($@, [-128], [127]), [1], [byte],
b4_ints_in($@, [-32768], [32767]), [1], [short],
- [int])])
+ [int])])
# b4_int_type_for(NAME)
# ---------------------
@@ -253,11 +253,11 @@ m4_define([b4_parse_param], b4_parse_param))
m4_define([b4_lex_param_decl],
[m4_ifset([b4_lex_param],
[b4_remove_comma([$1],
- b4_param_decls(b4_lex_param))],
- [$1])])
+ b4_param_decls(b4_lex_param))],
+ [$1])])
m4_define([b4_param_decls],
- [m4_map([b4_param_decl], address@hidden)])
+ [m4_map([b4_param_decl], address@hidden)])
m4_define([b4_param_decl], [, $1])
m4_define([b4_remove_comma], [m4_ifval(m4_quote($1), [$1, ], [])m4_shift2($@)])
@@ -270,8 +270,8 @@ m4_define([b4_remove_comma], [m4_ifval(m4_quote($1), [$1,
], [])m4_shift2($@)])
m4_define([b4_parse_param_decl],
[m4_ifset([b4_parse_param],
[b4_remove_comma([$1],
- b4_param_decls(b4_parse_param))],
- [$1])])
+ b4_param_decls(b4_parse_param))],
+ [$1])])
@@ -280,11 +280,11 @@ m4_define([b4_parse_param_decl],
# Delegating the lexer parameters to the lexer constructor.
m4_define([b4_lex_param_call],
[m4_ifset([b4_lex_param],
- [b4_remove_comma([$1],
- b4_param_calls(b4_lex_param))],
- [$1])])
+ [b4_remove_comma([$1],
+ b4_param_calls(b4_lex_param))],
+ [$1])])
m4_define([b4_param_calls],
- [m4_map([b4_param_call], address@hidden)])
+ [m4_map([b4_param_call], address@hidden)])
m4_define([b4_param_call], [, $2])
@@ -294,13 +294,13 @@ m4_define([b4_param_call], [, $2])
# Extra initialisations of the constructor.
m4_define([b4_parse_param_cons],
[m4_ifset([b4_parse_param],
- [b4_constructor_calls(b4_parse_param)])])
+ [b4_constructor_calls(b4_parse_param)])])
m4_define([b4_constructor_calls],
- [m4_map([b4_constructor_call], address@hidden)])
+ [m4_map([b4_constructor_call], address@hidden)])
m4_define([b4_constructor_call],
- [this.$2 = $2;
- ])
+ [this.$2 = $2;
+ ])
@@ -309,12 +309,12 @@ m4_define([b4_constructor_call],
# Extra instance variables.
m4_define([b4_parse_param_vars],
[m4_ifset([b4_parse_param],
- [
+ [
/* User arguments. */
b4_var_decls(b4_parse_param)])])
m4_define([b4_var_decls],
- [m4_map_sep([b4_var_decl], [
+ [m4_map_sep([b4_var_decl], [
], address@hidden)])
m4_define([b4_var_decl],
- [ protected $1;])
+ [ protected $1;])
diff --git a/examples/d/calc.y b/examples/d/calc.y
index a54e82ed..5cdbf9b5 100644
--- a/examples/d/calc.y
+++ b/examples/d/calc.y
@@ -156,4 +156,3 @@ void main ()
Calc p = new Calc (l);
p.parse ();
}
-
diff --git a/src/output.c b/src/output.c
index 6e3e0c2c..6a9553c5 100644
--- a/src/output.c
+++ b/src/output.c
@@ -236,7 +236,7 @@ prepare_rules (void)
prhs[r] = i;
/* RHS of the rule R. */
for (item_number *rhsp = rules[r].rhs; 0 <= *rhsp; ++rhsp)
- rhs[i++] = *rhsp;
+ rhs[i++] = *rhsp;
/* Separator in RHS. */
rhs[i++] = -1;
@@ -245,7 +245,7 @@ prepare_rules (void)
/* LHS of the rule R. */
r1[r] = rules[r].lhs->number;
/* Length of rule R's RHS. */
- r2[r] = rule_rhs_length(&rules[r]);
+ r2[r] = rule_rhs_length (&rules[r]);
/* Dynamic precedence (GLR). */
dprec[r] = rules[r].dprec;
/* Merger-function index (GLR). */
diff --git a/src/parse-gram.y b/src/parse-gram.y
index a0bf4a98..b0f89eb0 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -462,7 +462,7 @@ tag:
`-----------------------*/
// A non empty list of possibly tagged symbols for %nterm.
-//
+//
// Can easily be defined like symbol_decls but restricted to ID, but
// using token_decls allows to reudce the number of rules, and also to
// make nicer error messages on "%nterm 'a'" or '%nterm FOO "foo"'.
--
2.20.1