Skip to content

Commit e273ced

Browse files
committed
Simplify handlers
1 parent d77289b commit e273ced

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/Ramstack.ExpressionParser/ExpressionParser.Parser.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -187,57 +187,57 @@ static Expr HijackMemberExpression(Expr result, Expr value)
187187

188188
var mul_expression =
189189
prefix_expression.Fold(
190-
OneOf("*/%").ThenIgnore(S).Map(CreateIdentifier),
190+
OneOf("*/%").ThenIgnore(S).Do(CreateIdentifier),
191191
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
192192

193193
var add_expression =
194194
mul_expression.Fold(
195-
OneOf("+-").ThenIgnore(S).Map(CreateIdentifier),
195+
OneOf("+-").ThenIgnore(S).Do(CreateIdentifier),
196196
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
197197

198198
var shift_expression =
199199
add_expression.Fold(
200-
OneOf(["<<", ">>", ">>>"]).ThenIgnore(S).Map(CreateIdentifier),
200+
OneOf(["<<", ">>", ">>>"]).ThenIgnore(S).Do(CreateIdentifier),
201201
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
202202

203203
var relational_expression =
204204
shift_expression.Fold(
205-
OneOf(["<", ">", "<=", ">="]).ThenIgnore(S).Map(CreateIdentifier),
205+
OneOf(["<", ">", "<=", ">="]).ThenIgnore(S).Do(CreateIdentifier),
206206
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
207207

208208
var equality_expression =
209209
relational_expression.Fold(
210-
OneOf("==", "!=").ThenIgnore(S).Map(CreateIdentifier),
210+
OneOf("==", "!=").ThenIgnore(S).Do(CreateIdentifier),
211211
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
212212

213213
var bitwise_and_expression =
214214
equality_expression.Fold(
215-
L('&').ThenIgnore(S).Map(CreateIdentifier),
215+
L('&').ThenIgnore(S).Do(CreateIdentifier),
216216
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
217217

218218
var bitwise_xor_expression =
219219
bitwise_and_expression.Fold(
220-
L('^').ThenIgnore(S).Map(CreateIdentifier),
220+
L('^').ThenIgnore(S).Do(CreateIdentifier),
221221
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
222222

223223
var bitwise_or_expression =
224224
bitwise_xor_expression.Fold(
225-
L('|').ThenIgnore(S).Map(CreateIdentifier),
225+
L('|').ThenIgnore(S).Do(CreateIdentifier),
226226
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
227227

228228
var logical_and_expression =
229229
bitwise_or_expression.Fold(
230-
L("&&").ThenIgnore(S).Map(CreateIdentifier),
230+
L("&&").ThenIgnore(S).Do(CreateIdentifier),
231231
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
232232

233233
var logical_or_expression =
234234
logical_and_expression.Fold(
235-
L("||").ThenIgnore(S).Map(CreateIdentifier),
235+
L("||").ThenIgnore(S).Do(CreateIdentifier),
236236
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
237237

238238
var null_coalesce_expression =
239239
logical_or_expression.FoldR(
240-
L("??").ThenIgnore(S).Map(CreateIdentifier),
240+
L("??").ThenIgnore(S).Do(CreateIdentifier),
241241
(lhs, rhs, op) => new Expr.Binary(op, lhs, rhs));
242242

243243
var conditional_expression = Deferred<Expr>();
@@ -261,9 +261,9 @@ static Expr HijackMemberExpression(Expr result, Expr value)
261261
return S.Then(expression);
262262
}
263263

264-
private static Identifier CreateIdentifier(Match m, string v) =>
264+
private static Identifier CreateIdentifier(string v) =>
265265
new(v);
266266

267-
private static Identifier CreateIdentifier(Match m, char v) =>
267+
private static Identifier CreateIdentifier(char v) =>
268268
new(new string(v, 1));
269269
}

0 commit comments

Comments
 (0)