pygccxml-commit

[pygccxml-commit] SF.net SVN: pygccxml: [234] pygccxml_dev/unittests/data

[<rom...@us...>]

Revision: 234
Author:   roman_yakovenko
Date:     2006-06-19 13:10:30 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=234&view=rev

Log Message:
-----------
adding map_indexing_suite to generated code

Modified Paths:
--------------
    pygccxml_dev/pygccxml/declarations/__init__.py
    pygccxml_dev/pygccxml/declarations/container_traits.py
    pygccxml_dev/unittests/data/core_cache.hpp
    pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py
    pyplusplus_dev/examples/pyboost_dev/dev/date_time/include/date_time.pypp.xml
    pyplusplus_dev/pyplusplus/code_creators/__init__.py
    pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
    pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
    pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite.py
    pyplusplus_dev/pyplusplus/module_creator/creator.py
    pyplusplus_dev/pyplusplus/module_creator/types_database.py
Modified: pygccxml_dev/pygccxml/declarations/__init__.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/__init__.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pygccxml_dev/pygccxml/declarations/__init__.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -147,8 +147,11 @@
 from type_traits import smart_pointer_traits
 
 from container_traits import vector_traits
+from container_traits import map_traits 
+from container_traits import multimap_traits 
+from container_traits import hash_map_traits 
+from container_traits import hash_multimap_traits
 
-
 
 
 import templates

Modified: pygccxml_dev/pygccxml/declarations/container_traits.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/container_traits.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pygccxml_dev/pygccxml/declarations/container_traits.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -10,6 +10,7 @@
 import calldef
 import cpptypes
 import namespace 
+import templates
 import class_declaration
 import type_traits
     

Modified: pygccxml_dev/unittests/data/core_cache.hpp
===================================================================
--- pygccxml_dev/unittests/data/core_cache.hpp	2006-06-19 14:31:22 UTC (rev 233)
+++ pygccxml_dev/unittests/data/core_cache.hpp	2006-06-19 20:10:30 UTC (rev 234)
@@ -22,4 +22,4 @@
 
 #endif//__core_cache_hpp__
 
-//touch
\ No newline at end of file
+//touch//touch
\ No newline at end of file

Modified: pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py
===================================================================
--- pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pyplusplus_dev/examples/pyboost_dev/dev/date_time/generate_code.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -141,7 +141,7 @@
     def beautify_code( self, mb ):
         
         def is_vector_of_strings( decl ):
-            if not declarations.vector_traits.is_vector( decl ):
+            if not declarations.vector_traits.is_my_case( decl ):
                 return False
             return declarations.is_std_string( declarations.vector_traits.value_type(decl) )
 

Modified: pyplusplus_dev/examples/pyboost_dev/dev/date_time/include/date_time.pypp.xml
===================================================================
--- pyplusplus_dev/examples/pyboost_dev/dev/date_time/include/date_time.pypp.xml	2006-06-19 14:31:22 UTC (rev 233)
+++ pyplusplus_dev/examples/pyboost_dev/dev/date_time/include/date_time.pypp.xml	2006-06-19 20:10:30 UTC (rev 234)
@@ -2,8 +2,8 @@
 <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 _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 _1845 _1846 _1847 _1848 _1849 _1850 " mangled="_Z2::" demangled="::"/>
   <Namespace id="_2" name="std" context="_1" members="_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 _1896 _1897 _1898 _1899 _1900 _1901 _1906 _1907 _1912 _1913 _1926 _1927 _1932 _1933 _1938 _1939 _1940 _1941 _1942 _1943 _1944 _1945 _1946 _1947 _1948 _1962 _1963 _1964 _1965 _1966 _1967 _1968 _1969 _1970 _1971 _1974 _1979 _1980 _1981 _1982 _1987 _1988 _1989 _1990 _1993 _1994 _1995 _1996 _1997 _1998 _1999 _2000 _2001 _2002 _2003 _2012 _2013 _2014 _2045 _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 _2095 _2096 _2097 _2098 _2099 _2100 _2106 _2107 _2148 _2149 _2150 _2168 _2169 _2209 _2211 _2212 _2213 _2274 _2287 _2296 _2313 _2314 _2319 _2321 _2322 _2323 _2330 _2331 _2332 _2455 _2456 _2457 _2458 _2459 _2460 _2461 _2462 _2463 _2465 _2467 _2469 _2471 _2473 _2475 _2477 _2479 _2481 _2483 _2485 _2487 _2489 _2491 _2493 _2495 _2497 _2499 _2501 _2503 _2505 _2507 _2509 _2511 _2513 _2515 _2516 _2521 _2522 _2523 _2524 _2525 _2526 _2527 _2528 _2529 _2530 _2531 _2532 _2533 _2534 _2536 _2537 _2538 _2539 _2540 _2541 _2542 _2543 _2544 _2546 _2548 _2567 _2568 _2569 _2570 _2571 _2572 _2573 _2574 _2575 _2638 _2639 _2640 _2641 _2642 _2643 _2644 _2653 _2654 _2655 " mangled="_Z3std" demangled="std"/>
-  <Function id="_3" name="_GLOBAL__D__home_roman_pygccxml_sources_sources_pyplusplus_dev_examples_pyboost_dev_dev_date_time_include_date_time.pypp.hpp5J35cd" 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_dev_date_time_include_date_time.pypp.hpp5J35cd" returns="_1154" context="_1" location="f0:131" file="f0" line="131" endline="131"/>
+  <Function id="_3" name="_GLOBAL__D__home_roman_pygccxml_sources_sources_pyplusplus_dev_examples_pyboost_dev_dev_date_time_include_date_time.pypp.hppEAQ8Wa" 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_dev_date_time_include_date_time.pypp.hppEAQ8Wa" returns="_1154" context="_1" location="f0:131" file="f0" line="131" endline="131"/>
   <Variable id="_5" name="_ZGVN5boost9date_time10date_facetINS_9gregorian4dateEcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE" type="_1248" context="_1" location="f1:372" file="f1" line="372" artificial="1"/>
   <Function id="_6" name="__static_initialization_and_destruction_0" returns="_1154" context="_1" mangled="_Z41__static_initialization_and_destruction_0ii" demangled="__static_initialization_and_destruction_0(int, int)" location="f0:131" file="f0" line="131" endline="76">
     <Argument name="__initialize_p" type="_500" location="f0:131" file="f0" line="131"/>

