Browse Source

Refactored to use new constructors.

Brucey 3 năm trước cách đây
mục cha
commit
e03c5cefc8
46 tập tin đã thay đổi với 322 bổ sung315 xóa
  1. 187 209
      datetime.mod/datetime.bmx
  2. 1 1
      datetime.mod/examples/days_between_new_years.bmx
  3. 7 7
      datetime.mod/examples/holidays.bmx
  4. 2 2
      datetime.mod/examples/print_month.bmx
  5. 2 2
      datetime.mod/examples/tdate_create.bmx
  6. 1 1
      datetime.mod/examples/tdate_day.bmx
  7. 1 1
      datetime.mod/examples/tdate_month.bmx
  8. 1 1
      datetime.mod/examples/tdate_subtractDate.bmx
  9. 1 1
      datetime.mod/examples/tdate_year.bmx
  10. 1 1
      datetime.mod/examples/tdate_ymd.bmx
  11. 1 1
      datetime.mod/examples/tdateperiod_begin.bmx
  12. 3 3
      datetime.mod/examples/tdateperiod_contains.bmx
  13. 3 3
      datetime.mod/examples/tdateperiod_containsDate.bmx
  14. 2 2
      datetime.mod/examples/tdateperiod_create.bmx
  15. 1 1
      datetime.mod/examples/tdateperiod_createWithDays.bmx
  16. 2 2
      datetime.mod/examples/tdateperiod_intersection.bmx
  17. 3 3
      datetime.mod/examples/tdateperiod_intersects.bmx
  18. 3 3
      datetime.mod/examples/tdateperiod_isAdjacent.bmx
  19. 3 3
      datetime.mod/examples/tdateperiod_isAfter.bmx
  20. 3 3
      datetime.mod/examples/tdateperiod_isBefore.bmx
  21. 2 2
      datetime.mod/examples/tdateperiod_isNull.bmx
  22. 1 1
      datetime.mod/examples/tdateperiod_last.bmx
  23. 1 1
      datetime.mod/examples/tdateperiod_length.bmx
  24. 3 3
      datetime.mod/examples/tdateperiod_merge.bmx
  25. 1 1
      datetime.mod/examples/tdateperiod_periodEnd.bmx
  26. 3 3
      datetime.mod/examples/tdateperiod_shift.bmx
  27. 2 2
      datetime.mod/examples/tdateperiod_span.bmx
  28. 3 3
      datetime.mod/examples/tlocaldatetime_UTCTime.bmx
  29. 3 3
      datetime.mod/examples/tlocaldatetime_localTime.bmx
  30. 2 2
      datetime.mod/examples/ttime_addDays.bmx
  31. 2 2
      datetime.mod/examples/ttime_addDuration.bmx
  32. 2 2
      datetime.mod/examples/ttime_create.bmx
  33. 1 1
      datetime.mod/examples/ttime_createLocal.bmx
  34. 1 1
      datetime.mod/examples/ttime_createUniversal.bmx
  35. 2 2
      datetime.mod/examples/ttime_date.bmx
  36. 3 3
      datetime.mod/examples/ttime_subtract.bmx
  37. 2 2
      datetime.mod/examples/ttime_subtractDays.bmx
  38. 2 2
      datetime.mod/examples/ttime_subtractDuration.bmx
  39. 2 2
      datetime.mod/examples/ttime_timeOfDay.bmx
  40. 1 1
      datetime.mod/examples/ttimeduration_divide.bmx
  41. 1 1
      datetime.mod/examples/ttimeduration_format.bmx
  42. 1 1
      datetime.mod/examples/ttimeduration_multiply.bmx
  43. 2 2
      datetime.mod/examples/ttimeduration_subtract.bmx
  44. 24 0
      datetime.mod/glue.cpp
  45. 3 0
      datetime.mod/source.bmx
  46. 24 22
      locale.mod/locale.bmx

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 187 - 209
datetime.mod/datetime.bmx


