Branch: Tag:

2003-03-13

2003-03-13 02:18:43 by Martin Nilsson <mani@lysator.liu.se>

No imports. Autodoced.

Rev: lib/modules/Calendar.pmod/Gregorian.pmod:1.8
Rev: lib/modules/Calendar.pmod/ISO.pmod:1.8
Rev: lib/modules/Calendar.pmod/Islamic.pmod:1.8
Rev: lib/modules/Calendar.pmod/Julian.pmod:1.9
Rev: lib/modules/Calendar.pmod/Stardate.pmod:1.10
Rev: lib/modules/Calendar.pmod/Swedish.pmod:1.7
Rev: lib/modules/Calendar.pmod/Time.pmod:1.24
Rev: lib/modules/Calendar.pmod/TimeRanges.pmod:1.23
Rev: lib/modules/Calendar.pmod/YMD.pike:1.2

10:      // #pragma strict_types    - import "."; - inherit Time:Time; + inherit .Time:Time;      #include "constants.h"   
78:      // // ^^^ might be uninitialized (CALUNKNOWN)    -  Ruleset rules; +  .Ruleset rules;    constant is_ymd=1;      // ----------------------------------------
1320:    return ::week(@mp);    }    -  cYear set_ruleset(Ruleset r) +  cYear set_ruleset(.Ruleset r)    {    return Year("ymd_y",r,y,yjd,n);    }
1580:    return n;    }    -  cMonth set_ruleset(Ruleset r) +  cMonth set_ruleset(.Ruleset r)    {    return Month("ymd_yjmw",r,y,yjd,jd,m,n,wd,w);    }
1914:    return ::day(@mp);    }    -  cWeek set_ruleset(Ruleset r) +  cWeek set_ruleset(.Ruleset r)    {    return Week("ymd_yjwm",r,y,yjd,jd,w,n,md,m,mnd);    }
2250:    ->number_of_weeks();    }    -  cDay set_ruleset(Ruleset r) +  cDay set_ruleset(.Ruleset r)    {    return Day("ymd_ydmw",r,y,yjd,jd,yd,n,m,md,w,wd,mnd);    }
2507:    return tr;   }    + static mapping abbr2zones; +    // dwim timezone and call dwim time of day above   // this API may change without further notice   static TimeRange dwim_zone(TimeRange origin,string zonename,
2524:    if (origin->rules->abbr2zone[zonename])    zonename=origin->rules->abbr2zone[zonename];    -  Rule.Timezone zone=Timezone[zonename]; +  .Rule.Timezone zone=.Timezone[zonename];    if (!zone)    {    if (sscanf(zonename,"%[^-+]%s",string a,string b)==2 && a!="" && b!="")
2534:       return    dwim_tod(origin->set_timezone( -  Timezone.make_new_timezone( +  .Timezone.make_new_timezone(    tr->timezone(), -  Timezone.decode_timeskew(b))), +  .Timezone.decode_timeskew(b))),    whut,@args);    } -  -  array pz=TZnames.abbr2zones[zonename]; +  if(!abbr2zones) +  abbr2zones = master()->resolv("Calendar")["TZnames"]["abbr2zones"]; +  array pz=abbr2zones[zonename];    if (!pz) return 0;    foreach (pz,string zn)    {
2607:       TimeRange low;    -  Calendar cal=this_object(); +  .Calendar cal=this_object();         // #define NOCATCH