diff options
| author | Greg Brown <gmb60@cam.ac.uk> | 2021-02-17 14:29:45 +0000 |
|---|---|---|
| committer | Greg Brown <gmb60@cam.ac.uk> | 2021-02-17 14:29:45 +0000 |
| commit | 1ab32a794c593b041801c8aac51edc353757b610 (patch) | |
| tree | 38b94c2ebd56dee05c9d4e37ea45b954a458f596 /src | |
| parent | 45d2e305b71e2f89fb319fb59f1fa742cfc6bbbd (diff) | |
Fix small bug with naming.
Diffstat (limited to 'src')
| -rw-r--r-- | src/chomp/ast/substitute.rs | 4 | ||||
| -rw-r--r-- | src/nibble/convert.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/chomp/ast/substitute.rs b/src/chomp/ast/substitute.rs index c7cc03f..2008a15 100644 --- a/src/chomp/ast/substitute.rs +++ b/src/chomp/ast/substitute.rs @@ -424,8 +424,8 @@ impl Folder for InlineCalls { .expr .clone() .fold(&mut SubstituteParams { params: call.args })?; - expr.name = Some(expr.name.or(name).unwrap_or(call.name)); - expr.span = expr.span.or(span); + expr.name = Some(name.or(expr.name).unwrap_or(call.name)); + expr.span = span.or(expr.span); Ok(expr) } else { diff --git a/src/nibble/convert.rs b/src/nibble/convert.rs index bfa0be2..cef3159 100644 --- a/src/nibble/convert.rs +++ b/src/nibble/convert.rs @@ -266,7 +266,7 @@ impl Convert for Labelled { impl Convert for Alt { fn convert(self, context: &mut Context) -> Result<NamedExpression, ConvertError> { -fn convert_pair( + fn convert_pair( pair: Pair<Labelled, Token![|]>, context: &mut Context, ) -> Result<(NamedExpression, Option<Span>), ConvertError> { |