Garmelon/today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unify number parsing again

Browse source
This commit is contained in:
Joscha 2021-11-19 21:34:32 +01:00
parent 7ed4ba2372
commit e9cff194d3
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/parse/todayfile.pest
View file

@ -3,6 +3,8 @@ WHITESPACE = _{ !eol ~ WHITE_SPACE }
rest_some = { (!eol ~ ANY)+ }
rest_any = { (!eol ~ ANY)* }
number = @{ ASCII_DIGIT{1,9} } // Fits into an i32
title = { WHITESPACE ~ rest_some ~ eol }
year = @{ ASCII_DIGIT{4} }
@ -18,8 +20,7 @@ time = ${ hour ~ ":" ~ minute }
weekday = { "mon" | "tue" | "wed" | "thu" | "fri" | "sat" | "sun" }
amount_sign = { "+" | "-" }
amount_value = @{ ASCII_DIGIT{1,9} } // Fits into an i32
amount = { amount_sign? ~ amount_value? }
amount = { amount_sign? ~ number? }
delta_weekdays = { amount ~ weekday }
delta_minutes = { amount ~ "min" }
delta_years = { amount ~ "y" }
@ -41,7 +42,6 @@ delta = {
)+
}
number = @{ ("+" | "-")? ~ ASCII_DIGIT{1,9} } // Fits into an i32
boolean = { "true" | "false" }
variable = {
"mon" | "tue" | "wed" | "thu" | "fri" | "sat" | "sun"