Răsfoiți Sursa

Various housekeeping.

Brucey 2 ani în urmă
părinte
comite
df8edadaad
3 a modificat fișierele cu 122 adăugiri și 110 ștergeri
  1. 74 68
      datetime.mod/datetime.bmx
  2. 33 28
      datetime.mod/glue.cpp
  3. 15 14
      datetime.mod/source.bmx

+ 74 - 68
datetime.mod/datetime.bmx

@@ -87,7 +87,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(1984, 4, 23)
@@ -120,7 +120,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.localDay()
@@ -147,7 +147,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.fromString("2004-09-25")
@@ -166,7 +166,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.fromUndelimitedString("19760130")
@@ -218,7 +218,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2007, Jul, 17)
@@ -237,7 +237,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2007, Jul, 17)
@@ -256,7 +256,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2007, Jul, 17)
@@ -275,7 +275,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2006, Dec, 24)
@@ -300,7 +300,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.localDay()
@@ -327,7 +327,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.localDay()
@@ -346,7 +346,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.localDay()
@@ -366,7 +366,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.localDay()
@@ -385,7 +385,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.localDay()
@@ -404,7 +404,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.localDay()
@@ -423,7 +423,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d1:TDate = TDate.Create(2000, Jan, 1)
@@ -529,7 +529,7 @@ Type TDate
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.localDay()
@@ -549,7 +549,7 @@ Type TDate
 	' deletes the date instance
 	Method Delete()
 		If datePtr Then
-			bmx_datetime_delete(datePtr)
+			bmx_datetime_free(datePtr)
 			datePtr = Null
 		End If
 	End Method
@@ -574,7 +574,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local startDate:TDate = TDate.Create(2007, 1, 1)
@@ -596,7 +596,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local startDate:TDate = TDate.localDay()
@@ -630,7 +630,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local startDate:TDate = TDate.Create(2007, Feb, 1)
@@ -656,7 +656,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local startDate:TDate = TDate.localDay()
@@ -677,7 +677,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local startDate:TDate = TDate.localDay()
@@ -698,7 +698,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local startDate:TDate = TDate.localDay()
@@ -719,7 +719,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local startDate:TDate = TDate.localDay()
@@ -740,7 +740,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2007, 2, 1), TDate.Create(2007, 3, 1))
@@ -761,7 +761,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2007, 1, 1))
@@ -784,7 +784,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2007, 1, 1))
@@ -807,7 +807,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2007, 1, 1))
@@ -830,7 +830,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2007, 1, 1))
@@ -855,7 +855,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 1, 1))
@@ -878,7 +878,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 1, 1))
@@ -898,7 +898,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 1, 1))
@@ -918,7 +918,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 10, 1), TDate.Create(2007, 1, 1))
@@ -951,7 +951,7 @@ Type TDatePeriod
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local p1:TDatePeriod = TDatePeriod.Create(TDate.Create(2006, 1, 1), TDate.Create(2006, 10, 1))
@@ -1012,7 +1012,7 @@ Type TDatePeriod
 	
 	Method Delete()
 		If datePeriodPtr Then
-			bmx_datetime_period_delete(datePeriodPtr)
+			bmx_datetime_period_free(datePeriodPtr)
 			datePeriodPtr = Null
 		End If
 	End Method
@@ -1121,7 +1121,7 @@ Type TDateIterator Extends TDate Abstract
 
 	Method Delete()
 		If datePtr Then
-			bmx_datetime_iter_delete(datePtr)
+			bmx_datetime_iter_free(datePtr)
 			datePtr = Null
 		End If
 	End Method
@@ -1195,7 +1195,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2002, Jan, 1)
@@ -1227,7 +1227,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local t:TTime = TTime.CreateLocal()
@@ -1246,7 +1246,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local t:TTime = TTime.CreateUniversal()
@@ -1306,7 +1306,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2002, Jan, 10)
@@ -1325,7 +1325,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2002, Jan, 10)
@@ -1366,7 +1366,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2002, Jan, 1)
@@ -1389,7 +1389,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2002, Jan, 1)
@@ -1412,7 +1412,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2002, Jan, 1)
@@ -1435,7 +1435,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2002, Jan, 1)
@@ -1458,7 +1458,7 @@ Type TTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local d:TDate = TDate.Create(2002, Jan, 1)
@@ -1519,7 +1519,7 @@ Type TTime
 	
 	Method Delete()
 		If ptimePtr Then
-			bmx_ptime_delete(ptimePtr)
+			bmx_ptime_free(ptimePtr)
 			ptimePtr = Null
 		End If
 	End Method
@@ -1558,7 +1558,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td:TTimeDuration = TTimeDuration.Hour(10)
@@ -1577,7 +1577,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td:TTimeDuration = TTimeDuration.Minute(7)
@@ -1596,7 +1596,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td:TTimeDuration = TTimeDuration.Second(45)
@@ -1615,7 +1615,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td:TTimeDuration = TTimeDuration.Millisecond(180)
@@ -1695,7 +1695,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td:TTimeDuration = TDHours(12)
@@ -1729,7 +1729,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td:TTimeDuration = TDHours(12).add(TDMinutes(35)).add(TDSeconds(12))
@@ -1748,7 +1748,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td1:TTimeDuration = TTimeDuration.Create(12, 30, 20)
@@ -1768,7 +1768,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td:TTimeDuration = TTimeDuration.Create(18, 30) ' 18 hours and 30 mins
@@ -1787,7 +1787,7 @@ Type TTimeDuration
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local td:TTimeDuration = TTimeDuration.Create(4, 10, 6)
@@ -1847,7 +1847,7 @@ Type TTimeDuration
 
 	Method Delete()
 		If durationPtr Then
-			bmx_time_duration_delete(durationPtr)
+			bmx_time_duration_free(durationPtr)
 			durationPtr = Null
 		End If
 	End Method
@@ -2026,7 +2026,7 @@ Type TTimePeriod
 
 	Method Delete()
 		If timePeriodPtr Then
-			bmx_time_period_delete(timePeriodPtr)
+			bmx_time_period_free(timePeriodPtr)
 			timePeriodPtr = Null
 		End If
 	End Method
@@ -2090,6 +2090,12 @@ Type TTZDatabase
 ' TODO !!
 	End Method
 	
+	Method Delete()
+		If tzDatabasePtr Then
+			bmx_tz_database_free(tzDatabasePtr)
+			tzDatabasePtr = Null
+		End If
+	End Method
 	
 End Type
 
@@ -2147,7 +2153,7 @@ Type TLocalDateTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local pt:TTime = TTime.Create(TDate.Create(2004, Nov, 5), TDHours(10))
@@ -2170,7 +2176,7 @@ Type TLocalDateTime
 	<pre>
 	SuperStrict
 	
-	Framework BaH.DateTime
+	Framework Boost.DateTime
 	Import BRL.StandardIO
 	
 	Local pt:TTime = TTime.Create(TDate.Create(2004, Nov, 5), TDHours(10))
@@ -2283,7 +2289,7 @@ Type TLocalDateTime
 	
 	Method Delete()
 		If localDateTimePtr Then
-			bmx_local_date_time_delete(localDateTimePtr)
+			bmx_local_date_time_free(localDateTimePtr)
 			localDateTimePtr = Null
 		End If
 	End Method
@@ -2451,7 +2457,7 @@ Type TLocalTimePeriod
 	
 	Method Delete()
 		If localTimePeriodPtr Then
-			bmx_local_time_period_delete(localTimePeriodPtr)
+			bmx_local_time_period_free(localTimePeriodPtr)
 			localTimePeriodPtr = Null
 		End If
 	End Method
@@ -2663,7 +2669,7 @@ Type TPartialDate Extends TYearBasedGenerator
 
 	Method Delete()
 		If ybgPtr Then
-			bmx_partial_date_delete(ybgPtr)
+			bmx_partial_date_free(ybgPtr)
 			ybgPtr = Null
 		End If
 	End Method
@@ -2696,7 +2702,7 @@ Type TLastDayOfWeekInMonth Extends TYearBasedGenerator
 
 	Method Delete()
 		If ybgPtr Then
-			bmx_last_day_of_week_in_month_delete(ybgPtr)
+			bmx_last_day_of_week_in_month_free(ybgPtr)
 			ybgPtr = Null
 		End If
 	End Method
@@ -2729,7 +2735,7 @@ Type TFirstDayOfWeekInMonth Extends TYearBasedGenerator
 
 	Method Delete()
 		If ybgPtr Then
-			bmx_first_day_of_week_in_month_delete(ybgPtr)
+			bmx_first_day_of_week_in_month_free(ybgPtr)
 			ybgPtr = Null
 		End If
 	End Method
@@ -2765,7 +2771,7 @@ Type TNthDayOfWeekInMonth Extends TYearBasedGenerator
 
 	Method Delete()
 		If ybgPtr Then
-			bmx_nth_day_of_week_in_month_delete(ybgPtr)
+			bmx_nth_day_of_week_in_month_free(ybgPtr)
 			ybgPtr = Null
 		End If
 	End Method
@@ -2802,7 +2808,7 @@ Type TFirstDayOfWeekAfter
 
 	Method Delete()
 		If ybgPtr Then
-			bmx_first_day_of_week_after_delete(ybgPtr)
+			bmx_first_day_of_week_after_free(ybgPtr)
 			ybgPtr = Null
 		End If
 	End Method
@@ -2839,7 +2845,7 @@ Type TFirstDayOfWeekBefore
 
 	Method Delete()
 		If ybgPtr Then
-			bmx_first_day_of_week_before_delete(ybgPtr)
+			bmx_first_day_of_week_before_free(ybgPtr)
 			ybgPtr = Null
 		End If
 	End Method

+ 33 - 28
datetime.mod/glue.cpp

@@ -46,7 +46,7 @@ extern "C" {
 	date * bmx_datetime_universalday();
 
 	date * bmx_datetime_newdate(int year, int month, int day);	
-	void bmx_datetime_delete(date * d);
+	void bmx_datetime_free(date * d);
 
 	int bmx_datetime_before(date * myDate, date * yourDate);
 	int bmx_datetime_after(date * myDate, date * yourDate);
@@ -71,7 +71,7 @@ extern "C" {
 	date_period * bmx_datetime_period_datedate(date * d1, date * d2);
 	date_period * bmx_datetime_period_withdays(date * d, int length);
 	void bmx_datetime_period_shift(date_period * p, int length);
-	void bmx_datetime_period_delete(date_period * p);
+	void bmx_datetime_period_free(date_period * p);
 	
 	date * bmx_datetime_period_begin(date_period * p);
 	date * bmx_datetime_period_last(date_period * p);
@@ -104,7 +104,7 @@ extern "C" {
 	day_iterator * bmx_datetime_dayiter(date * d, int offset);
 	month_iterator * bmx_datetime_monthiter(date * d, int offset);
 	year_iterator * bmx_datetime_yeariter(date * d, int offset);
-	void bmx_datetime_iter_delete(date_iterator * d);
+	void bmx_datetime_iter_free(date_iterator * d);
 
 	int bmx_datetime_iter_before(date_iterator * myDate, date * yourDate);
 	int bmx_datetime_iter_after(date_iterator * myDate, date * yourDate);
@@ -127,7 +127,7 @@ extern "C" {
 	BBString * bmx_datetime_iter_asformat(date_iterator * d, BBString * format, std::locale * loc, date_facet * facet);
 	
 	time_duration * bmx_time_duration(int hours, int minutes, int seconds, int fraction);
-	void bmx_time_duration_delete(time_duration * d);
+	void bmx_time_duration_free(time_duration * d);
 	time_duration * bmx_time_duration_new_hours(int value);
 	time_duration * bmx_time_duration_new_minutes(int value);
 	time_duration * bmx_time_duration_new_seconds(int value);
@@ -155,7 +155,7 @@ extern "C" {
 	int bmx_time_num_fractional_digits();
 	
 	ptime * bmx_ptime_new(date * d, time_duration * t);
-	void bmx_ptime_delete(ptime * p);
+	void bmx_ptime_free(ptime * p);
 	ptime * bmx_ptime_local_new();
 	ptime * bmx_ptime_universal_new();
 	ptime * bmx_ptime_local_microsecond_new();
@@ -179,13 +179,13 @@ extern "C" {
 
 	partial_date * bmx_partial_date_new(int day, int month);
 	date * bmx_partial_date_get_date(partial_date *  p, int year);
-	void bmx_partial_date_delete(partial_date *  p);
+	void bmx_partial_date_free(partial_date *  p);
 	last_day_of_the_week_in_month * bmx_last_day_of_week_in_month_new(int weekday, int month);
 	date * bmx_last_day_of_week_in_month_get_date(last_day_of_the_week_in_month *  p, int year);
-	void bmx_last_day_of_week_in_month_delete(last_day_of_the_week_in_month *  p);
+	void bmx_last_day_of_week_in_month_free(last_day_of_the_week_in_month *  p);
 	first_day_of_the_week_in_month * bmx_first_day_of_week_in_month_new(int weekday, int month);
 	date * bmx_first_day_of_week_in_month_get_date(first_day_of_the_week_in_month *  p, int year);
-	void bmx_first_day_of_week_in_month_delete(first_day_of_the_week_in_month *  p);
+	void bmx_first_day_of_week_in_month_free(first_day_of_the_week_in_month *  p);
 	
 	BBString * bmx_weekday_to_string(int wd);
 	
@@ -199,7 +199,7 @@ extern "C" {
 	time_period * bmx_time_period_timetime(ptime * p1, ptime * p2);
 	time_period * bmx_time_period_withduration(ptime * p, time_duration * d);
 	void bmx_time_period_shift(time_period * tp, time_duration * d);
-	void bmx_time_period_delete(time_period * tp);
+	void bmx_time_period_free(time_period * tp);
 	ptime * bmx_time_period_begin(time_period * tp);
 	ptime * bmx_time_period_last(time_period * tp);
 	ptime * bmx_time_period_end(time_period * tp);
@@ -231,6 +231,7 @@ extern "C" {
 	tz_database * bmx_tz_database();
 	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);
 	
 	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);
@@ -256,14 +257,14 @@ extern "C" {
 	
 	nth_day_of_the_week_in_month * bmx_nth_day_of_week_in_month_new(int nth, int weekday, int month);
 	date * bmx_nth_day_of_week_in_month_get_date(nth_day_of_the_week_in_month *  p, int year);
-	void bmx_nth_day_of_week_in_month_delete(nth_day_of_the_week_in_month *  p);
+	void bmx_nth_day_of_week_in_month_free(nth_day_of_the_week_in_month *  p);
 
 	first_day_of_the_week_after * bmx_first_day_of_week_after_new(int weekday);
 	date * bmx_first_day_of_week_after_get_date(first_day_of_the_week_after *  p, date * d);
-	void bmx_first_day_of_week_after_delete(first_day_of_the_week_after *  p);
+	void bmx_first_day_of_week_after_free(first_day_of_the_week_after *  p);
 	first_day_of_the_week_before * bmx_first_day_of_week_before_new(int weekday);
 	date * bmx_first_day_of_week_before_get_date(first_day_of_the_week_before *  p, date * d);
-	void bmx_first_day_of_week_before_delete(first_day_of_the_week_before *  p);
+	void bmx_first_day_of_week_before_free(first_day_of_the_week_before *  p);
 
 	int bmx_days_until_weekday(date * d, int weekday);
 	int bmx_days_before_weekday(date * d, int weekday);
@@ -288,11 +289,11 @@ extern "C" {
 	local_date_time * bmx_local_date_time_subtract_years(local_date_time * ldt, int value);
 	local_date_time * bmx_local_date_time_add_duration(local_date_time * ldt, time_duration * td);
 	local_date_time * bmx_local_date_time_subtract_duration(local_date_time * ldt, time_duration * td);
-	void bmx_local_date_time_delete(local_date_time * ldt);
+	void bmx_local_date_time_free(local_date_time * ldt);
 	
 	local_time_period * bmx_local_time_period_new(local_date_time * ldt1, local_date_time * ldt2);
 	local_time_period * bmx_local_time_period_new_duration(local_date_time * ldt, time_duration * d);
-	void bmx_local_time_period_delete(local_time_period * ldt);
+	void bmx_local_time_period_free(local_time_period * ldt);
 	local_date_time * bmx_local_time_period_begin(local_time_period * ldt);
 	local_date_time * bmx_local_time_period_last(local_time_period * ldt);
 	local_date_time * bmx_local_time_period_end(local_time_period * ldt);
@@ -343,7 +344,7 @@ date * bmx_datetime_newdate(int year, int month, int day) {
 	}
 }
 
-void bmx_datetime_delete(date * d) {
+void bmx_datetime_free(date * d) {
 	delete d;
 }
 
@@ -453,7 +454,7 @@ void bmx_datetime_period_shift(date_period * p, int length) {
 	p->shift(days(length));
 }
 
-void bmx_datetime_period_delete(date_period * p) {
+void bmx_datetime_period_free(date_period * p) {
 	delete p;
 }
 
@@ -568,7 +569,7 @@ year_iterator * bmx_datetime_yeariter(date * d, int offset) {
 	return new year_iterator(*d, offset);
 }
 
-void bmx_datetime_iter_delete(date_iterator * d) {
+void bmx_datetime_iter_free(date_iterator * d) {
 	delete d;
 }
 
@@ -677,7 +678,7 @@ time_duration * bmx_time_duration(int hours, int minutes, int seconds, int fract
 	return new time_duration(hours, minutes, seconds, fraction);
 }
 
-void bmx_time_duration_delete(time_duration * d) {
+void bmx_time_duration_free(time_duration * d) {
 	delete d;
 }
 
@@ -788,7 +789,7 @@ ptime * bmx_ptime_new(date * d, time_duration * t) {
 	return new ptime(*d, *t);
 }
 
-void bmx_ptime_delete(ptime * p) {
+void bmx_ptime_free(ptime * p) {
 	delete p;
 }
 
@@ -886,7 +887,7 @@ date * bmx_partial_date_get_date(partial_date *  p, int year) {
 	return new date(p->get_date(year));
 }
 
-void bmx_partial_date_delete(partial_date *  p) {
+void bmx_partial_date_free(partial_date *  p) {
 	delete p;
 }
 
@@ -898,7 +899,7 @@ date * bmx_last_day_of_week_in_month_get_date(last_day_of_the_week_in_month *  p
 	return new date(p->get_date(year));
 }
 
-void bmx_last_day_of_week_in_month_delete(last_day_of_the_week_in_month *  p) {
+void bmx_last_day_of_week_in_month_free(last_day_of_the_week_in_month *  p) {
 	delete p;
 }
 
@@ -910,7 +911,7 @@ date * bmx_first_day_of_week_in_month_get_date(first_day_of_the_week_in_month *
 	return new date(p->get_date(year));
 }
 
-void bmx_first_day_of_week_in_month_delete(first_day_of_the_week_in_month *  p) {
+void bmx_first_day_of_week_in_month_free(first_day_of_the_week_in_month *  p) {
 	delete p;
 }
 
@@ -972,7 +973,7 @@ ptime * bmx_time_period_begin(time_period * tp) {
 	return new ptime(tp->begin());
 }
 
-void bmx_time_period_delete(time_period * tp) {
+void bmx_time_period_free(time_period * tp) {
 	delete tp;
 }
 
@@ -1095,6 +1096,10 @@ tz_database * bmx_tz_load_from_file(BBString * filename) {
 	return db;
 }
 
+void bmx_tz_database_free(tz_database * db) {
+	delete db;
+}
+
 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));
@@ -1262,7 +1267,7 @@ date * bmx_nth_day_of_week_in_month_get_date(nth_day_of_the_week_in_month *  p,
 	return new date(p->get_date(year));
 }
 
-void bmx_nth_day_of_week_in_month_delete(nth_day_of_the_week_in_month *  p) {
+void bmx_nth_day_of_week_in_month_free(nth_day_of_the_week_in_month *  p) {
 	delete p;
 }
 
@@ -1274,7 +1279,7 @@ date * bmx_first_day_of_week_after_get_date(first_day_of_the_week_after *  p, da
 	return new date(p->get_date(*d));
 }
 
-void bmx_first_day_of_week_after_delete(first_day_of_the_week_after *  p) {
+void bmx_first_day_of_week_after_free(first_day_of_the_week_after *  p) {
 	delete p;
 }
 
@@ -1286,7 +1291,7 @@ date * bmx_first_day_of_week_before_get_date(first_day_of_the_week_before *  p,
 	return new date(p->get_date(*d));
 }
 
-void bmx_first_day_of_week_before_delete(first_day_of_the_week_before *  p) {
+void bmx_first_day_of_week_before_free(first_day_of_the_week_before *  p) {
 	delete p;
 }
 
@@ -1371,7 +1376,7 @@ local_date_time * bmx_local_date_time_subtract_duration(local_date_time * ldt, t
 	return new local_date_time(*ldt - *td);
 }
 
-void bmx_local_date_time_delete(local_date_time * ldt) {
+void bmx_local_date_time_free(local_date_time * ldt) {
 	delete ldt;
 }
 
@@ -1383,7 +1388,7 @@ local_time_period * bmx_local_time_period_new_duration(local_date_time * ldt, ti
 	return new local_time_period(*ldt, *d);
 }
 
-void bmx_local_time_period_delete(local_time_period * ldt) {
+void bmx_local_time_period_free(local_time_period * ldt) {
 	delete ldt;
 }
 

+ 15 - 14
datetime.mod/source.bmx

@@ -40,7 +40,7 @@ Import "glue.cpp"
 Extern
 
 	Function bmx_datetime_newdate:Byte Ptr(year:Int, Month:Int, day:Int)
-	Function bmx_datetime_delete(date:Byte Ptr)
+	Function bmx_datetime_free(date:Byte Ptr)
 
 	Function bmx_datetime_before:Int(myDate:Byte Ptr, yourDate:Byte Ptr)
 	Function bmx_datetime_after:Int(myDate:Byte Ptr, yourDate:Byte Ptr)
@@ -69,7 +69,7 @@ Extern
 	Function bmx_datetime_period_datedate:Byte Ptr(d1:Byte Ptr, d2:Byte Ptr)
 	Function bmx_datetime_period_withdays:Byte Ptr(date:Byte Ptr, days:Int)
 	Function bmx_datetime_period_shift(period:Byte Ptr, days:Int)
-	Function bmx_datetime_period_delete(period:Byte Ptr)
+	Function bmx_datetime_period_free(period:Byte Ptr)
 	
 	Function bmx_datetime_period_begin:Byte Ptr(period:Byte Ptr)
 	Function bmx_datetime_period_last:Byte Ptr(period:Byte Ptr)
@@ -95,7 +95,7 @@ Extern
 	Function bmx_datetime_period_isgreater:Int(p1:Byte Ptr, p2:Byte Ptr)
 	Function bmx_datetime_period_isequal:Int(p1:Byte Ptr, p2:Byte Ptr)
 
-	Function bmx_datetime_iter_delete(iter:Byte Ptr)
+	Function bmx_datetime_iter_free(iter:Byte Ptr)
 	
 	Function bmx_datetime_dayiter:Byte Ptr(date:Byte Ptr, offset:Int)
 	Function bmx_datetime_monthiter:Byte Ptr(date:Byte Ptr, offset:Int)
@@ -125,7 +125,7 @@ Extern
 	Function bmx_datetime_iter_asformat:String(date:Byte Ptr, f:String, locale:Byte Ptr, facet:Byte Ptr)
 
 	Function bmx_time_duration:Byte Ptr(hours:Int, minutes:Int, seconds:Int, fraction:Int)
-	Function bmx_time_duration_delete(duration:Byte Ptr)
+	Function bmx_time_duration_free(duration:Byte Ptr)
 	Function bmx_time_duration_new_hours:Byte Ptr(value:Int)
 	Function bmx_time_duration_new_minutes:Byte Ptr(value:Int)
 	Function bmx_time_duration_new_seconds:Byte Ptr(value:Int)
@@ -153,7 +153,7 @@ Extern
 	Function bmx_time_num_fractional_digits:Int()
 	
 	Function bmx_ptime_new:Byte Ptr(date:Byte Ptr, duration:Byte Ptr)
-	Function bmx_ptime_delete(time:Byte Ptr)
+	Function bmx_ptime_free(time:Byte Ptr)
 	Function bmx_ptime_local_new:Byte Ptr()
 	Function bmx_ptime_universal_new:Byte Ptr()
 	Function bmx_ptime_local_microsecond_new:Byte Ptr()
@@ -176,15 +176,15 @@ Extern
 	
 	Function bmx_partial_date_new:Byte Ptr(day:Int, Month:Int)
 	Function bmx_partial_date_get_date:Byte Ptr(ybg:Byte Ptr, year:Int)
-	Function bmx_partial_date_delete(ybg:Byte Ptr)
+	Function bmx_partial_date_free(ybg:Byte Ptr)
 	
 	Function bmx_last_day_of_week_in_month_new:Byte Ptr(WeekDay:Int, Month:Int)
 	Function bmx_last_day_of_week_in_month_get_date:Byte Ptr(ybg:Byte Ptr, year:Int)
-	Function bmx_last_day_of_week_in_month_delete(ybg:Byte Ptr)
+	Function bmx_last_day_of_week_in_month_free(ybg:Byte Ptr)
 
 	Function bmx_first_day_of_week_in_month_new:Byte Ptr(WeekDay:Int, Month:Int)
 	Function bmx_first_day_of_week_in_month_get_date:Byte Ptr(ybg:Byte Ptr, year:Int)
-	Function bmx_first_day_of_week_in_month_delete(ybg:Byte Ptr)
+	Function bmx_first_day_of_week_in_month_free(ybg:Byte Ptr)
 	
 	Function bmx_weekday_to_string:String(WeekDay:Int)
 	
@@ -200,7 +200,7 @@ Extern
 	Function bmx_time_period_withduration:Byte Ptr(beginTime:Byte Ptr, duration:Byte Ptr)
 	Function bmx_time_period_shift(time:Byte Ptr, duration:Byte Ptr)
 	Function bmx_time_period_begin:Byte Ptr(time:Byte Ptr)
-	Function bmx_time_period_delete(time:Byte Ptr)
+	Function bmx_time_period_free(time:Byte Ptr)
 	Function bmx_time_period_last:Byte Ptr(time:Byte Ptr)
 	Function bmx_time_period_end:Byte Ptr(time:Byte Ptr)
 	Function bmx_time_period_length:Byte Ptr(time:Byte Ptr)
@@ -231,6 +231,7 @@ Extern
 	Function bmx_tz_database:Byte Ptr()
 	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_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)
@@ -257,14 +258,14 @@ Extern
 
 	Function bmx_nth_day_of_week_in_month_new:Byte Ptr(nth:Int, WeekDay:Int, Month:Int)
 	Function bmx_nth_day_of_week_in_month_get_date:Byte Ptr(ybg:Byte Ptr, year:Int)
-	Function bmx_nth_day_of_week_in_month_delete(ybg:Byte Ptr)
+	Function bmx_nth_day_of_week_in_month_free(ybg:Byte Ptr)
 	
 	Function bmx_first_day_of_week_after_new:Byte Ptr(WeekDay:Int)
 	Function bmx_first_day_of_week_after_get_date:Byte Ptr(ybg:Byte Ptr, date:Byte Ptr)
-	Function bmx_first_day_of_week_after_delete(ybg:Byte Ptr)
+	Function bmx_first_day_of_week_after_free(ybg:Byte Ptr)
 	Function bmx_first_day_of_week_before_new:Byte Ptr(WeekDay:Int)
 	Function bmx_first_day_of_week_before_get_date:Byte Ptr(ybg:Byte Ptr, date:Byte Ptr)
-	Function bmx_first_day_of_week_before_delete(ybg:Byte Ptr)
+	Function bmx_first_day_of_week_before_free(ybg:Byte Ptr)
 	
 	Function bmx_days_until_weekday:Int(date:Byte Ptr, WeekDay:Int)
 	Function bmx_days_before_weekday:Int(date:Byte Ptr, WeekDay:Int)
@@ -289,11 +290,11 @@ Extern
 	Function bmx_local_date_time_subtract_years:Byte Ptr(ldt:Byte Ptr, value:Int)
 	Function bmx_local_date_time_add_duration:Byte Ptr(ldt:Byte Ptr, duration:Byte Ptr)
 	Function bmx_local_date_time_subtract_duration:Byte Ptr(ldt:Byte Ptr, duration:Byte Ptr)
-	Function bmx_local_date_time_delete(ldt:Byte Ptr)
+	Function bmx_local_date_time_free(ldt:Byte Ptr)
 	
 	Function bmx_local_time_period_new:Byte Ptr(ldt1:Byte Ptr, ldt2:Byte Ptr)
 	Function bmx_local_time_period_new_duration:Byte Ptr(ldt:Byte Ptr, duration:Byte Ptr)
-	Function bmx_local_time_period_delete(ltp:Byte Ptr)
+	Function bmx_local_time_period_free(ltp:Byte Ptr)
 	Function bmx_local_time_period_begin:Byte Ptr(ltp:Byte Ptr)
 	Function bmx_local_time_period_last:Byte Ptr(ltp:Byte Ptr)
 	Function bmx_local_time_period_end:Byte Ptr(ltp:Byte Ptr)