+ 1 - 1
datetime.mod/examples/days_between_new_years.bmx

@@ -11,7 +11,7 @@ Import BRL.StandardIO
 
 Local today:TDate = TDate.localDay()
 
-Local newYearsDay:TPartialDate = TPartialDate.Create(1, Jan)
+Local newYearsDay:TPartialDate = New TPartialDate(1, Jan)
 
 ' Subtract two dates to get a duration
 Local daysSinceYearStart:Int = today.subtractDate(newYearsDay.getDate(today.year()))

+ 7 - 7
datetime.mod/examples/holidays.bmx

@@ -29,19 +29,19 @@ Local year:Int = Input("Enter year : ").toInt()
 
 Local holidays:TList = New TList
 
-holidays.addLast(TPartialDate.Create(1, Jan)) ' Western New Year
-holidays.addLast(TPartialDate.Create(4, Jul)) ' US Independence Day
-holidays.addLast(TPartialDate.Create(25, Dec)) ' Christmas Day
+holidays.addLast(New TPartialDate(1, Jan)) ' Western New Year
+holidays.addLast(New TPartialDate(4, Jul)) ' US Independence Day
+holidays.addLast(New TPartialDate(25, Dec)) ' Christmas Day
 
 
 ' US labor day
-holidays.addLast(TNthDayOfWeekInMonth.Create(First, Monday, Sep))
+holidays.addLast(New TNthDayOfWeekInMonth(First, Monday, Sep))
 ' Martin Luther King Day
-holidays.addLast(TNthDayOfWeekInMonth.Create(Third, Monday, Jan))
+holidays.addLast(New TNthDayOfWeekInMonth(Third, Monday, Jan))
 ' Presidents day
-holidays.addLast(TNthDayOfWeekInMonth.Create(Second, Tuesday, Feb))
+holidays.addLast(New TNthDayOfWeekInMonth(Second, Tuesday, Feb))
 ' Thanksgiving
-holidays.addLast(TNthDayOfWeekInMonth.Create(Fourth, Thursday, Nov))
+holidays.addLast(New TNthDayOfWeekInMonth(Fourth, Thursday, Nov))
 
 
 Local allHolidays:TList = New TList

+ 2 - 2
datetime.mod/examples/print_month.bmx

@@ -13,10 +13,10 @@ Local m:Int = Min(12, Max(1, Input("Enter Month: ").toInt()))
 ' Use the calendar to get the last day of the month
 Local eomDay:Int = EndOfMonthDay(y, m)
 
-Local endOfMonth:TDate = TDate.Create(y, m, eomDay)
+Local endOfMonth:TDate = New TDate(y, m, eomDay)
 
 ' construct an iterator starting with first day of the month
-Local ditr:TDateDayIterator = TDateDayIterator.CreateIterator(TDate.Create(y, m, 1))
+Local ditr:TDateDayIterator = New TDateDayIterator(New TDate(y, m, 1))
 
 ' loop thru the days and print each one
 While Not ditr.isAfter(endOfMonth)

+ 2 - 2
datetime.mod/examples/tdate_create.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(1984, 4, 23)
+Local d:TDate = New TDate(1984, 4, 23)
 
 Print d.toString()
 
-Print TDate.Create(1990, Mar, 12).toString()
+Print New TDate(1990, Mar, 12).toString()

+ 1 - 1
datetime.mod/examples/tdate_day.bmx

@@ -3,6 +3,6 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2007, Jul, 17)
+Local d:TDate = New TDate(2007, Jul, 17)
 
 Print d.day()

+ 1 - 1
datetime.mod/examples/tdate_month.bmx

@@ -3,6 +3,6 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2007, Jul, 17)
+Local d:TDate = New TDate(2007, Jul, 17)
 
 Print d.month()

+ 1 - 1
datetime.mod/examples/tdate_subtractDate.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d1:TDate = TDate.Create(2000, Jan, 1)
+Local d1:TDate = New TDate(2000, Jan, 1)
 Local d2:TDate = TDate.localDay()
 
 Print d2.subtractDate(d1)

+ 1 - 1
datetime.mod/examples/tdate_year.bmx

@@ -3,6 +3,6 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2007, Jul, 17)
+Local d:TDate = New TDate(2007, Jul, 17)
 
 Print d.year()

+ 1 - 1
datetime.mod/examples/tdate_ymd.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2006, Dec, 24)
+Local d:TDate = New TDate(2006, Dec, 24)
 
 Local year:Int, month:Int, day:Int
 

+ 1 - 1
datetime.mod/examples/tdateperiod_begin.bmx

@@ -5,6 +5,6 @@ Import BRL.StandardIO
 
 Local startDate:TDate = TDate.localDay()
 
-Local p:TDatePeriod = TDatePeriod.CreateWithDays(startDate, 100)
+Local p:TDatePeriod = New TDatePeriod(startDate, 100)
 
 Print p.begin().toString()

+ 3 - 3
datetime.mod/examples/tdateperiod_contains.bmx

@@ -3,10 +3,10 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2007, 1, 1))
+Local p:TDatePeriod = New TDatePeriod(New TDate(2006, 1, 1), New TDate(2007, 1, 1))
 
-Local pGood:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 4, 4), TDate.Create(2006, 5, 5))
-Local pBad:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 2, 1))
+Local pGood:TDatePeriod = New TDatePeriod(New TDate(2006, 4, 4), New TDate(2006, 5, 5))
+Local pBad:TDatePeriod = New TDatePeriod(New TDate(2006, 10, 1), New TDate(2007, 2, 1))
 
 Print p.contains(pGood)
 Print p.contains(pBad)

+ 3 - 3
datetime.mod/examples/tdateperiod_containsDate.bmx

@@ -3,10 +3,10 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2007, 1, 1))
+Local p:TDatePeriod = New TDatePeriod(New TDate(2006, 1, 1), New TDate(2007, 1, 1))
 
-Local goodDate:TDate = TDate.Create(2006, 6, 1)
-Local badDate:TDate = TDate.create(2005, 1, 1)
+Local goodDate:TDate = New TDate(2006, 6, 1)
+Local badDate:TDate = New TDate(2005, 1, 1)
 
 Print p.containsDate(goodDate)
 Print p.containsDate(badDate)

+ 2 - 2
datetime.mod/examples/tdateperiod_create.bmx

@@ -3,9 +3,9 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local startDate:TDate = TDate.Create(2007, 1, 1)
+Local startDate:TDate = New TDate(2007, 1, 1)
 Local endDate:TDate = TDate.localDay()
 
-Local p:TDatePeriod = TDatePeriod.Create(startDate, endDate)
+Local p:TDatePeriod = New TDatePeriod(startDate, endDate)
 
 Print p.toString()

+ 1 - 1
datetime.mod/examples/tdateperiod_createWithDays.bmx

@@ -5,6 +5,6 @@ Import BRL.StandardIO
 
 Local startDate:TDate = TDate.localDay()
 
-Local p:TDatePeriod = TDatePeriod.CreateWithDays(startDate, 150)
+Local p:TDatePeriod = New TDatePeriod(startDate, 150)
 
 Print p.toString()

+ 2 - 2
datetime.mod/examples/tdateperiod_intersection.bmx

@@ -3,9 +3,9 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2007, 1, 1))
+Local p1:TDatePeriod = New TDatePeriod(New TDate(2006, 1, 1), New TDate(2007, 1, 1))
 
-Local p2:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 2, 1))
+Local p2:TDatePeriod = New TDatePeriod(New TDate(2006, 10, 1), New TDate(2007, 2, 1))
 
 Local intersection:TDatePeriod = p1.intersection(p2)
 

+ 3 - 3
datetime.mod/examples/tdateperiod_intersects.bmx

@@ -3,10 +3,10 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2007, 1, 1))
+Local p:TDatePeriod = New TDatePeriod(New TDate(2006, 1, 1), New TDate(2007, 1, 1))
 
-Local pGood:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 2, 1))
-Local pBad:TDatePeriod = TDatePeriod.Create(TDate.Create(2005, 1, 1), TDate.Create(2005, 12, 1))
+Local pGood:TDatePeriod = New TDatePeriod(New TDate(2006, 10, 1), New TDate(2007, 2, 1))
+Local pBad:TDatePeriod = New TDatePeriod(New TDate(2005, 1, 1), New TDate(2005, 12, 1))
 
 Print p.intersects(pGood)
 Print p.intersects(pBad)

+ 3 - 3
datetime.mod/examples/tdateperiod_isAdjacent.bmx

@@ -3,10 +3,10 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 1, 1))
-Local p2:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2006, 10, 1))
+Local p1:TDatePeriod = New TDatePeriod(New TDate(2006, 10, 1), New TDate(2007, 1, 1))
+Local p2:TDatePeriod = New TDatePeriod(New TDate(2006, 1, 1), New TDate(2006, 10, 1))
 
-Local p3:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2006, 9, 1)) ' a gap here!
+Local p3:TDatePeriod = New TDatePeriod(New TDate(2006, 1, 1), New TDate(2006, 9, 1)) ' a gap here!
 
 Print p1.isAdjacent(p2)
 Print p1.isAdjacent(p3)

+ 3 - 3
datetime.mod/examples/tdateperiod_isAfter.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 1, 1))
+Local p:TDatePeriod = New TDatePeriod(New TDate(2006, 10, 1), New TDate(2007, 1, 1))
 
-Print p.isAfter(TDate.Create(2000, 1, 1))
-Print p.isAfter(TDate.Create(2008, 1, 1))
+Print p.isAfter(New TDate(2000, 1, 1))
+Print p.isAfter(New TDate(2008, 1, 1))

+ 3 - 3
datetime.mod/examples/tdateperiod_isBefore.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 1, 1))
+Local p:TDatePeriod = New TDatePeriod(New TDate(2006, 10, 1), New TDate(2007, 1, 1))
 
-Print p.isBefore(TDate.Create(2000, 1, 1))
-Print p.isBefore(TDate.Create(2008, 1, 1))
+Print p.isBefore(New TDate(2000, 1, 1))
+Print p.isBefore(New TDate(2008, 1, 1))

+ 2 - 2
datetime.mod/examples/tdateperiod_isNull.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2007, 2, 1), TDate.Create(2007, 3, 1))
-Local p2:TDatePeriod = TDatePeriod.Create(TDate.Create(2007, 2, 1), TDate.Create(2007, 1, 1))
+Local p1:TDatePeriod = New TDatePeriod(New TDate(2007, 2, 1), New TDate(2007, 3, 1))
+Local p2:TDatePeriod = New TDatePeriod(New TDate(2007, 2, 1), New TDate(2007, 1, 1))
 
 Print p1.isNull()
 Print p2.isNull()

+ 1 - 1
datetime.mod/examples/tdateperiod_last.bmx

@@ -5,6 +5,6 @@ Import BRL.StandardIO
 
 Local startDate:TDate = TDate.localDay()
 
-Local p:TDatePeriod = TDatePeriod.CreateWithDays(startDate, 100)
+Local p:TDatePeriod = New TDatePeriod(startDate, 100)
 
 Print p.last().toString()

+ 1 - 1
datetime.mod/examples/tdateperiod_length.bmx

@@ -5,6 +5,6 @@ Import BRL.StandardIO
 
 Local startDate:TDate = TDate.localDay()
 
-Local p:TDatePeriod = TDatePeriod.CreateWithDays(startDate, 100)
+Local p:TDatePeriod = New TDatePeriod(startDate, 100)
 
 Print p.length()

+ 3 - 3
datetime.mod/examples/tdateperiod_merge.bmx

@@ -3,10 +3,10 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 1, 1))
-Local p2:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 12, 1), TDate.Create(2007, 2, 1))
+Local p1:TDatePeriod = New TDatePeriod(New TDate(2006, 10, 1), New TDate(2007, 1, 1))
+Local p2:TDatePeriod = New TDatePeriod(New TDate(2006, 12, 1), New TDate(2007, 2, 1))
 
-Local p3:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2006, 5, 1)) ' doesn't overlap !
+Local p3:TDatePeriod = New TDatePeriod(New TDate(2006, 1, 1), New TDate(2006, 5, 1)) ' doesn't overlap !
 
 
 Local merged:TDatePeriod = p1.merge(p2)

+ 1 - 1
datetime.mod/examples/tdateperiod_periodEnd.bmx

@@ -5,6 +5,6 @@ Import BRL.StandardIO
 
 Local startDate:TDate = TDate.localDay()
 
-Local p:TDatePeriod = TDatePeriod.CreateWithDays(startDate, 100)
+Local p:TDatePeriod = New TDatePeriod(startDate, 100)
 
 Print p.periodEnd().toString()

+ 3 - 3
datetime.mod/examples/tdateperiod_shift.bmx

@@ -3,10 +3,10 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local startDate:TDate = TDate.Create(2007, Feb, 1)
-Local endDate:TDate = TDate.Create(2007, Mar, 1)
+Local startDate:TDate = New TDate(2007, Feb, 1)
+Local endDate:TDate = New TDate(2007, Mar, 1)
 
-Local p:TDatePeriod = TDatePeriod.Create(startDate, endDate)
+Local p:TDatePeriod = New TDatePeriod(startDate, endDate)
 
 Print p.toString()
 

+ 2 - 2
datetime.mod/examples/tdateperiod_span.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2006, 10, 1))
-Local p2:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 12, 1), TDate.Create(2007, 2, 1))
+Local p1:TDatePeriod = New TDatePeriod(New TDate(2006, 1, 1), New TDate(2006, 10, 1))
+Local p2:TDatePeriod = New TDatePeriod(New TDate(2006, 12, 1), New TDate(2007, 2, 1))
 
 Local span:TDatePeriod = p1.span(p2)
 

+ 3 - 3
datetime.mod/examples/tlocaldatetime_UTCTime.bmx

@@ -3,10 +3,10 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local pt:TTime = TTime.Create(TDate.Create(2004, Nov, 5), TDHours(10))
+Local pt:TTime = New TTime(New TDate(2004, Nov, 5), TDHours(10))
 
-Local zone:TTimeZone = TTimeZone.Create("MST-07")
+Local zone:TTimeZone = New TTimeZone("MST-07")
 
-Local az:TLocalDateTime = TLocalDateTime.CreateFromTime(pt, zone)
+Local az:TLocalDateTime = New TLocalDateTime(pt, zone)
 
 Print az.UTCTime().toString()

+ 3 - 3
datetime.mod/examples/tlocaldatetime_localTime.bmx

@@ -3,11 +3,11 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local pt:TTime = TTime.Create(TDate.Create(2004, Nov, 5), TDHours(10))
+Local pt:TTime = New TTime(New TDate(2004, Nov, 5), TDHours(10))
 
-Local zone:TTimeZone = TTimeZone.Create("MST-07")
+Local zone:TTimeZone = New TTimeZone("MST-07")
 
-Local az:TLocalDateTime = TLocalDateTime.CreateFromTime(pt, zone)
+Local az:TLocalDateTime = New TLocalDateTime(pt, zone)
 
 Print az.UTCTime().toString()
 Print az.localTime().toString()

+ 2 - 2
datetime.mod/examples/ttime_addDays.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2002, Jan, 1)
-Local t:TTime = TTime.Create(d, TDMinutes(5))
+Local d:TDate = New TDate(2002, Jan, 1)
+Local t:TTime = New TTime(d, TDMinutes(5))
 
 Local t2:TTime = t.addDays(1)
 

+ 2 - 2
datetime.mod/examples/ttime_addDuration.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2002, Jan, 1)
-Local t:TTime = TTime.Create(d, TDMinutes(5))
+Local d:TDate = New TDate(2002, Jan, 1)
+Local t:TTime = New TTime(d, TDMinutes(5))
 
 Local t2:TTime = t.addDuration(TDHours(1).add(TDMinutes(2)))
 

+ 2 - 2
datetime.mod/examples/ttime_create.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2002, Jan, 1)
-Local t:TTime = TTime.Create(d, TDHours(14))
+Local d:TDate = New TDate(2002, Jan, 1)
+Local t:TTime = New TTime(d, TDHours(14))
 
 Print t.toString()

+ 1 - 1
datetime.mod/examples/ttime_createLocal.bmx

@@ -3,6 +3,6 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local t:TTime = TTime.CreateLocal()
+Local t:TTime = New TTime()
 
 Print t.toString()

+ 1 - 1
datetime.mod/examples/ttime_createUniversal.bmx

@@ -3,6 +3,6 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local t:TTime = TTime.CreateUniversal()
+Local t:TTime = New TTime.CreateUniversal()
 
 Print t.toString()

+ 2 - 2
datetime.mod/examples/ttime_date.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2002, Jan, 10)
-Local t:TTime = TTime.Create(d, TTimeDuration.Hour(1))
+Local d:TDate = New TDate(2002, Jan, 10)
+Local t:TTime = New TTime(d, TTimeDuration.Hour(1))
 
 Print t.date().toString()

+ 3 - 3
datetime.mod/examples/ttime_subtract.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2002, Jan, 1)
-Local t1:TTime = TTime.Create(d, TDMinutes(5))
-Local t2:TTime = TTime.Create(d, TDMinutes(2))
+Local d:TDate = New TDate(2002, Jan, 1)
+Local t1:TTime = New TTime(d, TDMinutes(5))
+Local t2:TTime = New TTime(d, TDMinutes(2))
 
 Print t2.subtract(t1).toString() ' negative result

+ 2 - 2
datetime.mod/examples/ttime_subtractDays.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2002, Jan, 1)
-Local t:TTime = TTime.Create(d, TDMinutes(5))
+Local d:TDate = New TDate(2002, Jan, 1)
+Local t:TTime = New TTime(d, TDMinutes(5))
 
 Local t2:TTime = t.subtractDays(1)
 

+ 2 - 2
datetime.mod/examples/ttime_subtractDuration.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2002, Jan, 1)
-Local t:TTime = TTime.Create(d, TDMinutes(5))
+Local d:TDate = New TDate(2002, Jan, 1)
+Local t:TTime = New TTime(d, TDMinutes(5))
 
 Local t2:TTime = t.subtractDuration(TDMinutes(2))
 

+ 2 - 2
datetime.mod/examples/ttime_timeOfDay.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local d:TDate = TDate.Create(2002, Jan, 10)
-Local t:TTime = TTime.Create(d, TDHours(1))
+Local d:TDate = New TDate(2002, Jan, 10)
+Local t:TTime = New TTime(d, TDHours(1))
 
 Print t.timeOfDay().toString()

+ 1 - 1
datetime.mod/examples/ttimeduration_divide.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local td:TTimeDuration = TTimeDuration.Create(18, 30) ' 18 hours and 30 mins
+Local td:TTimeDuration = New TTimeDuration(18, 30) ' 18 hours and 30 mins
 
 Print td.divide(2).toString() ' 9 hours and 15 mins
 

+ 1 - 1
datetime.mod/examples/ttimeduration_format.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local td:TTimeDuration = TTimeDuration.Create(12, 30, 20)
+Local td:TTimeDuration = New TTimeDuration(12, 30, 20)
 
 Print td.format("%+%H:%M")
 

+ 1 - 1
datetime.mod/examples/ttimeduration_multiply.bmx

