-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(fluent-bundle): Remove WriteValue and ResolveValue traits
- Loading branch information
1 parent
af86dfb
commit 1ee2a7c
Showing
5 changed files
with
79 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,91 @@ | ||
| use super::scope::Scope; | ||
| use super::{ResolverError, WriteValue}; | ||
| use super::ResolverError; | ||
|
|
||
| use std::borrow::Borrow; | ||
| use std::fmt; | ||
|
|
||
| use fluent_syntax::ast; | ||
|
|
||
| use crate::memoizer::MemoizerKind; | ||
| use crate::resolver::ResolveValue; | ||
| use crate::resource::FluentResource; | ||
| use crate::types::FluentValue; | ||
|
|
||
| const MAX_PLACEABLES: u8 = 100; | ||
|
|
||
| impl<'bundle> WriteValue<'bundle> for ast::Pattern<&'bundle str> { | ||
| fn write<'ast, 'args, 'errors, W, R, M>( | ||
| &'ast self, | ||
| w: &mut W, | ||
| scope: &mut Scope<'bundle, 'ast, 'args, 'errors, R, M>, | ||
| ) -> fmt::Result | ||
| where | ||
| W: fmt::Write, | ||
| R: Borrow<FluentResource>, | ||
| M: MemoizerKind, | ||
| { | ||
| let len = self.elements.len(); | ||
| pub fn write_pattern<'bundle, 'ast, 'args, 'errors, W, R, M>( | ||
| pattern: &'ast ast::Pattern<&'bundle str>, | ||
| w: &mut W, | ||
| scope: &mut Scope<'bundle, 'ast, 'args, 'errors, R, M>, | ||
| ) -> fmt::Result | ||
| where | ||
| W: fmt::Write, | ||
| R: Borrow<FluentResource>, | ||
| M: MemoizerKind, | ||
| { | ||
| let len = pattern.elements.len(); | ||
|
|
||
| for elem in &self.elements { | ||
| if scope.dirty { | ||
| return Ok(()); | ||
| } | ||
| for elem in &pattern.elements { | ||
| if scope.dirty { | ||
| return Ok(()); | ||
| } | ||
|
|
||
| match elem { | ||
| ast::PatternElement::TextElement { value } => { | ||
| if let Some(ref transform) = scope.bundle.transform { | ||
| w.write_str(&transform(value))?; | ||
| } else { | ||
| w.write_str(value)?; | ||
| } | ||
| match elem { | ||
| ast::PatternElement::TextElement { value } => { | ||
| if let Some(ref transform) = scope.bundle.transform { | ||
| w.write_str(&transform(value))?; | ||
| } else { | ||
| w.write_str(value)?; | ||
| } | ||
| } | ||
| ast::PatternElement::Placeable { ref expression } => { | ||
| scope.placeables += 1; | ||
| if scope.placeables > MAX_PLACEABLES { | ||
| scope.dirty = true; | ||
| scope.add_error(ResolverError::TooManyPlaceables); | ||
| return Ok(()); | ||
| } | ||
| ast::PatternElement::Placeable { ref expression } => { | ||
| scope.placeables += 1; | ||
| if scope.placeables > MAX_PLACEABLES { | ||
| scope.dirty = true; | ||
| scope.add_error(ResolverError::TooManyPlaceables); | ||
| return Ok(()); | ||
| } | ||
|
|
||
| let needs_isolation = scope.bundle.use_isolating | ||
| && len > 1 | ||
| && !matches!( | ||
| expression, | ||
| ast::Expression::Inline(ast::InlineExpression::MessageReference { .. },) | ||
| | ast::Expression::Inline( | ||
| ast::InlineExpression::TermReference { .. }, | ||
| ) | ||
| | ast::Expression::Inline( | ||
| ast::InlineExpression::StringLiteral { .. }, | ||
| ) | ||
| ); | ||
| if needs_isolation { | ||
| w.write_char('\u{2068}')?; | ||
| } | ||
| scope.maybe_track(w, self, expression)?; | ||
| if needs_isolation { | ||
| w.write_char('\u{2069}')?; | ||
| } | ||
| let needs_isolation = scope.bundle.use_isolating | ||
| && len > 1 | ||
| && !matches!( | ||
| expression, | ||
| ast::Expression::Inline(ast::InlineExpression::MessageReference { .. },) | ||
| | ast::Expression::Inline(ast::InlineExpression::TermReference { .. },) | ||
| | ast::Expression::Inline(ast::InlineExpression::StringLiteral { .. },) | ||
| ); | ||
| if needs_isolation { | ||
| w.write_char('\u{2068}')?; | ||
| } | ||
| scope.maybe_track(w, pattern, expression)?; | ||
| if needs_isolation { | ||
| w.write_char('\u{2069}')?; | ||
| } | ||
| } | ||
| } | ||
| Ok(()) | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
||
| impl<'bundle> ResolveValue<'bundle> for ast::Pattern<&'bundle str> { | ||
| fn resolve<'ast, 'args, 'errors, R, M>( | ||
| &'ast self, | ||
| scope: &mut Scope<'bundle, 'ast, 'args, 'errors, R, M>, | ||
| ) -> FluentValue<'bundle> | ||
| where | ||
| R: Borrow<FluentResource>, | ||
| M: MemoizerKind, | ||
| { | ||
| let len = self.elements.len(); | ||
| pub fn resolve_pattern<'bundle, 'ast, 'args, 'errors, R, M>( | ||
| pattern: &'ast ast::Pattern<&'bundle str>, | ||
| scope: &mut Scope<'bundle, 'ast, 'args, 'errors, R, M>, | ||
| ) -> FluentValue<'bundle> | ||
| where | ||
| R: Borrow<FluentResource>, | ||
| M: MemoizerKind, | ||
| { | ||
| let len = pattern.elements.len(); | ||
|
|
||
| if len == 1 { | ||
| if let ast::PatternElement::TextElement { value } = self.elements[0] { | ||
| return scope | ||
| .bundle | ||
| .transform | ||
| .map_or_else(|| value.into(), |transform| transform(value).into()); | ||
| } | ||
| if len == 1 { | ||
| if let ast::PatternElement::TextElement { value } = pattern.elements[0] { | ||
| return scope | ||
| .bundle | ||
| .transform | ||
| .map_or_else(|| value.into(), |transform| transform(value).into()); | ||
| } | ||
|
|
||
| let mut result = String::new(); | ||
| self.write(&mut result, scope) | ||
| .expect("Failed to write to a string."); | ||
| result.into() | ||
| } | ||
|
|
||
| let mut result = String::new(); | ||
| write_pattern(pattern, &mut result, scope).expect("Failed to write to a string."); | ||
| result.into() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters