pygccxml-commit Mailing List for C++ Python language bindings (Page 71)
Brought to you by:
mbaas,
roman_yakovenko
Menu
▾
▴
pygccxml-commit
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(190) |
Apr
(166) |
May
(170) |
Jun
(75) |
Jul
(105) |
Aug
(131) |
Sep
(99) |
Oct
(84) |
Nov
(67) |
Dec
(54) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(66) |
Feb
(49) |
Mar
(25) |
Apr
(62) |
May
(21) |
Jun
(34) |
Jul
(9) |
Aug
(21) |
Sep
(5) |
Oct
|
Nov
(63) |
Dec
(34) |
| 2008 |
Jan
(10) |
Feb
(42) |
Mar
(26) |
Apr
(25) |
May
(6) |
Jun
(40) |
Jul
(18) |
Aug
(29) |
Sep
(6) |
Oct
(32) |
Nov
(14) |
Dec
(56) |
| 2009 |
Jan
(127) |
Feb
(52) |
Mar
(2) |
Apr
(10) |
May
(29) |
Jun
(3) |
Jul
|
Aug
(16) |
Sep
(4) |
Oct
(11) |
Nov
(8) |
Dec
(14) |
| 2010 |
Jan
(31) |
Feb
(1) |
Mar
(7) |
Apr
(9) |
May
(1) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(8) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <rom...@us...> - 2006-05-14 08:15:13
|
Revision: 91 Author: roman_yakovenko Date: 2006-05-14 01:15:06 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=91&view=rev Log Message: ----------- adding central sconstruct file Added Paths: ----------- pyplusplus_dev/examples/pyboost_dev/sconstruct Added: pyplusplus_dev/examples/pyboost_dev/sconstruct =================================================================== --- pyplusplus_dev/examples/pyboost_dev/sconstruct (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/sconstruct 2006-05-14 08:15:06 UTC (rev 91) @@ -0,0 +1,22 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import sys +sys.path.append( './../..' ) +import environment + +env = Environment( + LIBS=['boost_python'] + , LIBPATH=[ environment.boost.libs, environment.python.libs ] + , CPPPATH=[ environment.boost.include, environment.python.include ] + , SHLIBPREFIX='' + , SHLIBSUFFIX=environment.scons.suffix +) + +Export( 'env' ) +env.SConscript( ['pyboost/date_time/sconscript'] ) +env.SConscript( ['pyboost/crc/sconscript'] ) +env.SConscript( ['pyboost/random/sconscript'] ) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 08:14:29
|
Revision: 90 Author: roman_yakovenko Date: 2006-05-14 01:14:24 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=90&view=rev Log Message: ----------- changing gccxml path Modified Paths: -------------- pyplusplus_dev/environment.py Modified: pyplusplus_dev/environment.py =================================================================== --- pyplusplus_dev/environment.py 2006-05-14 08:11:18 UTC (rev 89) +++ pyplusplus_dev/environment.py 2006-05-14 08:14:24 UTC (rev 90) @@ -37,7 +37,7 @@ boost.libs = '/home/roman/boost_cvs/bin' boost.include = '/home/roman/boost_cvs' python.include = '/usr/include/python2.4' - gccxml.executable = '/home/roman/gccxml/bin/gccxml' + gccxml.executable = '/home/roman/gccxml-build/bin/gccxml' _my_path = None This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 08:11:27
|
Revision: 89 Author: roman_yakovenko Date: 2006-05-14 01:11:18 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=89&view=rev Log Message: ----------- adding new unittests for crc and randmo Added Paths: ----------- pyplusplus_dev/examples/pyboost_dev/unittests/crc/ pyplusplus_dev/examples/pyboost_dev/unittests/crc/__init__.py pyplusplus_dev/examples/pyboost_dev/unittests/crc/unittests/ pyplusplus_dev/examples/pyboost_dev/unittests/crc/unittests/test_all.py pyplusplus_dev/examples/pyboost_dev/unittests/random/ pyplusplus_dev/examples/pyboost_dev/unittests/random/unittests/ Added: pyplusplus_dev/examples/pyboost_dev/unittests/crc/__init__.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/unittests/crc/__init__.py (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/unittests/crc/__init__.py 2006-05-14 08:11:18 UTC (rev 89) @@ -0,0 +1,41 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import _crc_ + +print dir( _crc_ ) + +from _crc_ import crc_16_type as crc16 +from _crc_ import crc_32_type as crc32 +from _crc_ import crc_ccitt_type as crc_ccitt +from _crc_ import fast_crc_type as fast_crc + +__optimal__ = [ crc16, crc32, crc_ccitt, fast_crc ] + +from _crc_ import crc_basic_1 +from _crc_ import crc_basic_16 +from _crc_ import crc_basic_3 +from _crc_ import crc_basic_32 +from _crc_ import crc_basic_7 + +basic = { + 1 : crc_basic_1 + , 3 : crc_basic_3 + , 7 : crc_basic_7 + , 16 : crc_basic_16 + , 32 : crc_basic_32 +} + +__basic__ = basic.values() + +__all__ = __optimal__ + __basic__ + +def process_bytes( self, data ): + for byte in data: + self.process_byte( byte ) + +for cls in __all__: + cls.process_bytes = process_bytes \ No newline at end of file Added: pyplusplus_dev/examples/pyboost_dev/unittests/crc/unittests/test_all.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/unittests/crc/unittests/test_all.py (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/unittests/crc/unittests/test_all.py 2006-05-14 08:11:18 UTC (rev 89) @@ -0,0 +1,90 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import sys +sys.path.append( '../..' ) + +import unittest +import crc + +class consts: + data = [ 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39 ] + crc_ccitt_result = 0x29B1 + crc_16_result = 0xBB3D + crc_32_result = 0xCBF43926 + +class tester_t( unittest.TestCase ): + def __init__( self, *args ): + unittest.TestCase.__init__( self, *args ) + + def fundamental_test( self, cls, data, expected ): + inst = cls() + inst.process_bytes( data ) + print inst.checksum() + #self.failUnless( inst.checksum() == expected ) + + def compute_test( self, fast_crc, slow_crc, expected ): + fast_crc.process_bytes( consts.data, len(consts.data) ) + slow_crc.process_bytes( consts.data, len(consts.data) ) + + def test( self ): + self.fundamental_test( crc.crc_ccitt, consts.data, consts.crc_ccitt_result ) + + def test_small_crc_3( self ): + #The CRC standard is a SDH/SONET Low Order LCAS control word with CRC-3 + #taken from ITU-T G.707 (12/03) XIII.2. + + #Four samples, each four bytes should all have a CRC of zero + samples = \ + [ + [ 0x3A, 0xC4, 0x08, 0x06 ], + [ 0x42, 0xC5, 0x0A, 0x41 ], + [ 0x4A, 0xC5, 0x08, 0x22 ], + [ 0x52, 0xC4, 0x08, 0x05 ] + ] + + # Basic computer + tester1 = crc.basic[3]( 0x03 ) #same as crc.crc_basic_3 + + tester1.process_bytes( samples[0] ) + self.failUnless( tester1.checksum() == 0 ) + + tester1.reset() + tester1.process_bytes( samples[1] ) + self.failUnless( tester1.checksum() == 0 ) + + tester1.reset() + tester1.process_bytes( samples[2] ) + self.failUnless( tester1.checksum() == 0 ) + + tester1.reset() + tester1.process_bytes( samples[3] ) + self.failUnless( tester1.checksum() == 0 ) + + # Optimal computer + #define PRIVATE_CRC_FUNC boost::crc<3, 0x03, 0, 0, false, false> + #define PRIVATE_ACRC_FUNC boost::augmented_crc<3, 0x03> + + #self.failUnless( 0 == PRIVATE_CRC_FUNC(samples[0], 4) ) + #self.failUnless( 0 == PRIVATE_CRC_FUNC(samples[1], 4) ) + #self.failUnless( 0 == PRIVATE_CRC_FUNC(samples[2], 4) ) + #self.failUnless( 0 == PRIVATE_CRC_FUNC(samples[3], 4) ) + + # maybe the fix to CRC functions needs to be applied to augmented CRCs? + + #undef PRIVATE_ACRC_FUNC + #undef PRIVATE_CRC_FUNC + +def create_suite(): + suite = unittest.TestSuite() + suite.addTest( unittest.makeSuite(tester_t) ) + return suite + +def run_suite(): + unittest.TextTestRunner(verbosity=2).run( create_suite() ) + +if __name__ == "__main__": + run_suite() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 08:09:35
|
Revision: 88 Author: roman_yakovenko Date: 2006-05-14 01:09:23 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=88&view=rev Log Message: ----------- fixing date_time structure Added Paths: ----------- pyplusplus_dev/examples/pyboost_dev/unittests/date_time/__init__.py pyplusplus_dev/examples/pyboost_dev/unittests/date_time/date_time_zonespec.csv Added: pyplusplus_dev/examples/pyboost_dev/unittests/date_time/__init__.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/unittests/date_time/__init__.py (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/unittests/date_time/__init__.py 2006-05-14 08:09:23 UTC (rev 88) @@ -0,0 +1,257 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import _date_time_ + +#import pprint +#pprint.pprint( dir( _date_time_ ) ) + +#implementation details +#int_adapter_int = _date_time_.int_adapter_int +#int_adapter_long = _date_time_.int_adapter_long +#int_adapter_ulong = _date_time_.int_adapter_ulong + +next_weekday = _date_time_.next_weekday +to_simple_string_type = _date_time_.to_simple_string_type +from_simple_string = _date_time_.from_simple_string +from_undelimited_string = _date_time_.from_undelimited_string +date_period_from_wstring = _date_time_.date_period_from_wstring +#to_sql_string_type_w = _date_time_.to_sql_string_type_w +parse_undelimited_time_duration = _date_time_.parse_undelimited_time_duration +#to_iso_extended_string_type_w = _date_time_.to_iso_extended_string_type_w +previous_weekday = _date_time_.previous_weekday +to_sql_wstring = _date_time_.to_sql_wstring +date_from_tm = _date_time_.date_from_tm +parse_undelimited_date = _date_time_.parse_undelimited_date +nth_as_str = _date_time_.nth_as_str +date_period_from_string = _date_time_.date_period_from_string +to_sql_string_type = _date_time_.to_sql_string_type +to_simple_wstring = _date_time_.to_simple_wstring +split = _date_time_.split +from_uk_string = _date_time_.from_uk_string +duration_from_string = _date_time_.duration_from_string +from_string = _date_time_.from_string +to_iso_extended_wstring = _date_time_.to_iso_extended_wstring +days_until_weekday = _date_time_.days_until_weekday +to_iso_string = _date_time_.to_iso_string +parse_iso_time = _date_time_.parse_iso_time +power = _date_time_.power +special_value_from_string = _date_time_.special_value_from_string +#to_iso_string_type_w = _date_time_.to_iso_string_type_w +time_from_string = _date_time_.time_from_string +date_from_iso_string = _date_time_.date_from_iso_string +parse_delimited_time_duration = _date_time_.parse_delimited_time_duration +to_iso_extended_string = _date_time_.to_iso_extended_string +from_iso_string = _date_time_.from_iso_string +from_simple_string_type = _date_time_.from_simple_string_type +to_tm = _date_time_.to_tm +absolute_value = _date_time_.absolute_value +to_simple_string = _date_time_.to_simple_string +convert_to_lower = _date_time_.convert_to_lower +days_before_weekday = _date_time_.days_before_weekday +to_iso_wstring = _date_time_.to_iso_wstring +#to_simple_string_type_w = _date_time_.to_simple_string_type_w +to_iso_string_type = _date_time_.to_iso_string_type +to_iso_extended_string_type = _date_time_.to_iso_extended_string_type +parse_delimited_time = _date_time_.parse_delimited_time +to_sql_string = _date_time_.to_sql_string +from_us_string = _date_time_.from_us_string + + + + + + + + + + + + +# ############################################################################## +# +# Creating shortcuts for enums. I using this approach because is allows to use +# "code complition" futures on most editors +# +# ############################################################################## + +months_of_year = _date_time_.months_of_year +Mar = months_of_year.Mar +Feb = months_of_year.Feb +Aug = months_of_year.Aug +Sep = months_of_year.Sep +Apr = months_of_year.Apr +Jun = months_of_year.Jun +Jul = months_of_year.Jul +Jan = months_of_year.Jan +May = months_of_year.May +Nov = _date_time_.months_of_year.Nov +Dec = _date_time_.months_of_year.Dec +Oct = _date_time_.months_of_year.Oct +NotAMonth = months_of_year.NotAMonth +NumMonths = months_of_year.NumMonths + +time_is_dst_result = _date_time_.time_is_dst_result +ambiguous = time_is_dst_result.ambiguous +is_not_in_dst = time_is_dst_result.is_not_in_dst +invalid_time_label = time_is_dst_result.invalid_time_label +is_in_dst = time_is_dst_result.is_in_dst + +date_resolutions = _date_time_.date_resolutions +week = date_resolutions.week +century = date_resolutions.century +months = date_resolutions.months +year = date_resolutions.year +day = date_resolutions.day +decade = date_resolutions.decade +NumDateResolutions = date_resolutions.NumDateResolutions + +weekdays = _date_time_.weekdays +Monday = weekdays.Monday +Tuesday = weekdays.Tuesday +Friday = weekdays.Friday +Wednesday = weekdays.Wednesday +Thursday = weekdays.Thursday +Sunday = weekdays.Sunday +Saturday = weekdays.Saturday + +special_values = _date_time_.special_values +not_special = special_values.not_special +neg_infin = special_values.neg_infin +pos_infin = special_values.pos_infin +min_date_time = special_values.min_date_time +not_a_date_time = special_values.not_a_date_time +max_date_time = special_values.max_date_time +NumSpecialValues = special_values.NumSpecialValues + +dst_flags = _date_time_.dst_flags +not_dst = dst_flags.not_dst +is_dst = dst_flags.is_dst +calculate = dst_flags.calculate + +time_resolutions = _date_time_.time_resolutions +ten_thousandth = time_resolutions.ten_thousandth +hundreth = time_resolutions.hundreth +nano = time_resolutions.nano +NumResolutions = time_resolutions.NumResolutions +micro = time_resolutions.micro +sec = time_resolutions.sec +milli = time_resolutions.milli +tenth = time_resolutions.tenth + +ymd_order_spec = _date_time_.ymd_order_spec +ymd_order_dmy = ymd_order_spec.ymd_order_dmy +ymd_order_us = ymd_order_spec.ymd_order_us +ymd_order_iso = ymd_order_spec.ymd_order_iso + +month_format_spec = _date_time_.month_format_spec +month_as_short_string = month_format_spec.month_as_short_string +month_as_long_string = month_format_spec.month_as_long_string +month_as_integer = month_format_spec.month_as_integer + + +class gregorian: + date_period = _date_time_.date_period + year_based_generator = _date_time_.gregorian_year_based_generator + partial_date = _date_time_.partial_date + nth_kday_of_month = _date_time_.nth_kday_of_month + nth_day_of_the_week_in_month = _date_time_.nth_kday_of_month + first_kday_of_month = _date_time_.first_kday_of_month + first_day_of_the_week_in_month = _date_time_.first_kday_of_month + last_kday_of_month = _date_time_.last_kday_of_month + last_day_of_the_week_in_month = _date_time_.last_kday_of_month + first_kday_after = _date_time_.first_kday_after + first_day_of_the_week_after = _date_time_.first_kday_after + first_kday_before = _date_time_.first_kday_before + first_day_of_the_week_before = _date_time_.first_kday_before + day_clock = _date_time_.day_clock + date = _date_time_.date + date_duration = _date_time_.date_duration + days = _date_time_.date_duration + greg_day = _date_time_.greg_day + greg_month = _date_time_.greg_month + greg_weekday = _date_time_.greg_weekday + greg_year = _date_time_.greg_year + gregorian_calendar = _date_time_.gregorian_calendar + calendar = _date_time_.gregorian_calendar + year_month_day = _date_time_.year_month_day + ymd_type = _date_time_.year_month_day + months = _date_time_.months + years = _date_time_.years + weeks = _date_time_.weeks + days_until_weekday = staticmethod( _date_time_.days_until_weekday ) + days_before_weekday = staticmethod( _date_time_.days_before_weekday ) + next_weekday = staticmethod( _date_time_.next_weekday ) + previous_weekday = staticmethod( _date_time_.previous_weekday ) + day_of_year_type = _date_time_.day_of_year_type + greg_day_of_year_rep = _date_time_.day_of_year_type + greg_weekday_rep = _date_time_.greg_weekday_rep + greg_day_rep = _date_time_.greg_day_rep + greg_month_rep = _date_time_.greg_month_rep + greg_year_rep = _date_time_.greg_year_rep + +class posix_time: + ptime = _date_time_.ptime + time_duration = _date_time_.time_duration + time_duration_impl = _date_time_.time_duration_impl + time_period = _date_time_.time_period + hours = _date_time_.hours + minutes = _date_time_.minutes + seconds = _date_time_.seconds + millisec = _date_time_.milliseconds + milliseconds = _date_time_.milliseconds + microsec = _date_time_.microseconds + microseconds = _date_time_.microseconds + if hasattr( _date_time_, 'nanoseconds' ): + nanosec = _date_time_.nanoseconds + nanoseconds = _date_time_.nanoseconds + second_clock = _date_time_.second_clock + microsec_clock = _date_time_.microsec_clock + us_dst = _date_time_.us_dst + no_dst = _date_time_.us_dst + +class local_time: + dst_calc_rule = _date_time_.dst_calc_rule + local_date_time = _date_time_.local_date_time + custom_time_zone = _date_time_.custom_time_zone + posix_time_zone = _date_time_.posix_time_zone + time_zone_base = _date_time_.time_zone_base + time_zone = _date_time_.custom_time_zone + tz_database = _date_time_.tz_database + time_zone_names = _date_time_.time_zone_names + time_zone_database = _date_time_.tz_database + partial_date_dst_rule = _date_time_.partial_date_dst_rule + partial_date_dst_rule.date_type = gregorian.date + partial_date_dst_rule.start_rule = gregorian.partial_date + partial_date_dst_rule.end_rule = gregorian.partial_date + dst_calc_rule = _date_time_.dst_calc_rule + first_last_dst_rule = _date_time_.first_last_dst_rule + first_last_dst_rule.date_type = gregorian.date + first_last_dst_rule.start_rule = gregorian.first_kday_of_month + first_last_dst_rule.end_rule = gregorian.last_kday_of_month + last_last_dst_rule = _date_time_.last_last_dst_rule + last_last_dst_rule.date_type = gregorian.date + last_last_dst_rule.start_rule = gregorian.last_kday_of_month + last_last_dst_rule.end_rule = gregorian.last_kday_of_month + nth_last_dst_rule = _date_time_.nth_last_dst_rule + nth_last_dst_rule.date_type = gregorian.date + nth_last_dst_rule.start_rule = gregorian.nth_kday_of_month + nth_last_dst_rule.end_rule = gregorian.last_kday_of_month + nth_kday_dst_rule = _date_time_.nth_kday_dst_rule + nth_kday_dst_rule.date_type = gregorian.date + nth_kday_dst_rule.start_rule = gregorian.nth_kday_of_month + nth_kday_dst_rule.end_rule = gregorian.nth_kday_of_month + nth_day_of_the_week_in_month_dst_rule = nth_kday_dst_rule + local_time_period = _date_time_.local_time_period + class local_sec_clock: + pass + #local_sec_clock = _date_time_.local_sec_clock + local_sec_clock.local_time = staticmethod( _date_time_.local_sec_clock__local_time ) + class local_microsec_clock: + pass + #local_microsec_clock = _date_time_.local_microsec_clock + local_microsec_clock.local_time = staticmethod( _date_time_.local_microsec_clock__local_time ) + dst_adjustment_offsets = _date_time_.dst_adjustment_offsets Added: pyplusplus_dev/examples/pyboost_dev/unittests/date_time/date_time_zonespec.csv =================================================================== --- pyplusplus_dev/examples/pyboost_dev/unittests/date_time/date_time_zonespec.csv (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/unittests/date_time/date_time_zonespec.csv 2006-05-14 08:09:23 UTC (rev 88) @@ -0,0 +1,379 @@ +"ID","STD ABBR","STD NAME","DST ABBR","DST NAME","GMT offset","DST adjustment","DST Start Date rule","Start time","DST End date rule","End time" +"Africa/Abidjan","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Accra","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Addis_Ababa","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Africa/Algiers","CET","CET","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Asmera","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Africa/Bamako","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Bangui","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Banjul","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Bissau","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Blantyre","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Brazzaville","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Bujumbura","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Cairo","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;5;4","+00:00:00","-1;5;9","+00:00:00" +"Africa/Casablanca","WET","WET","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Ceuta","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Africa/Conakry","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Dakar","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Dar_es_Salaam","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Africa/Djibouti","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Africa/Douala","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/El_Aaiun","WET","WET","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Freetown","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Gaborone","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Harare","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Johannesburg","SAST","SAST","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Kampala","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Africa/Khartoum","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Africa/Kigali","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Kinshasa","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Lagos","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Libreville","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Lome","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Luanda","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Lubumbashi","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Lusaka","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Malabo","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Maputo","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Maseru","SAST","SAST","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Mbabane","SAST","SAST","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Mogadishu","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Africa/Monrovia","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Nairobi","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Africa/Ndjamena","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Niamey","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Nouakchott","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Ouagadougou","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Porto-Novo","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Sao_Tome","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Timbuktu","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Africa/Tripoli","EET","EET","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Africa/Tunis","CET","CET","","","+01:00:00","+00:00:00","","","","+00:00:00" +"Africa/Windhoek","WAT","WAT","WAST","WAST","+01:00:00","+01:00:00","1;0;9","+02:00:00","1;0;4","+02:00:00" +"America/Adak","HAST","HAST","HADT","HADT","-10:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Anchorage","AKST","AKST","AKDT","AKDT","-09:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Anguilla","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Antigua","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Araguaina","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" +"America/Aruba","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Asuncion","PYT","PYT","PYST","PYST","-04:00:00","+01:00:00","1;0;10","+00:00:00","1;0;3","+00:00:00" +"America/Barbados","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Belem","BRT","BRT","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Belize","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Boa_Vista","AMT","AMT","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Bogota","COT","COT","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Boise","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Buenos_Aires","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Cambridge_Bay","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Cancun","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" +"America/Caracas","VET","VET","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Catamarca","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Cayenne","GFT","GFT","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Cayman","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Chicago","CST","Central Standard Time","CDT","Central Daylight Time","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Chihuahua","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" +"America/Cordoba","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Costa_Rica","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Cuiaba","AMT","AMT","AMST","AMST","-04:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" +"America/Curacao","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Danmarkshavn","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"America/Dawson","PST","PST","PDT","PDT","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Dawson_Creek","MST","MST","","","-07:00:00","+00:00:00","","","","+00:00:00" +"America/Denver","MST","Mountain Standard Time","MDT","Mountain Daylight Time","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Detroit","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Dominica","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Edmonton","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Eirunepe","ACT","ACT","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/El_Salvador","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Fortaleza","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" +"America/Glace_Bay","AST","AST","ADT","ADT","-04:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Godthab","WGT","WGT","WGST","WGST","-03:00:00","+01:00:00","-1;6;3","+22:00:00","-1;6;10","+23:00:00" +"America/Goose_Bay","AST","AST","ADT","ADT","-04:00:00","+01:00:00","1;0;4","+00:01:00","-1;0;10","+00:01:00" +"America/Grand_Turk","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+00:00:00","-1;0;10","+00:00:00" +"America/Grenada","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Guadeloupe","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Guatemala","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Guayaquil","ECT","ECT","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Guyana","GYT","GYT","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Halifax","AST","AST","ADT","ADT","-04:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Havana","CST","CST","CDT","CDT","-05:00:00","+01:00:00","1;0;4","+00:00:00","-1;0;10","+01:00:00" +"America/Hermosillo","MST","MST","","","-07:00:00","+00:00:00","","","","+00:00:00" +"America/Indiana/Indianapolis","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Indiana/Knox","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Indiana/Marengo","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Indiana/Vevay","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Indianapolis","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Inuvik","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Iqaluit","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Jamaica","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Jujuy","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Juneau","AKST","AKST","AKDT","AKDT","-09:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Kentucky/Louisville","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Kentucky/Monticello","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/La_Paz","BOT","BOT","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Lima","PET","PET","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Los_Angeles","PST","Pacific Standard Time","PDT","Pacific Daylight Time","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Louisville","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Maceio","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" +"America/Managua","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Manaus","AMT","AMT","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Martinique","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Mazatlan","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" +"America/Mendoza","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Menominee","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Merida","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" +"America/Mexico_City","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Miquelon","PMST","PMST","PMDT","PMDT","-03:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Monterrey","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" +"America/Montevideo","UYT","UYT","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Montreal","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Montserrat","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Nassau","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/New_York","EST","Eastern Standard Time","EDT","Eastern Daylight Time","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Nipigon","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Nome","AKST","AKST","AKDT","AKDT","-09:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Noronha","FNT","FNT","","","-02:00:00","+00:00:00","","","","+00:00:00" +"America/North_Dakota/Center","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Panama","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Pangnirtung","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Paramaribo","SRT","SRT","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Phoenix","MST","Mountain Standard Time","","","-07:00:00","+00:00:00","","","","+00:00:00" +"America/Port-au-Prince","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Port_of_Spain","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Porto_Velho","AMT","AMT","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Puerto_Rico","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Rainy_River","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Rankin_Inlet","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Recife","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" +"America/Regina","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Rio_Branco","ACT","ACT","","","-05:00:00","+00:00:00","","","","+00:00:00" +"America/Rosario","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" +"America/Santiago","CLT","CLT","CLST","CLST","-04:00:00","+01:00:00","2;0;10","+00:00:00","2;0;3","+00:00:00" +"America/Santo_Domingo","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Sao_Paulo","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" +"America/Scoresbysund","EGT","EGT","EGST","EGST","-01:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+01:00:00" +"America/Shiprock","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/St_Johns","NST","NST","NDT","NDT","-03:30:00","+01:00:00","1;0;4","+00:01:00","-1;0;10","+00:01:00" +"America/St_Kitts","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/St_Lucia","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/St_Louis","CST","Central Standard Time","CDT","Central Daylight Time","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/St_Thomas","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/St_Vincent","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Swift_Current","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Tegucigalpa","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" +"America/Thule","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Thunder_Bay","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Tijuana","PST","PST","PDT","PDT","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Tortola","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" +"America/Vancouver","PST","PST","PDT","PDT","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Whitehorse","PST","PST","PDT","PDT","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Winnipeg","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+03:00:00" +"America/Yakutat","AKST","AKST","AKDT","AKDT","-09:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"America/Yellowknife","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"Antarctica/Casey","WST","WST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Antarctica/Davis","DAVT","DAVT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Antarctica/DumontDUrville","DDUT","DDUT","","","+10:00:00","+00:00:00","","","","+00:00:00" +"Antarctica/Mawson","MAWT","MAWT","","","+06:00:00","+00:00:00","","","","+00:00:00" +"Antarctica/McMurdo","NZST","NZST","NZDT","NZDT","+12:00:00","+01:00:00","1;0;10","+02:00:00","3;0;3","+03:00:00" +"Antarctica/Palmer","CLT","CLT","CLST","CLST","-04:00:00","+01:00:00","2;0;10","+00:00:00","2;0;3","+00:00:00" +"Antarctica/South_Pole","NZST","NZST","NZDT","NZDT","+12:00:00","+01:00:00","1;0;10","+02:00:00","3;0;3","+03:00:00" +"Antarctica/Syowa","SYOT","SYOT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Antarctica/Vostok","VOST","VOST","","","+06:00:00","+00:00:00","","","","+00:00:00" +"Arctic/Longyearbyen","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Aden","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Asia/Almaty","ALMT","ALMT","ALMST","ALMST","+06:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" +"Asia/Amman","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;4;3","+00:00:00","-1;4;9","+01:00:00" +"Asia/Anadyr","ANAT","ANAT","ANAST","ANAST","+12:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Aqtau","AQTT","AQTT","AQTST","AQTST","+04:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" +"Asia/Aqtobe","AQTT","AQTT","AQTST","AQTST","+05:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" +"Asia/Ashgabat","TMT","TMT","","","+05:00:00","+00:00:00","","","","+00:00:00" +"Asia/Baghdad","AST","AST","ADT","ADT","+03:00:00","+01:00:00","1;0;4","+03:00:00","1;0;10","+04:00:00" +"Asia/Bahrain","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Asia/Baku","AZT","AZT","AZST","AZST","+04:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+01:00:00" +"Asia/Bangkok","ICT","ICT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Asia/Beirut","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" +"Asia/Bishkek","KGT","KGT","KGST","KGST","+05:00:00","+01:00:00","-1;0;3","+02:30:00","-1;0;10","+02:30:00" +"Asia/Brunei","BNT","BNT","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Calcutta","IST","IST","","","+05:30:00","+00:00:00","","","","+00:00:00" +"Asia/Choibalsan","CHOT","CHOT","","","+09:00:00","+00:00:00","","","","+00:00:00" +"Asia/Chongqing","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Colombo","LKT","LKT","","","+06:00:00","+00:00:00","","","","+00:00:00" +"Asia/Damascus","EET","EET","EEST","EEST","+02:00:00","+01:00:00","1;0;4","+00:00:00","1;0;10","+00:00:00" +"Asia/Dhaka","BDT","BDT","","","+06:00:00","+00:00:00","","","","+00:00:00" +"Asia/Dili","TPT","TPT","","","+09:00:00","+00:00:00","","","","+00:00:00" +"Asia/Dubai","GST","GST","","","+04:00:00","+00:00:00","","","","+00:00:00" +"Asia/Dushanbe","TJT","TJT","","","+05:00:00","+00:00:00","","","","+00:00:00" +"Asia/Gaza","EET","EET","EEST","EEST","+02:00:00","+01:00:00","3;5;4","+00:00:00","3;5;10","+00:00:00" +"Asia/Harbin","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Hong_Kong","HKT","HKT","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Hovd","HOVT","HOVT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Asia/Irkutsk","IRKT","IRKT","IRKST","IRKST","+08:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Istanbul","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Asia/Jakarta","WIT","WIT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Asia/Jayapura","EIT","EIT","","","+09:00:00","+00:00:00","","","","+00:00:00" +"Asia/Jerusalem","IST","IST","IDT","IDT","+02:00:00","+01:00:00","1;0;4","+01:00:00","1;0;10","+01:00:00" +"Asia/Kabul","AFT","AFT","","","+04:30:00","+00:00:00","","","","+00:00:00" +"Asia/Kamchatka","PETT","PETT","PETST","PETST","+12:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Karachi","PKT","PKT","","","+05:00:00","+00:00:00","","","","+00:00:00" +"Asia/Kashgar","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Katmandu","NPT","NPT","","","+05:45:00","+00:00:00","","","","+00:00:00" +"Asia/Krasnoyarsk","KRAT","KRAT","KRAST","KRAST","+07:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Kuala_Lumpur","MYT","MYT","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Kuching","MYT","MYT","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Kuwait","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Asia/Macao","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Magadan","MAGT","MAGT","MAGST","MAGST","+11:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Manila","PHT","PHT","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Muscat","GST","GST","","","+04:00:00","+00:00:00","","","","+00:00:00" +"Asia/Nicosia","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Asia/Novosibirsk","NOVT","NOVT","NOVST","NOVST","+06:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Omsk","OMST","OMST","OMSST","OMSST","+06:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Phnom_Penh","ICT","ICT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Asia/Pontianak","WIT","WIT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Asia/Pyongyang","KST","KST","","","+09:00:00","+00:00:00","","","","+00:00:00" +"Asia/Qatar","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Asia/Rangoon","MMT","MMT","","","+06:30:00","+00:00:00","","","","+00:00:00" +"Asia/Riyadh","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Asia/Saigon","ICT","ICT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Asia/Sakhalin","SAKT","SAKT","SAKST","SAKST","+10:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Samarkand","UZT","UZT","","","+05:00:00","+00:00:00","","","","+00:00:00" +"Asia/Seoul","KST","KST","","","+09:00:00","+00:00:00","","","","+00:00:00" +"Asia/Shanghai","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Singapore","SGT","SGT","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Taipei","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Tashkent","UZT","UZT","","","+05:00:00","+00:00:00","","","","+00:00:00" +"Asia/Tbilisi","GET","GET","GEST","GEST","+04:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" +"Asia/Tehran","IRT","IRT","","","+03:30:00","+00:00:00","","","","+00:00:00" +"Asia/Thimphu","BTT","BTT","","","+06:00:00","+00:00:00","","","","+00:00:00" +"Asia/Tokyo","JST","JST","","","+09:00:00","+00:00:00","","","","+00:00:00" +"Asia/Ujung_Pandang","CIT","CIT","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Ulaanbaatar","ULAT","ULAT","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Urumqi","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Asia/Vientiane","ICT","ICT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Asia/Vladivostok","VLAT","VLAT","VLAST","VLAST","+10:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Yakutsk","YAKT","YAKT","YAKST","YAKST","+09:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Yekaterinburg","YEKT","YEKT","YEKST","YEKST","+05:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Asia/Yerevan","AMT","AMT","AMST","AMST","+04:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Atlantic/Azores","AZOT","AZOT","AZOST","AZOST","-01:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+01:00:00" +"Atlantic/Bermuda","AST","AST","ADT","ADT","-04:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" +"Atlantic/Canary","WET","WET","WEST","WEST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" +"Atlantic/Cape_Verde","CVT","CVT","","","-01:00:00","+00:00:00","","","","+00:00:00" +"Atlantic/Faeroe","WET","WET","WEST","WEST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" +"Atlantic/Jan_Mayen","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Atlantic/Madeira","WET","WET","WEST","WEST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" +"Atlantic/Reykjavik","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Atlantic/South_Georgia","GST","GST","","","-02:00:00","+00:00:00","","","","+00:00:00" +"Atlantic/St_Helena","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" +"Atlantic/Stanley","FKT","FKT","FKST","FKST","-04:00:00","+01:00:00","1;0;9","+02:00:00","3;0;4","+02:00:00" +"Australia/Adelaide","CST","CST","CST","CST","+09:30:00","+01:00:00","-1;0;10","+02:00:00","-1;0;3","+03:00:00" +"Australia/Brisbane","EST","EST","","","+10:00:00","+00:00:00","","","","+00:00:00" +"Australia/Broken_Hill","CST","CST","CST","CST","+09:30:00","+01:00:00","-1;0;10","+02:00:00","-1;0;3","+03:00:00" +"Australia/Darwin","CST","CST","","","+09:30:00","+00:00:00","","","","+00:00:00" +"Australia/Hobart","EST","EST","EST","EST","+10:00:00","+01:00:00","1;0;10","+02:00:00","-1;0;3","+03:00:00" +"Australia/Lindeman","EST","EST","","","+10:00:00","+00:00:00","","","","+00:00:00" +"Australia/Lord_Howe","LHST","LHST","LHST","LHST","+10:30:00","+00:30:00","-1;0;10","+02:00:00","-1;0;3","+02:00:00" +"Australia/Melbourne","EST","EST","EST","EST","+10:00:00","+01:00:00","-1;0;10","+02:00:00","-1;0;3","+03:00:00" +"Australia/Perth","WST","WST","","","+08:00:00","+00:00:00","","","","+00:00:00" +"Australia/Sydney","EST","EST","EST","EST","+10:00:00","+01:00:00","-1;0;10","+02:00:00","-1;0;3","+03:00:00" +"Europe/Amsterdam","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Andorra","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Athens","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Belfast","GMT","GMT","BST","BST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" +"Europe/Belgrade","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Berlin","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Bratislava","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Brussels","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Bucharest","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Budapest","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Chisinau","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Copenhagen","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Dublin","GMT","GMT","IST","IST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" +"Europe/Gibraltar","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Helsinki","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Istanbul","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Kaliningrad","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Kiev","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Lisbon","WET","WET","WEST","WEST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" +"Europe/Ljubljana","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/London","GMT","GMT","BST","BST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" +"Europe/Luxembourg","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Madrid","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Malta","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Minsk","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Monaco","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Moscow","MSK","MSK","MSD","MSD","+03:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Nicosia","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Oslo","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Paris","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Prague","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Riga","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Rome","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Samara","SAMT","SAMT","SAMST","SAMST","+04:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/San_Marino","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Sarajevo","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Simferopol","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Skopje","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Sofia","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Stockholm","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Tallinn","EET","EET","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Europe/Tirane","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Uzhgorod","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Vaduz","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Vatican","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Vienna","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Vilnius","EET","EET","","","+02:00:00","+00:00:00","","","","+00:00:00" +"Europe/Warsaw","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Zagreb","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Europe/Zaporozhye","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" +"Europe/Zurich","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" +"Indian/Antananarivo","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Indian/Chagos","IOT","IOT","","","+06:00:00","+00:00:00","","","","+00:00:00" +"Indian/Christmas","CXT","CXT","","","+07:00:00","+00:00:00","","","","+00:00:00" +"Indian/Cocos","CCT","CCT","","","+06:30:00","+00:00:00","","","","+00:00:00" +"Indian/Comoro","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Indian/Kerguelen","TFT","TFT","","","+05:00:00","+00:00:00","","","","+00:00:00" +"Indian/Mahe","SCT","SCT","","","+04:00:00","+00:00:00","","","","+00:00:00" +"Indian/Maldives","MVT","MVT","","","+05:00:00","+00:00:00","","","","+00:00:00" +"Indian/Mauritius","MUT","MUT","","","+04:00:00","+00:00:00","","","","+00:00:00" +"Indian/Mayotte","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" +"Indian/Reunion","RET","RET","","","+04:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Apia","WST","WST","","","-11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Auckland","NZST","NZST","NZDT","NZDT","+12:00:00","+01:00:00","1;0;10","+02:00:00","3;0;3","+03:00:00" +"Pacific/Chatham","CHAST","CHAST","CHADT","CHADT","+12:45:00","+01:00:00","1;0;10","+02:45:00","3;0;3","+03:45:00" +"Pacific/Easter","EAST","EAST","EASST","EASST","-06:00:00","+01:00:00","2;6;10","+22:00:00","2;6;3","+22:00:00" +"Pacific/Efate","VUT","VUT","","","+11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Enderbury","PHOT","PHOT","","","+13:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Fakaofo","TKT","TKT","","","-10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Fiji","FJT","FJT","","","+12:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Funafuti","TVT","TVT","","","+12:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Galapagos","GALT","GALT","","","-06:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Gambier","GAMT","GAMT","","","-09:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Guadalcanal","SBT","SBT","","","+11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Guam","ChST","ChST","","","+10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Honolulu","HST","HST","","","-10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Johnston","HST","HST","","","-10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Kiritimati","LINT","LINT","","","+14:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Kosrae","KOST","KOST","","","+11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Kwajalein","MHT","MHT","","","+12:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Majuro","MHT","MHT","","","+12:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Marquesas","MART","MART","","","-09:30:00","+00:00:00","","","","+00:00:00" +"Pacific/Midway","SST","SST","","","-11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Nauru","NRT","NRT","","","+12:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Niue","NUT","NUT","","","-11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Norfolk","NFT","NFT","","","+11:30:00","+00:00:00","","","","+00:00:00" +"Pacific/Noumea","NCT","NCT","","","+11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Pago_Pago","SST","SST","","","-11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Palau","PWT","PWT","","","+09:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Pitcairn","PST","PST","","","-08:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Ponape","PONT","PONT","","","+11:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Port_Moresby","PGT","PGT","","","+10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Rarotonga","CKT","CKT","","","-10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Saipan","ChST","ChST","","","+10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Tahiti","TAHT","TAHT","","","-10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Tarawa","GILT","GILT","","","+12:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Tongatapu","TOT","TOT","","","+13:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Truk","TRUT","TRUT","","","+10:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Wake","WAKT","WAKT","","","+12:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Wallis","WFT","WFT","","","+12:00:00","+00:00:00","","","","+00:00:00" +"Pacific/Yap","YAPT","YAPT","","","+10:00:00","+00:00:00","","","","+00:00:00" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 08:07:10
|
Revision: 87 Author: roman_yakovenko Date: 2006-05-14 01:07:01 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=87&view=rev Log Message: ----------- fixing date_time structure Modified Paths: -------------- pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/test_all.py Removed Paths: ------------- pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/date_time.py pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/date_time_zonespec.csv Deleted: pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/date_time.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/date_time.py 2006-05-14 08:04:34 UTC (rev 86) +++ pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/date_time.py 2006-05-14 08:07:01 UTC (rev 87) @@ -1,257 +0,0 @@ -#! /usr/bin/python -# Copyright 2004 Roman Yakovenko. -# Distributed under the Boost Software License, Version 1.0. (See -# accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -import _date_time_ - -#import pprint -#pprint.pprint( dir( _date_time_ ) ) - -#implementation details -#int_adapter_int = _date_time_.int_adapter_int -#int_adapter_long = _date_time_.int_adapter_long -#int_adapter_ulong = _date_time_.int_adapter_ulong - -next_weekday = _date_time_.next_weekday -to_simple_string_type = _date_time_.to_simple_string_type -from_simple_string = _date_time_.from_simple_string -from_undelimited_string = _date_time_.from_undelimited_string -date_period_from_wstring = _date_time_.date_period_from_wstring -to_sql_string_type_w = _date_time_.to_sql_string_type_w -parse_undelimited_time_duration = _date_time_.parse_undelimited_time_duration -to_iso_extended_string_type_w = _date_time_.to_iso_extended_string_type_w -previous_weekday = _date_time_.previous_weekday -to_sql_wstring = _date_time_.to_sql_wstring -date_from_tm = _date_time_.date_from_tm -parse_undelimited_date = _date_time_.parse_undelimited_date -nth_as_str = _date_time_.nth_as_str -date_period_from_string = _date_time_.date_period_from_string -to_sql_string_type = _date_time_.to_sql_string_type -to_simple_wstring = _date_time_.to_simple_wstring -split = _date_time_.split -from_uk_string = _date_time_.from_uk_string -duration_from_string = _date_time_.duration_from_string -from_string = _date_time_.from_string -to_iso_extended_wstring = _date_time_.to_iso_extended_wstring -days_until_weekday = _date_time_.days_until_weekday -to_iso_string = _date_time_.to_iso_string -parse_iso_time = _date_time_.parse_iso_time -power = _date_time_.power -special_value_from_string = _date_time_.special_value_from_string -to_iso_string_type_w = _date_time_.to_iso_string_type_w -time_from_string = _date_time_.time_from_string -date_from_iso_string = _date_time_.date_from_iso_string -parse_delimited_time_duration = _date_time_.parse_delimited_time_duration -to_iso_extended_string = _date_time_.to_iso_extended_string -from_iso_string = _date_time_.from_iso_string -from_simple_string_type = _date_time_.from_simple_string_type -to_tm = _date_time_.to_tm -absolute_value = _date_time_.absolute_value -to_simple_string = _date_time_.to_simple_string -convert_to_lower = _date_time_.convert_to_lower -days_before_weekday = _date_time_.days_before_weekday -to_iso_wstring = _date_time_.to_iso_wstring -to_simple_string_type_w = _date_time_.to_simple_string_type_w -to_iso_string_type = _date_time_.to_iso_string_type -to_iso_extended_string_type = _date_time_.to_iso_extended_string_type -parse_delimited_time = _date_time_.parse_delimited_time -to_sql_string = _date_time_.to_sql_string -from_us_string = _date_time_.from_us_string - - - - - - - - - - - - -# ############################################################################## -# -# Creating shortcuts for enums. I using this approach because is allows to use -# "code complition" futures on most editors -# -# ############################################################################## - -months_of_year = _date_time_.months_of_year -Mar = months_of_year.Mar -Feb = months_of_year.Feb -Aug = months_of_year.Aug -Sep = months_of_year.Sep -Apr = months_of_year.Apr -Jun = months_of_year.Jun -Jul = months_of_year.Jul -Jan = months_of_year.Jan -May = months_of_year.May -Nov = _date_time_.months_of_year.Nov -Dec = _date_time_.months_of_year.Dec -Oct = _date_time_.months_of_year.Oct -NotAMonth = months_of_year.NotAMonth -NumMonths = months_of_year.NumMonths - -time_is_dst_result = _date_time_.time_is_dst_result -ambiguous = time_is_dst_result.ambiguous -is_not_in_dst = time_is_dst_result.is_not_in_dst -invalid_time_label = time_is_dst_result.invalid_time_label -is_in_dst = time_is_dst_result.is_in_dst - -date_resolutions = _date_time_.date_resolutions -week = date_resolutions.week -century = date_resolutions.century -months = date_resolutions.months -year = date_resolutions.year -day = date_resolutions.day -decade = date_resolutions.decade -NumDateResolutions = date_resolutions.NumDateResolutions - -weekdays = _date_time_.weekdays -Monday = weekdays.Monday -Tuesday = weekdays.Tuesday -Friday = weekdays.Friday -Wednesday = weekdays.Wednesday -Thursday = weekdays.Thursday -Sunday = weekdays.Sunday -Saturday = weekdays.Saturday - -special_values = _date_time_.special_values -not_special = special_values.not_special -neg_infin = special_values.neg_infin -pos_infin = special_values.pos_infin -min_date_time = special_values.min_date_time -not_a_date_time = special_values.not_a_date_time -max_date_time = special_values.max_date_time -NumSpecialValues = special_values.NumSpecialValues - -dst_flags = _date_time_.dst_flags -not_dst = dst_flags.not_dst -is_dst = dst_flags.is_dst -calculate = dst_flags.calculate - -time_resolutions = _date_time_.time_resolutions -ten_thousandth = time_resolutions.ten_thousandth -hundreth = time_resolutions.hundreth -nano = time_resolutions.nano -NumResolutions = time_resolutions.NumResolutions -micro = time_resolutions.micro -sec = time_resolutions.sec -milli = time_resolutions.milli -tenth = time_resolutions.tenth - -ymd_order_spec = _date_time_.ymd_order_spec -ymd_order_dmy = ymd_order_spec.ymd_order_dmy -ymd_order_us = ymd_order_spec.ymd_order_us -ymd_order_iso = ymd_order_spec.ymd_order_iso - -month_format_spec = _date_time_.month_format_spec -month_as_short_string = month_format_spec.month_as_short_string -month_as_long_string = month_format_spec.month_as_long_string -month_as_integer = month_format_spec.month_as_integer - - -class gregorian: - date_period = _date_time_.date_period - year_based_generator = _date_time_.gregorian_year_based_generator - partial_date = _date_time_.partial_date - nth_kday_of_month = _date_time_.nth_kday_of_month - nth_day_of_the_week_in_month = _date_time_.nth_kday_of_month - first_kday_of_month = _date_time_.first_kday_of_month - first_day_of_the_week_in_month = _date_time_.first_kday_of_month - last_kday_of_month = _date_time_.last_kday_of_month - last_day_of_the_week_in_month = _date_time_.last_kday_of_month - first_kday_after = _date_time_.first_kday_after - first_day_of_the_week_after = _date_time_.first_kday_after - first_kday_before = _date_time_.first_kday_before - first_day_of_the_week_before = _date_time_.first_kday_before - day_clock = _date_time_.day_clock - date = _date_time_.date - date_duration = _date_time_.date_duration - days = _date_time_.date_duration - greg_day = _date_time_.greg_day - greg_month = _date_time_.greg_month - greg_weekday = _date_time_.greg_weekday - greg_year = _date_time_.greg_year - gregorian_calendar = _date_time_.gregorian_calendar - calendar = _date_time_.gregorian_calendar - year_month_day = _date_time_.year_month_day - ymd_type = _date_time_.year_month_day - months = _date_time_.months - years = _date_time_.years - weeks = _date_time_.weeks - days_until_weekday = staticmethod( _date_time_.days_until_weekday ) - days_before_weekday = staticmethod( _date_time_.days_before_weekday ) - next_weekday = staticmethod( _date_time_.next_weekday ) - previous_weekday = staticmethod( _date_time_.previous_weekday ) - day_of_year_type = _date_time_.day_of_year_type - greg_day_of_year_rep = _date_time_.day_of_year_type - greg_weekday_rep = _date_time_.greg_weekday_rep - greg_day_rep = _date_time_.greg_day_rep - greg_month_rep = _date_time_.greg_month_rep - greg_year_rep = _date_time_.greg_year_rep - -class posix_time: - ptime = _date_time_.ptime - time_duration = _date_time_.time_duration - time_duration_impl = _date_time_.time_duration_impl - time_period = _date_time_.time_period - hours = _date_time_.hours - minutes = _date_time_.minutes - seconds = _date_time_.seconds - millisec = _date_time_.milliseconds - milliseconds = _date_time_.milliseconds - microsec = _date_time_.microseconds - microseconds = _date_time_.microseconds - if hasattr( _date_time_, 'nanoseconds' ): - nanosec = _date_time_.nanoseconds - nanoseconds = _date_time_.nanoseconds - second_clock = _date_time_.second_clock - microsec_clock = _date_time_.microsec_clock - us_dst = _date_time_.us_dst - no_dst = _date_time_.us_dst - -class local_time: - dst_calc_rule = _date_time_.dst_calc_rule - local_date_time = _date_time_.local_date_time - custom_time_zone = _date_time_.custom_time_zone - posix_time_zone = _date_time_.posix_time_zone - time_zone_base = _date_time_.time_zone_base - time_zone = _date_time_.custom_time_zone - tz_database = _date_time_.tz_database - time_zone_names = _date_time_.time_zone_names - time_zone_database = _date_time_.tz_database - partial_date_dst_rule = _date_time_.partial_date_dst_rule - partial_date_dst_rule.date_type = gregorian.date - partial_date_dst_rule.start_rule = gregorian.partial_date - partial_date_dst_rule.end_rule = gregorian.partial_date - dst_calc_rule = _date_time_.dst_calc_rule - first_last_dst_rule = _date_time_.first_last_dst_rule - first_last_dst_rule.date_type = gregorian.date - first_last_dst_rule.start_rule = gregorian.first_kday_of_month - first_last_dst_rule.end_rule = gregorian.last_kday_of_month - last_last_dst_rule = _date_time_.last_last_dst_rule - last_last_dst_rule.date_type = gregorian.date - last_last_dst_rule.start_rule = gregorian.last_kday_of_month - last_last_dst_rule.end_rule = gregorian.last_kday_of_month - nth_last_dst_rule = _date_time_.nth_last_dst_rule - nth_last_dst_rule.date_type = gregorian.date - nth_last_dst_rule.start_rule = gregorian.nth_kday_of_month - nth_last_dst_rule.end_rule = gregorian.last_kday_of_month - nth_kday_dst_rule = _date_time_.nth_kday_dst_rule - nth_kday_dst_rule.date_type = gregorian.date - nth_kday_dst_rule.start_rule = gregorian.nth_kday_of_month - nth_kday_dst_rule.end_rule = gregorian.nth_kday_of_month - nth_day_of_the_week_in_month_dst_rule = nth_kday_dst_rule - local_time_period = _date_time_.local_time_period - class local_sec_clock: - pass - #local_sec_clock = _date_time_.local_sec_clock - local_sec_clock.local_time = staticmethod( _date_time_.local_sec_clock__local_time ) - class local_microsec_clock: - pass - #local_microsec_clock = _date_time_.local_microsec_clock - local_microsec_clock.local_time = staticmethod( _date_time_.local_microsec_clock__local_time ) - dst_adjustment_offsets = _date_time_.dst_adjustment_offsets \ No newline at end of file Deleted: pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/date_time_zonespec.csv =================================================================== --- pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/date_time_zonespec.csv 2006-05-14 08:04:34 UTC (rev 86) +++ pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/date_time_zonespec.csv 2006-05-14 08:07:01 UTC (rev 87) @@ -1,379 +0,0 @@ -"ID","STD ABBR","STD NAME","DST ABBR","DST NAME","GMT offset","DST adjustment","DST Start Date rule","Start time","DST End date rule","End time" -"Africa/Abidjan","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Accra","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Addis_Ababa","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Africa/Algiers","CET","CET","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Asmera","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Africa/Bamako","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Bangui","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Banjul","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Bissau","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Blantyre","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Brazzaville","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Bujumbura","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Cairo","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;5;4","+00:00:00","-1;5;9","+00:00:00" -"Africa/Casablanca","WET","WET","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Ceuta","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Africa/Conakry","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Dakar","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Dar_es_Salaam","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Africa/Djibouti","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Africa/Douala","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/El_Aaiun","WET","WET","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Freetown","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Gaborone","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Harare","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Johannesburg","SAST","SAST","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Kampala","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Africa/Khartoum","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Africa/Kigali","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Kinshasa","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Lagos","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Libreville","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Lome","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Luanda","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Lubumbashi","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Lusaka","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Malabo","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Maputo","CAT","CAT","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Maseru","SAST","SAST","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Mbabane","SAST","SAST","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Mogadishu","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Africa/Monrovia","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Nairobi","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Africa/Ndjamena","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Niamey","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Nouakchott","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Ouagadougou","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Porto-Novo","WAT","WAT","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Sao_Tome","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Timbuktu","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Africa/Tripoli","EET","EET","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Africa/Tunis","CET","CET","","","+01:00:00","+00:00:00","","","","+00:00:00" -"Africa/Windhoek","WAT","WAT","WAST","WAST","+01:00:00","+01:00:00","1;0;9","+02:00:00","1;0;4","+02:00:00" -"America/Adak","HAST","HAST","HADT","HADT","-10:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Anchorage","AKST","AKST","AKDT","AKDT","-09:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Anguilla","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Antigua","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Araguaina","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" -"America/Aruba","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Asuncion","PYT","PYT","PYST","PYST","-04:00:00","+01:00:00","1;0;10","+00:00:00","1;0;3","+00:00:00" -"America/Barbados","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Belem","BRT","BRT","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Belize","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Boa_Vista","AMT","AMT","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Bogota","COT","COT","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Boise","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Buenos_Aires","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Cambridge_Bay","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Cancun","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" -"America/Caracas","VET","VET","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Catamarca","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Cayenne","GFT","GFT","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Cayman","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Chicago","CST","Central Standard Time","CDT","Central Daylight Time","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Chihuahua","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" -"America/Cordoba","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Costa_Rica","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Cuiaba","AMT","AMT","AMST","AMST","-04:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" -"America/Curacao","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Danmarkshavn","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"America/Dawson","PST","PST","PDT","PDT","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Dawson_Creek","MST","MST","","","-07:00:00","+00:00:00","","","","+00:00:00" -"America/Denver","MST","Mountain Standard Time","MDT","Mountain Daylight Time","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Detroit","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Dominica","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Edmonton","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Eirunepe","ACT","ACT","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/El_Salvador","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Fortaleza","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" -"America/Glace_Bay","AST","AST","ADT","ADT","-04:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Godthab","WGT","WGT","WGST","WGST","-03:00:00","+01:00:00","-1;6;3","+22:00:00","-1;6;10","+23:00:00" -"America/Goose_Bay","AST","AST","ADT","ADT","-04:00:00","+01:00:00","1;0;4","+00:01:00","-1;0;10","+00:01:00" -"America/Grand_Turk","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+00:00:00","-1;0;10","+00:00:00" -"America/Grenada","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Guadeloupe","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Guatemala","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Guayaquil","ECT","ECT","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Guyana","GYT","GYT","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Halifax","AST","AST","ADT","ADT","-04:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Havana","CST","CST","CDT","CDT","-05:00:00","+01:00:00","1;0;4","+00:00:00","-1;0;10","+01:00:00" -"America/Hermosillo","MST","MST","","","-07:00:00","+00:00:00","","","","+00:00:00" -"America/Indiana/Indianapolis","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Indiana/Knox","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Indiana/Marengo","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Indiana/Vevay","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Indianapolis","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Inuvik","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Iqaluit","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Jamaica","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Jujuy","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Juneau","AKST","AKST","AKDT","AKDT","-09:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Kentucky/Louisville","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Kentucky/Monticello","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/La_Paz","BOT","BOT","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Lima","PET","PET","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Los_Angeles","PST","Pacific Standard Time","PDT","Pacific Daylight Time","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Louisville","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Maceio","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" -"America/Managua","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Manaus","AMT","AMT","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Martinique","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Mazatlan","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" -"America/Mendoza","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Menominee","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Merida","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" -"America/Mexico_City","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Miquelon","PMST","PMST","PMDT","PMDT","-03:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Monterrey","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;5","+02:00:00","-1;0;9","+02:00:00" -"America/Montevideo","UYT","UYT","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Montreal","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Montserrat","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Nassau","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/New_York","EST","Eastern Standard Time","EDT","Eastern Daylight Time","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Nipigon","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Nome","AKST","AKST","AKDT","AKDT","-09:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Noronha","FNT","FNT","","","-02:00:00","+00:00:00","","","","+00:00:00" -"America/North_Dakota/Center","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Panama","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Pangnirtung","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Paramaribo","SRT","SRT","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Phoenix","MST","Mountain Standard Time","","","-07:00:00","+00:00:00","","","","+00:00:00" -"America/Port-au-Prince","EST","EST","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Port_of_Spain","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Porto_Velho","AMT","AMT","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Puerto_Rico","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Rainy_River","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Rankin_Inlet","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Recife","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" -"America/Regina","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Rio_Branco","ACT","ACT","","","-05:00:00","+00:00:00","","","","+00:00:00" -"America/Rosario","ART","ART","","","-03:00:00","+00:00:00","","","","+00:00:00" -"America/Santiago","CLT","CLT","CLST","CLST","-04:00:00","+01:00:00","2;0;10","+00:00:00","2;0;3","+00:00:00" -"America/Santo_Domingo","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Sao_Paulo","BRT","BRT","BRST","BRST","-03:00:00","+01:00:00","2;0;10","+00:00:00","3;0;2","+00:00:00" -"America/Scoresbysund","EGT","EGT","EGST","EGST","-01:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+01:00:00" -"America/Shiprock","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/St_Johns","NST","NST","NDT","NDT","-03:30:00","+01:00:00","1;0;4","+00:01:00","-1;0;10","+00:01:00" -"America/St_Kitts","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/St_Lucia","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/St_Louis","CST","Central Standard Time","CDT","Central Daylight Time","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/St_Thomas","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/St_Vincent","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Swift_Current","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Tegucigalpa","CST","CST","","","-06:00:00","+00:00:00","","","","+00:00:00" -"America/Thule","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Thunder_Bay","EST","EST","EDT","EDT","-05:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Tijuana","PST","PST","PDT","PDT","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Tortola","AST","AST","","","-04:00:00","+00:00:00","","","","+00:00:00" -"America/Vancouver","PST","PST","PDT","PDT","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Whitehorse","PST","PST","PDT","PDT","-08:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Winnipeg","CST","CST","CDT","CDT","-06:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+03:00:00" -"America/Yakutat","AKST","AKST","AKDT","AKDT","-09:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"America/Yellowknife","MST","MST","MDT","MDT","-07:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"Antarctica/Casey","WST","WST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Antarctica/Davis","DAVT","DAVT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Antarctica/DumontDUrville","DDUT","DDUT","","","+10:00:00","+00:00:00","","","","+00:00:00" -"Antarctica/Mawson","MAWT","MAWT","","","+06:00:00","+00:00:00","","","","+00:00:00" -"Antarctica/McMurdo","NZST","NZST","NZDT","NZDT","+12:00:00","+01:00:00","1;0;10","+02:00:00","3;0;3","+03:00:00" -"Antarctica/Palmer","CLT","CLT","CLST","CLST","-04:00:00","+01:00:00","2;0;10","+00:00:00","2;0;3","+00:00:00" -"Antarctica/South_Pole","NZST","NZST","NZDT","NZDT","+12:00:00","+01:00:00","1;0;10","+02:00:00","3;0;3","+03:00:00" -"Antarctica/Syowa","SYOT","SYOT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Antarctica/Vostok","VOST","VOST","","","+06:00:00","+00:00:00","","","","+00:00:00" -"Arctic/Longyearbyen","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Aden","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Asia/Almaty","ALMT","ALMT","ALMST","ALMST","+06:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" -"Asia/Amman","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;4;3","+00:00:00","-1;4;9","+01:00:00" -"Asia/Anadyr","ANAT","ANAT","ANAST","ANAST","+12:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Aqtau","AQTT","AQTT","AQTST","AQTST","+04:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" -"Asia/Aqtobe","AQTT","AQTT","AQTST","AQTST","+05:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" -"Asia/Ashgabat","TMT","TMT","","","+05:00:00","+00:00:00","","","","+00:00:00" -"Asia/Baghdad","AST","AST","ADT","ADT","+03:00:00","+01:00:00","1;0;4","+03:00:00","1;0;10","+04:00:00" -"Asia/Bahrain","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Asia/Baku","AZT","AZT","AZST","AZST","+04:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+01:00:00" -"Asia/Bangkok","ICT","ICT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Asia/Beirut","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" -"Asia/Bishkek","KGT","KGT","KGST","KGST","+05:00:00","+01:00:00","-1;0;3","+02:30:00","-1;0;10","+02:30:00" -"Asia/Brunei","BNT","BNT","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Calcutta","IST","IST","","","+05:30:00","+00:00:00","","","","+00:00:00" -"Asia/Choibalsan","CHOT","CHOT","","","+09:00:00","+00:00:00","","","","+00:00:00" -"Asia/Chongqing","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Colombo","LKT","LKT","","","+06:00:00","+00:00:00","","","","+00:00:00" -"Asia/Damascus","EET","EET","EEST","EEST","+02:00:00","+01:00:00","1;0;4","+00:00:00","1;0;10","+00:00:00" -"Asia/Dhaka","BDT","BDT","","","+06:00:00","+00:00:00","","","","+00:00:00" -"Asia/Dili","TPT","TPT","","","+09:00:00","+00:00:00","","","","+00:00:00" -"Asia/Dubai","GST","GST","","","+04:00:00","+00:00:00","","","","+00:00:00" -"Asia/Dushanbe","TJT","TJT","","","+05:00:00","+00:00:00","","","","+00:00:00" -"Asia/Gaza","EET","EET","EEST","EEST","+02:00:00","+01:00:00","3;5;4","+00:00:00","3;5;10","+00:00:00" -"Asia/Harbin","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Hong_Kong","HKT","HKT","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Hovd","HOVT","HOVT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Asia/Irkutsk","IRKT","IRKT","IRKST","IRKST","+08:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Istanbul","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Asia/Jakarta","WIT","WIT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Asia/Jayapura","EIT","EIT","","","+09:00:00","+00:00:00","","","","+00:00:00" -"Asia/Jerusalem","IST","IST","IDT","IDT","+02:00:00","+01:00:00","1;0;4","+01:00:00","1;0;10","+01:00:00" -"Asia/Kabul","AFT","AFT","","","+04:30:00","+00:00:00","","","","+00:00:00" -"Asia/Kamchatka","PETT","PETT","PETST","PETST","+12:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Karachi","PKT","PKT","","","+05:00:00","+00:00:00","","","","+00:00:00" -"Asia/Kashgar","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Katmandu","NPT","NPT","","","+05:45:00","+00:00:00","","","","+00:00:00" -"Asia/Krasnoyarsk","KRAT","KRAT","KRAST","KRAST","+07:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Kuala_Lumpur","MYT","MYT","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Kuching","MYT","MYT","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Kuwait","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Asia/Macao","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Magadan","MAGT","MAGT","MAGST","MAGST","+11:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Manila","PHT","PHT","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Muscat","GST","GST","","","+04:00:00","+00:00:00","","","","+00:00:00" -"Asia/Nicosia","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Asia/Novosibirsk","NOVT","NOVT","NOVST","NOVST","+06:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Omsk","OMST","OMST","OMSST","OMSST","+06:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Phnom_Penh","ICT","ICT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Asia/Pontianak","WIT","WIT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Asia/Pyongyang","KST","KST","","","+09:00:00","+00:00:00","","","","+00:00:00" -"Asia/Qatar","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Asia/Rangoon","MMT","MMT","","","+06:30:00","+00:00:00","","","","+00:00:00" -"Asia/Riyadh","AST","AST","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Asia/Saigon","ICT","ICT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Asia/Sakhalin","SAKT","SAKT","SAKST","SAKST","+10:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Samarkand","UZT","UZT","","","+05:00:00","+00:00:00","","","","+00:00:00" -"Asia/Seoul","KST","KST","","","+09:00:00","+00:00:00","","","","+00:00:00" -"Asia/Shanghai","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Singapore","SGT","SGT","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Taipei","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Tashkent","UZT","UZT","","","+05:00:00","+00:00:00","","","","+00:00:00" -"Asia/Tbilisi","GET","GET","GEST","GEST","+04:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+00:00:00" -"Asia/Tehran","IRT","IRT","","","+03:30:00","+00:00:00","","","","+00:00:00" -"Asia/Thimphu","BTT","BTT","","","+06:00:00","+00:00:00","","","","+00:00:00" -"Asia/Tokyo","JST","JST","","","+09:00:00","+00:00:00","","","","+00:00:00" -"Asia/Ujung_Pandang","CIT","CIT","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Ulaanbaatar","ULAT","ULAT","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Urumqi","CST","CST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Asia/Vientiane","ICT","ICT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Asia/Vladivostok","VLAT","VLAT","VLAST","VLAST","+10:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Yakutsk","YAKT","YAKT","YAKST","YAKST","+09:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Yekaterinburg","YEKT","YEKT","YEKST","YEKST","+05:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Asia/Yerevan","AMT","AMT","AMST","AMST","+04:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Atlantic/Azores","AZOT","AZOT","AZOST","AZOST","-01:00:00","+01:00:00","-1;0;3","+00:00:00","-1;0;10","+01:00:00" -"Atlantic/Bermuda","AST","AST","ADT","ADT","-04:00:00","+01:00:00","1;0;4","+02:00:00","-1;0;10","+02:00:00" -"Atlantic/Canary","WET","WET","WEST","WEST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" -"Atlantic/Cape_Verde","CVT","CVT","","","-01:00:00","+00:00:00","","","","+00:00:00" -"Atlantic/Faeroe","WET","WET","WEST","WEST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" -"Atlantic/Jan_Mayen","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Atlantic/Madeira","WET","WET","WEST","WEST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" -"Atlantic/Reykjavik","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Atlantic/South_Georgia","GST","GST","","","-02:00:00","+00:00:00","","","","+00:00:00" -"Atlantic/St_Helena","GMT","GMT","","","+00:00:00","+00:00:00","","","","+00:00:00" -"Atlantic/Stanley","FKT","FKT","FKST","FKST","-04:00:00","+01:00:00","1;0;9","+02:00:00","3;0;4","+02:00:00" -"Australia/Adelaide","CST","CST","CST","CST","+09:30:00","+01:00:00","-1;0;10","+02:00:00","-1;0;3","+03:00:00" -"Australia/Brisbane","EST","EST","","","+10:00:00","+00:00:00","","","","+00:00:00" -"Australia/Broken_Hill","CST","CST","CST","CST","+09:30:00","+01:00:00","-1;0;10","+02:00:00","-1;0;3","+03:00:00" -"Australia/Darwin","CST","CST","","","+09:30:00","+00:00:00","","","","+00:00:00" -"Australia/Hobart","EST","EST","EST","EST","+10:00:00","+01:00:00","1;0;10","+02:00:00","-1;0;3","+03:00:00" -"Australia/Lindeman","EST","EST","","","+10:00:00","+00:00:00","","","","+00:00:00" -"Australia/Lord_Howe","LHST","LHST","LHST","LHST","+10:30:00","+00:30:00","-1;0;10","+02:00:00","-1;0;3","+02:00:00" -"Australia/Melbourne","EST","EST","EST","EST","+10:00:00","+01:00:00","-1;0;10","+02:00:00","-1;0;3","+03:00:00" -"Australia/Perth","WST","WST","","","+08:00:00","+00:00:00","","","","+00:00:00" -"Australia/Sydney","EST","EST","EST","EST","+10:00:00","+01:00:00","-1;0;10","+02:00:00","-1;0;3","+03:00:00" -"Europe/Amsterdam","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Andorra","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Athens","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Belfast","GMT","GMT","BST","BST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" -"Europe/Belgrade","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Berlin","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Bratislava","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Brussels","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Bucharest","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Budapest","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Chisinau","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Copenhagen","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Dublin","GMT","GMT","IST","IST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" -"Europe/Gibraltar","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Helsinki","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Istanbul","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Kaliningrad","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Kiev","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Lisbon","WET","WET","WEST","WEST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" -"Europe/Ljubljana","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/London","GMT","GMT","BST","BST","+00:00:00","+01:00:00","-1;0;3","+01:00:00","-1;0;10","+02:00:00" -"Europe/Luxembourg","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Madrid","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Malta","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Minsk","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Monaco","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Moscow","MSK","MSK","MSD","MSD","+03:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Nicosia","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Oslo","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Paris","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Prague","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Riga","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Rome","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Samara","SAMT","SAMT","SAMST","SAMST","+04:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/San_Marino","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Sarajevo","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Simferopol","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Skopje","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Sofia","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Stockholm","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Tallinn","EET","EET","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Europe/Tirane","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Uzhgorod","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Vaduz","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Vatican","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Vienna","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Vilnius","EET","EET","","","+02:00:00","+00:00:00","","","","+00:00:00" -"Europe/Warsaw","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Zagreb","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Europe/Zaporozhye","EET","EET","EEST","EEST","+02:00:00","+01:00:00","-1;0;3","+03:00:00","-1;0;10","+04:00:00" -"Europe/Zurich","CET","CET","CEST","CEST","+01:00:00","+01:00:00","-1;0;3","+02:00:00","-1;0;10","+03:00:00" -"Indian/Antananarivo","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Indian/Chagos","IOT","IOT","","","+06:00:00","+00:00:00","","","","+00:00:00" -"Indian/Christmas","CXT","CXT","","","+07:00:00","+00:00:00","","","","+00:00:00" -"Indian/Cocos","CCT","CCT","","","+06:30:00","+00:00:00","","","","+00:00:00" -"Indian/Comoro","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Indian/Kerguelen","TFT","TFT","","","+05:00:00","+00:00:00","","","","+00:00:00" -"Indian/Mahe","SCT","SCT","","","+04:00:00","+00:00:00","","","","+00:00:00" -"Indian/Maldives","MVT","MVT","","","+05:00:00","+00:00:00","","","","+00:00:00" -"Indian/Mauritius","MUT","MUT","","","+04:00:00","+00:00:00","","","","+00:00:00" -"Indian/Mayotte","EAT","EAT","","","+03:00:00","+00:00:00","","","","+00:00:00" -"Indian/Reunion","RET","RET","","","+04:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Apia","WST","WST","","","-11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Auckland","NZST","NZST","NZDT","NZDT","+12:00:00","+01:00:00","1;0;10","+02:00:00","3;0;3","+03:00:00" -"Pacific/Chatham","CHAST","CHAST","CHADT","CHADT","+12:45:00","+01:00:00","1;0;10","+02:45:00","3;0;3","+03:45:00" -"Pacific/Easter","EAST","EAST","EASST","EASST","-06:00:00","+01:00:00","2;6;10","+22:00:00","2;6;3","+22:00:00" -"Pacific/Efate","VUT","VUT","","","+11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Enderbury","PHOT","PHOT","","","+13:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Fakaofo","TKT","TKT","","","-10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Fiji","FJT","FJT","","","+12:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Funafuti","TVT","TVT","","","+12:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Galapagos","GALT","GALT","","","-06:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Gambier","GAMT","GAMT","","","-09:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Guadalcanal","SBT","SBT","","","+11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Guam","ChST","ChST","","","+10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Honolulu","HST","HST","","","-10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Johnston","HST","HST","","","-10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Kiritimati","LINT","LINT","","","+14:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Kosrae","KOST","KOST","","","+11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Kwajalein","MHT","MHT","","","+12:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Majuro","MHT","MHT","","","+12:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Marquesas","MART","MART","","","-09:30:00","+00:00:00","","","","+00:00:00" -"Pacific/Midway","SST","SST","","","-11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Nauru","NRT","NRT","","","+12:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Niue","NUT","NUT","","","-11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Norfolk","NFT","NFT","","","+11:30:00","+00:00:00","","","","+00:00:00" -"Pacific/Noumea","NCT","NCT","","","+11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Pago_Pago","SST","SST","","","-11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Palau","PWT","PWT","","","+09:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Pitcairn","PST","PST","","","-08:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Ponape","PONT","PONT","","","+11:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Port_Moresby","PGT","PGT","","","+10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Rarotonga","CKT","CKT","","","-10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Saipan","ChST","ChST","","","+10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Tahiti","TAHT","TAHT","","","-10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Tarawa","GILT","GILT","","","+12:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Tongatapu","TOT","TOT","","","+13:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Truk","TRUT","TRUT","","","+10:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Wake","WAKT","WAKT","","","+12:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Wallis","WFT","WFT","","","+12:00:00","+00:00:00","","","","+00:00:00" -"Pacific/Yap","YAPT","YAPT","","","+10:00:00","+00:00:00","","","","+00:00:00" Modified: pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/test_all.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/test_all.py 2006-05-14 08:04:34 UTC (rev 86) +++ pyplusplus_dev/examples/pyboost_dev/unittests/date_time/unittests/test_all.py 2006-05-14 08:07:01 UTC (rev 87) @@ -4,6 +4,9 @@ # accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +import sys +sys.path.append( '../..' ) + import unittest import gregorian_tester import posix_time_tester @@ -24,4 +27,4 @@ unittest.TextTestRunner(verbosity=2).run( create_suite() ) if __name__ == "__main__": - run_suite() \ No newline at end of file + run_suite() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 08:04:45
|
Revision: 86 Author: roman_yakovenko Date: 2006-05-14 01:04:34 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=86&view=rev Log Message: ----------- switching to centralized build of all pyboost example Added Paths: ----------- pyplusplus_dev/examples/pyboost_dev/pyboost/crc/ pyplusplus_dev/examples/pyboost_dev/pyboost/crc/crc_settings.py pyplusplus_dev/examples/pyboost_dev/pyboost/crc/generate_code.py pyplusplus_dev/examples/pyboost_dev/pyboost/crc/sconscript Added: pyplusplus_dev/examples/pyboost_dev/pyboost/crc/crc_settings.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/crc/crc_settings.py (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/crc/crc_settings.py 2006-05-14 08:04:34 UTC (rev 86) @@ -0,0 +1,24 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import os +import sys + +_script_dir = os.path.abspath( os.getcwd() ) +environment_path = os.path.realpath( os.path.join( _script_dir, '..', '..', '..', '..' ) ) +sys.path.append( environment_path ) + +from environment import boost, scons, gccxml, python + +module_name = '_crc_' +working_dir = _script_dir +generated_files_dir = os.path.join( _script_dir, 'generated' ) +unittests_dir = os.path.join( _script_dir, '..', '..', 'unittests', 'crc' ) + +defined_symbols = ['BOOST_NO_INCLASS_MEMBER_INITIALIZATION'] +undefined_symbols = [ '__MINGW32__' ] + + \ No newline at end of file Added: pyplusplus_dev/examples/pyboost_dev/pyboost/crc/generate_code.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/crc/generate_code.py (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/crc/generate_code.py 2006-05-14 08:04:34 UTC (rev 86) @@ -0,0 +1,122 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + + +import os +import sys +import time +import shutil +import crc_settings +from pygccxml import parser +from pygccxml import declarations +from pyplusplus import code_creators +from pyplusplus import module_builder + +LICENSE = """// Copyright 2004 Roman Yakovenko. +// Distributed under the Boost Software License, Version 1.0. (See +// accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +""" + +class code_generator_t(object): + def __init__(self): + self.__file = os.path.join( crc_settings.boost.include + ,'libs', 'crc', 'crc_test.cpp' ) + + self.__mb = module_builder.module_builder_t( + [ parser.create_cached_source_fc( + self.__file + , os.path.join( crc_settings.generated_files_dir, 'crc.xml' ) ) ] + , gccxml_path=crc_settings.gccxml.executable + , include_paths=[crc_settings.boost.include] + , define_symbols=crc_settings.defined_symbols + , undefine_symbols=crc_settings.undefined_symbols) + + def filter_declarations(self ): + self.__mb.global_ns.exclude() + boost_ns = self.__mb.global_ns.namespace( 'boost', recursive=False ) + boost_ns.classes( lambda decl: decl.name.startswith( 'crc_basic' ) ).include() + boost_ns.classes( lambda decl: decl.name.startswith( 'crc_optimal' ) ).include() + + def prepare_decls( self ): + boost_ns = self.__mb.namespace( 'boost' ) + classes = boost_ns.classes( lambda decl: decl.name.startswith( 'crc_basic' ) ) + classes.always_expose_using_scope = True + for cls in classes: + name, args = declarations.templates.split(cls.name) + cls.alias = name + '_' + args[0] + + classes = boost_ns.classes( lambda decl: decl.name.startswith( 'crc_optimal' ) ) + classes.always_expose_using_scope = True + for cls in classes: + name, args = declarations.templates.split(cls.name) + InitRem = args[2] + for f in cls.calldefs(): + for arg in f.arguments: + if arg.default_value == 'InitRem': + arg.default_value = InitRem + aliases = set( map( lambda decl: decl.name, cls.typedefs ) ) + if 'optimal_crc_type' in aliases: + aliases.remove( 'optimal_crc_type' ) + if len( aliases ) == 1: + cls.alias = list(aliases)[0] + elif cls.name == 'crc_optimal<32, 79764919, 0, 0, false, false>': + cls.alias = 'fast_crc_type' + elif cls.name == 'crc_optimal<32, 0, 0, 0, false, false>': + cls.alias = 'slow_crc_type' + else: + print 'no alias for class ', cls.name + def beautify_code( self ): + extmodule = self.__mb.code_creator + position = extmodule.last_include_index() + 1 + extmodule.adopt_creator( code_creators.namespace_using_t( 'boost' ) + , position ) + self.__mb.calldefs().create_with_signature = True + + def replace_include_directives( self ): + extmodule = self.__mb.code_creator + includes = filter( lambda creator: isinstance( creator, code_creators.include_t ) + , extmodule.creators ) + includes = includes[1:] #all includes except boost\python.hpp + map( lambda creator: extmodule.remove_creator( creator ), includes ) + extmodule.adopt_include( code_creators.include_t( header='boost/crc.hpp' ) ) + + def customize_extmodule( self ): + global LICENSE + extmodule = self.__mb.code_creator + #beautifying include code generation + extmodule.license = LICENSE + extmodule.user_defined_directories.append( crc_settings.boost.include ) + extmodule.user_defined_directories.append( crc_settings.working_dir ) + extmodule.user_defined_directories.append( crc_settings.generated_files_dir ) + extmodule.precompiled_header = 'boost/python.hpp' + self.replace_include_directives() + self.beautify_code( ) + + def write_files( self ): + self.__mb.write_module( os.path.join( crc_settings.generated_files_dir, 'crc.pypp.cpp' ) ) + + def create(self): + start_time = time.clock() + self.filter_declarations() + + self.prepare_decls() + + self.__mb.build_code_creator( crc_settings.module_name ) + + self.customize_extmodule() + self.write_files( ) + print 'time taken : ', time.clock() - start_time, ' seconds' + +def export(): + cg = code_generator_t() + cg.create() + +if __name__ == '__main__': + export() + print 'done' + + Added: pyplusplus_dev/examples/pyboost_dev/pyboost/crc/sconscript =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/crc/sconscript (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/crc/sconscript 2006-05-14 08:04:34 UTC (rev 86) @@ -0,0 +1,35 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import os +import sys +import crc_settings + +Import( 'env' ) + +def get_ccflags(): + if sys.platform == 'win32': + return crc_settings.scons.ccflags \ + + map( lambda ds: '/D%s' % ds, crc_settings.defined_symbols ) + else: + return map( lambda ds: '-D' + ds, crc_settings.defined_symbols ) + +def get_source_files(): + source_files = filter( lambda s: s.endswith( '.cpp' ), os.listdir(crc_settings.generated_files_dir) ) + return map( lambda fname: os.path.join( crc_settings.generated_files_dir, fname ), source_files ) + +def get_target(): + return os.path.join( crc_settings.generated_files_dir + , crc_settings.module_name + crc_settings.scons.suffix ) + +local_env = env.Copy() +local_env.Append( CPPPATH=[ crc_settings.generated_files_dir ] ) +local_env.Append( CCFLAGS=get_ccflags() ) + +_crc_ = local_env.SharedLibrary( target=crc_settings.module_name + , source=get_source_files() ) + +local_env.Install( '#unittests/crc', _crc_ ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 08:02:48
|
Revision: 85 Author: roman_yakovenko Date: 2006-05-14 01:02:37 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=85&view=rev Log Message: ----------- switching to centralized build of all pyboost example Modified Paths: -------------- pyplusplus_dev/examples/pyboost_dev/pyboost/random/generate_code.py Added Paths: ----------- pyplusplus_dev/examples/pyboost_dev/pyboost/random/random_settings.py pyplusplus_dev/examples/pyboost_dev/pyboost/random/sconscript Removed Paths: ------------- pyplusplus_dev/examples/pyboost_dev/pyboost/random/sconstruct pyplusplus_dev/examples/pyboost_dev/pyboost/random/settings.py Modified: pyplusplus_dev/examples/pyboost_dev/pyboost/random/generate_code.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/random/generate_code.py 2006-05-14 07:49:58 UTC (rev 84) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/random/generate_code.py 2006-05-14 08:02:37 UTC (rev 85) @@ -9,7 +9,7 @@ import sys import time import shutil -import settings +import random_settings from pygccxml import parser from pygccxml import declarations from pyplusplus import code_creators @@ -23,16 +23,17 @@ class code_generator_t(object): def __init__(self): - self.__file = os.path.join( settings.boost.include + self.__file = os.path.join( random_settings.boost.include , 'libs', 'random', 'random_test.cpp' ) self.__mb = module_builder.module_builder_t( [ parser.create_cached_source_fc( self.__file - , os.path.join( settings.generated_files_dir, 'random_test.xml' ) ) ] - , gccxml_path=settings.gccxml.executable - , include_paths=[settings.boost.include] - , undefine_symbols=settings.undefined_symbols) - + , os.path.join( random_settings.generated_files_dir, 'random_test.xml' ) ) ] + , gccxml_path=random_settings.gccxml.executable + , include_paths=[random_settings.boost.include] + , define_symbols=random_settings.defined_symbols + , undefine_symbols=random_settings.undefined_symbols) + def filter_declarations(self ): self.__mb.global_ns.exclude() boost_ns = self.__mb.global_ns.namespace( 'boost', recursive=False ) @@ -41,18 +42,23 @@ for cls in boost_ns.namespace( 'random' ).classes(): if cls.ignore: continue + if cls.name.startswith( 'const_mod' ): + cls.exclude() + continue + aliases = set([ t.name for t in cls.typedefs ]) + for alias in [ 'engine_value_type', 'value_type', 'base_type', 'engine_type' ]: + if alias in aliases: + aliases.remove( alias ) + if len( aliases ) == 1: + cls.alias = list( aliases )[0] else: - aliases = set([ t.name for t in cls.typedefs ]) - for alias in [ 'engine_value_type', 'value_type', 'base_type', 'engine_type' ]: - if alias in aliases: - aliases.remove( alias ) - if len( aliases ) == 1: - cls.alias = list( aliases )[0] - else: - print cls.name - for t in aliases: - print ' ', t - + print cls.name + for t in aliases: + print ' ', t + if cls.alias == 'ecuyer1988': + seed = cls.member_function( 'seed', arg_types=[None, None] ) + seed.exclude() + boost_ns.free_functions( "lessthan_signed_unsigned" ).exclude() boost_ns.free_functions( "equal_signed_unsigned" ).exclude() @@ -61,26 +67,42 @@ position = extmodule.last_include_index() + 1 extmodule.adopt_creator( code_creators.namespace_using_t( 'boost' ) , position ) + self.__mb.calldefs().create_with_signature = True + def replace_include_directives( self ): + extmodule = self.__mb.code_creator + includes = filter( lambda creator: isinstance( creator, code_creators.include_t ) + , extmodule.creators ) + includes = includes[1:] #all includes except boost\python.hpp + map( lambda creator: extmodule.remove_creator( creator ), includes ) + for include_header in ['boost/random.hpp', 'boost/nondet_random.hpp' ]: + extmodule.adopt_include( code_creators.include_t( header=include_header ) ) + def customize_extmodule( self ): global LICENSE extmodule = self.__mb.code_creator #beautifying include code generation extmodule.license = LICENSE - extmodule.user_defined_directories.append( settings.boost.include ) - extmodule.user_defined_directories.append( settings.working_dir ) - extmodule.user_defined_directories.append( settings.generated_files_dir ) + extmodule.user_defined_directories.append( random_settings.boost.include ) + extmodule.user_defined_directories.append( random_settings.working_dir ) + extmodule.user_defined_directories.append( random_settings.generated_files_dir ) extmodule.precompiled_header = 'boost/python.hpp' + self.replace_include_directives() self.beautify_code( ) + +#include "boost/random.hpp" +#include "boost/nondet_random.hpp" + + def write_files( self ): - self.__mb.write_module( os.path.join( settings.generated_files_dir, 'random.pypp.cpp' ) ) + self.__mb.write_module( os.path.join( random_settings.generated_files_dir, 'random.pypp.cpp' ) ) def create(self): start_time = time.clock() self.filter_declarations() - self.__mb.build_code_creator( settings.module_name ) + self.__mb.build_code_creator( random_settings.module_name ) self.customize_extmodule() self.write_files( ) Copied: pyplusplus_dev/examples/pyboost_dev/pyboost/random/random_settings.py (from rev 63, pyplusplus_dev/examples/pyboost_dev/pyboost/random/settings.py) =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/random/random_settings.py (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/random/random_settings.py 2006-05-14 08:02:37 UTC (rev 85) @@ -0,0 +1,27 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import os +import sys + +_script_dir = os.path.abspath( os.getcwd() ) +environment_path = os.path.realpath( os.path.join( _script_dir, '..', '..', '..', '..' ) ) +sys.path.append( environment_path ) + +from environment import boost, scons, gccxml, python + +module_name = '_random_' +working_dir = _script_dir +generated_files_dir = os.path.join( _script_dir, 'generated' ) +unittests_dir = os.path.join( _script_dir, '..', '..', 'unittests', 'random' ) + +defined_symbols = [ 'BOOST_NO_INCLASS_MEMBER_INITIALIZATION', 'BOOST_NO_INT64_T' ] +undefined_symbols = [ '__MINGW32__' ] +#defined_symbols = ['BOOST_DATE_TIME_NO_MEMBER_INIT'] +#if sys.platform == 'win32': + #defined_symbols.extend( [ 'BOOST_DATE_TIME_DYN_LINK' ] ) + + \ No newline at end of file Added: pyplusplus_dev/examples/pyboost_dev/pyboost/random/sconscript =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/random/sconscript (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/random/sconscript 2006-05-14 08:02:37 UTC (rev 85) @@ -0,0 +1,35 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import os +import sys +import random_settings + +Import( 'env' ) + +def get_ccflags(): + if sys.platform == 'win32': + return random_settings.scons.ccflags \ + + map( lambda ds: '/D%s' % ds, random_settings.defined_symbols ) + else: + return map( lambda ds: '-D' + ds, random_settings.defined_symbols ) + +def get_source_files(): + source_files = filter( lambda s: s.endswith( '.cpp' ), os.listdir(random_settings.generated_files_dir) ) + return map( lambda fname: os.path.join( random_settings.generated_files_dir, fname ), source_files ) + +def get_target(): + return os.path.join( random_settings.generated_files_dir + , random_settings.module_name + random_settings.scons.suffix ) + +local_env = env.Copy() +local_env.Append( CPPPATH=[ random_settings.generated_files_dir ] ) +local_env.Append( CCFLAGS=get_ccflags() ) + +_random_ = local_env.SharedLibrary( target=random_settings.module_name + , source=get_source_files() ) + +local_env.Install( '#unittests/random', _random_ ) Deleted: pyplusplus_dev/examples/pyboost_dev/pyboost/random/sconstruct =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/random/sconstruct 2006-05-14 07:49:58 UTC (rev 84) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/random/sconstruct 2006-05-14 08:02:37 UTC (rev 85) @@ -1,54 +0,0 @@ -#! /usr/bin/python -# Copyright 2004 Roman Yakovenko. -# Distributed under the Boost Software License, Version 1.0. (See -# accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -import os -import sys -from environment import settings - -def get_shlibsuffix(): - if sys.platform == 'win32': - return '.pyd' - else: - return '.so' - -def get_ccflags(): - if sys.platform == 'win32': - return [ '/MD' - , '/EHsc' - , '/GR' - , '/Zc:wchar_t' - , '/Zc:forScope' - , '/GR' ] \ - + map( lambda ds: '/D%s' % ds, settings.defined_symbols ) - else: - return map( lambda ds: '-D' + ds, settings.defined_symbols ) - -def get_py_date_time_files(): - source_files = filter( lambda s: s.endswith( '.cpp' ), os.listdir(settings.generated_files_dir) ) - return map( lambda fname: os.path.join( settings.generated_files_dir, fname ), source_files ) - -def get_libs(): - if sys.platform == 'win32': - return ['boost_python' ] #python24.lib - else: - return ['boost_python', 'libboost_date_time-gcc-1_34'] - -def get_target(): - return os.path.join( settings.unittests_dir - , settings.module_name + get_shlibsuffix() ) - -SharedLibrary( target=get_target() - , source=get_py_date_time_files() - , LIBS=get_libs() - , LIBPATH=[ settings.boost_libs_path, settings.python_libs_path ] - , CPPPATH=[ settings.boost_path - , settings.working_dir - , settings.python_include_path - , settings.generated_files_dir ] - , CCFLAGS=get_ccflags() - , SHLIBPREFIX='' - , SHLIBSUFFIX=get_shlibsuffix() -) Deleted: pyplusplus_dev/examples/pyboost_dev/pyboost/random/settings.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/random/settings.py 2006-05-14 07:49:58 UTC (rev 84) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/random/settings.py 2006-05-14 08:02:37 UTC (rev 85) @@ -1,25 +0,0 @@ -#! /usr/bin/python -# Copyright 2004 Roman Yakovenko. -# Distributed under the Boost Software License, Version 1.0. (See -# accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -import os -import sys - -_script_dir = os.path.split( os.path.abspath( sys.argv[0] ) )[0] -environment_path = os.path.normpath( os.path.join( _script_dir, '..', '..', '..', '..' ) ) - -sys.path.append( environment_path ) - -from environment import boost, scons, gccxml - -module_name = '_random_' -working_dir = _script_dir -generated_files_dir = os.path.join( _script_dir, 'generated' ) -unittests_dir = os.path.join( _script_dir, '..', '..', 'unittests', 'random' ) - -undefined_symbols = [ '__MINGW32__' ] -#defined_symbols = ['BOOST_DATE_TIME_NO_MEMBER_INIT'] -#if sys.platform == 'win32': - #defined_symbols.extend( [ 'BOOST_DATE_TIME_DYN_LINK' ] ) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:55:55
|
Revision: 84 Author: roman_yakovenko Date: 2006-05-14 00:49:58 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=84&view=rev Log Message: ----------- switching to centralized build of all pyboost example Modified Paths: -------------- pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/customization_data.py pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/generate_code.py pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/include/date_time.pypp.xml Added Paths: ----------- pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/date_time_settings.py pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/sconscript Removed Paths: ------------- pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/sconstruct pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/settings.py Modified: pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/customization_data.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/customization_data.py 2006-05-14 07:45:53 UTC (rev 83) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/customization_data.py 2006-05-14 07:49:58 UTC (rev 84) @@ -6,15 +6,8 @@ import os import sys -import settings +import date_time_settings -#I have small problem: not all function of instantiated template is instantiated -#I am looking for some flag that will forse them to be instantiated -#-fkeep-inline-functions -#-fno-default-inline -#-fno-implement-inlines -#-frepo - includes = [ "boost/date_time/special_defs.hpp" , "boost/date_time/time_defs.hpp" @@ -23,7 +16,7 @@ , "boost/date_time/gregorian/gregorian.hpp" , "boost/date_time/posix_time/posix_time.hpp" , "boost/date_time/local_time/local_time.hpp" - , os.path.join( settings.generated_files_dir, 'date_time_wrapper.hpp' ) + , os.path.join( date_time_settings.generated_files_dir, 'date_time_wrapper.hpp' ) ] name2alias = { @@ -33,23 +26,23 @@ : "date_duration" , "counted_time_system<boost::date_time::counted_time_rep<boost::posix_time::millisec_posix_time_system_config> >" : "counted_time_system_pyplusplus" - , "gregorian_calendar_base<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>,long unsigned int>" + , "gregorian_calendar_base<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>, unsigned long>" : "gregorian_calendar_base_pyplusplus" - , "year_month_day_base<boost::gregorian::greg_year,boost::gregorian::greg_month,boost::gregorian::greg_day>" + , "year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>" : "year_month_day" - , "date<boost::gregorian::date,boost::gregorian::gregorian_calendar,boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >" + , "date<boost::gregorian::date, boost::gregorian::gregorian_calendar, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >" : "date_pyplusplus" , "years_duration<boost::gregorian::greg_durations_config>" : "years" - , "base_time<boost::posix_time::ptime,boost::date_time::counted_time_system<boost::date_time::counted_time_rep<boost::posix_time::millisec_posix_time_system_config> > >" + , "base_time<boost::posix_time::ptime, boost::date_time::counted_time_system<boost::date_time::counted_time_rep<boost::posix_time::millisec_posix_time_system_config> > >" : "base_time_pyplusplus" , "month_functor<boost::gregorian::date>" : "month_functor_pyplusplus" - , "period<boost::gregorian::date,boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >" + , "period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >" : "date_period" - , "subsecond_duration<boost::posix_time::time_duration,1000>" + , "subsecond_duration<boost::posix_time::time_duration, (long long)1000>" : "milliseconds" - , "subsecond_duration<boost::posix_time::time_duration,1000000>" + , "subsecond_duration<boost::posix_time::time_duration, (long long)1000000>" : "microseconds" , "partial_date<boost::gregorian::date>" : "partial_date" @@ -65,127 +58,127 @@ : "first_kday_after" , "first_kday_before<boost::gregorian::date>" : "first_kday_before" - , "constrained_value<boost::CV::simple_exception_policy<short unsigned int, 1, 366, boost::gregorian::bad_day_of_year> >" + , "constrained_value<boost::CV::simple_exception_policy<unsigned short, 1, 366, boost::gregorian::bad_day_of_year> >" : 'day_of_year_type' - , "int_adapter<long unsigned int>" + , "int_adapter<unsigned long>" : "int_adapter_ulong" - , "int_adapter<long int>" + , "int_adapter<long>" : "int_adapter_long" , "int_adapter<int>" : "int_adapter_int" - , "int_adapter<long long int>" + , "int_adapter<long long>" : "int_adapter_long_long_int" - , "equality_comparable1<boost::posix_time::time_duration,boost::detail::empty_base>" + , "equality_comparable1<boost::posix_time::time_duration, boost::detail::empty_base>" : "__impl_details_1" - , "equality_comparable1<boost::posix_time::ptime,boost::detail::empty_base>" + , "equality_comparable1<boost::posix_time::ptime, boost::detail::empty_base>" : "__impl_details_2" - , "subtractable1<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::detail::empty_base>" + , "subtractable1<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base>" : "__impl_details_3" - , "subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::detail::empty_base,boost::detail::false_t>" + , "subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>" : "__impl_details_4" - , "addable1<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t> >" + , "addable1<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t> >" : "__impl_details_5" - , "equality_comparable<boost::posix_time::time_duration,boost::posix_time::time_duration,boost::detail::empty_base,boost::detail::false_t>" + , "equality_comparable<boost::posix_time::time_duration, boost::posix_time::time_duration, boost::detail::empty_base, boost::detail::false_t>" : "__impl_details_6" - , "less_than_comparable1<boost::posix_time::time_duration,boost::equality_comparable<boost::posix_time::time_duration, boost::posix_time::time_duration, boost::detail::empty_base, boost::detail::false_t> >" + , "less_than_comparable1<boost::posix_time::time_duration, boost::equality_comparable<boost::posix_time::time_duration, boost::posix_time::time_duration, boost::detail::empty_base, boost::detail::false_t> >" : "__impl_details_7" - , "equality_comparable<boost::posix_time::ptime,boost::posix_time::ptime,boost::detail::empty_base,boost::detail::false_t>" + , "equality_comparable<boost::posix_time::ptime, boost::posix_time::ptime, boost::detail::empty_base, boost::detail::false_t>" : "__impl_details_8" - , "less_than_comparable1<boost::posix_time::ptime,boost::equality_comparable<boost::posix_time::ptime, boost::posix_time::ptime, boost::detail::empty_base, boost::detail::false_t> >" + , "less_than_comparable1<boost::posix_time::ptime, boost::equality_comparable<boost::posix_time::ptime, boost::posix_time::ptime, boost::detail::empty_base, boost::detail::false_t> >" : "__impl_details_9" - , "less_than_comparable<boost::posix_time::ptime,boost::equality_comparable<boost::posix_time::ptime, boost::posix_time::ptime, boost::detail::empty_base, boost::detail::false_t>,boost::detail::empty_base,boost::detail::true_t>" + , "less_than_comparable<boost::posix_time::ptime, boost::equality_comparable<boost::posix_time::ptime, boost::posix_time::ptime, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>" : "__impl_details_10" - , "addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>,boost::detail::empty_base,boost::detail::true_t>" + , "addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>" : "__impl_details_11" - , "equality_comparable1<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t> >" + , "equality_comparable1<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t> >" : "__impl_details_12" - , "equality_comparable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>,boost::detail::empty_base,boost::detail::true_t>" + , "equality_comparable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>, boost::detail::empty_base, boost::detail::true_t>" : "__impl_details_13" - , "less_than_comparable1<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::equality_comparable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>, boost::detail::empty_base, boost::detail::true_t> >" + , "less_than_comparable1<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::equality_comparable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>, boost::detail::empty_base, boost::detail::true_t> >" : "__impl_details_14" - , "less_than_comparable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>,boost::equality_comparable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>, boost::detail::empty_base, boost::detail::true_t>,boost::detail::empty_base,boost::detail::true_t>" + , "less_than_comparable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::equality_comparable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::addable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::subtractable<boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::date_time::date_duration<boost::date_time::duration_traits_adapted>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>, boost::detail::empty_base, boost::detail::true_t>, boost::detail::empty_base, boost::detail::true_t>" : "__impl_details_15" - , "equality_comparable1<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>,boost::detail::empty_base>" + , "equality_comparable1<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::detail::empty_base>" : "__impl_details_16" - , "equality_comparable<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>,boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>,boost::detail::empty_base,boost::detail::false_t>" + , "equality_comparable<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::detail::empty_base, boost::detail::false_t>" : "__impl_details_17" - , "less_than_comparable1<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>,boost::equality_comparable<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::detail::empty_base, boost::detail::false_t> >" + , "less_than_comparable1<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::equality_comparable<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::detail::empty_base, boost::detail::false_t> >" : "__impl_details_18" - , "less_than_comparable<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>,boost::equality_comparable<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::detail::empty_base, boost::detail::false_t>,boost::detail::empty_base,boost::detail::true_t>" + , "less_than_comparable<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::equality_comparable<boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::date_time::period<boost::posix_time::ptime, boost::posix_time::time_duration>, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>" : "__impl_details_19" - , "equality_comparable1<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >,boost::detail::empty_base>" + , "equality_comparable1<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::detail::empty_base>" : "__impl_details_20" - , "equality_comparable<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >,boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >,boost::detail::empty_base,boost::detail::false_t>" + , "equality_comparable<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::detail::empty_base, boost::detail::false_t>" : "__impl_details_21" - , "less_than_comparable1<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >,boost::equality_comparable<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::detail::empty_base, boost::detail::false_t> >" + , "less_than_comparable1<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::equality_comparable<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::detail::empty_base, boost::detail::false_t> >" : "__impl_details_22" - , "less_than_comparable<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >,boost::equality_comparable<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::detail::empty_base, boost::detail::false_t>,boost::detail::empty_base,boost::detail::true_t>" + , "less_than_comparable<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::equality_comparable<boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::date_time::period<boost::gregorian::date, boost::date_time::date_duration<boost::date_time::duration_traits_adapted> >, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>" : "__impl_details_23" - , "equality_comparable1<boost::gregorian::date,boost::detail::empty_base>" + , "equality_comparable1<boost::gregorian::date, boost::detail::empty_base>" : "__impl_details_24" - , "equality_comparable<boost::gregorian::date,boost::gregorian::date,boost::detail::empty_base,boost::detail::false_t>" + , "equality_comparable<boost::gregorian::date, boost::gregorian::date, boost::detail::empty_base, boost::detail::false_t>" : "__impl_details_25" - , "less_than_comparable1<boost::gregorian::date,boost::equality_comparable<boost::gregorian::date, boost::gregorian::date, boost::detail::empty_base, boost::detail::false_t> >" + , "less_than_comparable1<boost::gregorian::date, boost::equality_comparable<boost::gregorian::date, boost::gregorian::date, boost::detail::empty_base, boost::detail::false_t> >" : "__impl_details_26" - , "less_than_comparable<boost::gregorian::date,boost::equality_comparable<boost::gregorian::date, boost::gregorian::date, boost::detail::empty_base, boost::detail::false_t>,boost::detail::empty_base,boost::detail::true_t>" + , "less_than_comparable<boost::gregorian::date, boost::equality_comparable<boost::gregorian::date, boost::gregorian::date, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>" : "__impl_details_27" - , "less_than_comparable<boost::posix_time::time_duration,boost::equality_comparable<boost::posix_time::time_duration, boost::posix_time::time_duration, boost::detail::empty_base, boost::detail::false_t>,boost::detail::empty_base,boost::detail::true_t>" + , "less_than_comparable<boost::posix_time::time_duration, boost::equality_comparable<boost::posix_time::time_duration, boost::posix_time::time_duration, boost::detail::empty_base, boost::detail::false_t>, boost::detail::empty_base, boost::detail::true_t>" : "__impl_details_28" - , "equality_comparable1<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>,boost::detail::empty_base>" + , "equality_comparable1<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::detail::empty_base>" : "__impl_details_29" - , "equality_comparable<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>,boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>,boost::detail::empty_base,boost::detail::false_t>" + , "equality_comparable<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::detail::empty_base, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>::false_t>" : "__impl_details_30" - , "less_than_comparable1<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>,boost::equality_comparable<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::detail::empty_base, boost::detail::false_t> >" + , "less_than_comparable1<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::equality_comparable<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::detail::empty_base, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>::false_t> >" : "__impl_details_31" - , "less_than_comparable<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>,boost::equality_comparable<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::detail::empty_base, boost::detail::false_t>,boost::detail::empty_base,boost::detail::true_t>" + , "less_than_comparable<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::equality_comparable<boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::detail::empty_base, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>::false_t>, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>, boost::date_time::period<boost::local_time::local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >, boost::posix_time::time_duration>::true_t>" : "__impl_details_32" - , "wrapping_int2<short int,1,12>" + , "wrapping_int2<short, 1, 12>" : "__impl_details_33" - , "time_zone_base<boost::posix_time::ptime,char>" + , "time_zone_base<boost::posix_time::ptime, char>" : "time_zone_base" , "dst_day_calc_rule<boost::gregorian::date>" : "dst_calc_rule" , "day_calc_dst_rule<boost::local_time::nth_kday_rule_spec>" : "nth_kday_dst_rule" - , "local_date_time_base<boost::posix_time::ptime,boost::date_time::time_zone_base<boost::posix_time::ptime, char> >" + , "local_date_time_base<boost::posix_time::ptime, boost::date_time::time_zone_base<boost::posix_time::ptime, char> >" : "local_date_time" - , "dst_calculator<boost::gregorian::date,boost::posix_time::time_duration>" + , "dst_calculator<boost::gregorian::date, boost::posix_time::time_duration>" : "dst_calculator" - , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>,boost::date_time::iso_extended_format<wchar_t>,wchar_t>" + , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>, boost::date_time::iso_extended_format<wchar_t>, wchar_t>" : "ymd_iso_extended_wformatter" - , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>,boost::date_time::iso_format<wchar_t>,wchar_t>" + , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>, boost::date_time::iso_format<wchar_t>, wchar_t>" : "ymd_iso_wformatter" - , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>,boost::date_time::simple_format<wchar_t>,wchar_t>" + , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>, boost::date_time::simple_format<wchar_t>, wchar_t>" : "ymd_simple_wformatter" - , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>,boost::date_time::iso_extended_format<char>,char>" + , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>, boost::date_time::iso_extended_format<char>, char>" : "ymd_iso_extended_formatter" - , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>,boost::date_time::iso_format<char>,char>" + , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>, boost::date_time::iso_format<char>, char>" : "ymd_iso_formatter" - , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>,boost::date_time::simple_format<char>,char>" + , "ymd_formatter<boost::date_time::year_month_day_base<boost::gregorian::greg_year, boost::gregorian::greg_month, boost::gregorian::greg_day>, boost::date_time::simple_format<char>, char>" : "ymd_simple_formatter" - , "date_formatter<boost::gregorian::date,boost::date_time::iso_format<wchar_t>,wchar_t>" + , "date_formatter<boost::gregorian::date, boost::date_time::iso_format<wchar_t>, wchar_t>" : "date_iso_wformatter" - , "date_formatter<boost::gregorian::date,boost::date_time::iso_extended_format<wchar_t>,wchar_t>" + , "date_formatter<boost::gregorian::date, boost::date_time::iso_extended_format<wchar_t>, wchar_t>" : "date_iso_extended_wformatter" - , "date_formatter<boost::gregorian::date,boost::date_time::simple_format<wchar_t>,wchar_t>" + , "date_formatter<boost::gregorian::date, boost::date_time::simple_format<wchar_t>, wchar_t>" : "date_simple_wformatter" - , "date_formatter<boost::gregorian::date,boost::date_time::iso_format<char>,char>" + , "date_formatter<boost::gregorian::date, boost::date_time::iso_format<char>, char>" : "date_iso_formatter" - , "date_formatter<boost::gregorian::date,boost::date_time::iso_extended_format<char>,char>" + , "date_formatter<boost::gregorian::date, boost::date_time::iso_extended_format<char>, char>" : "date_iso_extended_formatter" - , "date_formatter<boost::gregorian::date,boost::date_time::simple_format<char>,char>" + , "date_formatter<boost::gregorian::date, boost::date_time::simple_format<char>, char>" : "date_simple_formatter" - , "month_formatter<boost::gregorian::greg_month,boost::date_time::iso_extended_format<wchar_t>,wchar_t>" + , "month_formatter<boost::gregorian::greg_month, boost::date_time::iso_extended_format<wchar_t>, wchar_t>" : "month_iso_extended_wformatter" - , "month_formatter<boost::gregorian::greg_month,boost::date_time::iso_format<wchar_t>,wchar_t>" + , "month_formatter<boost::gregorian::greg_month, boost::date_time::iso_format<wchar_t>, wchar_t>" : "month_iso_wformatter" - , "month_formatter<boost::gregorian::greg_month,boost::date_time::simple_format<wchar_t>,wchar_t>" + , "month_formatter<boost::gregorian::greg_month, boost::date_time::simple_format<wchar_t>, wchar_t>" : "month_simple_wformatter" - , "month_formatter<boost::gregorian::greg_month,boost::date_time::iso_extended_format<char>,char>" + , "month_formatter<boost::gregorian::greg_month, boost::date_time::iso_extended_format<char>, char>" : "month_iso_extended_formatter" - , "month_formatter<boost::gregorian::greg_month,boost::date_time::iso_format<char>,char>" + , "month_formatter<boost::gregorian::greg_month, boost::date_time::iso_format<char>, char>" : "month_iso_formatter" - , "month_formatter<boost::gregorian::greg_month,boost::date_time::simple_format<char>,char>" + , "month_formatter<boost::gregorian::greg_month, boost::date_time::simple_format<char>, char>" : "month_simple_formatter" , "iso_extended_format<wchar_t>" : "iso_extended_wformat" @@ -206,10 +199,10 @@ } if sys.platform == 'win32': - name2alias[ "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, long int> >" ] \ + name2alias[ "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, long> >" ] \ = "time_duration_impl" else: - name2alias[ "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, int> >" ] \ + name2alias[ "time_duration<boost::posix_time::time_duration, boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, (boost::date_time::time_resolutions)5, (long long)1000000, 6, int> >" ] \ = "time_duration_impl" alias2name = {} Copied: pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/date_time_settings.py (from rev 63, pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/settings.py) =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/date_time_settings.py (rev 0) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/date_time_settings.py 2006-05-14 07:49:58 UTC (rev 84) @@ -0,0 +1,26 @@ +#! /usr/bin/python +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import os +import sys + +_script_dir = os.path.abspath( os.getcwd() ) +environment_path = os.path.realpath( os.path.join( _script_dir, '..', '..', '..', '..' ) ) +sys.path.append( environment_path ) + +from environment import boost, scons, gccxml, python + +module_name = '_date_time_' +working_dir = _script_dir +generated_files_dir = os.path.join( _script_dir, 'generated' ) +unittests_dir = os.path.realpath( os.path.join( _script_dir, '..', '..', 'unittests', 'date_time' ) ) + +date_time_pypp_include = os.path.join( _script_dir, 'include' ) + +undefined_symbols = [ '__MINGW32__' ] +defined_symbols = ['BOOST_DATE_TIME_NO_MEMBER_INIT'] +if sys.platform == 'win32': + defined_symbols.extend( [ 'BOOST_DATE_TIME_DYN_LINK' ] ) \ No newline at end of file Modified: pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/generate_code.py =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/generate_code.py 2006-05-14 07:45:53 UTC (rev 83) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/generate_code.py 2006-05-14 07:49:58 UTC (rev 84) @@ -9,7 +9,7 @@ import sys import time import shutil -import settings +import date_time_settings from pygccxml import parser from pygccxml import declarations from pyplusplus import code_creators @@ -18,18 +18,18 @@ class code_generator_t(object): def __init__(self): - self.__file = os.path.join( settings.date_time_pypp_include, 'date_time.pypp.hpp' ) + self.__file = os.path.join( date_time_settings.date_time_pypp_include, 'date_time.pypp.hpp' ) def _create_xml_file( self ): #On windows I have some problems to compile boost.date_time #library, so I use xml files generated on linux - config = parser.config_t( gccxml_path=settings.gccxml.executable - , include_paths=[settings.boost.include] - , define_symbols=settings.defined_symbols - , undefine_symbols=settings.undefined_symbols ) + config = parser.config_t( gccxml_path=date_time_settings.gccxml.executable + , include_paths=[date_time_settings.boost.include] + , define_symbols=date_time_settings.defined_symbols + , undefine_symbols=date_time_settings.undefined_symbols ) reader = parser.source_reader_t( config ) - destination = os.path.join( settings.date_time_pypp_include, 'date_time.pypp.xml' ) + destination = os.path.join( date_time_settings.date_time_pypp_include, 'date_time.pypp.xml' ) if sys.platform == 'linux2': reader.create_xml_file( self.__file, destination ) return destination @@ -37,10 +37,10 @@ def create_module_builder(self): date_time_xml_file = self._create_xml_file() mb = module_builder.module_builder_t( [ parser.create_gccxml_fc( date_time_xml_file ) ] - , gccxml_path=settings.gccxml.executable - , include_paths=[settings.boost.include] - , define_symbols=settings.defined_symbols - , undefine_symbols=settings.undefined_symbols + , gccxml_path=date_time_settings.gccxml.executable + , include_paths=[date_time_settings.boost.include] + , define_symbols=date_time_settings.defined_symbols + , undefine_symbols=date_time_settings.undefined_symbols , optimize_queries=False) if sys.platform == 'win32': linux_name = "time_duration<boost::posix_time::time_duration,boost::date_time::time_resolution_traits<boost::date_time::time_resolution_traits_adapted64_impl, micro, 1000000, 6, int> >" @@ -48,9 +48,14 @@ time_duration_impl = mb.class_( linux_name ) #small price for generating code from xml and not from sources time_duration_impl.name = win_name - + + for f_decl in mb.free_functions(): + f_decl.alias = f_decl.name + f_decl.name = f_decl.demangled_name + #f_decl.create_with_signature = True + mb.run_query_optimizer() - + for name, alias in customization_data.name2alias.items(): decl = mb.class_( name ) decl.alias = alias @@ -69,8 +74,8 @@ boost_ns.namespace( 'local_time', recursive=False ).include() boost_ns.classes( lambda decl: decl.name.startswith( 'constrained_value<' ) ).include() - to_be_removed = [ 'month_str_to_ushort', 'from_stream_type', 'parse_date' ] - boost_ns.calldefs( lambda decl: decl.name in to_be_removed ).exclude() + for name in [ 'month_str_to_ushort', 'from_stream_type', 'parse_date' ]: + boost_ns.calldefs( lambda decl: decl.name.startswith( name ) ).exclude() to_be_removed = [ 'c_time' , 'duration_traits_long' @@ -109,54 +114,7 @@ tdi = mb.class_( lambda decl: decl.alias == 'time_duration_impl' ) tdi_init = tdi.constructor( arg_types=[None, None, None, None], recursive=False) tdi_init.ignore=True - - - def fix_free_template_functions(self, mb): - boost_ns = mb.global_ns.namespace( 'boost', recursive=False ) - boost_ns.free_functions().create_with_signature = True - - #This function fixes some boost.date_time function signatures - tmpl_on_return_type = [ 'parse_iso_time' - , 'parse_undelimited_time_duration' - , 'parse_delimited_time' - , 'parse_delimited_time_duration' - , 'parse_undelimited_date' - , 'str_from_delimited_time_duration'] - functions = boost_ns.free_functions( lambda decl: decl.name in tmpl_on_return_type ) - for function in functions: - function.alias = function.name - function.name = declarations.templates.join( function.name - , [ function.return_type.decl_string ] ) - - #template on second argument - functions = boost_ns.free_functions( 'from_simple_string_type' ) - functions.create_with_signature = False - for function in functions: - function.alias = function.name - return_args = declarations.templates.split( function.return_type.decl_string )[1] - args = [ return_args[0] ] - if 'wchar_t' in function.arguments[0].type.decl_string: - args.append( 'wchar_t' ) - else: - args.append( 'char' ) - function.name = declarations.templates.join( function.name, args ) - - tmpl_on_char_type = [ 'to_iso_extended_string_type' - , 'to_iso_string_type' - , 'to_simple_string_type' - , 'to_sql_string_type' ] - - functions = boost_ns.free_functions( lambda decl: decl.name in tmpl_on_char_type ) - for function in functions: - function.alias = function.name - args = [] - if 'wchar_t' in function.return_type.decl_string: - args.append( 'wchar_t' ) - function.alias = function.alias + '_w' - else: - args.append( 'char' ) - function.name = declarations.templates.join( function.name, args ) - + def replace_include_directives( self, mb ): extmodule = mb.code_creator includes = filter( lambda creator: isinstance( creator, code_creators.include_t ) @@ -224,7 +182,6 @@ start_time = time.clock() mb = self.create_module_builder() self.filter_declarations(mb) - self.fix_free_template_functions( mb ) self.add_code( mb ) mb.build_code_creator( settings.module_name ) Modified: pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/include/date_time.pypp.xml =================================================================== --- pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/include/date_time.pypp.xml 2006-05-14 07:45:53 UTC (rev 83) +++ pyplusplus_dev/examples/pyboost_dev/pyboost/date_time/include/date_time.pypp.xml 2006-05-14 07:49:58 UTC (rev 84) @@ -1,11 +1,11 @@ <?xml version="1.0"?> -<GCC_XML cvs_revision="1.111"> - <Namespace id="_1" name="::" members="_3 _4 _5 _6 _7 _8 _9 _10 _11 _12 _13 _14 _15 _16 _17 _18 _19 _20 _21 _22 _23 _24 _25 _26 _27 _28 _29 _30 _31 _32 _33 _34 _35 _36 _37 _38 _39 _40 _41 _42 _43 _44 _45 _46 _47 _48 _49 _50 _51 _52 _53 _54 _55 _56 _57 _58 _59 _60 _61 _62 _63 _64 _65 _66 _67 _68 _69 _70 _71 _72 _73 _74 _75 _76 _77 _78 _79 _80 _81 _82 _83 _84 _85 _86 _87 _88 _89 _90 _91 _92 _93 _94 _95 _96 _97 _98 _99 _100 _101 _102 _103 _104 _105 _106 _107 _108 _109 _110 _111 _112 _113 _114 _115 _116 _117 _118 _119 _120 _121 _122 _123 _124 _125 _126 _127 _128 _129 _130 _131 _132 _133 _134 _135 _136 _137 _138 _139 _140 _141 _142 _143 _144 _145 _146 _147 _148 _149 _150 _151 _152 _153 _154 _155 _156 _157 _158 _159 _160 _161 _162 _163 _164 _165 _166 _167 _168 _169 _170 _171 _172 _173 _174 _175 _176 _177 _178 _179 _180 _181 _182 _183 _184 _185 _186 _187 _188 _189 _190 _191 _192 _193 _194 _195 _196 _197 _198 _199 _200 _201 _202 _203 _204 _205 _206 _207 _208 _209 _210 _211 _212 _213 _214 _215 _216 _217 _218 _219 _220 _221 _222 _223 _224 _225 _226 _227 _228 _229 _230 _231 _232 _233 _234 _235 _236 _237 _238 _239 _240 _241 _242 _243 _244 _245 _246 _247 _248 _249 _250 _251 _252 _253 _254 _255 _256 _257 _258 _259 _260 _261 _262 _263 _264 _265 _266 _267 _268 _269 _270 _271 _272 _273 _274 _275 _276 _277 _278 _279 _280 _281 _282 _283 _284 _285 _286 _287 _288 _289 _290 _291 _292 _293 _294 _295 _296 _297 _298 _299 _300 _301 _302 _303 _304 _305 _306 _307 _308 _309 _310 _311 _312 _313 _314 _315 _316 _317 _318 _319 _320 _321 _322 _323 _324 _325 _326 _327 _328 _329 _330 _331 _332 _333 _334 _335 _336 _337 _338 _339 _340 _341 _342 _343 _344 _345 _346 _347 _348 _349 _350 _351 _352 _353 _354 _355 _356 _357 _358 _359 _360 _361 _362 _363 _364 _365 _366 _367 _368 _369 _370 _371 _372 _373 _374 _375 _376 _377 _378 _379 _380 _381 _382 _383 _384 _385 _386 _387 _388 _389 _390 _391 _392 _393 _394 _395 _396 _397 _398 _399 _400 _401 _402 _403 _404 _405 _406 _407 _408 _409 _410 _411 _412 _413 _414 _415 _416 _417 _418 _419 _420 _421 _422 _423 _424 _425 _426 _427 _428 _429 _430 _431 _432 _433 _434 _435 _436 _437 _438 _439 _440 _441 _442 _443 _444 _445 _446 _447 _448 _449 _450 _451 _452 _453 _454 _455 _456 _457 _458 _459 _460 _461 _462 _463 _464 _465 _466 _467 _468 _469 _470 _471 _472 _473 _474 _475 _476 _477 _478 _479 _480 _482 _483 _484 _485 _486 _487 _488 _489 _490 _491 _492 _493 _494 _495 _496 _497 _498 _499 _501 _502 _503 _504 _505 _506 _508 _509 _510 _511 _512 _513 _514 _515 _516 _517 _518 _519 _520 _521 _522 _523 _524 _525 _526 _527 _528 _529 _530 _531 _532 _533 _534 _535 _536 _537 _538 _539 _540 _541 _542 _543 _544 _545 _546 _547 _548 _549 _550 _551 _552 _553 _554 _555 _556 _557 _558 _559 _560 _561 _562 _563 _564 _565 _566 _567 _568 _569 _570 _571 _572 _573 _574 _575 _576 _577 _578 _579 _580 _581 _582 _583 _584 _585 _586 _587 _588 _589 _590 _591 _592 _593 _594 _595 _596 _597 _598 _599 _600 _601 _602 _603 _604 _605 _606 _607 _608 _609 _610 _611 _612 _613 _614 _615 _616 _617 _618 _619 _621 _622 _623 _624 _625 _626 _627 _628 _629 _630 _631 _632 _633 _634 _635 _636 _638 _639 _640 _641 _642 _643 _644 _645 _646 _647 _648 _649 _650 _651 _652 _653 _654 _655 _656 _657 _658 _659 _660 _661 _662 _663 _664 _665 _666 _667 _668 _669 _670 _671 _672 _673 _674 _675 _676 _677 _678 _679 _680 _681 _682 _683 _684 _685 _686 _687 _688 _689 _690 _691 _692 _693 _694 _695 _696 _697 _698 _699 _700 _701 _702 _703 _704 _705 _706 _707 _708 _709 _710 _711 _712 _713 _714 _715 _716 _717 _718 _719 _720 _721 _722 _723 _724 _725 _726 _727 _728 _729 _730 _731 _732 _733 _734 _735 _736 _737 _738 _739 _740 _741 _742 _743 _744 _745 _746 _747 _748 _749 _750 _751 _752 _753 _754 _755 _756 _757 _758 _759 _760 _761 _762 _763 _764 _766 _767 _768 _769 _770 _771 _772 _773 _774 _775 _776 _777 _778 _779 _780 _781 _782 _783 _784 _785 _786 _787 _788 _789 _790 _791 _792 _793 _794 _795 _796 _797 _798 _799 _800 _801 _802 _803 _804 _805 _806 _807 _808 _809 _810 _811 _812 _813 _814 _815 _816 _817 _819 _820 _821 _823 _824 _825 _826 _827 _828 _829 _830 _831 _832 _833 _834 _835 _836 _837 _838 _839 _840 _841 _842 _843 _844 _845 _846 _847 _848 _849 _850 _851 _852 _853 _854 _855 _856 _857 _858 _859 _860 _861 _862 _863 _864 _865 _866 _867 _868 _869 _870 _871 _872 _873 _874 _875 _876 _877 _878 _879 _880 _881 _882 _883 _884 _885 _886 _887 _888 _889 _890 _891 _892 _893 _894 _895 _896 _897 _898 _899 _900 _901 _902 _903 _904 _905 _906 _907 _908 _909 _910 _911 _912 _913 _914 _915 _916 _917 _918 _919 _920 _921 _922 _923 _924 _925 _926 _927 _928 _929 _930 _931 _932 _933 _934 _935 _936 _937 _938 _939 _940 _941 _942 _943 _944 _945 _946 _947 _948 _949 _950 _951 _952 _953 _954 _955 _956 _957 _958 _959 _960 _961 _962 _963 _964 _965 _966 _967 _968 _969 _970 _971 _972 _973 _974 _975 _976 _977 _978 _979 _980 _981 _982 _983 _984 _985 _986 _987 _988 _989 _990 _991 _992 _993 _994 _995 _996 _997 _998 _999 _1000 _1001 _1002 _1003 _1005 _1006 _1007 _1008 _1009 _1010 _1011 _1012 _1013 _1014 _1015 _1016 _1017 _1018 _1019 _1020 _1021 _1022 _1023 _1024 _1025 _1026 _1027 _1028 _1029 _1030 _1031 _1032 _1033 _1034 _1035 _1036 _1037 _1038 _1039 _1040 _1041 _1042 _1043 _1044 _1045 _1046 _1047 _1048 _1049 _1050 _1051 _1052 _1053 _1054 _1055 _1056 _1057 _1058 _1059 _1060 _1061 _1062 _1063 _1064 _1065 _1066 _1067 _1068 _1069 _1070 _1071 _1072 _1073 _1074 _1075 _1076 _1077 _1078 _1079 _1080 _1081 _1082 _1083 _1084 _1085 _1086 _1087 _1088 _1089 _1090 _1091 _1092 _1093 _1094 _1095 _1096 _1097 _1098 _1099 _1100 _1101 _1102 _1103 _1104 _1106 _1108 _1110 _1111 _1112 _1113 _1114 _1115 _1116 _1117 _1118 _1119 _1120 _1121 _1122 _1123 _1124 _1125 _1126 _1127 _1128 _1129 _1130 _1131 _1132 _1133 _1135 _1134 _1137 _1139 _1141 _1143 _1144 _1145 _1146 _1147 _1148 _1149 _1150 _1151 _1152 _1153 _1155 _1156 _1157 _1158 _1160 _1161 _1163 _1164 _1166 _1167 _1169 _1171 _1173 _1175 _1177 _1179 _1181 _1183 _1185 _1186 _1187 _1188 _1189 _1190 _1191 _1105 _1107 _765 _1192 _1194 _1195 _1193 _1196 _1197 _1198 _1199 _1200 _1201 _1202 _1203 _1204 _1205 _1206 _1207 _1208 _1209 _1210 _1211 _1212 _1213 _1214 _1215 _1216 _1217 _1218 _1219 _1220 _1221 _1222 _1223 _1224 _1225 _1226 _1227 _1228 _1229 _1230 _1231 _1232 _1233 _1234 _1235 _1236 _1237 _1238 _1239 _1241 _1242 _1243 _1244 _1245 _1247 _1249 _1250 _1251 _1252 _1253 _1255 _1256 _1257 _1258 _1260 _1261 _1262 _1263 _1264 _1265 _1266 _1267 _1268 _1269 _1270 _1271 _1272 _1273 _1274 _1275 _1276 _1277 _1278 _1279 _1280 _1281 _1282 _1283 _1284 _1285 _1286 _1287 _1288 _1289 _1290 _1291 _1292 _1293 _1294 _1295 _1296 _1297 _1298 _1299 _1300 _1301 _1302 _1303 _1304 _1305 _1306 _1307 _1308 _1309 _1310 _1311 _1312 _1313 _1314 _1315 _1316 _1317 _1318 _1319 _1320 _1321 _1322 _1323 _1324 _1325 _1326 _1327 _1328 _1329 _1330 _1331 _1332 _1333 _1334 _1335 _1336 _1337 _1338 _1339 _1340 _1341 _1342 _1343 _1344 _1345 _1346 _1347 _1348 _1349 _1350 _1351 _1352 _1353 _1354 _1355 _1356 _1357 _1358 _1359 _1360 _1361 _1362 _1363 _1364 _1365 _1366 _1367 _1368 _1369 _1370 _1371 _1372 _1373 _1374 _1375 _1376 _1377 _1378 _1379 _1380 _1381 _1382 _1383 _1384 _1385 _1386 _1387 _1388 _1389 _1390 _1391 _1392 _1393 _1394 _1395 _1396 _1397 _1398 _1399 _1400 _1401 _1402 _1403 _1404 _1405 _1406 _1407 _1408 _1409 _1410 _1411 _1412 _1413 _1414 _1415 _1416 _1417 _1418 _1419 _1420 _1421 _1422 _1423 _1424 _1425 _1426 _1427 _1428 _1430 _1431 _1432 _1433 _1434 _1435 _1436 _1437 _1438 _1439 _1440 _1441 _1442 _1443 _1444 _1445 _1446 _1447 _1448 _1449 _1450 _1451 _1452 _1453 _1454 _1455 _1456 _1457 _1458 _1459 _1460 _1461 _1462 _1463 _1464 _1465 _1466 _1467 _1468 _1469 _1470 _1471 _1472 _1473 _1474 _1475 _1476 _1477 _1478 _1479 _1480 _1481 _1482 _1483 _1484 _1485 _1486 _1487 _1488 _1489 _1491 _1490 _1492 _1493 _818 _1494 _1495 _1496 _1497 _1499 _1498 _1501 _1502 _1503 _1504 _1505 _1506 _1507 _1508 _1509 _1510 _1512 _1513 _1514 _1515 _1516 _1517 _1518 _1519 _1520 _1521 _1522 _1523 _1525 _1524 _1526 _1527 _1528 _1529 _1530 _1531 _1532 _1533 _1534 _1535 _1536 _1537 _1538 _1539 _1540 _1541 _1542 _1543 _1544 _1545 _1546 _1547 _1548 _1549 _1550 _1551 _1552 _1553 _1554 _1555 _1556 _1557 _1558 _1559 _1560 _1562 _1563 _1564 _1565 _1566 _1567 _1568 _1569 _1570 _1571 _1573 _1574 _1575 _1576 _1577 _1578 _1579 _1580 _1581 _1582 _1583 _1584 _1585 _1586 _1587 _1588 _1589 _1590 _1591 _1592 _1593 _1594 _1561 _1595 _1596 _1597 _1598 _1599 _1600 _1601 _1602 _1603 _1604 _1605 _1606 _1607 _1608 _1609 _1610 _1611 _1612 _1613 _1614 _1615 _1616 _1617 _1618 _1619 _1620 _1621 _1622 _1623 _1624 _1625 _1626 _1627 _1628 _1629 _1630 _1631 _1632 _1633 _1634 _1635 _1636 _1637 _1638 _1639 _1640 _1641 _1642 _1643 _1644 _1645 _1646 _1647 _1648 _1649 _1650 _1651 _1652 _1653 _1654 _1655 _1656 _1657 _1658 _1659 _1660 _1661 _1662 _1663 _1664 _1665 _1666 _1667 _1668 _1669 _1670 _1671 _1672 _1673 _1674 _1675 _1676 _1677 _1678 _1679 _1680 _1681 _1682 _1683 _1684 _1685 _1686 _1687 _1688 _1689 _1690 _1691 _1692 _1693 _1694 _1695 _1696 _1697 _1698 _1699 _1700 _1701 _1702 _1703 _1704 _1705 _1706 _1707 _1708 _1709 _1710 _1711 _1712 _1713 _1714 _1715 _1716 _1717 _1718 _1719 _1720 _1721 _1722 _1723 _1724 _1725 _1726 _1727 _1728 _1729 _1730 _1731 _1732 _1733 _1734 _1735 _1736 _1737 _1738 _1739 _1740 _1741 _1742 _1743 _1744 _1745 _1746 _1747 _1748 _1749 _1750 _1751 _1752 _1753 _1754 _1755 _1756 _1757 _1758 _1759 _1760 _1761 _1762 _1763 _1764 _1765 _1766 _1767 _1768 _1769 _1770 _1771 _1772 _1773 _1774 _1775 _1776 _1777 _1778 _1779 _1780 _1781 _1782 _1783 _1784 _1785 _1786 _1787 _1788 _1789 _1790 _1791 _1792 _1793 _1794 _1795 _1796 _1797 _1798 _1799 _1800 _1801 _1802 _1803 _1804 _1805 _1806 _1807 _1808 _1809 _1810 _1811 _1812 _1813 _1814 _1815 _1816 _1817 _1818 _1819 _1820 _1821 _1822 _1823 _1824 _1825 _1826 _1827 _1828 _1829 _1830 _1831 _1832 _1833 _1834 _1835 _1836 _1837 _1838 _1839 _1840 _1841 _1842 _1843 _1844 " mangled="_Z2::"/> - <Namespace id="_2" name="std" context="_1" members="_1846 _1847 _1848 _1849 _1850 _1851 _1852 _1853 _1854 _1855 _1856 _1857 _1858 _1859 _1860 _1861 _1862 _1863 _1864 _1865 _1866 _1867 _1868 _1869 _1870 _1871 _1872 _1873 _1874 _1875 _1876 _1877 _1878 _1879 _1880 _1881 _1882 _1883 _1884 _1885 _1886 _1887 _1888 _1889 _1890 _1891 _1892 _1893 _1894 _1895 _1900 _1901 _1906 _1907 _1920 _1921 _1926 _1927 _1932 _1933 _1934 _1935 _1936 _1937 _1938 _1939 _1940 _1941 _1942 _1956 _1957 _1958 _1959 _1960 _1961 _1962 _1963 _1964 _1965 _1968 _1973 _1974 _1975 _1976 _1981 _1982 _1983 _1984 _1987 _1988 _1989 _1990 _1991 _1992 _1993 _1994 _1995 _1996 _1997 _2006 _2007 _2008 _2039 _2048 _2049 _2050 _2051 _2052 _2053 _2054 _2055 _2056 _2057 _2058 _2059 _2060 _2061 _2062 _2063 _2064 _2065 _2066 _2067 _2068 _2069 _2070 _2071 _2072 _2073 _2074 _2075 _2076 _2077 _2078 _2079 _2080 _2081 _2082 _2083 _2084 _2085 _2086 _2087 _2088 _2089 _2090 _2091 _2092 _2093 _2094 _2100 _2101 _2142 _2143 _2144 _2162 _2163 _2203 _2205 _2206 _2207 _2268 _2281 _2290 _2307 _2308 _2313 _2315 _2316 _2317 _2324 _2325 _2326 _2449 _2450 _2451 _2452 _2453 _2454 _2455 _2456 _2457 _2459 _2461 _2463 _2465 _2467 _2469 _2471 _2473 _2475 _2477 _2479 _2481 _2483 _2485 _2487 _2489 _2491 _2493 _2495 _2497 _2499 _2501 _2503 _2505 _2507 _2509 _2510 _2515 _2516 _2517 _2518 _2519 _2520 _2521 _2522 _2523 _2524 _2525 _2526 _2527 _2528 _2530 _2531 _2532 _2533 _2534 _2535 _2536 _2537 _2538 _2540 _2542 _2561 _2562 _2563 _2564 _2565 _2566 _2567 _2568 _2569 _2632 _2633 _2634 _2635 _2636 _2637 _2638 _2647 _2648 _2649 " mangled="_Z3std"/> - <Function id="_3" name="_GLOBAL__D__home_roman_pygccxml_sources_sources_pyplusplus_dev_examples_pyboost_dev_pyboost_date_time_include_date_time.pypp.hppmhWTva" returns="_1154" context="_1" location="f0:131" file="f0" line="131" endline="131"/> - <Function id="_4" name="_GLOBAL__I__home_roman_pygccxml_sources_sources_pyplusplus_dev_examples_pyboost_dev_pyboost_date_time_include_date_time.pypp.hppmhWTva" returns="_1154" context="_1" location="f0:131" file="f0" line="131" endline="131"/> +<GCC_XML cvs_revision="1.112"> + <Namespace id="_1" name="::" members="_3 _4 _5 _6 _7 _8 _9 _10 _11 _12 _13 _14 _15 _16 _17 _18 _19 _20 _21 _22 _23 _24 _25 _26 _27 _28 _29 _30 _31 _32 _33 _34 _35 _36 _37 _38 _39 _40 _41 _42 _43 _44 _45 _46 _47 _48 _49 _50 _51 _52 _53 _54 _55 _56 _57 _58 _59 _60 _61 _62 _63 _64 _65 _66 _67 _68 _69 _70 _71 _72 _73 _74 _75 _76 _77 _78 _79 _80 _81 _82 _83 _84 _85 _86 _87 _88 _89 _90 _91 _92 _93 _94 _95 _96 _97 _98 _99 _100 _101 _102 _103 _104 _105 _106 _107 _108 _109 _110 _111 _112 _113 _114 _115 _116 _117 _118 _119 _120 _121 _122 _123 _124 _125 _126 _127 _128 _129 _130 _131 _132 _133 _134 _135 _136 _137 _138 _139 _140 _141 _142 _143 _144 _145 _146 _147 _148 _149 _150 _151 _152 _153 _154 _155 _156 _157 _158 _159 _160 _161 _162 _163 _164 _165 _166 _167 _168 _169 _170 _171 _172 _173 _174 _175 _176 _177 _178 _179 _180 _181 _182 _183 _184 _185 _186 _187 _188 _189 _190 _191 _192 _193 _194 _195 _196 _197 _198 _199 _200 _201 _202 _203 _204 _205 _206 _207 _208 _209 _210 _211 _212 _213 _214 _215 _216 _217 _218 _219 _220 _221 _222 _223 _224 _225 _226 _227 _228 _229 _230 _231 _232 _233 _234 _235 _236 _237 _238 _239 _240 _241 _242 _243 _244 _245 _246 _247 _248 _249 _250 _251 _252 _253 _254 _255 _256 _257 _258 _259 _260 _261 _262 _263 _264 _265 _266 _267 _268 _269 _270 _271 _272 _273 _274 _275 _276 _277 _278 _279 _280 _281 _282 _283 _284 _285 _286 _287 _288 _289 _290 _291 _292 _293 _294 _295 _296 _297 _298 _299 _300 _301 _302 _303 _304 _305 _306 _307 _308 _309 _310 _311 _312 _313 _314 _315 _316 _317 _318 _319 _320 _321 _322 _323 _324 _325 _326 _327 _328 _329 _330 _331 _332 _333 _334 _335 _336 _337 _338 _339 _340 _341 _342 _343 _344 _345 _346 _347 _348 _349 _350 _351 _352 _353 _354 _355 _356 _357 _358 _359 _360 _361 _362 _363 _364 _365 _366 _367 _368 _369 _370 _371 _372 _373 _374 _375 _376 _377 _378 _379 _380 _381 _382 _383 _384 _385 _386 _387 _388 _389 _390 _391 _392 _393 _394 _395 _396 _397 _398 _399 _400 _401 _402 _403 _404 _405 _406 _407 _408 _409 _410 _411 _412 _413 _414 _415 _416 _417 _418 _419 _420 _421 _422 _423 _424 _425 _426 _427 _428 _429 _430 _431 _432 _433 _434 _435 _436 _437 _438 _439 _440 _441 _442 _443 _444 _445 _446 _447 _448 _449 _450 _451 _452 _453 _454 _455 _456 _457 _458 _459 _460 _461 _462 _463 _464 _465 _466 _467 _468 _469 _470 _471 _472 _473 _474 _475 _476 _477 _478 _479 _480 _482 _483 _484 _485 _486 _487 _488 _489 _490 _491 _492 _493 _494 _495 _496 _497 _498 _499 _501 _502 _503 _504 _505 _506 _508 _509 _510 _511 _512 _513 _514 _515 _516 _517 _518 _519 _520 _521 _522 _523 _524 _525 _526 _527 _528 _529 _530 _531 _532 _533 _534 _535 _536 _537 _538 _539 _540 _541 _542 _543 _544 _545 _546 _547 _548 _549 _550 _551 _552 _553 _554 _555 _556 _557 _558 _559 _560 _561 _562 _563 _564 _565 _566 _567 _568 _569 _570 _571 _572 _573 _574 _575 _576 _577 _578 _579 _580 _581 _582 _583 _584 _585 _586 _587 _588 _589 _590 _591 _592 _593 _594 _595 _596 _597 _598 _599 _600 _601 _602 _603 _604 _605 _606 _607 _608 _609 _610 _611 _612 _613 _614 _615 _616 _617 _618 _619 _621 _622 _623 _624 _625 _626 _627 _628 _629 _630 _631 _632 _633 _634 _635 _636 _638 _639 _640 _641 _642 _643 _644 _645 _646 _647 _648 _649 _650 _651 _652 _653 _654 _655 _656 _657 _658 _659 _660 _661 _662 _663 _664 _665 _666 _667 _668 _669 _670 _671 _672 _673 _674 _675 _676 _677 _678 _679 _680 _681 _682 _683 _684 _685 _686 _687 _688 _689 _690 _691 _692 _693 _694 _695 _696 _697 _698 _699 _700 _701 _702 _703 _704 _705 _706 _707 _708 _709 _710 _711 _712 _713 _714 _715 _716 _717 _718 _719 _720 _721 _722 _723 _724 _725 _726 _727 _728 _729 _730 _731 _732 _733 _734 _735 _736 _737 _738 _739 _740 _741 _742 _743 _744 _745 _746 _747 _748 _749 _750 _751 _752 _753 _754 _755 _756 _757 _758 _759 _760 _761 _762 _763 _764 _766 _767 _768 _769 _770 _771 _772 _773 _774 _775 _776 _777 _778 _779 _780 _781 _782 _783 _784 _785 _786 _787 _788 _789 _790 _791 _792 _793 _794 _795 _796 _797 _798 _799 _800 _801 _802 _803 _804 _805 _806 _807 _808 _809 _810 _811 _812 _813 _814 _815 _816 _817 _819 _820 _821 _823 _824 _825 _826 _827 _828 _829 _830 _831 _832 _833 _834 _835 _836 _837 _838 _839 _840 _841 _842 _843 _844 _845 _846 _847 _848 _849 _850 _851 _852 _853 _854 _855 _856 _857 _858 _859 _860 _861 _862 _863 _864 _865 _866 _867 _868 _869 _870 _871 _872 _873 _874 _875 _876 _877 _878 _879 _880 _881 _882 _883 _884 _885 _886 _887 _888 _889 _890 _891... [truncated message content] |
|
From: <rom...@us...> - 2006-05-14 07:46:02
|
Revision: 83 Author: roman_yakovenko Date: 2006-05-14 00:45:53 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=83&view=rev Log Message: ----------- adding exception specification to function-wrappers Added Paths: ----------- pyplusplus_dev/unittests/data/mem_fun_with_exception_to_be_exported.hpp pyplusplus_dev/unittests/mem_fun_with_exception_tester.py Added: pyplusplus_dev/unittests/data/mem_fun_with_exception_to_be_exported.hpp =================================================================== --- pyplusplus_dev/unittests/data/mem_fun_with_exception_to_be_exported.hpp (rev 0) +++ pyplusplus_dev/unittests/data/mem_fun_with_exception_to_be_exported.hpp 2006-05-14 07:45:53 UTC (rev 83) @@ -0,0 +1,23 @@ +// Copyright 2004 Roman Yakovenko. +// Distributed under the Boost Software License, Version 1.0. (See +// accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + +#ifndef __mem_fun_with_exception_to_be_exported_hpp__ +#define __mem_fun_with_exception_to_be_exported_hpp__ + +#include <exception> + +namespace mem_fun_with_exception{ + +struct data_t{ +public: + virtual void do_nothing() throw( std::exception ) + {} +}; + +} + +#endif//__mem_fun_with_exception_to_be_exported_hpp__ + + Added: pyplusplus_dev/unittests/mem_fun_with_exception_tester.py =================================================================== --- pyplusplus_dev/unittests/mem_fun_with_exception_tester.py (rev 0) +++ pyplusplus_dev/unittests/mem_fun_with_exception_tester.py 2006-05-14 07:45:53 UTC (rev 83) @@ -0,0 +1,38 @@ +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import os +import sys +import unittest +import fundamental_tester_base +from pygccxml import declarations + +class tester_t(fundamental_tester_base.fundamental_tester_base_t): + EXTENSION_NAME = 'mem_fun_with_exception' + + def __init__( self, *args ): + fundamental_tester_base.fundamental_tester_base_t.__init__( + self + , tester_t.EXTENSION_NAME + , *args ) + + def customize( self, mb ): + mb.calldefs().create_with_signature = True + + def run_tests(self, module): + d = module.data_t() + d.do_nothing() + + +def create_suite(): + suite = unittest.TestSuite() + suite.addTest( unittest.makeSuite(tester_t)) + return suite + +def run_suite(): + unittest.TextTestRunner(verbosity=2).run( create_suite() ) + +if __name__ == "__main__": + run_suite() \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:44:46
|
Revision: 82 Author: roman_yakovenko Date: 2006-05-14 00:44:40 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=82&view=rev Log Message: ----------- fixing test failure, caused by switching to demangled class name Modified Paths: -------------- pyplusplus_dev/unittests/operators_tester.py Modified: pyplusplus_dev/unittests/operators_tester.py =================================================================== --- pyplusplus_dev/unittests/operators_tester.py 2006-05-14 07:38:37 UTC (rev 81) +++ pyplusplus_dev/unittests/operators_tester.py 2006-05-14 07:44:40 UTC (rev 82) @@ -20,15 +20,15 @@ def customize( self, mb ): mb.global_ns.exclude() - - rational = mb.class_('rational<long int>') + + rational = mb.class_('rational<long>') rational.include() rational.alias = "pyrational" r_assign = rational.calldef( 'assign', recursive=False ) r_assign.call_policies = call_policies.return_self() - foperators = mb.free_operators( lambda decl: 'rational<long int>' in decl.decl_string ) + foperators = mb.free_operators( lambda decl: 'rational<long>' in decl.decl_string ) foperators.include() bad_rational = mb.class_('bad_rational' ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:38:42
|
Revision: 81 Author: roman_yakovenko Date: 2006-05-14 00:38:37 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=81&view=rev Log Message: ----------- adding exception specification to function-wrappers adding some small fix for special operators Modified Paths: -------------- pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py Modified: pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py =================================================================== --- pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2006-05-14 07:34:21 UTC (rev 80) +++ pyplusplus_dev/pyplusplus/decl_wrappers/calldef_wrapper.py 2006-05-14 07:38:37 UTC (rev 81) @@ -17,11 +17,11 @@ class calldef_t(decl_wrapper.decl_wrapper_t): def __init__(self, *arguments, **keywords): decl_wrapper.decl_wrapper_t.__init__( self, *arguments, **keywords ) - + self._call_policies = None self._use_keywords = True self._use_default_arguments = True - self._create_with_signature = False + self._create_with_signature = False self._overridable = None def get_call_policies(self): @@ -47,7 +47,7 @@ def _set_use_default_arguments(self, use_default_arguments): self._use_default_arguments = use_default_arguments use_default_arguments = property( _get_use_default_arguments, _set_use_default_arguments ) - + def has_wrapper( self ): if not isinstance( self, declarations.member_calldef_t ): return False @@ -70,24 +70,24 @@ def get_overridable( self ): """ - Virtual functions, that returns const reference, could not be overriden - from Python. The reason is simple: in boost::python::override::operator(...) + Virtual functions, that returns const reference, could not be overriden + from Python. The reason is simple: in boost::python::override::operator(...) result of marshaling (Python 2 C++) is saved on stack, after function exit, the result will be reference to no where - access violetion. For example see temporal variable tester """ if None is self._overridable: - if isinstance( self, declarations.member_calldef_t ) \ + if isinstance( self, declarations.member_calldef_t ) \ and self.virtuality != declarations.VIRTUALITY_TYPES.NOT_VIRTUAL \ and declarations.is_reference( self.return_type ): self._overridable = False else: self._overridable = True return self._overridable - + def set_overridable( self, overridable ): self._overridable = overridable - + overridable = property( get_overridable, set_overridable , doc = get_overridable.__doc__ ) @@ -128,8 +128,8 @@ tmpl = 'WARNING: Function "%s" takes as argument (name=%s, pos=%d ) ' \ + 'non-const reference to C++ fundamental type - ' \ + 'function could not be called from Python.' - msg.append( tmpl % ( str( self ), arg.name, index ) ) - + msg.append( tmpl % ( str( self ), arg.name, index ) ) + if False == self.overridable: msg.append( self.get_overridable.__doc__ ) return msg @@ -138,12 +138,12 @@ def __init__(self, *arguments, **keywords): declarations.member_function_t.__init__( self, *arguments, **keywords ) calldef_t.__init__( self ) - + class constructor_t( declarations.constructor_t, calldef_t ): def __init__(self, *arguments, **keywords): declarations.constructor_t.__init__( self, *arguments, **keywords ) calldef_t.__init__( self ) - + def _exportable_impl( self ): if self.is_artificial: return 'pyplusplus does not exports compiler generated constructors' @@ -156,14 +156,14 @@ calldef_t.__init__( self ) class operators_helper: - + inplace = [ '+=', '-=', '*=', '/=', '%=', '>>=', '<<=', '&=', '^=', '|=' ] comparison = [ '==', '!=', '<', '>', '<=', '>=' ] non_member = [ '+', '-', '*', '/', '%', '&', '^', '|' ] #'>>', '<<', not implemented unary = [ '!', '~', '+', '-' ] - + all = inplace + comparison + non_member + unary - + def is_supported( oper ): if oper.symbol == '*' and len( oper.arguments ) == 0: #dereference does not make sense @@ -178,13 +178,13 @@ #see http://www.boost.org/libs/python/doc/v2/operators.html#introduction return 'operator %s is not supported. Please take a look on http://www.boost.org/libs/python/doc/v2/operators.html#introduction.' return '' - exportable = staticmethod( exportable ) - + exportable = staticmethod( exportable ) + class member_operator_t( declarations.member_operator_t, calldef_t ): def __init__(self, *arguments, **keywords): declarations.member_operator_t.__init__( self, *arguments, **keywords ) calldef_t.__init__( self ) - + def _get_alias( self): alias = super( member_operator_t, self )._get_alias() if alias == self.name: @@ -200,7 +200,7 @@ def _exportable_impl( self ): return operators_helper.exportable( self ) - + class casting_operator_t( declarations.casting_operator_t, calldef_t ): def prepare_special_cases(): @@ -221,26 +221,28 @@ alias = '__int__' elif declarations.is_floating_point( type_ ): alias = '__float__' - else: - continue #void + else: + continue #void if alias: special_cases[ type_ ] = alias special_cases[ const_t( type_ ) ] = alias special_cases[ pointer_t( const_t( declarations.char_t() ) ) ] = '__str__' std_string = '::std::basic_string<char,std::char_traits<char>,std::allocator<char> >' - std_wstring = '::std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t> >' + std_wstring1 = '::std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t> >' + std_wstring2 = '::std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >' special_cases[ std_string ] = '__str__' - special_cases[ std_wstring ] = '__str__' + special_cases[ std_wstring1 ] = '__str__' + special_cases[ std_wstring2 ] = '__str__' special_cases[ '::std::string' ] = '__str__' special_cases[ '::std::wstring' ] = '__str__' - - #TODO: add + + #TODO: add # std::complex<SomeType> some type should be converted to double return special_cases - + SPECIAL_CASES = prepare_special_cases() #casting_member_operator_t.prepare_special_cases() - + def __init__(self, *arguments, **keywords): declarations.casting_operator_t.__init__( self, *arguments, **keywords ) calldef_t.__init__( self ) @@ -259,7 +261,7 @@ self._alias = alias break else: - self._alias = 'as_' + self._generate_valid_name(self.return_type.decl_string) + self._alias = 'as_' + self._generate_valid_name(self.return_type.decl_string) return self._alias alias = property( _get_alias, decl_wrapper.decl_wrapper_t._set_alias ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:34:26
|
Revision: 80 Author: roman_yakovenko Date: 2006-05-14 00:34:21 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=80&view=rev Log Message: ----------- adding exception specification to function-wrappers Modified Paths: -------------- pyplusplus_dev/pyplusplus/code_creators/calldef.py Modified: pyplusplus_dev/pyplusplus/code_creators/calldef.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-05-14 07:32:42 UTC (rev 79) +++ pyplusplus_dev/pyplusplus/code_creators/calldef.py 2006-05-14 07:34:21 UTC (rev 80) @@ -113,6 +113,13 @@ msg = msg + 'Reason: function returns reference to local variable!' return 'throw std::logic_error("%s");' % msg + def throw_specifier_code( self ): + if not self.declaration.exceptions: + return '' + exceptions = map( lambda exception: + algorithm.create_identifier( self, declarations.full_name( exception ) ) + , self.declaration.exceptions ) + return ' throw( ' + self.PARAM_SEPARATOR.join( exceptions ) + ' )' class free_function_t( calldef_t ): def __init__( self, function, parent=None ): @@ -210,7 +217,7 @@ calldef_wrapper_t.__init__( self, function=function, parent=parent ) def create_declaration(self): - template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s' + template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s%(throw)s' constness = '' if self.declaration.has_const: @@ -221,6 +228,7 @@ , 'name' : self.declaration.name , 'args' : self.args_declaration() , 'constness' : constness + , 'throw' : self.throw_specifier_code() } def create_body( self ): @@ -299,7 +307,7 @@ , has_const=self.declaration.has_const ) def create_declaration(self, name): - template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s' + template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s %(throw)s' constness = '' if self.declaration.has_const: @@ -310,6 +318,7 @@ , 'name' : name , 'args' : self.args_declaration() , 'constness' : constness + , 'throw' : self.throw_specifier_code() } def create_virtual_body(self): @@ -404,7 +413,7 @@ , has_const=self.declaration.has_const ) def create_declaration(self, name): - template = '%(return_type)s %(name)s( %(args)s )%(constness)s' + template = '%(return_type)s %(name)s( %(args)s )%(constness)s%(throw)s' constness = '' if self.declaration.has_const: @@ -415,6 +424,7 @@ , 'name' : name , 'args' : self.args_declaration() , 'constness' : constness + , 'throw' : self.throw_specifier_code() } def create_body(self): @@ -484,12 +494,13 @@ , arguments_types=map( lambda arg: arg.type, self.declaration.arguments ) ) def create_declaration(self, name): - template = 'static %(return_type)s %(name)s( %(args)s )' + template = 'static %(return_type)s %(name)s( %(args)s )%(throw)s' return template % { 'return_type' : self.declaration.return_type.decl_string , 'name' : name , 'args' : self.args_declaration() + , 'throw' : self.throw_specifier_code() } def create_body(self): @@ -559,7 +570,7 @@ , has_const=self.declaration.has_const ) def create_declaration(self, name): - template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s' + template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s%(throw)s' constness = '' if self.declaration.has_const: @@ -570,6 +581,7 @@ , 'name' : name , 'args' : self.args_declaration() , 'constness' : constness + , 'throw' : self.throw_specifier_code() } def create_virtual_body(self): @@ -646,7 +658,7 @@ , has_const=self.declaration.has_const ) def create_declaration(self): - template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s' + template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s%(throw)s' constness = '' if self.declaration.has_const: @@ -657,6 +669,7 @@ , 'name' : self.declaration.name , 'args' : self.args_declaration() , 'constness' : constness + , 'throw' : self.throw_specifier_code() } def create_body( self ): @@ -700,7 +713,7 @@ , has_const=self.declaration.has_const ) def create_declaration(self): - template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s' + template = 'virtual %(return_type)s %(name)s( %(args)s )%(constness)s%(throw)s' constness = '' if self.declaration.has_const: @@ -711,6 +724,7 @@ , 'name' : self.declaration.name , 'args' : self.args_declaration() , 'constness' : constness + , 'throw' : self.throw_specifier_code() } def create_body( self ): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:32:47
|
Revision: 79 Author: roman_yakovenko Date: 2006-05-14 00:32:42 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=79&view=rev Log Message: ----------- adding test case for unnamed namespace bug Modified Paths: -------------- pygccxml_dev/unittests/namespace_matcher_tester.py Modified: pygccxml_dev/unittests/namespace_matcher_tester.py =================================================================== --- pygccxml_dev/unittests/namespace_matcher_tester.py 2006-05-14 07:32:12 UTC (rev 78) +++ pygccxml_dev/unittests/namespace_matcher_tester.py 2006-05-14 07:32:42 UTC (rev 79) @@ -31,10 +31,27 @@ global_ns = declarations.get_global_namespace( self.declarations ) global_ns.init_optimizer() self.failUnless( 0 == len( global_ns.namespaces( 'does not exist', allow_empty=True ) ) ) + +class unnamed_ns_tester_t( parser_test_case.parser_test_case_t ): + COMPILATION_MODE = parser.COMPILATION_MODE.ALL_AT_ONCE + def __init__(self, *args ): + parser_test_case.parser_test_case_t.__init__( self, *args ) + self.header = 'unnamed_ns_bug.hpp' + self.declarations = None + def setUp(self): + if not self.declarations: + self.declarations = parser.parse( [self.header], self.config ) + + def test( self ): + declarations.matcher.get_single( + declarations.namespace_matcher_t( name='::' ) + , self.declarations ) + def create_suite(): suite = unittest.TestSuite() suite.addTest( unittest.makeSuite(tester_t)) + suite.addTest( unittest.makeSuite(unnamed_ns_tester_t)) return suite def run_suite(): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:32:20
|
Revision: 78 Author: roman_yakovenko Date: 2006-05-14 00:32:12 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=78&view=rev Log Message: ----------- adding test case for demangled property Modified Paths: -------------- pygccxml_dev/unittests/test_all.py Added Paths: ----------- pygccxml_dev/unittests/demangled_tester.py Added: pygccxml_dev/unittests/demangled_tester.py =================================================================== --- pygccxml_dev/unittests/demangled_tester.py (rev 0) +++ pygccxml_dev/unittests/demangled_tester.py 2006-05-14 07:32:12 UTC (rev 78) @@ -0,0 +1,40 @@ +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import unittest +import autoconfig +import parser_test_case + +from pygccxml import utils +from pygccxml import parser +from pygccxml import declarations + +class tester_t( parser_test_case.parser_test_case_t ): + def __init__(self, *args ): + parser_test_case.parser_test_case_t.__init__( self, *args ) + self.header = 'demangled.hpp' + self.global_ns = None + + def setUp(self): + if not self.global_ns: + decls = parser.parse( [self.header], self.config ) + self.global_ns = declarations.get_global_namespace( decls ) + self.global_ns.init_optimizer() + + def test( self ): + demangled = self.global_ns.namespace( 'demangled' ) + cls = demangled.class_( 'item_t<3740067437l, 11l, 2147483648l>' ) + self.failUnless( cls._name == 'item_t<0deece66d,11,080000000>' ) + +def create_suite(): + suite = unittest.TestSuite() + suite.addTest( unittest.makeSuite(tester_t)) + return suite + +def run_suite(): + unittest.TextTestRunner(verbosity=2).run( create_suite() ) + +if __name__ == "__main__": + run_suite() \ No newline at end of file Modified: pygccxml_dev/unittests/test_all.py =================================================================== --- pygccxml_dev/unittests/test_all.py 2006-05-14 07:31:46 UTC (rev 77) +++ pygccxml_dev/unittests/test_all.py 2006-05-14 07:32:12 UTC (rev 78) @@ -32,6 +32,7 @@ import cache_enums_tester import decl_printer_tester import typedefs_tester +import demangled_tester def create_suite(): testers = [ @@ -63,6 +64,7 @@ , cache_enums_tester , decl_printer_tester , typedefs_tester + , demangled_tester ] main_suite = unittest.TestSuite() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:31:51
|
Revision: 77 Author: roman_yakovenko Date: 2006-05-14 00:31:46 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=77&view=rev Log Message: ----------- changing gccxml path Modified Paths: -------------- pygccxml_dev/unittests/autoconfig.py Modified: pygccxml_dev/unittests/autoconfig.py =================================================================== --- pygccxml_dev/unittests/autoconfig.py 2006-05-14 07:29:20 UTC (rev 76) +++ pygccxml_dev/unittests/autoconfig.py 2006-05-14 07:31:46 UTC (rev 77) @@ -18,7 +18,7 @@ if sys.platform == 'win32': gccxml_path = 'c:/tools/gccxml/bin/gccxml.exe' else: - gccxml_path = '/home/roman/gccxml/bin/gccxml' + gccxml_path = '/home/roman/gccxml-build/bin/gccxml' try: import pygccxml @@ -27,6 +27,8 @@ sys.path.append( os.path.join( os.curdir, '..' ) ) import pygccxml print 'unittests will run on DEVELOPMENT version' + +pygccxml.declarations.class_t.USE_DEMANGLED_AS_NAME = True #try: #import pydsc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:29:25
|
Revision: 76 Author: roman_yakovenko Date: 2006-05-14 00:29:20 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=76&view=rev Log Message: ----------- adding new test case, that should be checked with boost.type_traits library Modified Paths: -------------- pygccxml_dev/unittests/data/type_traits.hpp Modified: pygccxml_dev/unittests/data/type_traits.hpp =================================================================== --- pygccxml_dev/unittests/data/type_traits.hpp 2006-05-14 07:27:38 UTC (rev 75) +++ pygccxml_dev/unittests/data/type_traits.hpp 2006-05-14 07:29:20 UTC (rev 76) @@ -175,6 +175,7 @@ typedef int& int_ref_t; typedef const int& const_int_ref_t; + typedef int const& int_const_ref_t; typedef some_struct_t& some_struct_ref_t; typedef int*& int_ptr_ref_t; } @@ -215,6 +216,7 @@ typedef const void const_void_t; typedef const incomplete_type const_incomplete_type_t; typedef int* const int_const_t; + //TODO typedef const int& const_int_ref_t; } namespace no{ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:27:46
|
Revision: 75 Author: roman_yakovenko Date: 2006-05-14 00:27:38 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=75&view=rev Log Message: ----------- adding test case for demangled property Added Paths: ----------- pygccxml_dev/unittests/data/demangled.hpp Added: pygccxml_dev/unittests/data/demangled.hpp =================================================================== --- pygccxml_dev/unittests/data/demangled.hpp (rev 0) +++ pygccxml_dev/unittests/data/demangled.hpp 2006-05-14 07:27:38 UTC (rev 75) @@ -0,0 +1,27 @@ +// Copyright 2004 Roman Yakovenko. +// Distributed under the Boost Software License, Version 1.0. (See +// accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + +#ifndef __demangled_hpp +#define __demangled_hpp + +namespace demangled{ + +template< unsigned long i1, unsigned long i2, unsigned long i3> +struct item_t{ + static const unsigned long v1 = i1; + static const unsigned long v2 = i2; + static const unsigned long v3 = i3; +}; + +struct buggy{ + typedef unsigned long ulong; + typedef item_t< ulong( 0xDEECE66DUL ) | (ulong(0x5) << 32), 0xB, ulong(1) << 31 > my_item_t; + my_item_t my_item_var; +}; + + +} + +#endif//__demangled_hpp \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:27:18
|
Revision: 74 Author: roman_yakovenko Date: 2006-05-14 00:27:09 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=74&view=rev Log Message: ----------- adding test case for unnamed namespace bug Added Paths: ----------- pygccxml_dev/unittests/data/unnamed_ns_bug.hpp Added: pygccxml_dev/unittests/data/unnamed_ns_bug.hpp =================================================================== --- pygccxml_dev/unittests/data/unnamed_ns_bug.hpp (rev 0) +++ pygccxml_dev/unittests/data/unnamed_ns_bug.hpp 2006-05-14 07:27:09 UTC (rev 74) @@ -0,0 +1,24 @@ +// Copyright 2004 Roman Yakovenko. +// Distributed under the Boost Software License, Version 1.0. (See +// accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + +#ifndef __unnamed_ns_bug_hpp__ +#define __unnamed_ns_bug_hpp__ + +// unnamed namespace +namespace{ + bool bool_var; +} + +namespace ns{ + +class test_t{ +public: + int var; +}; + +} + + +#endif//__unnamed_ns_bug_hpp__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:25:32
|
Revision: 73 Author: roman_yakovenko Date: 2006-05-14 00:25:24 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=73&view=rev Log Message: ----------- adding demangled property to declaration_t class, requiered few fixes in parser package Modified Paths: -------------- pygccxml_dev/pygccxml/parser/linker.py pygccxml_dev/pygccxml/parser/patcher.py pygccxml_dev/pygccxml/parser/project_reader.py pygccxml_dev/pygccxml/parser/scanner.py Modified: pygccxml_dev/pygccxml/parser/linker.py =================================================================== --- pygccxml_dev/pygccxml/parser/linker.py 2006-05-14 07:23:52 UTC (rev 72) +++ pygccxml_dev/pygccxml/parser/linker.py 2006-05-14 07:25:24 UTC (rev 73) @@ -84,7 +84,8 @@ def visit_casting_operator( self ): self.__link_calldef() - self.__inst.name = 'operator ' + self.__inst.return_type.decl_string + #will be fixed by patcher. It is needed because of demangled name taken into account + #self.__inst._name = 'operator ' + self.__inst.return_type.decl_string def visit_free_function( self ): self.__link_calldef() @@ -101,15 +102,15 @@ #class name. I think this is because those constructors are compiler #generated. I need to find out more about this and to talk with Brad - new_name = self.__inst.name + new_name = self.__inst._name if templates.is_instantiation( new_name ): new_name = templates.name( new_name ) for decl in self.__inst.declarations: if not isinstance( decl, constructor_t ): continue - if '.' in decl.name or '$' in decl.name: - decl.name = new_name + if '.' in decl._name or '$' in decl._name: + decl._name = new_name bases = self.__inst.bases.split() self.__inst.bases = [] Modified: pygccxml_dev/pygccxml/parser/patcher.py =================================================================== --- pygccxml_dev/pygccxml/parser/patcher.py 2006-05-14 07:23:52 UTC (rev 72) +++ pygccxml_dev/pygccxml/parser/patcher.py 2006-05-14 07:25:24 UTC (rev 73) @@ -172,8 +172,20 @@ return call_invocation.join( f_q_name, args ) +class fix_casting_operator_name_patcher_t( patcher_base_t ): + def __init__( self, decls ): + patcher_base_t.__init__( self, decls ) + + def patch_it(self): + for decl in declarations.make_flatten( self.decls ): + if not isinstance( decl, declarations.casting_operator_t): + continue + decl.name = 'operator ' + decl.return_type.decl_string + def patch_it(decls): patcher = default_argument_patcher_t( decls ) patcher.patch_it() + patcher2 = fix_casting_operator_name_patcher_t( decls ) + patcher2.patch_it() return patcher.decls \ No newline at end of file Modified: pygccxml_dev/pygccxml/parser/project_reader.py =================================================================== --- pygccxml_dev/pygccxml/parser/project_reader.py 2006-05-14 07:23:52 UTC (rev 72) +++ pygccxml_dev/pygccxml/parser/project_reader.py 2006-05-14 07:25:24 UTC (rev 73) @@ -15,6 +15,51 @@ ALL_AT_ONCE = 'all at once' FILE_BY_FILE = 'file by file' + +#TODO: rework next explanation to something useful. +""" +file_configuration_t is rather cool feature. When you create module_builder_t +class instance you should pass list of files. This list can contain string( == file paths ) and/or instances of file_configuration_t class. + +file_configuration_t is class with fat interface. +It has 4 states: + 1. it could contain reference to source file. + Use "create_source_fc" function to create an instance of file_configuration_t + + 2. it could contain reference to source file and xml file. In this case if xml file + exist, source file will not be parsed by gccxml. If xml file does not exists, source + file will be parsed and xml file will be saved for future use. + See create_cached_source_fc function + + 3. it could contain reference to xml file only + See create_gccxml_fc + + 4. it could contain some text. In this case, parser will create temporal file on + disk and will pass it as an argument to gccxml. + See create_text_fc + +In most cases you don't all those features. If I were you, I would create regular +source file and put all template instantiation there. + +Any way the code: + +tmpl_inst = ''' +===================== + #include "TempClass.h" + + namespace details{ + inline void export_templates(){ + sizeof( TempClass<int> ); + } + } +''' + +import module_builder +mb = module_builder.module_builder_t( + [ module_builder.create_text_fc( tmpl_inst ) ] + , .... ) + +""" class file_configuration_t( object ): class CONTENT_TYPE: STANDARD_SOURCE_FILE = 'standard source file' @@ -239,7 +284,7 @@ for other_ns in other_ns_list: main_ns = pygccxml.declarations.find_declaration( answer , type=pygccxml.declarations.namespace_t - , name=other_ns.name + , name=other_ns._name , recursive=False ) if main_ns: main_ns.take_parenting( other_ns ) @@ -253,23 +298,23 @@ decls = [] for decl in nsref.declarations: if not ddhash.has_key( decl.__class__ ): - ddhash[ decl.__class__ ] = { decl.name : [ decl ] } + ddhash[ decl.__class__ ] = { decl._name : [ decl ] } decls.append( decl ) else: joined_decls = ddhash[ decl.__class__ ] - if not joined_decls.has_key( decl.name ): + if not joined_decls.has_key( decl._name ): decls.append( decl ) - joined_decls[decl.name] = [ decl ] + joined_decls[decl._name] = [ decl ] else: if isinstance( decl, pygccxml.declarations.calldef_t ): - if decl not in joined_decls[decl.name]: + if decl not in joined_decls[decl._name]: #functions has overloading decls.append( decl ) - joined_decls[decl.name].append( decl ) + joined_decls[decl._name].append( decl ) else: - assert 1 == len( joined_decls[ decl.name ] ) + assert 1 == len( joined_decls[ decl._name ] ) if isinstance( decl, pygccxml.declarations.namespace_t ): - joined_decls[ decl.name ][0].take_parenting( decl ) + joined_decls[ decl._name ][0].take_parenting( decl ) nsref.declarations = decls def _join_class_hierarchy( self, namespaces ): @@ -347,7 +392,7 @@ decl_wrapper_type.declaration = leaved_classes[ create_key(decl_wrapper_type.declaration) ] else: msg = [] - msg.append( "Unable to find out actual class definition: '%s'." % decl_wrapper_type.declaration.name ) + msg.append( "Unable to find out actual class definition: '%s'." % decl_wrapper_type.declaration._name ) msg.append( "Class definition has been changed from one compilation to an other." ) msg.append( "Why did it happen to me? Here is a short list of reasons: " ) msg.append( " 1. There are different preprocessor definitions applied on same file during compilation" ) Modified: pygccxml_dev/pygccxml/parser/scanner.py =================================================================== --- pygccxml_dev/pygccxml/parser/scanner.py 2006-05-14 07:23:52 UTC (rev 72) +++ pygccxml_dev/pygccxml/parser/scanner.py 2006-05-14 07:25:24 UTC (rev 73) @@ -25,6 +25,7 @@ XML_AN_CONST = "const" XML_AN_CONTEXT = "context" XML_AN_DEFAULT = "default" +XML_AN_DEMANGLED = "demangled" XML_AN_EXTERN = "extern" XML_AN_FILE = "file" XML_AN_ID = "id" @@ -145,11 +146,6 @@ continue members_mapping[ id( decl ) ] = members self.__members = members_mapping - #for id, members in self.__members.iteritems(): - #decl = self.__declarations.get( id, None ) - #if not decl or not isinstance( decl, scopedef_t): - #continue - #self.__declarations[id].declarations = members def declarations(self): return self.__declarations @@ -189,6 +185,7 @@ self.__read_bases( obj, attrs ) self.__read_artificial(obj, attrs) self.__read_mangled( obj, attrs) + self.__read_demangled( obj, attrs) elif isinstance( obj, type_t ): self.__types[ attrs[XML_AN_ID] ] = obj elif isinstance( obj, types.StringTypes ): @@ -229,6 +226,9 @@ def __read_mangled( self, decl, attrs ): decl.mangled = attrs.get( XML_AN_MANGLED, None ) + def __read_demangled( self, decl, attrs ): + decl.demangled = attrs.get( XML_AN_DEMANGLED, None ) + def __read_access( self, attrs ): self.__access[ attrs[XML_AN_ID] ] = attrs.get( XML_AN_ACCESS, ACCESS_TYPES.PUBLIC ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:23:58
|
Revision: 72 Author: roman_yakovenko Date: 2006-05-14 00:23:52 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=72&view=rev Log Message: ----------- Fixing small bug causes unnamed namespace. Modified Paths: -------------- pygccxml_dev/pygccxml/declarations/filters.py Modified: pygccxml_dev/pygccxml/declarations/filters.py =================================================================== --- pygccxml_dev/pygccxml/declarations/filters.py 2006-05-14 07:22:54 UTC (rev 71) +++ pygccxml_dev/pygccxml/declarations/filters.py 2006-05-14 07:23:52 UTC (rev 72) @@ -290,6 +290,11 @@ declaration_matcher_t.__init__( self, name=name, decl_type=namespace.namespace_t) def __call__( self, decl ): + if self.name and decl.name == '': + #unnamed namespace have same name as thier parent, we should prevent + #this happens. The price is: user should search for unnamed namespace + #directly. + return False return super( namespace_matcher_t, self ).__call__( decl ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:23:01
|
Revision: 71 Author: roman_yakovenko Date: 2006-05-14 00:22:54 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=71&view=rev Log Message: ----------- adding demangled property to the declaration_t Modified Paths: -------------- pygccxml_dev/pygccxml/declarations/declaration.py Modified: pygccxml_dev/pygccxml/declarations/declaration.py =================================================================== --- pygccxml_dev/pygccxml/declarations/declaration.py 2006-05-14 07:22:25 UTC (rev 70) +++ pygccxml_dev/pygccxml/declarations/declaration.py 2006-05-14 07:22:54 UTC (rev 71) @@ -68,7 +68,8 @@ class declaration_t( object ): """Base class for all classes that represent a C++ declaration. """ - def __init__( self, name='', parent=None, location=None, is_artificial=False, mangled=None ): + + def __init__( self, name='', parent=None, location=None, is_artificial=False, mangled=None, demangled=None ): self._name = name if parent: assert( isinstance( parent, declaration_t ) ) @@ -76,6 +77,7 @@ self._location = location self._is_artificial = is_artificial self._mangled = mangled + self._demangled = demangled def __str__(self): """Default __str__ method. @@ -144,8 +146,12 @@ return self.__class__.__name__ < other.__class__.__name__ return self._get__cmp__data() < other._get__cmp__data() + def _get_name_impl( self ): + return self._name + def _get_name( self ): - return self._name + return self._get_name_impl() + def _set_name( self, new_name ): self._name = new_name name = property( _get_name, _set_name @@ -205,6 +211,15 @@ @type: str """ ) + def _get_demangled( self ): + return self._demangled + def _set_demangled( self, demangled ): + self._demangled = demangled + demangled = property( _get_demangled, _set_demangled + , doc="""Demangled compiler generated declaration name + @type: str + """ ) + def _create_decl_string(self): return algorithm.full_name( self ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:22:30
|
Revision: 70 Author: roman_yakovenko Date: 2006-05-14 00:22:25 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=70&view=rev Log Message: ----------- class_t."name" property is now returns demangled string. The reason is that this is the only way to report right name of the class Modified Paths: -------------- pygccxml_dev/pygccxml/declarations/class_declaration.py Modified: pygccxml_dev/pygccxml/declarations/class_declaration.py =================================================================== --- pygccxml_dev/pygccxml/declarations/class_declaration.py 2006-05-14 07:20:29 UTC (rev 69) +++ pygccxml_dev/pygccxml/declarations/class_declaration.py 2006-05-14 07:22:25 UTC (rev 70) @@ -85,6 +85,8 @@ class class_t( scopedef.scopedef_t ): """describes class definition""" + + USE_DEMANGLED_AS_NAME = True def __init__( self, name='', parent=None, class_type=CLASS_TYPES.CLASS, is_abstract=False ): scopedef.scopedef_t.__init__( self, name, parent ) if class_type: @@ -98,6 +100,21 @@ self._protected_members = [] self._typedefs = [] + def _get_name_impl( self ): + if class_t.USE_DEMANGLED_AS_NAME and self.demangled: + fname = algorithm.full_name( self.parent ) + if fname.startswith( '::' ) and not self.demangled.startswith( '::' ): + fname = fname[2:] + if self.demangled.startswith( fname ): + tmp = self.demangled[ len( fname ): ] #demangled::name + if tmp.startswith( '::' ): + tmp = tmp[2:] + return tmp + else: + return self._name + else: + return self._name + def __str__(self): name = algorithm.full_name(self) if name[:2]=="::": This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:20:35
|
Revision: 69 Author: roman_yakovenko Date: 2006-05-14 00:20:29 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=69&view=rev Log Message: ----------- From now, it is possible to get access to demangled name of the function. It can help in some cases with template functions Modified Paths: -------------- pygccxml_dev/pygccxml/declarations/calldef.py Modified: pygccxml_dev/pygccxml/declarations/calldef.py =================================================================== --- pygccxml_dev/pygccxml/declarations/calldef.py 2006-05-14 07:17:02 UTC (rev 68) +++ pygccxml_dev/pygccxml/declarations/calldef.py 2006-05-14 07:20:29 UTC (rev 69) @@ -21,6 +21,7 @@ import algorithm import declaration import type_traits +import call_invocation class VIRTUALITY_TYPES: """class that defines "virtuality" constants""" @@ -42,7 +43,7 @@ self._name = name self._default_value = default_value self._type = type - + def __str__(self): if self.default_value==None: return "%s %s"%(self.type, self.name) @@ -108,7 +109,8 @@ self._exceptions = exceptions self._return_type = return_type self._has_extern = has_extern - + self._demangled_name = None + def _get__cmp__call_items(self): raise NotImplementedError() @@ -180,7 +182,68 @@ doc="""Was this callable declared as "extern"? @type: bool """) - + + def __remove_parent_fname( self, demangled ): + demangled = demangled.strip() + parent_fname = algorithm.full_name( self.parent ) + if parent_fname.startswith( '::' ) and not demangled.startswith( '::' ): + parent_fname = parent_fname[2:] + demangled = demangled[ len( parent_fname ): ] + return demangled + + def _get_demangled_name( self ): + if not self.demangled: + self._demangled_name = '' + + if self._demangled_name: + return self._demangled_name + + if self._demangled_name == '': + return self.name + + demangled = self.demangled + if self.return_type: + return_type = type_traits.remove_alias( self.return_type ).decl_string + + if return_type.startswith( '::' ) and not self.demangled.startswith( '::' ): + return_type = return_type[2:] + demangled = self.demangled + if demangled.startswith( return_type ): + demangled = demangled[ len( return_type ): ] + demangled = demangled.strip() + #removing scope + demangled_name = call_invocation.name( self.__remove_parent_fname( demangled ) ) + if demangled_name.startswith( '::' ): + demangled_name = demangled_name[2:] + #to be on the safe side + if demangled_name.startswith( self.name ): + self._demangled_name = demangled_name + return self._demangled_name + + #well, I am going to try an other strategy + fname = algorithm.full_name( self ) + found = self.demangled.find( fname ) + if -1 == found: + if fname.startswith( '::' ): + fname = fname[2:] + found = self.demangled.find( fname ) + if -1 == found: + self._demangled_name = '' + return self.name + demangled_name = call_invocation.name( self.demangled[ found: ] ) + demangled_name = self.__remove_parent_fname( demangled_name ) + if demangled_name.startswith( '::' ): + demangled_name = demangled_name[2:] + #to be on the safe side + if demangled_name.startswith( self.name ): + self._demangled_name = demangled_name + return self._demangled_name + #if -1 == found: + self._demangled_name = '' + return self.name + + demangled_name = property( _get_demangled_name ) + #Second level in hierarchy of calldef class member_calldef_t( calldef_t ): """base class for "callable" declarations that defined within C++ class or struct""" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-14 07:17:10
|
Revision: 68 Author: roman_yakovenko Date: 2006-05-14 00:17:02 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=68&view=rev Log Message: ----------- replacing assert with RuntimeError Modified Paths: -------------- pygccxml_dev/pygccxml/declarations/algorithm.py Modified: pygccxml_dev/pygccxml/declarations/algorithm.py =================================================================== --- pygccxml_dev/pygccxml/declarations/algorithm.py 2006-05-11 07:37:35 UTC (rev 67) +++ pygccxml_dev/pygccxml/declarations/algorithm.py 2006-05-14 07:17:02 UTC (rev 68) @@ -38,7 +38,8 @@ @return: full name of declarations. """ - assert decl + if None is decl: + raise RuntimeError( "Unable to generate full name for None object!" ) decl_path = declaration_path( decl ) ##Here I have lack of knowledge: ##TODO: "What is the full name of declaration declared in unnamed namespace?" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-05-11 07:37:42
|
Revision: 67 Author: roman_yakovenko Date: 2006-05-11 00:37:35 -0700 (Thu, 11 May 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=67&view=rev Log Message: ----------- small fix Modified Paths: -------------- pyplusplus_dev/docs/call_wrapper_policies/introduction.rest Modified: pyplusplus_dev/docs/call_wrapper_policies/introduction.rest =================================================================== --- pyplusplus_dev/docs/call_wrapper_policies/introduction.rest 2006-05-08 07:13:21 UTC (rev 66) +++ pyplusplus_dev/docs/call_wrapper_policies/introduction.rest 2006-05-11 07:37:35 UTC (rev 67) @@ -50,10 +50,10 @@ Variable names -------------- -I think it should be possible to apply few |cwp| on a single function. Thus, it -will be possible to create few convinience function, from one single function. -The main,read unresolved, issue, is management of variable names within function-wrapper. -I see next problems, that we should solve, before proceeding to implementation: +I think it should be possible to apply few |cwp| on a single function. +The main, ( read unresolved ) issue, is management of variable names within +function-wrapper. I see next problems, that we should solve, before proceeding +to implementation: 1. To share variable name, between different pieces of code. @@ -188,7 +188,7 @@ } Arrays size -~~~~~~~~~~~ +^^^^^^^^^^^ 1. static array - size of array is known at compile time. 2. dynamic array This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