Modified: pyplusplus_dev/pyplusplus/code_creators/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/__init__.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pyplusplus_dev/pyplusplus/code_creators/__init__.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -106,4 +106,5 @@
 
 from array_1_registrator import array_1_registrator_t
 
-from indexing_suites import vector_indexing_suite_t
\ No newline at end of file
+from indexing_suites import vector_indexing_suite_t
+from indexing_suites import map_indexing_suite_t
\ No newline at end of file

Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -10,8 +10,9 @@
 from pygccxml import declarations
 
 class indexing_suite_t( code_creator.code_creator_t ):
-    def __init__(self, parent=None ):        
+    def __init__(self, suite_name, parent=None ):        
         code_creator.code_creator_t.__init__( self, parent=parent )
+        self.__suite_name = suite_name
         
     def _get_configuration( self ):
         return self.parent.declaration.indexing_suite
@@ -20,20 +21,9 @@
     def _get_container( self ):
         return self.parent.declaration 
     container = property( _get_container )
-    
-class vector_indexing_suite_t( indexing_suite_t ):
-    """
-    Creates boost.python code that needed to export a vector of some class
-    """
-    #class_< std::vector<X> >("XVec")
-    #    .def(vector_indexing_suite<std::vector<X> >())
-    #;
 
-    def __init__(self, parent=None ):        
-        indexing_suite_t.__init__( self, parent=parent )
-
-    def _create_indexing_suite_declaration( self ):
-        vector_indexing_suite = algorithm.create_identifier( self, 'boost::python::vector_indexing_suite' )
+    def _create_suite_declaration( self ):
+        suite_identifier = algorithm.create_identifier( self, self.__suite_name )
         args = [ self.container.decl_string ]
         if self.configuration.derived_policies:
             if self.configuration.no_proxy:
@@ -44,9 +34,31 @@
         else:
             if self.configuration.no_proxy:
                 args.append( 'true' )        
-        return declarations.templates.join( vector_indexing_suite, args )        
+        return declarations.templates.join( suite_identifier, args )        
 
     def _create_impl(self):
-        return "def( %s() )" %  self._create_indexing_suite_declaration()
+        return "def( %s() )" %  self._create_suite_declaration()
 
-    
\ No newline at end of file
+class vector_indexing_suite_t( indexing_suite_t ):
+    """
+    Creates boost.python code that needed to export a vector of some class
+    """
+    #class_< std::vector<X> >("XVec")
+    #    .def(vector_indexing_suite<std::vector<X> >())
+    #;
+
+    def __init__(self, parent=None ):        
+        indexing_suite_t.__init__( self, 'boost::python::vector_indexing_suite', parent=parent )
+
+class map_indexing_suite_t( indexing_suite_t ):
+    """
+    Creates boost.python code that needed to export a vector of some class
+    """
+    #class_< std::vector<X> >("XVec")
+    #    .def(vector_indexing_suite<std::vector<X> >())
+    #;
+
+    def __init__(self, parent=None ):        
+        indexing_suite_t.__init__( self, 'boost::python::map_indexing_suite', parent=parent )
+
+        
\ No newline at end of file

Modified: pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -13,6 +13,9 @@
 def guess_indexing_suite( class_ ):
     if declarations.vector_traits.is_my_case( class_ ):
         return container_suites.vector_suite_t( class_ )
+    if declarations.map_traits.is_my_case( class_ ) \
+       or declarations.hash_map_traits.is_my_case( class_ ):
+        return container_suites.map_suite_t( class_ )
 
 #this will only be exported if indexing suite is not None and only when needed
 class class_declaration_t(decl_wrapper.decl_wrapper_t, declarations.class_declaration_t):

Modified: pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/indexing_suite.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -61,3 +61,13 @@
         
     def value_type( self ):
         return declarations.vector_traits.value_type( self.container_class )
+
+class map_suite_t( indexing_suite_t ):
+    def __init__( self, cls ):
+        indexing_suite_t.__init__( self, cls )
+        self.__traits = declarations.map_traits
+        if declarations.hash_map_traits.is_my_case( self.container_class ):        
+            self.__traits = declarations.hash_map_traits
+        
+    def value_type( self ):
+        return self.__traits.value_type( self.container_class )

Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -353,19 +353,29 @@
                 pass
     
     def _treat_indexing_suite( self ):
+        def create_cls_cc( cls ):
+            if isinstance( cls, declarations.class_t ):
+                return code_creators.class_t( class_inst=cls )
+            else:
+                return code_creators.class_declaration_t( class_inst=cls )
+
         if self.__types_db.used_vectors:
             header = "boost/python/suite/indexing/vector_indexing_suite.hpp"
             self.__extmodule.add_system_header( header )
             self.__extmodule.add_include( header=header )
             for cls in self.__types_db.used_vectors:
-                cls_creator = None
-                if isinstance( cls, declarations.class_t ):
-                    cls_creator = code_creators.class_t( class_inst=cls )
-                else:
-                    cls_creator = code_creators.class_declaration_t( class_inst=cls )
+                cls_creator = create_cls_cc( cls )
                 cls_creator.adopt_creator( code_creators.vector_indexing_suite_t() )
                 self.__module_body.adopt_creator( cls_creator )
-
+        if self.__types_db.used_maps:
+            header = "boost/python/suite/indexing/map_indexing_suite.hpp"
+            self.__extmodule.add_system_header( header )
+            self.__extmodule.add_include( header=header )
+            for cls in self.__types_db.used_maps:
+                cls_creator = create_cls_cc( cls )
+                cls_creator.adopt_creator( code_creators.map_indexing_suite_t() )
+                self.__module_body.adopt_creator( cls_creator )
+ 
     def create(self, decl_headers=None):
         """Create and return the module for the extension.
         

Modified: pyplusplus_dev/pyplusplus/module_creator/types_database.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/types_database.py	2006-06-19 14:31:22 UTC (rev 233)
+++ pyplusplus_dev/pyplusplus/module_creator/types_database.py	2006-06-19 20:10:30 UTC (rev 234)
@@ -19,6 +19,7 @@
         self.__fundamental_strs = declarations.FUNDAMENTAL_TYPES.keys()
         self.__normalize_data = [ ',', '<', '>', '*', '&', '(', ')', '::' ]
         self.__used_vectors = set()
+        self.__used_maps = set()
     
     def update( self, decl ):
         if isinstance( decl, declarations.calldef_t ):
@@ -54,18 +55,28 @@
         type = declarations.remove_alias( type )
         type = declarations.remove_pointer( type )
         type = declarations.remove_reference( type )        
-        if declarations.vector_traits.is_my_case( type ):
-            vector = declarations.vector_traits.class_declaration( type )
-            try:
+        try:
+            if declarations.vector_traits.is_my_case( type ):
+                vector = declarations.vector_traits.class_declaration( type )
                 declarations.vector_traits.value_type( vector )
                 self.__used_vectors.add( vector )
                 return True
-            except RuntimeError, error:
-                msg = 'WARNING: pyplusplus found std::vector instantiation declaration, '
-                msg = msg + 'but can not find out value type!'
-                msg = msg + os.linesep + 'This class will not be exported!'
-                msg = msg + os.linesep + 'std::vector instantiation is: ' + vector.decl_string
-                _logging_.logger.warn( msg )
+            if declarations.map_traits.is_my_case( type ):
+                map_ = declarations.map_traits.class_declaration( type )
+                declarations.map_traits.value_type( map_ )
+                self.__used_maps.add( map_ )
+                return True
+            if declarations.hash_map_traits.is_my_case( type ):
+                map_ = declarations.hash_map_traits.class_declaration( type )
+                declarations.hash_map_traits.value_type( map_ )
+                self.__used_maps.add( map_ )
+                return True
+        except RuntimeError, error:
+            msg = 'WARNING: pyplusplus found std::vector instantiation declaration, '
+            msg = msg + 'but can not find out value type!'
+            msg = msg + os.linesep + 'This class will not be exported!'
+            msg = msg + os.linesep + 'std::vector instantiation is: ' + vector.decl_string
+            _logging_.logger.warn( msg )
         return False
         
     def _update_db( self, db, type_ ):
@@ -166,3 +177,6 @@
         return self.__used_vectors
     used_vectors = property( _get_used_vectors )
 
+    def _get_used_maps( self ):
+        return self.__used_maps
+    used_maps = property( _get_used_maps )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[pygccxml-commit] SF.net SVN: pygccxml: [304] pygccxml_dev/unittests/data

[<rom...@us...>]

Revision: 304
Author:   roman_yakovenko
Date:     2006-07-12 12:06:37 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=304&view=rev

Log Message:
-----------
improving indexing suite 

Modified Paths:
--------------
    pygccxml_dev/unittests/data/core_cache.hpp
    pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
    pyplusplus_dev/pyplusplus/module_creator/creator.py
    pyplusplus_dev/pyplusplus/module_creator/types_database.py
    pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp
    pyplusplus_dev/unittests/data/indexing_suites_to_be_exported.hpp
Modified: pygccxml_dev/unittests/data/core_cache.hpp
===================================================================
--- pygccxml_dev/unittests/data/core_cache.hpp	2006-07-12 17:56:21 UTC (rev 303)
+++ pygccxml_dev/unittests/data/core_cache.hpp	2006-07-12 19:06:37 UTC (rev 304)
@@ -22,4 +22,4 @@
 
 #endif//__core_cache_hpp__
 
-//touch//touch//touch//touch
\ No newline at end of file
+//touch//touch//touch//touch//touch
\ No newline at end of file

Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py	2006-07-12 17:56:21 UTC (rev 303)
+++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py	2006-07-12 19:06:37 UTC (rev 304)
@@ -31,15 +31,16 @@
     def _create_suite_declaration( self ):
         suite_identifier = algorithm.create_identifier( self, self.guess_suite_name() )
         args = [ self.container.decl_string ]
+        try:
+            no_proxy = str( self.configuration.no_proxy ).lower()
+        except:
+            no_proxy = 'false'
         if self.configuration.derived_policies:
-            if self.configuration.no_proxy:
-                args.append( 'true' )
-            else:
-                args.append( 'false' )
+            args.append( no_proxy )
             args.append( self.configuration.derived_policies )
         else:
-            if self.configuration.no_proxy:
-                args.append( 'true' )        
+            if 'true' == no_proxy:
+                args.append( no_proxy)        
         return declarations.templates.join( suite_identifier, args )        
 
     def _create_impl(self):

Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/creator.py	2006-07-12 17:56:21 UTC (rev 303)
+++ pyplusplus_dev/pyplusplus/module_creator/creator.py	2006-07-12 19:06:37 UTC (rev 304)
@@ -26,7 +26,25 @@
 #       };
 #};
 
+INDEXING_SUITE_1_CONTAINERS = { 
+    'vector<' : "boost/python/suite/indexing/vector_indexing_suite.hpp" 
+    , 'map<' : "boost/python/suite/indexing/map_indexing_suite.hpp" 
+}
 
+INDEXING_SUITE_2_CONTAINERS = {
+      'vector<' : "boost/python/suite/indexing/vector.hpp"
+    , 'deque<' : "boost/python/suite/indexing/deque.hpp"
+    , 'list<' : "boost/python/suite/indexing/list.hpp"
+    , 'map<' : "boost/python/suite/indexing/map.hpp"
+    , 'hash_map<' : "boost/python/suite/indexing/map.hpp"
+    , 'set<' : "boost/python/suite/indexing/set.hpp"
+    , 'hash_set<' : "boost/python/suite/indexing/set.hpp"
+    #TODO: queue, priority, stack, multimap, hash_multimap, multiset, hash_multiset
+}
+
+INDEXING_SUITE_2_MAIN_HEADER = "boost/python/suite/indexing/container_suite.hpp"
+
+
 class creator_t( declarations.decl_visitor_t ):
     """Creating code creators.
 
@@ -376,6 +394,10 @@
                 pass
     
     def _treat_indexing_suite( self ):
+        global INDEXING_SUITE_1_CONTAINERS
+        global INDEXING_SUITE_2_CONTAINERS
+        global INDEXING_SUITE_2_MAIN_HEADER
+        
         def create_explanation(cls):
             msg = '//WARNING: the next line of code will not compile, because "%s" does not have operator== !'
             msg = msg % cls.indexing_suite.element_type.decl_string
@@ -390,27 +412,10 @@
         if not self.__types_db.used_containers:
             return 
         
-        #supported container : [ header file, is already used ]
-        
         used_headers = set()
-        isuite1 = { 
-            'vector<' : "boost/python/suite/indexing/vector_indexing_suite.hpp" 
-            , 'map<' : "boost/python/suite/indexing/map_indexing_suite.hpp" 
-        }
 
-        isuite2 = {
-              'vector<' : "boost/python/suite/indexing/vector.hpp"
-            , 'deque<' : "boost/python/suite/indexing/deque.hpp"
-            , 'list<' : "boost/python/suite/indexing/list.hpp"
-            , 'map<' : "boost/python/suite/indexing/map.hpp"
-            , 'hash_map<' : "boost/python/suite/indexing/map.hpp"
-            , 'set<' : "boost/python/suite/indexing/set.hpp"
-            , 'hash_set<' : "boost/python/suite/indexing/set.hpp"
-            #TODO: queue, priority, stack, multimap, hash_multimap, multiset, hash_multiset
-        }
+        creators = []
         
-        container_suite_header = "boost/python/suite/indexing/container_suite.hpp"
-        
         cmp_by_name = lambda cls1, cls2: cmp( cls1.decl_string, cls2.decl_string )
         used_containers = list( self.__types_db.used_containers )
         used_containers.sort( cmp_by_name )
@@ -418,43 +423,61 @@
             container_name = cls.name.split( '<' )[0] + '<'
 
             if isinstance( cls.indexing_suite, decl_wrappers.indexing_suite1_t ):
-                isuite = isuite1
+                isuite = INDEXING_SUITE_1_CONTAINERS
             else:
-                isuite = isuite2
+                isuite = INDEXING_SUITE_2_CONTAINERS
 
             if not isuite.has_key( container_name ):
                 continue #not supported
             
-            if isuite is isuite2:
-                used_headers.add( container_suite_header ) 
+            if isuite is INDEXING_SUITE_2_CONTAINERS:
+                used_headers.add( INDEXING_SUITE_2_MAIN_HEADER ) 
 
             used_headers.add( isuite[ container_name ] )
 
             cls_creator = create_cls_cc( cls )
-            element_type = cls.indexing_suite.element_type
-            if isuite is isuite1:
-                if declarations.is_class( element_type ) and not declarations.has_public_equal( element_type ):
+            creators.append( cls_creator )
+            try:
+                element_type = cls.indexing_suite.element_type
+            except:
+                element_type = None
+            if isuite is INDEXING_SUITE_1_CONTAINERS:
+                if not ( None is element_type ) \
+                   and declarations.is_class( element_type ) \
+                   and not declarations.has_public_equal( element_type ):
                     cls_creator.adopt_creator( create_explanation( cls ) )  
                 cls_creator.adopt_creator( code_creators.indexing_suite1_t(cls) )
             else:
                 class_traits = declarations.class_traits
-                if class_traits.is_my_case( element_type ):
+                if not ( None is element_type ) \
+                   and class_traits.is_my_case( element_type ):
                     value_cls = class_traits.get_declaration( element_type )
                     element_type_cc = code_creators.value_traits_t( value_cls )
                     self.__extmodule.adopt_creator( element_type_cc, self.__extmodule.creators.index( self.__module_body ) )                        
                 cls_creator.adopt_creator( code_creators.indexing_suite2_t(cls) )
-            self.__module_body.adopt_creator( cls_creator )
 
-        if container_suite_header in used_headers:
+        if INDEXING_SUITE_2_MAIN_HEADER in used_headers:
             #I want this header to be the first one.
-            used_headers.remove( container_suite_header )
-            self.__extmodule.add_system_header( container_suite_header )
-            self.__extmodule.add_include( container_suite_header )
+            used_headers.remove( INDEXING_SUITE_2_MAIN_HEADER )
+            self.__extmodule.add_system_header( INDEXING_SUITE_2_MAIN_HEADER )
+            self.__extmodule.add_include( INDEXING_SUITE_2_MAIN_HEADER )
             
         for header in used_headers:
             self.__extmodule.add_system_header( header )
             self.__extmodule.add_include( header )
