language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 15:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Pass State by value.

Browse source
This commit is contained in:
Richard Feldman 2019-09-03 22:37:53 -04:00
parent 6a77f00ff9
commit f9f63f88c6
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/parse/parser.rs
View file

@ -149,17 +149,17 @@ fn state_size() {
pub type ParseResult<'a, Output> = Result<(State<'a>, Output), (State<'a>, Attempting)>;
pub trait Parser<'a, Output> {
fn parse(&self, &'a Bump, &'a State<'a>, attempting: Attempting) -> ParseResult<'a, Output>;
fn parse(&self, &'a Bump, State<'a>, attempting: Attempting) -> ParseResult<'a, Output>;
}
impl<'a, F, Output> Parser<'a, Output> for F
where
F: Fn(&'a Bump, &'a State<'a>, Attempting) -> ParseResult<'a, Output>,
F: Fn(&'a Bump, State<'a>, Attempting) -> ParseResult<'a, Output>,
{
fn parse(
&self,
arena: &'a Bump,
state: &'a State<'a>,
state: State<'a>,
attempting: Attempting,
) -> ParseResult<'a, Output> {
self(arena, state, attempting)
@ -191,7 +191,7 @@ pub fn keyword<'a>(kw: &'static str) -> impl Parser<'a, ()> {
// in the state, only the column.
debug_assert!(!kw.contains("\n"));
move |_arena: &'a Bump, state: &'a State<'a>, attempting| {
move |_arena: &'a Bump, state: State<'a>, attempting| {
let input = state.input;
match input.get(0..kw.len()) {
@ -210,7 +210,7 @@ where
P: Parser<'a, A>,
F: Fn(&A) -> bool,
{
move |arena: &'a Bump, state: &'a State<'a>, attempting| {
move |arena: &'a Bump, state: State<'a>, attempting| {
if let Ok((next_state, output)) = parser.parse(arena, state, attempting) {
if predicate(&output) {
return Ok((next_state, output));
@ -223,7 +223,7 @@ where
pub fn any<'a>(
_arena: &'a Bump,
state: &'a State<'a>,
state: State<'a>,
attempting: Attempting,
) -> ParseResult<'a, char> {
let input = state.input;