diff options
author | David Li <li.davidm96@gmail.com> | 2017-11-04 19:53:47 -0400 |
---|---|---|
committer | David Li <li.davidm96@gmail.com> | 2017-11-04 19:53:47 -0400 |
commit | 9cbe12458d9b3e3dc55e30fff1e396e1b7cf0d9a (patch) | |
tree | e0509b2033bd414eccd687ac53a8158d21ae875f /src/taiga.lalrpop | |
parent | 13e7a55d3924f77fccf8b97a2373dfb29eba6e5a (diff) |
Parse strings without escapes
Diffstat (limited to 'src/taiga.lalrpop')
-rw-r--r-- | src/taiga.lalrpop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/taiga.lalrpop b/src/taiga.lalrpop index 68238eb..ffee4ee 100644 --- a/src/taiga.lalrpop +++ b/src/taiga.lalrpop @@ -84,11 +84,15 @@ ExpressionSign: Box<ast::WithLocation<ast::Expression>> = { ExpressionBase: Box<ast::WithLocation<ast::Expression>> = { Num => Box::new(<>.map(|v| ast::Expression::Number(v))), + String => Box::new(<>.map(|v| ast::Expression::String(v))), Spanned<r"nil"> => Box::new(<>.map(|v| ast::Expression::Nil)), "(" <Expression> ")" => <>, }; Num: WithLocation<u64> = <e: Spanned<r"[0-9]+">> => e.map(|v| u64::from_str(v).unwrap()); +String: WithLocation<String> = <l: @L> <v:r##""(?:[^"\\]|\\\\)*""##> <r: @R> => { + WithLocation::new(v[1..v.len() - 1].to_owned(), l, r) +}; Spanned<T>: WithLocation<T> = { <l: @L> <v: T> <r: @R> => WithLocation::new(v, l, r) |