-
+    
+        #I am going tp find last class registration and to add all container creators
+        #after it.
+        last_cls_index = -1
+        for i in range( len( self.__module_body.creators ) - 1, -1, -1 ):
+            if isinstance( self.__module_body.creators[i], code_creators.class_t ):
+                last_cls_index = i
+                break
+        insert_position = last_cls_index + 1
+        creators.reverse()
+        for creator in creators:
+            self.__module_body.adopt_creator( creator, insert_position )
+            
     def create(self, decl_headers=None):
         """Create and return the module for the extension.
         

Modified: pyplusplus_dev/pyplusplus/module_creator/types_database.py
===================================================================
--- pyplusplus_dev/pyplusplus/module_creator/types_database.py	2006-07-12 17:56:21 UTC (rev 303)
+++ pyplusplus_dev/pyplusplus/module_creator/types_database.py	2006-07-12 19:06:37 UTC (rev 304)
@@ -73,11 +73,12 @@
         try:            
             check_extraction = container_cls.indexing_suite.element_type
         except RuntimeError, error:
-            msg = 'pyplusplus found "%s" instantiation declaration, ' % container_cls.name
-            msg = msg + 'but can not find out value type!'
-            msg = msg + os.linesep + 'This class will not be exported!'
-            _logging_.loggers.declarations.warn( msg )
-            return False
+            msg = []
+            msg.append( 'pyplusplus found class "%s" - instantiation declaration, not definition.' % container_cls.name )
+            msg.append( 'pyplusplus can not find out container value_type( mapped_type )!' )
+            msg.append( 'This class will be exported, but there is a posiblity, that generated code will not compile.' )
+            msg.append( 'The solution to the problem is to create a variable of the class.' )
+            _logging_.loggers.declarations.warn( os.linesep.join( msg ) )
         
         self.__containers.add( container_cls )
         return True

Modified: pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp	2006-07-12 17:56:21 UTC (rev 303)
+++ pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp	2006-07-12 19:06:37 UTC (rev 304)
@@ -7,8 +7,13 @@
 #define __indexing_suites2_to_be_exported_hpp__
 
 #include <vector>
+#include <string>
 
 namespace indexing_suites2 {
+
+typedef std::vector< std::string > strings_t;
+
+inline void do_nothing( const strings_t& ){}
 
 struct item_t{    
     item_t() : value( -1 ){}

Modified: pyplusplus_dev/unittests/data/indexing_suites_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/indexing_suites_to_be_exported.hpp	2006-07-12 17:56:21 UTC (rev 303)
+++ pyplusplus_dev/unittests/data/indexing_suites_to_be_exported.hpp	2006-07-12 19:06:37 UTC (rev 304)
@@ -7,8 +7,13 @@
 #define __indexing_suites_to_be_exported_hpp__
 
 #include <vector>
+#include <string>
 
 namespace indexing_suites {
+
+typedef std::vector< std::string > strings_t;
+
+inline void do_nothing( const strings_t& ){}
 
 struct item_t{    
     item_t() : value( -1 ){}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[pygccxml-commit] SF.net SVN: pygccxml: [1284] pygccxml_dev/unittests/data

[<rom...@us...>]

Revision: 1284
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1284&view=rev
Author:   roman_yakovenko
Date:     2008-03-22 15:10:00 -0700 (Sat, 22 Mar 2008)

Log Message:
-----------
porting "data" files to msvc 9.0

Modified Paths:
--------------
    pygccxml_dev/unittests/data/attributes.hpp
    pygccxml_dev/unittests/data/remove_template_defaults.hpp

Modified: pygccxml_dev/unittests/data/attributes.hpp
===================================================================
--- pygccxml_dev/unittests/data/attributes.hpp	2008-03-17 07:45:39 UTC (rev 1283)
+++ pygccxml_dev/unittests/data/attributes.hpp	2008-03-22 22:10:00 UTC (rev 1284)
@@ -6,6 +6,8 @@
 #ifndef __atributes_hpp__
 #define __atributes_hpp__
 
+#ifdef __GCCXML__
+
 #define _out_ __attribute( (gccxml( "out" ) ) )
 #define _sealed_ __attribute( (gccxml( "sealed" ) ) )
 #define _no_throw_ __attribute( (gccxml( "no throw" ) ) )
@@ -20,5 +22,7 @@
     
 }
 
+#endif//__GCCXML__
+
 #endif//__atributes_hpp__
 

Modified: pygccxml_dev/unittests/data/remove_template_defaults.hpp
===================================================================
--- pygccxml_dev/unittests/data/remove_template_defaults.hpp	2008-03-17 07:45:39 UTC (rev 1283)
+++ pygccxml_dev/unittests/data/remove_template_defaults.hpp	2008-03-22 22:10:00 UTC (rev 1284)
@@ -13,7 +13,11 @@
 #else
     #include <hash_set>
     #include <hash_map>
-    #define HASH_XXX_NS std
+	#ifdef __GCCXML__
+		#define HASH_XXX_NS std
+	#else
+		#define HASH_XXX_NS stdext
+	#endif//GCCXML
 #endif
 #include <string>
 #include <vector>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[pygccxml-commit] SF.net SVN: pygccxml: [1285] pygccxml_dev/unittests/data

[<rom...@us...>]

Revision: 1285
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1285&view=rev
Author:   roman_yakovenko
Date:     2008-03-22 15:14:05 -0700 (Sat, 22 Mar 2008)

Log Message:
-----------
adding Visual Studio 8.0 build scripts for "data"

Added Paths:
-----------
    pygccxml_dev/unittests/data/msvc_build/
    pygccxml_dev/unittests/data/msvc_build/all.cpp
    pygccxml_dev/unittests/data/msvc_build/msvc_build.sln
    pygccxml_dev/unittests/data/msvc_build/msvc_build.vcproj

Added: pygccxml_dev/unittests/data/msvc_build/all.cpp
===================================================================
--- pygccxml_dev/unittests/data/msvc_build/all.cpp	                        (rev 0)
+++ pygccxml_dev/unittests/data/msvc_build/all.cpp	2008-03-22 22:14:05 UTC (rev 1285)
@@ -0,0 +1,43 @@
+#include "abstract_classes.hpp"
+#include "attributes.hpp"
+#include "bit_fields.hpp"
+#include "complex_types.hpp"
+#include "core_cache.hpp"
+#include "core_class_hierarchy.hpp"
+#include "core_diamand_hierarchy_base.hpp"
+#include "core_diamand_hierarchy_derived1.hpp"
+#include "core_diamand_hierarchy_derived2.hpp"
+#include "core_diamand_hierarchy_final_derived.hpp"
+#include "core_membership.hpp"
+#include "core_ns_join_1.hpp"
+#include "core_ns_join_2.hpp"
+#include "core_ns_join_3.hpp"
+#include "core_overloads_1.hpp"
+#include "core_overloads_2.hpp"
+#include "core_types.hpp"
+#include "declarations_calldef.hpp"
+#include "declarations_comparison.hpp"
+#include "declarations_enums.hpp"
+#include "declarations_for_filtering.hpp"
+#include "declarations_variables.hpp"
+#include "demangled.hpp"
+#include "free_operators.hpp"
+#include "has_public_binary_operator_traits.hpp"
+#include "include_all.hpp"
+#include "include_std.hpp"
+#include "indexing_suites2.hpp"
+#include "noncopyable.hpp"
+#include "patcher.hpp"
+#include "remove_template_defaults.hpp"
+#include "string_traits.hpp"
+#include "type_as_exception_bug.h"
+#include "type_traits.hpp"
+#include "typedefs1.hpp"
+#include "typedefs2.hpp"
+#include "typedefs_base.hpp"
+#include "unnamed_classes.hpp"
+#include "unnamed_enums_bug1.hpp"
+#include "unnamed_enums_bug2.hpp"
+#include "unnamed_ns_bug.hpp"
+#include "vector_traits.hpp"
+

Added: pygccxml_dev/unittests/data/msvc_build/msvc_build.sln
===================================================================
--- pygccxml_dev/unittests/data/msvc_build/msvc_build.sln	                        (rev 0)
+++ pygccxml_dev/unittests/data/msvc_build/msvc_build.sln	2008-03-22 22:14:05 UTC (rev 1285)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc_build", "msvc_build.vcproj", "{FEC30A07-68D0-49A3-B7DE-431E5E3B9B6D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FEC30A07-68D0-49A3-B7DE-431E5E3B9B6D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FEC30A07-68D0-49A3-B7DE-431E5E3B9B6D}.Debug|Win32.Build.0 = Debug|Win32
+		{FEC30A07-68D0-49A3-B7DE-431E5E3B9B6D}.Release|Win32.ActiveCfg = Release|Win32
+		{FEC30A07-68D0-49A3-B7DE-431E5E3B9B6D}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Added: pygccxml_dev/unittests/data/msvc_build/msvc_build.vcproj
===================================================================
--- pygccxml_dev/unittests/data/msvc_build/msvc_build.vcproj	                        (rev 0)
+++ pygccxml_dev/unittests/data/msvc_build/msvc_build.vcproj	2008-03-22 22:14:05 UTC (rev 1285)
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="msvc_build"
+	ProjectGUID="{FEC30A07-68D0-49A3-B7DE-431E5E3B9B6D}"
+	RootNamespace="msvc_build"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
+				GenerateXMLDocumentationFiles="true"
+				BrowseInformation="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+				ValidateIntelliSense="true"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\all.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\abstract_classes.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\attributes.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\bit_fields.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\complex_types.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_cache.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_class_hierarchy.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_diamand_hierarchy_base.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_diamand_hierarchy_derived1.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_diamand_hierarchy_derived2.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_diamand_hierarchy_final_derived.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_membership.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_ns_join_1.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_ns_join_2.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_ns_join_3.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_overloads_1.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_overloads_2.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\core_types.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\declarations_calldef.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\declarations_comparison.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\declarations_enums.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\declarations_for_filtering.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\declarations_variables.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\demangled.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\free_operators.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\has_public_binary_operator_traits.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\include_all.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\include_std.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\indexing_suites2.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\noncopyable.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\patcher.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\remove_template_defaults.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\string_traits.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\type_as_exception_bug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\type_traits.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\typedefs1.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\typedefs2.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\typedefs_base.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\unnamed_classes.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\unnamed_enums_bug1.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\unnamed_enums_bug2.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\unnamed_ns_bug.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\vector_traits.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[pygccxml-commit] SF.net SVN: pygccxml: [343] pygccxml_dev/unittests/data

[<rom...@us...>]

Revision: 343
Author:   roman_yakovenko
Date:     2006-07-24 11:24:45 -0700 (Mon, 24 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=343&view=rev

Log Message:
-----------
fixing and improving write class to multiple files
functionality

Modified Paths:
--------------
    pygccxml_dev/unittests/data/core_cache.hpp
    pyplusplus_dev/pyplusplus/_logging_/__init__.py
    pyplusplus_dev/pyplusplus/file_writers/class_multiple_files.py
    pyplusplus_dev/pyplusplus/file_writers/multiple_files.py
Modified: pygccxml_dev/unittests/data/core_cache.hpp
===================================================================
--- pygccxml_dev/unittests/data/core_cache.hpp	2006-07-24 15:50:36 UTC (rev 342)
+++ pygccxml_dev/unittests/data/core_cache.hpp	2006-07-24 18:24:45 UTC (rev 343)
@@ -22,4 +22,4 @@
 
 #endif//__core_cache_hpp__
 
-//touch//touch//touch//touch//touch
\ No newline at end of file
+//touch//touch//touch//touch//touch//touch
\ No newline at end of file

Modified: pyplusplus_dev/pyplusplus/_logging_/__init__.py
===================================================================
--- pyplusplus_dev/pyplusplus/_logging_/__init__.py	2006-07-24 15:50:36 UTC (rev 342)
+++ pyplusplus_dev/pyplusplus/_logging_/__init__.py	2006-07-24 18:24:45 UTC (rev 343)
@@ -17,7 +17,6 @@
 def _create_logger_( name ):    
     logger = logging.getLogger(name)
     __handler = logging.StreamHandler(sys.stdout)
-#    __handler.setFormatter( logging.Formatter( os.linesep + '%(levelname)s %(message)s' ) )
     __handler.setFormatter( multi_line_formatter_t( os.linesep + '%(levelname)s: %(message)s' ) )
     logger.addHandler(__handler) 
     logger.setLevel(logging.INFO)

Modified: pyplusplus_dev/pyplusplus/file_writers/class_multiple_files.py
===================================================================
--- pyplusplus_dev/pyplusplus/file_writers/class_multiple_files.py	2006-07-24 15:50:36 UTC (rev 342)
+++ pyplusplus_dev/pyplusplus/file_writers/class_multiple_files.py	2006-07-24 18:24:45 UTC (rev 343)
@@ -32,8 +32,9 @@
             self.split_internal_enums
             , self.split_internal_unnamed_enums
             , self.split_internal_member_functions
-            , self.split_internal_classes
-            , self.split_internal_member_variables
+            , self.split_internal_classes
+            #not supported yet
+            #, self.split_internal_member_variables
         ]
  
     def split_class_impl( self, class_creator):
@@ -109,16 +110,17 @@
         header_code.append( '' )
         header_code.append( function_decl + ';' )
         self.write_file( file_path + self.HEADER_EXT
-                         , self.create_header( pattern, os.linesep.join(header_code) ) )
+                         , self.create_header( class_creator.alias + '_' + pattern
+                                               , os.linesep.join(header_code) ) )
         
         #writting source file        
         source_code = []
         if self.extmodule.license:
             source_code.append( self.extmodule.license.create() )
-        
-        head_headers = [ file_path + self.HEADER_EXT ]#relevant header file
-        tail_headers = [ self.wrapper_header(class_creator) ]
-        source_code.append( self.create_include_code( creators, head_headers, tail_headers ) )
+        
+        #relevant header file
+        head_headers = [ os.path.join( class_creator.alias, pattern + self.HEADER_EXT) ]
+        source_code.append( self.create_include_code( creators, head_headers ) )
 
         source_code.append( '' )
         source_code.append( self.create_namespaces_code( creators ) )
@@ -154,6 +156,8 @@
     def split_internal_member_functions( self, class_creator ):
         creators = filter( lambda x: isinstance(x, code_creators.mem_fun_t )
                            , class_creator.creators )
+        for creator in creators:
+            creator.works_on_instance = False
         self.split_internal_creators( class_creator, creators, 'memfuns' )
         return 'memfuns'
 

Modified: pyplusplus_dev/pyplusplus/file_writers/multiple_files.py
===================================================================
--- pyplusplus_dev/pyplusplus/file_writers/multiple_files.py	2006-07-24 15:50:36 UTC (rev 342)
+++ pyplusplus_dev/pyplusplus/file_writers/multiple_files.py	2006-07-24 18:24:45 UTC (rev 343)
@@ -67,7 +67,7 @@
                     "#ifndef __%(file_name)s_hpp__pyplusplus_wrapper__"
                   , "#define __%(file_name)s_hpp__pyplusplus_wrapper__"
                   , ''
-                  , "%(code)s;"
+                  , "%(code)s"
                   , ''
                   , "#endif//__%(file_name)s_hpp__pyplusplus_wrapper__" ])
         
@@ -92,9 +92,11 @@
         return self.create_value_traits_header_name( value_class )
     
     def create_include_code( self, creators, head_headers=None, tail_headers=None ):      
-        answer = []
+        answer = []
+        normalize = code_creators.include_directories_t.normalize
         if head_headers:
-            answer.extend( map( lambda header: '#include "%s"' % header, head_headers ) )
+            answer.extend( map( lambda header: '#include "%s"' % normalize( header )
+                                , head_headers ) )
 
         # Include all 'global' include files...
         includes = filter( lambda creator: isinstance( creator, code_creators.include_t )
@@ -107,7 +109,8 @@
                 answer.append( '#include "%s"' % header )
     
         if tail_headers:
-            answer.extend( map( lambda header: '#include "%s"' % header, tail_headers ) )
+            answer.extend( map( lambda header: '#include "%s"' % normalize( header )
+                                , tail_headers ) )
         
         return os.linesep.join( answer )
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[pygccxml-commit] SF.net SVN: pygccxml: [478] pygccxml_dev/unittests/data

[<rom...@us...>]

Revision: 478
Author:   roman_yakovenko
Date:     2006-08-27 11:49:18 -0700 (Sun, 27 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=478&view=rev

Log Message:
-----------
adding type_alg_cache_t class and remove_aliase
optimization

Modified Paths:
--------------
    pygccxml_dev/pygccxml/declarations/algorithms_cache.py
    pygccxml_dev/pygccxml/declarations/class_declaration.py
    pygccxml_dev/pygccxml/declarations/cpptypes.py
    pygccxml_dev/pygccxml/declarations/namespace.py
    pygccxml_dev/pygccxml/declarations/type_traits.py
    pygccxml_dev/pygccxml/parser/project_reader.py
    pygccxml_dev/pygccxml/parser/source_reader.py
    pygccxml_dev/unittests/data/typedefs1.hpp
    pygccxml_dev/unittests/data/typedefs2.hpp
    pygccxml_dev/unittests/data/typedefs_base.hpp
Modified: pygccxml_dev/pygccxml/declarations/algorithms_cache.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/algorithms_cache.py	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/pygccxml/declarations/algorithms_cache.py	2006-08-27 18:49:18 UTC (rev 478)
@@ -7,10 +7,15 @@
 defines class that will keep results of different calculations.
 """
 