@@ -3,7 +3,7 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local td:TTimeDuration = TTimeDuration.Create(4, 10, 6)
+Local td:TTimeDuration = New TTimeDuration(4, 10, 6)
 
 Print td.multiply(3).toString()
 

+ 2 - 2
datetime.mod/examples/ttimeduration_subtract.bmx

@@ -3,8 +3,8 @@ SuperStrict
 Framework Boost.DateTime
 Import BRL.StandardIO
 
-Local td1:TTimeDuration = TTimeDuration.Create(12, 30, 20)
-Local td2:TTimeDuration = TTimeDuration.Create(1, 30, 20)
+Local td1:TTimeDuration = New TTimeDuration(12, 30, 20)
+Local td2:TTimeDuration = New TTimeDuration(1, 30, 20)
 
 Print td1.subtract(td2).toString()
 

+ 24 - 0
datetime.mod/glue.cpp

@@ -214,6 +214,7 @@ extern "C" {
 	int bmx_time_period_isless(time_period * tp1, time_period * tp2);
 	int bmx_time_period_isgreater(time_period * tp1, time_period * tp2);
 	int bmx_time_period_isequal(time_period * tp1, time_period * tp2);
+	BBString * bmx_time_period_to_simple_string(time_period * tp);
 	
 	MaxTimeZone * bmx_posix_time_zone(BBString * id);
 	BBString * bmx_time_zone_dst_zone_abbrev(MaxTimeZone * tz);
@@ -232,6 +233,8 @@ extern "C" {
 	tz_database * bmx_tz_load_from_file(BBString * filename);
 	MaxTimeZone * bmx_tz_time_zone_from_region(tz_database * db, BBString * id);
 	void bmx_tz_database_free(tz_database * db);
+	void bmx_tz_database_add_record(tz_database * db, BBString * id, MaxTimeZone * tz);
+	BBArray * bmx_tz_database_region_list(tz_database * db);
 	
 	local_date_time * bmx_local_date_time_new_sec_clock(MaxTimeZone * tz);
 	local_date_time * bmx_local_date_time_new_time(ptime * p, MaxTimeZone * tz);
@@ -1029,6 +1032,10 @@ int bmx_time_period_isequal(time_period * tp1, time_period * tp2) {
 	return *tp1 == *tp2;
 }
 
+BBString * bmx_time_period_to_simple_string(time_period * tp) {
+	return bbStringFromUTF8String((const unsigned char*)to_simple_string(*tp).c_str());
+}
+
 ptime * bmx_ptime_from_time_t(std::time_t * t) {
 	return new ptime(from_time_t(*t));
 }
@@ -1100,6 +1107,23 @@ void bmx_tz_database_free(tz_database * db) {
 	delete db;
 }
 
+void bmx_tz_database_add_record(tz_database * db, BBString * id, MaxTimeZone * tz) {
+	char * n = (char*)bbStringToUTF8String(id);
+	db->add_record(std::string(n), tz->timeZone);
+	bbMemFree(n);
+}
+
+BBArray * bmx_tz_database_region_list(tz_database * db) {
+	std::vector<std::string> list = db->region_list();
+	int n=list.size();
+	BBArray *p = bbArrayNew1D( "$",n );
+	BBString **s = (BBString**)BBARRAYDATA( p,p->dims );
+	for( int i = 0; i < n; ++i ){
+		s[i] = bbStringFromUTF8String((unsigned char*)list[i].c_str());
+	}
+	return p;
+}
+
 MaxTimeZone * bmx_tz_time_zone_from_region(tz_database * db, BBString * id) {
 	char * d = (char*)bbStringToUTF8String(id);
 	time_zone_ptr p = db->time_zone_from_region(std::string(d));

+ 3 - 0
datetime.mod/source.bmx

@@ -214,6 +214,7 @@ Extern
 	Function bmx_time_period_isless:Int(tp1:Byte Ptr, tp2:Byte Ptr)
 	Function bmx_time_period_isgreater:Int(tp1:Byte Ptr, tp2:Byte Ptr)
 	Function bmx_time_period_isequal:Int(tp1:Byte Ptr, tp2:Byte Ptr)
+	Function bmx_time_period_to_simple_string:String(time:Byte Ptr)
 	
 	Function bmx_posix_time_zone:Byte Ptr(id:String)
 	Function bmx_time_zone_dst_zone_abbrev:String(tz:Byte Ptr)
@@ -232,6 +233,8 @@ Extern
 	Function bmx_tz_load_from_file:Byte Ptr(filename:String)
 	Function bmx_tz_time_zone_from_region:Byte Ptr(db:Byte Ptr, id:String)
 	Function bmx_tz_database_free(db:Byte Ptr)
+	Function bmx_tz_database_add_record(db:Byte Ptr, id:String, zone:Byte Ptr)
+	Function bmx_tz_database_region_list:String[](db:Byte Ptr)
 	
 	Function bmx_local_date_time_new_sec_clock:Byte Ptr(zone:Byte Ptr)
 	Function bmx_local_date_time_new_time:Byte Ptr(time:Byte Ptr, zone:Byte Ptr)

+ 24 - 22
locale.mod/locale.bmx

@@ -30,10 +30,12 @@ bbdoc: Boost Locale
 End Rem
 Module Boost.Locale
 
-ModuleInfo "Version: 1.03"
+ModuleInfo "Version: 1.04"
 ModuleInfo "License: BSD"
 ModuleInfo "Copyright: Wrapper - 2013-2022 Bruce A Henderson"
 
+ModuleInfo "History: 1.04"
+ModuleInfo "History: Refactored."
 ModuleInfo "History: 1.03"
 ModuleInfo "History: Update to Boost 1.80."
 ModuleInfo "History: 1.02"
@@ -59,7 +61,7 @@ Import "common.bmx"
 
 
 Private
-Global localeGenerator:TBLGenerator = New TBLGenerator.Create()
+Global localeGenerator:TBLGenerator = New TBLGenerator()
 
 Public
 
@@ -70,19 +72,18 @@ Type TBLGenerator
 
 	Field genPtr:Byte Ptr
 
-	Function CreateGenerator:TBLGenerator()
-		Return New TBLGenerator.Create()
-	End Function
-	
-	Method Create:TBLGenerator()
+	Method New()
 		genPtr = bmx_boostlocale_generator_create()
-		Return Self
 	End Method
 	
 	Method generate:TBLLocale(id:String)
-		Return TBLLocale._create(bmx_boostlocale_generator_generate(genPtr, id))
+		Return New TBLLocale(_generate(id))
 	End Method
 
+	Private
+	Method _generate:Byte Ptr(id:String)
+		Return bmx_boostlocale_generator_generate(genPtr, id)
+	End Method
 End Type
 
 Rem
@@ -101,7 +102,7 @@ End Rem
 Function SetLocale(locale:Object)
 	If locale Then
 		If String(locale) Then
-			currentLocale = TBLLocale.Create(String(locale))
+			currentLocale = New TBLLocale(String(locale))
 		Else If TBLLocale(locale) Then
 			currentLocale = TBLLocale(locale)
 		End If
@@ -115,18 +116,19 @@ Type TBLLocale
 
 	Field localePtr:Byte Ptr
 	
-	Function Create:TBLLocale(locale:String)
-		Return localeGenerator.generate(locale)
-	End Function
-	
-	Function _create:TBLLocale(localePtr:Byte Ptr)
-		If localePtr Then
-			Local this:TBLLocale = New TBLLocale
-			this.localePtr = localePtr
-			Return this
-		End If
-		Return Null
-	End Function
+	Private
+	Method New()
+	End Method
+
+	Method New(localePtr:Byte Ptr)
+		Self.localePtr = localePtr
+	End Method
+
+	Public
+
+	Method New(locale:String)
+		New(localeGenerator._generate(locale))
+	End Method
 
 	Method name:String()
 		Return bmx_boostlocale_locale_name(localePtr)

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác