@@ -201,11 +201,10 @@ object Parsers {
201
201
lazy val struct : Parser [Struct [T ]] = {
202
202
type TField = Binding [T ]
203
203
204
- val field : Parser [TField ] =
205
- (
206
- ident.map(_.map(Identifier .apply)) <* tokens.colon.orElse(tokens.equalsSign),
207
- tokens.withComments(node),
208
- ).mapN(Binding .apply[T ])
204
+ val field : Parser [TField ] = Binding [T ].liftN(
205
+ ident.map(_.map(Identifier .apply)) <* tokens.colon.orElse(tokens.equalsSign),
206
+ tokens.withComments(node),
207
+ )
209
208
210
209
// field, then optional whitespace, then optional coma, then optionally more `fields`
211
210
val fields : Parser0 [Struct .Fields [T ]] = field
@@ -252,11 +251,12 @@ object Parsers {
252
251
.withContext(" query_operation_name" )
253
252
}
254
253
255
- val query : Parser [Query [T ]] =
256
- (
254
+ val query : Parser [Query [T ]] = Query [ T ]
255
+ .liftN (
257
256
tokens.withComments(queryOperationName, left = false ),
258
257
tokens.withComments(struct, right = false ),
259
- ).mapN(Query .apply).withContext(" query" )
258
+ )
259
+ .withContext(" query" )
260
260
261
261
val runQuery
262
262
: Parser [RunQuery [T ]] = tokens.withComments(query).map(RunQuery (_)).withContext(" run_query" )
@@ -269,8 +269,10 @@ object Parsers {
269
269
.map(Prelude .apply)
270
270
.withContext(" prelude" )
271
271
272
- val sourceFile : Parser0 [SourceFile [T ]] = (prelude, tokens.withComments0(statement.rep0))
273
- .mapN(SourceFile .apply[T ])
272
+ val sourceFile : Parser0 [SourceFile [T ]] = SourceFile [T ].liftN(
273
+ prelude,
274
+ tokens.withComments0(statement.rep0),
275
+ )
274
276
275
277
implicit class ParserOps [A ](
276
278
parser : Parser [A ]
0 commit comments