From 581f9f7e97fe185b23ee0cce4bff13762e941bc5 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 30 May 2020 15:49:13 -0400 Subject: [PATCH] Update parser to treat all string rvalues as templates. --- src/parser/parser.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/parser/parser.rs b/src/parser/parser.rs index e134642..de1199e 100644 --- a/src/parser/parser.rs +++ b/src/parser/parser.rs @@ -111,13 +111,12 @@ pub struct Partial<'a> { #[derive(Clone, Debug, PartialEq)] pub enum OwnedLiteral { LPositiveInteger(u64), - LString(String), } #[derive(Clone, Debug, PartialEq)] pub enum RValue<'a> { RVPath(Path<'a>), - // RVTemplate(Vec), + RVTemplate(Vec), RVLiteral(OwnedLiteral), } @@ -327,9 +326,7 @@ fn template_string_rvalue(i: &str) -> IResult<&str, Vec> { fn rvalue(i: &str) -> IResult<&str, RValue> { alt(( map(path, RValue::RVPath), - map(quoted_string, |s| { - RValue::RVLiteral(OwnedLiteral::LString(s)) - }), + map(template_string_rvalue, RValue::RVTemplate), map(postitive_integer_literal, |num| { RValue::RVLiteral(OwnedLiteral::LPositiveInteger(num)) }),