-class algorithms_cache_t( object ):
+
+class declaration_algs_cache_t( object ):
     def __init__( self ):
         object.__init__( self )
         self._enabled = True
+        self._full_name = None
+        self._access_type = None
+        self._demangled_name = None
+        self._declaration_path = None
 
     def disable( self ):
         self._enabled = False
@@ -22,44 +27,44 @@
     def enabled( self ):
         return self._enabled
 
-class declaration_algs_cache_t( algorithms_cache_t ):
-    def __init__( self ):
-        algorithms_cache_t.__init__( self )
-        self._full_name = None
-        self._access_type = None
-        self._demangled_name = None
-        self._declaration_path = None
+    def _get_full_name( self ):
+        return self._full_name
 
-    def _get_full_name( self ):
-        if self.enabled:
-            return self._full_name
-        return None
     def _set_full_name( self, fname ):
+        if not self.enabled:
+            fname = None
         self._full_name = fname
+        
     full_name = property( _get_full_name, _set_full_name )
 
     def _get_access_type( self ):
-        if self.enabled:
-            return self._access_type
-        return None
+        return self._access_type
+
     def _set_access_type( self, access_type ):
+        if not self.enabled:
+            access_type = None
         self._access_type = access_type
+        
     access_type = property( _get_access_type, _set_access_type )
 
     def _get_demangled_name( self ):
