Skip to content

Parse mixed-case and compound named clock values #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Parse mixed-case and compound named clock values #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/fugit/nat.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ module Parser include Raabro
MONTHDAY_REX = /3[0-1]|[0-2]?[0-9]/.freeze
WEEKDAY_REX = /(#{WEEKDAYS.join('|')})(?=($|[-, \t]))/i.freeze
# prevent "mon" from eating "monday"
NAMED_M_REX = /#{NMINUTES.keys.join('|')}/i.freeze
NAMED_M_REX = /#{NMINUTES.keys.sort_by { |k| -k.length }.join('|')}/i.freeze
NAMED_H_REX = /#{NHOURS.keys.join('|')}/i.freeze
POINT_REX = /(#{POINTS.join('|')})[ \t]+/i.freeze
INTERVAL_REX = /[ \t]*(#{INTERVALS.join('|')})/.freeze
Expand Down Expand Up @@ -558,8 +558,8 @@ def rewrite_named_hour(t)
mt = t.sublookup(:named_m)
apt = t.sublookup(:ampm)

h = ht.strinp
m = mt ? mt.strinp : 0
h = ht.strinpd
m = mt ? mt.strinpd : 0
h = NHOURS[h]
m = NMINUTES[m] || m

Expand Down