From bb5efa658f02e5319e1e15427fe74e3fb7606556 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Tue, 3 Feb 2009 12:34:30 -0500 Subject: [PATCH] fix start/now mismatch, remove commented code --- .../lib/Horde/Date/Parser/Locale/Base.php | 24 ++---------- .../lib/Horde/Date/Parser/Locale/Base/Ordinal.php | 2 +- .../lib/Horde/Date/Parser/Locale/Base/Repeater.php | 44 ---------------------- .../Date_Parser/lib/Horde/Date/Parser/Tag.php | 12 +++--- 4 files changed, 10 insertions(+), 72 deletions(-) diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php index 7e241f5fc..c243908f1 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base.php @@ -279,7 +279,7 @@ class Horde_Date_Parser_Locale_Base public function handle_m_d($month, $day, $timeTokens, $options) { - $month->start = $this->now; + $month->now = $this->now; $span = $month->this($options['context']); $dayStart = new Horde_Date(array('year' => $span->begin->year, 'month' => $span->begin->month, 'day' => $day)); @@ -420,22 +420,6 @@ class Horde_Date_Parser_Locale_Base public function handle_s_r_p($tokens, $options) { - $repeater = $tokens[1]->getTag('Repeater'); - - /* - # span = - # case true - # when [RepeaterYear, RepeaterSeason, RepeaterSeasonName, RepeaterMonth, RepeaterMonthName, RepeaterWeek].include?(repeater.class) - # self.parse("this hour", :guess => false, :now => @now) - # when [RepeaterWeekend, RepeaterDay, RepeaterDayName, RepeaterDayPortion, RepeaterHour].include?(repeater.class) - # self.parse("this minute", :guess => false, :now => @now) - # when [RepeaterMinute, RepeaterSecond].include?(repeater.class) - # self.parse("this second", :guess => false, :now => @now) - # else - # raise(ChronicPain, "Invalid repeater: #{repeater.class}") - # end - */ - $span = $this->parse('this second', array('guess' => false, 'now' => $this->now)); return $this->handle_srp($tokens, $span, $options); } @@ -460,7 +444,7 @@ class Horde_Date_Parser_Locale_Base public function handle_orr($tokens, $outerSpan, $options) { $repeater = $tokens[1]->getTag('Repeater'); - $repeater->start = $outerSpan->begin - 1; + $repeater->now = $outerSpan->begin - 1; $ordinal = $tokens[0]->getTag('Ordinal')->type; $span = null; @@ -507,7 +491,7 @@ class Horde_Date_Parser_Locale_Base } $head = array_shift($repeaters); - $head->start = $this->now; + $head->now = $this->now; switch ($grabber->type) { case 'last': @@ -559,7 +543,7 @@ class Horde_Date_Parser_Locale_Base $head = array_shift($tags); $rest = $tags; - $head->start = ($pointer == 'future') ? $span->begin : $span->end; + $head->now = ($pointer == 'future') ? $span->begin : $span->end; $h = $head->this('none'); if ($span->include($h->begin) || $span->include($h->end)) { diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php index 1b75d49ca..710f79382 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Ordinal.php @@ -29,7 +29,7 @@ class Horde_Date_Parser_Locale_Base_Ordinal extends Horde_Date_Parser_Tag { if (preg_match($this->ordinalDayRegex, $token->word, $matches)) { if ($matches[1] <= 31) { - /* @TODO FIXME - hardcoded class name */ + /* FIXME - hardcoded class name */ return new Horde_Date_Parser_Locale_Base_OrdinalDay((int)$m[1]); } } diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater.php b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater.php index c4b19076a..b722664bd 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Locale/Base/Repeater.php @@ -115,48 +115,4 @@ class Horde_Date_Parser_Locale_Base_Repeater extends Horde_Date_Parser_Tag } } - /* - def <=>(other) - width <=> other.width - end - */ - - /** - * returns the width (in seconds or months) of this repeatable. - */ - public function width() - { - throw new Horde_Date_Parser_Exception('Repeatable#width must be overridden in subclasses'); - } - - /** - * returns the next occurance of this repeatable. - */ - public function next($pointer) - { - if (is_null($this->now)) { - throw new Horde_Date_Parser_Exception('Start point must be set before calling next()'); - } - - if (!in_array($pointer, array('future', 'none', 'past'))) { - throw new Horde_Date_Parser_Exception("First argument 'pointer' must be one of 'past', 'future', 'none'"); - } - } - - public function this($pointer) - { - if (is_null($this->now)) { - throw new Horde_Date_Parser_Exception('Start point must be set before calling this()'); - } - - if (!in_array($pointer, array('future', 'none', 'past'))) { - throw new Horde_Date_Parser_Exception("First argument 'pointer' must be one of 'past', 'future', 'none'"); - } - } - - public function __toString() - { - return 'repeater'; - } - } diff --git a/framework/Date_Parser/lib/Horde/Date/Parser/Tag.php b/framework/Date_Parser/lib/Horde/Date/Parser/Tag.php index a0796408a..af46685cd 100644 --- a/framework/Date_Parser/lib/Horde/Date/Parser/Tag.php +++ b/framework/Date_Parser/lib/Horde/Date/Parser/Tag.php @@ -1,7 +1,10 @@ type = $type; } - public function start($s) - { - $this->now = $s; - } - } -- 2.11.0