-        if self.enabled:
-            return self._demangled_name
-        return None
+        return self._demangled_name
+
     def _set_demangled_name( self, demangled_name ):
+        if not self.enabled:
+            demangled_name = None        
         self._demangled_name = demangled_name
+    
     demangled_name = property( _get_demangled_name, _set_demangled_name )
 
     def _get_declaration_path( self ):
-        if self.enabled:
-            return self._declaration_path
-        return None
+        return self._declaration_path
+
     def _set_declaration_path( self, declaration_path ):
+        if not self.enabled:
+            declaration_path = None
         self._declaration_path = declaration_path
+    
     declaration_path = property( _get_declaration_path, _set_declaration_path )
 
     def reset( self ):
@@ -76,17 +81,31 @@
     def reset_access_type( self ):
         self.access_type = None
 
-#Introducing next cache to the type broke unit test. I should find out why.
-#~ class type_algs_cache_t( algorithms_cache_t ):
-    #~ def __init__( self ):
-        #~ algorithms_cache_t.__init__( self )
-        #~ self._remove_alias = None
+class type_algs_cache_t( object ):
+    enabled = True
+    
+    @staticmethod
+    def disable():
+        type_algs_cache_t.enabled = False
 
-    #~ def _get_remove_alias( self ):
-        #~ if self.enabled:
-            #~ return self._remove_alias
-        #~ return None
-    #~ def _set_remove_alias( self, remove_alias ):
-        #~ self._remove_alias = remove_alias
-    #~ remove_alias = property( _get_remove_alias, _set_remove_alias )
+    @staticmethod
+    def enable( self ):
+        type_algs_cache_t.enabled = True
 
+    def __init__( self ):
+        object.__init__( self )
+        self._remove_alias = None
+
+    def _get_remove_alias( self ):
+        return self._remove_alias
+
+    def _set_remove_alias( self, remove_alias ):
+        if not type_algs_cache_t.enabled:
+            remove_alias = None
+        self._remove_alias = remove_alias
+    
+    remove_alias = property( _get_remove_alias, _set_remove_alias )
+
+    def reset(self):
+        self.remove_alias = None
+        
\ No newline at end of file

Modified: pygccxml_dev/pygccxml/declarations/class_declaration.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/class_declaration.py	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/pygccxml/declarations/class_declaration.py	2006-08-27 18:49:18 UTC (rev 478)
@@ -284,6 +284,7 @@
         else:
             raise RuntimeError( "Invalid access type: %s." % access )
         decl.parent = self
+        decl.cache.reset()
         decl.cache.access_type = access
 
     def remove_declaration( self, decl ):
@@ -302,7 +303,7 @@
         else: #decl.cache.access_type == ACCESS_TYPES.PRVATE
             container = self.private_members
         del container[ container.index( decl ) ]
-        decl.cache.reset_access_type()
+        decl.cache.reset()
 
     def find_out_member_access_type( self, member ):
         """

Modified: pygccxml_dev/pygccxml/declarations/cpptypes.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/cpptypes.py	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/pygccxml/declarations/cpptypes.py	2006-08-27 18:49:18 UTC (rev 478)
@@ -7,11 +7,14 @@
 defines classes, that describe C++ types
 """
 
+import algorithms_cache
+
 class type_t(object):
     """base class for all types"""
     def __init__(self):
         object.__init__( self )
-
+        self.cache = algorithms_cache.type_algs_cache_t() 
+        
     def __str__(self):
         res = self.decl_string
         if res[:2]=="::":
@@ -44,7 +47,6 @@
     def clone( self ):
         "returns new instance of the type"
         answer = self._clone_impl()
-        assert answer
         return answer
 
 #There are cases when GCC-XML reports something like this
@@ -578,7 +580,7 @@
         return self._declaration.decl_string
 
     def _clone_impl( self ):
-        return declarated_t( self.declaration )
+        return declarated_t( self._declaration )
 
 class type_qualifiers_t( object ):
     """contains additional information about type: mutable, static, extern"""

Modified: pygccxml_dev/pygccxml/declarations/namespace.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/namespace.py	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/pygccxml/declarations/namespace.py	2006-08-27 18:49:18 UTC (rev 478)
@@ -51,6 +51,7 @@
     def adopt_declaration( self, decl ):
         self.declarations.append( decl )
         decl.parent = self 
+        decl.cache.reset()
         
     def remove_declaration( self, decl ):
         """
@@ -60,6 +61,7 @@
         @type decl: L{declaration_t}
         """
         del self.declarations[ self.declarations.index( decl ) ]
+        decl.cache.reset()
         #add more comment about this.
         #if not keep_parent:
         #    decl.parent=None

Modified: pygccxml_dev/pygccxml/declarations/type_traits.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/type_traits.py	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/pygccxml/declarations/type_traits.py	2006-08-27 18:49:18 UTC (rev 478)
@@ -41,12 +41,20 @@
 
 def remove_alias(type_):
     """returns type without typedefs"""
+    type_ref = None
     if isinstance( type_, cpptypes.type_t ):
-        return __remove_alias( type_.clone() )
+        type_ref = type_
     elif isinstance( type_, typedef.typedef_t ):
-        return __remove_alias( type_.type.clone() )
+        type_ref = type_.type
     else:
+        pass #not a valid input, just return it
+    if not type_ref:
         return type_
+    if type_ref.cache.remove_alias:
+        return type_ref.cache.remove_alias
+    no_alias = __remove_alias( type_ref.clone() )
+    type_ref.cache.remove_alias = no_alias
+    return no_alias
 
 def create_cv_types( base ):
     """implementation details"""

Modified: pygccxml_dev/pygccxml/parser/project_reader.py
===================================================================
--- pygccxml_dev/pygccxml/parser/project_reader.py	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/pygccxml/parser/project_reader.py	2006-08-27 18:49:18 UTC (rev 478)
@@ -425,6 +425,9 @@
         create_key = lambda decl:( decl.location.as_tuple()
                                    , tuple( pygccxml.declarations.declaration_path( decl ) ) )
         for decl_wrapper_type in declarated_types:
+            #it is possible, that cache contains reference to dropped class
+            #We need to clear it
+            decl_wrapper_type.cache.reset() 
             if isinstance( decl_wrapper_type.declaration, pygccxml.declarations.class_t ):
                 key = create_key(decl_wrapper_type.declaration)
                 if leaved_classes.has_key( key ):

Modified: pygccxml_dev/pygccxml/parser/source_reader.py
===================================================================
--- pygccxml_dev/pygccxml/parser/source_reader.py	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/pygccxml/parser/source_reader.py	2006-08-27 18:49:18 UTC (rev 478)
@@ -29,9 +29,8 @@
     @return: None
     """   
     visited = set()
-    for decl in decls:
-        if not isinstance( decl, typedef_t ):
-            continue
+    typedefs = filter( lambda decl: isinstance( decl, typedef_t ), decls )
+    for decl in typedefs:
         type_ = remove_alias( decl.type )
         if not isinstance( type_, declarated_t ):
             continue

Modified: pygccxml_dev/unittests/data/typedefs1.hpp
===================================================================
--- pygccxml_dev/unittests/data/typedefs1.hpp	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/unittests/data/typedefs1.hpp	2006-08-27 18:49:18 UTC (rev 478)
@@ -1,17 +1,17 @@
-// 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 __typedefs1_hpp__
-#define __typedefs1_hpp__
-
-#include "typedefs_base.hpp"
-
-namespace typedefs{
-
-typedef item_t Item1;
-
-}
-
+// 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 __typedefs1_hpp__
+#define __typedefs1_hpp__
+
+#include "typedefs_base.hpp"
+
+namespace typedefs{
+
+typedef item_t Item1;
+
+}
+
 #endif//__typedefs1_hpp__
\ No newline at end of file

Modified: pygccxml_dev/unittests/data/typedefs2.hpp
===================================================================
--- pygccxml_dev/unittests/data/typedefs2.hpp	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/unittests/data/typedefs2.hpp	2006-08-27 18:49:18 UTC (rev 478)
@@ -1,17 +1,17 @@
-// 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 __typedefs2_hpp__
-#define __typedefs2_hpp__
-
-#include "typedefs_base.hpp"
-
-namespace typedefs{
-
-typedef item_t Item2;
-
-}
-
+// 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 __typedefs2_hpp__
+#define __typedefs2_hpp__
+
+#include "typedefs_base.hpp"
+
+namespace typedefs{
+
+typedef item_t Item2;
+
+}
+
 #endif//__typedefs2_hpp__
\ No newline at end of file

Modified: pygccxml_dev/unittests/data/typedefs_base.hpp
===================================================================
--- pygccxml_dev/unittests/data/typedefs_base.hpp	2006-08-27 06:52:22 UTC (rev 477)
+++ pygccxml_dev/unittests/data/typedefs_base.hpp	2006-08-27 18:49:18 UTC (rev 478)
@@ -1,18 +1,17 @@
-// 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 __typedefs_hpp__
-#define __typedefs_hpp__
-
-namespace typedefs{
-
-struct item_t{};
-
-typedef item_t Item;
-
-}
-
-#endif//__typedefs_hpp__
-
+// 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 __typedefs_hpp__
+#define __typedefs_hpp__
+
+namespace typedefs{
+
+struct item_t{};
+
+typedef item_t Item;
+
+}
+
+#endif//__typedefs_hpp__


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.