Changeset 159 in dev for trunk/abdev
- Timestamp:
- Jun 17, 2007, 4:44:57 AM (17 years ago)
- Location:
- trunk/abdev
- Files:
-
- 2 added
- 1 deleted
- 25 edited
-
BasicCompiler32/BasicCompiler.vcproj (modified) (56 diffs)
-
BasicCompiler32/Compile_Calc.cpp (modified) (1 diff)
-
BasicCompiler32/Compile_Func.cpp (modified) (1 diff)
-
BasicCompiler32/Compile_Var.cpp (modified) (2 diffs)
-
BasicCompiler32/MakePeHdr.cpp (modified) (2 diffs)
-
BasicCompiler32/NumOpe.cpp (modified) (2 diffs)
-
BasicCompiler64/BasicCompiler.vcproj (modified) (27 diffs)
-
BasicCompiler64/Compile_Calc.cpp (modified) (1 diff)
-
BasicCompiler64/Compile_Func.cpp (modified) (1 diff)
-
BasicCompiler64/Compile_Var.cpp (modified) (2 diffs)
-
BasicCompiler64/MakePeHdr.cpp (modified) (2 diffs)
-
BasicCompiler64/NumOpe.cpp (modified) (2 diffs)
-
BasicCompiler_Common/Class.cpp (modified) (24 diffs)
-
BasicCompiler_Common/Class.h (modified) (5 diffs)
-
BasicCompiler_Common/DebugMiddleFile.cpp (modified) (7 diffs)
-
BasicCompiler_Common/DebugSection.h (modified) (1 diff)
-
BasicCompiler_Common/Diagnose.cpp (modified) (2 diffs)
-
BasicCompiler_Common/NumOpe_GetType.cpp (modified) (2 diffs)
-
BasicCompiler_Common/Subroutine.cpp (modified) (2 diffs)
-
BasicCompiler_Common/Type.cpp (modified) (2 diffs)
-
BasicCompiler_Common/VariableOpe.cpp (modified) (3 diffs)
-
BasicCompiler_Common/include/Smoothie.h (modified) (3 diffs)
-
BasicCompiler_Common/include/logger.h (deleted)
-
BasicCompiler_Common/src/Member.cpp (modified) (1 diff)
-
BasicCompiler_Common/src/Namespace.cpp (modified) (1 diff)
-
BasicCompiler_Common/src/Smoothie.cpp (modified) (1 diff)
-
abcompiler32.sln (added)
-
abcompiler64.sln (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/abdev/BasicCompiler32/BasicCompiler.vcproj
r140 r159 48 48 Name="VCCLCompilerTool" 49 49 Optimization="0" 50 AdditionalIncludeDirectories="..\ cpplibs\boost;..\BasicCompiler_Common\include"50 AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include" 51 51 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN" 52 52 MinimalRebuild="true" … … 75 75 <Tool 76 76 Name="VCLinkerTool" 77 AdditionalDependencies="comctl32.lib psapi.lib "77 AdditionalDependencies="comctl32.lib psapi.lib commond.lib" 78 78 OutputFile="../ActiveBasic/BasicCompiler32.exe" 79 79 LinkIncremental="2" 80 80 SuppressStartupBanner="true" 81 AdditionalLibraryDirectories="..\..\jenga\lib\x86" 81 82 GenerateDebugInformation="true" 82 83 ProgramDatabaseFile=".\Debug/BasicCompiler32.pdb" … … 148 149 InlineFunctionExpansion="2" 149 150 FavorSizeOrSpeed="1" 150 AdditionalIncludeDirectories="..\ cpplibs\boost;..\BasicCompiler_Common\include"151 AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include" 151 152 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN" 152 153 StringPooling="true" … … 176 177 <Tool 177 178 Name="VCLinkerTool" 178 AdditionalDependencies="comctl32.lib psapi.lib "179 AdditionalDependencies="comctl32.lib psapi.lib common.lib" 179 180 OutputFile="../ActiveBasic/BasicCompiler32.exe" 180 181 LinkIncremental="1" 181 182 SuppressStartupBanner="true" 183 AdditionalLibraryDirectories="..\..\jenga\lib\x86" 182 184 ProgramDatabaseFile=".\Release/BasicCompiler32.pdb" 183 185 SubSystem="2" … … 198 200 SuppressStartupBanner="true" 199 201 OutputFile=".\Release/BasicCompiler.bsc" 200 />201 <Tool202 Name="VCFxCopTool"203 />204 <Tool205 Name="VCAppVerifierTool"206 />207 <Tool208 Name="VCWebDeploymentTool"209 />210 <Tool211 Name="VCPostBuildEventTool"212 />213 </Configuration>214 <Configuration215 Name="English_Rel|Win32"216 OutputDirectory=".\English_Rel"217 IntermediateDirectory=".\English_Rel"218 ConfigurationType="1"219 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"220 UseOfMFC="0"221 ATLMinimizesCRunTimeLibraryUsage="false"222 CharacterSet="2"223 >224 <Tool225 Name="VCPreBuildEventTool"226 />227 <Tool228 Name="VCCustomBuildTool"229 />230 <Tool231 Name="VCXMLDataGeneratorTool"232 />233 <Tool234 Name="VCWebServiceProxyGeneratorTool"235 />236 <Tool237 Name="VCMIDLTool"238 PreprocessorDefinitions="NDEBUG"239 MkTypLibCompatible="true"240 SuppressStartupBanner="true"241 TargetEnvironment="1"242 TypeLibraryName=".\English_Rel/BasicCompiler.tlb"243 HeaderFileName=""244 />245 <Tool246 Name="VCCLCompilerTool"247 Optimization="2"248 InlineFunctionExpansion="1"249 AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"250 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;ENG"251 StringPooling="true"252 RuntimeLibrary="0"253 EnableFunctionLevelLinking="true"254 PrecompiledHeaderFile=".\English_Rel/BasicCompiler.pch"255 AssemblerListingLocation=".\English_Rel/"256 ObjectFile=".\English_Rel/"257 ProgramDataBaseFileName=".\English_Rel/"258 BrowseInformation="2"259 BrowseInformationFile=".\English_Rel/"260 WarningLevel="3"261 SuppressStartupBanner="true"262 />263 <Tool264 Name="VCManagedResourceCompilerTool"265 />266 <Tool267 Name="VCResourceCompilerTool"268 PreprocessorDefinitions="NDEBUG,ENG"269 Culture="1033"270 />271 <Tool272 Name="VCPreLinkEventTool"273 />274 <Tool275 Name="VCLinkerTool"276 AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib"277 OutputFile="../ActiveBasic/BasicCompiler32.exe"278 LinkIncremental="1"279 SuppressStartupBanner="true"280 ProgramDatabaseFile=".\English_Rel/BasicCompiler32.pdb"281 SubSystem="2"282 TargetMachine="1"283 />284 <Tool285 Name="VCALinkTool"286 />287 <Tool288 Name="VCManifestTool"289 AdditionalManifestFiles="manifest.xml"290 />291 <Tool292 Name="VCXDCMakeTool"293 />294 <Tool295 Name="VCBscMakeTool"296 SuppressStartupBanner="true"297 OutputFile=".\English_Rel/BasicCompiler.bsc"298 202 /> 299 203 <Tool … … 337 241 /> 338 242 </FileConfiguration> 339 <FileConfiguration340 Name="English_Rel|Win32"341 >342 <Tool343 Name="VCResourceCompilerTool"344 PreprocessorDefinitions=""345 />346 </FileConfiguration>347 243 </File> 348 244 <Filter … … 368 264 /> 369 265 </FileConfiguration> 370 <FileConfiguration371 Name="English_Rel|Win32"372 >373 <Tool374 Name="VCCLCompilerTool"375 PreprocessorDefinitions=""376 />377 </FileConfiguration>378 266 </File> 379 267 <File … … 396 284 /> 397 285 </FileConfiguration> 398 <FileConfiguration399 Name="English_Rel|Win32"400 >401 <Tool402 Name="VCCLCompilerTool"403 PreprocessorDefinitions=""404 />405 </FileConfiguration>406 286 </File> 407 287 <File … … 424 304 /> 425 305 </FileConfiguration> 426 <FileConfiguration427 Name="English_Rel|Win32"428 >429 <Tool430 Name="VCCLCompilerTool"431 PreprocessorDefinitions=""432 />433 </FileConfiguration>434 306 </File> 435 307 <File … … 456 328 /> 457 329 </FileConfiguration> 458 <FileConfiguration459 Name="English_Rel|Win32"460 >461 <Tool462 Name="VCCLCompilerTool"463 PreprocessorDefinitions=""464 />465 </FileConfiguration>466 330 </File> 467 331 <File … … 484 348 /> 485 349 </FileConfiguration> 486 <FileConfiguration487 Name="English_Rel|Win32"488 >489 <Tool490 Name="VCCLCompilerTool"491 PreprocessorDefinitions=""492 />493 </FileConfiguration>494 350 </File> 495 351 <File … … 512 368 /> 513 369 </FileConfiguration> 514 <FileConfiguration515 Name="English_Rel|Win32"516 >517 <Tool518 Name="VCCLCompilerTool"519 PreprocessorDefinitions=""520 />521 </FileConfiguration>522 370 </File> 523 371 <File … … 540 388 /> 541 389 </FileConfiguration> 542 <FileConfiguration543 Name="English_Rel|Win32"544 >545 <Tool546 Name="VCCLCompilerTool"547 PreprocessorDefinitions=""548 />549 </FileConfiguration>550 390 </File> 551 391 <File … … 568 408 /> 569 409 </FileConfiguration> 570 <FileConfiguration571 Name="English_Rel|Win32"572 >573 <Tool574 Name="VCCLCompilerTool"575 PreprocessorDefinitions=""576 />577 </FileConfiguration>578 410 </File> 579 411 <File … … 596 428 /> 597 429 </FileConfiguration> 598 <FileConfiguration599 Name="English_Rel|Win32"600 >601 <Tool602 Name="VCCLCompilerTool"603 PreprocessorDefinitions=""604 />605 </FileConfiguration>606 430 </File> 607 431 <File … … 628 452 /> 629 453 </FileConfiguration> 630 <FileConfiguration631 Name="English_Rel|Win32"632 >633 <Tool634 Name="VCCLCompilerTool"635 PreprocessorDefinitions=""636 />637 </FileConfiguration>638 454 </File> 639 455 <File … … 656 472 /> 657 473 </FileConfiguration> 658 <FileConfiguration659 Name="English_Rel|Win32"660 >661 <Tool662 Name="VCCLCompilerTool"663 PreprocessorDefinitions=""664 />665 </FileConfiguration>666 474 </File> 667 475 <File … … 684 492 /> 685 493 </FileConfiguration> 686 <FileConfiguration687 Name="English_Rel|Win32"688 >689 <Tool690 Name="VCCLCompilerTool"691 PreprocessorDefinitions=""692 />693 </FileConfiguration>694 494 </File> 695 495 <Filter … … 715 515 /> 716 516 </FileConfiguration> 717 <FileConfiguration718 Name="English_Rel|Win32"719 >720 <Tool721 Name="VCCLCompilerTool"722 PreprocessorDefinitions=""723 />724 </FileConfiguration>725 517 </File> 726 518 <File … … 743 535 /> 744 536 </FileConfiguration> 745 <FileConfiguration746 Name="English_Rel|Win32"747 >748 <Tool749 Name="VCCLCompilerTool"750 PreprocessorDefinitions=""751 />752 </FileConfiguration>753 537 </File> 754 538 <File … … 771 555 /> 772 556 </FileConfiguration> 773 <FileConfiguration774 Name="English_Rel|Win32"775 >776 <Tool777 Name="VCCLCompilerTool"778 PreprocessorDefinitions=""779 />780 </FileConfiguration>781 557 </File> 782 558 <File … … 799 575 /> 800 576 </FileConfiguration> 801 <FileConfiguration802 Name="English_Rel|Win32"803 >804 <Tool805 Name="VCCLCompilerTool"806 PreprocessorDefinitions=""807 />808 </FileConfiguration>809 577 </File> 810 578 </Filter> … … 835 603 /> 836 604 </FileConfiguration> 837 <FileConfiguration838 Name="English_Rel|Win32"839 >840 <Tool841 Name="VCCLCompilerTool"842 PreprocessorDefinitions=""843 />844 </FileConfiguration>845 605 </File> 846 606 <File … … 863 623 /> 864 624 </FileConfiguration> 865 <FileConfiguration866 Name="English_Rel|Win32"867 >868 <Tool869 Name="VCCLCompilerTool"870 PreprocessorDefinitions=""871 />872 </FileConfiguration>873 625 </File> 874 626 </Filter> … … 895 647 /> 896 648 </FileConfiguration> 897 <FileConfiguration898 Name="English_Rel|Win32"899 >900 <Tool901 Name="VCCLCompilerTool"902 PreprocessorDefinitions=""903 />904 </FileConfiguration>905 649 </File> 906 650 <File … … 927 671 /> 928 672 </FileConfiguration> 929 <FileConfiguration930 Name="English_Rel|Win32"931 >932 <Tool933 Name="VCCLCompilerTool"934 PreprocessorDefinitions=""935 />936 </FileConfiguration>937 673 </File> 938 674 <File … … 955 691 /> 956 692 </FileConfiguration> 957 <FileConfiguration958 Name="English_Rel|Win32"959 >960 <Tool961 Name="VCCLCompilerTool"962 PreprocessorDefinitions=""963 />964 </FileConfiguration>965 693 </File> 966 694 <File … … 981 709 <FileConfiguration 982 710 Name="Release|Win32" 983 >984 <Tool985 Name="VCCLCompilerTool"986 PreprocessorDefinitions=""987 />988 </FileConfiguration>989 <FileConfiguration990 Name="English_Rel|Win32"991 711 > 992 712 <Tool … … 1025 745 /> 1026 746 </FileConfiguration> 1027 <FileConfiguration1028 Name="English_Rel|Win32"1029 >1030 <Tool1031 Name="VCCLCompilerTool"1032 ObjectFile="$(IntDir)\$(InputName)1.obj"1033 XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"1034 />1035 </FileConfiguration>1036 747 </File> 1037 748 </Filter> … … 1058 769 /> 1059 770 </FileConfiguration> 1060 <FileConfiguration1061 Name="English_Rel|Win32"1062 >1063 <Tool1064 Name="VCCLCompilerTool"1065 PreprocessorDefinitions=""1066 />1067 </FileConfiguration>1068 771 </File> 1069 772 <File … … 1090 793 /> 1091 794 </FileConfiguration> 1092 <FileConfiguration1093 Name="English_Rel|Win32"1094 >1095 <Tool1096 Name="VCCLCompilerTool"1097 PreprocessorDefinitions=""1098 />1099 </FileConfiguration>1100 795 </File> 1101 796 <File … … 1126 821 /> 1127 822 </FileConfiguration> 1128 <FileConfiguration1129 Name="English_Rel|Win32"1130 >1131 <Tool1132 Name="VCCLCompilerTool"1133 PreprocessorDefinitions=""1134 />1135 </FileConfiguration>1136 823 </File> 1137 824 <File … … 1162 849 /> 1163 850 </FileConfiguration> 1164 <FileConfiguration1165 Name="English_Rel|Win32"1166 >1167 <Tool1168 Name="VCCLCompilerTool"1169 PreprocessorDefinitions=""1170 />1171 </FileConfiguration>1172 851 </File> 1173 852 <File … … 1198 877 /> 1199 878 </FileConfiguration> 1200 <FileConfiguration1201 Name="English_Rel|Win32"1202 >1203 <Tool1204 Name="VCCLCompilerTool"1205 PreprocessorDefinitions=""1206 />1207 </FileConfiguration>1208 879 </File> 1209 880 <File … … 1244 915 <FileConfiguration 1245 916 Name="Release|Win32" 1246 >1247 <Tool1248 Name="VCCLCompilerTool"1249 PreprocessorDefinitions=""1250 />1251 </FileConfiguration>1252 <FileConfiguration1253 Name="English_Rel|Win32"1254 917 > 1255 918 <Tool … … 1283 946 /> 1284 947 </FileConfiguration> 1285 <FileConfiguration1286 Name="English_Rel|Win32"1287 >1288 <Tool1289 Name="VCCLCompilerTool"1290 PreprocessorDefinitions=""1291 />1292 </FileConfiguration>1293 948 </File> 1294 949 <File … … 1311 966 /> 1312 967 </FileConfiguration> 1313 <FileConfiguration1314 Name="English_Rel|Win32"1315 >1316 <Tool1317 Name="VCCLCompilerTool"1318 PreprocessorDefinitions=""1319 />1320 </FileConfiguration>1321 968 </File> 1322 969 <File … … 1339 986 /> 1340 987 </FileConfiguration> 1341 <FileConfiguration1342 Name="English_Rel|Win32"1343 >1344 <Tool1345 Name="VCCLCompilerTool"1346 PreprocessorDefinitions=""1347 />1348 </FileConfiguration>1349 988 </File> 1350 989 <Filter … … 1370 1009 /> 1371 1010 </FileConfiguration> 1372 <FileConfiguration1373 Name="English_Rel|Win32"1374 >1375 <Tool1376 Name="VCCLCompilerTool"1377 PreprocessorDefinitions=""1378 />1379 </FileConfiguration>1380 1011 </File> 1381 1012 <File … … 1398 1029 /> 1399 1030 </FileConfiguration> 1400 <FileConfiguration1401 Name="English_Rel|Win32"1402 >1403 <Tool1404 Name="VCCLCompilerTool"1405 PreprocessorDefinitions=""1406 />1407 </FileConfiguration>1408 1031 </File> 1409 1032 <File … … 1426 1049 /> 1427 1050 </FileConfiguration> 1428 <FileConfiguration1429 Name="English_Rel|Win32"1430 >1431 <Tool1432 Name="VCCLCompilerTool"1433 PreprocessorDefinitions=""1434 />1435 </FileConfiguration>1436 1051 </File> 1437 1052 <File … … 1454 1069 /> 1455 1070 </FileConfiguration> 1456 <FileConfiguration1457 Name="English_Rel|Win32"1458 >1459 <Tool1460 Name="VCCLCompilerTool"1461 PreprocessorDefinitions=""1462 />1463 </FileConfiguration>1464 1071 </File> 1465 1072 <File … … 1482 1089 /> 1483 1090 </FileConfiguration> 1484 <FileConfiguration1485 Name="English_Rel|Win32"1486 >1487 <Tool1488 Name="VCCLCompilerTool"1489 PreprocessorDefinitions=""1490 />1491 </FileConfiguration>1492 1091 </File> 1493 1092 <File … … 1510 1109 /> 1511 1110 </FileConfiguration> 1512 <FileConfiguration1513 Name="English_Rel|Win32"1514 >1515 <Tool1516 Name="VCCLCompilerTool"1517 PreprocessorDefinitions=""1518 />1519 </FileConfiguration>1520 1111 </File> 1521 1112 <File … … 1538 1129 /> 1539 1130 </FileConfiguration> 1540 <FileConfiguration1541 Name="English_Rel|Win32"1542 >1543 <Tool1544 Name="VCCLCompilerTool"1545 PreprocessorDefinitions=""1546 />1547 </FileConfiguration>1548 1131 </File> 1549 1132 <File … … 1566 1149 /> 1567 1150 </FileConfiguration> 1568 <FileConfiguration1569 Name="English_Rel|Win32"1570 >1571 <Tool1572 Name="VCCLCompilerTool"1573 PreprocessorDefinitions=""1574 />1575 </FileConfiguration>1576 1151 </File> 1577 1152 <File … … 1594 1169 /> 1595 1170 </FileConfiguration> 1596 <FileConfiguration1597 Name="English_Rel|Win32"1598 >1599 <Tool1600 Name="VCCLCompilerTool"1601 PreprocessorDefinitions=""1602 />1603 </FileConfiguration>1604 1171 </File> 1605 1172 </Filter> … … 1626 1193 /> 1627 1194 </FileConfiguration> 1628 <FileConfiguration1629 Name="English_Rel|Win32"1630 >1631 <Tool1632 Name="VCCLCompilerTool"1633 PreprocessorDefinitions=""1634 />1635 </FileConfiguration>1636 1195 </File> 1637 1196 </Filter> … … 1658 1217 /> 1659 1218 </FileConfiguration> 1660 <FileConfiguration1661 Name="English_Rel|Win32"1662 >1663 <Tool1664 Name="VCCLCompilerTool"1665 PreprocessorDefinitions=""1666 />1667 </FileConfiguration>1668 1219 </File> 1669 1220 </Filter> … … 1690 1241 /> 1691 1242 </FileConfiguration> 1692 <FileConfiguration1693 Name="English_Rel|Win32"1694 >1695 <Tool1696 Name="VCCLCompilerTool"1697 PreprocessorDefinitions=""1698 />1699 </FileConfiguration>1700 1243 </File> 1701 1244 <File … … 1718 1261 /> 1719 1262 </FileConfiguration> 1720 <FileConfiguration1721 Name="English_Rel|Win32"1722 >1723 <Tool1724 Name="VCCLCompilerTool"1725 PreprocessorDefinitions=""1726 />1727 </FileConfiguration>1728 1263 </File> 1729 1264 <File … … 1746 1281 /> 1747 1282 </FileConfiguration> 1748 <FileConfiguration1749 Name="English_Rel|Win32"1750 >1751 <Tool1752 Name="VCCLCompilerTool"1753 PreprocessorDefinitions=""1754 />1755 </FileConfiguration>1756 1283 </File> 1757 1284 <File … … 1774 1301 /> 1775 1302 </FileConfiguration> 1776 <FileConfiguration1777 Name="English_Rel|Win32"1778 >1779 <Tool1780 Name="VCCLCompilerTool"1781 PreprocessorDefinitions=""1782 />1783 </FileConfiguration>1784 1303 </File> 1785 1304 <File … … 1796 1315 <FileConfiguration 1797 1316 Name="Release|Win32" 1798 >1799 <Tool1800 Name="VCCLCompilerTool"1801 PreprocessorDefinitions=""1802 />1803 </FileConfiguration>1804 <FileConfiguration1805 Name="English_Rel|Win32"1806 1317 > 1807 1318 <Tool … … 1864 1375 <FileConfiguration 1865 1376 Name="Release|Win32" 1866 >1867 <Tool1868 Name="VCCLCompilerTool"1869 PreprocessorDefinitions=""1870 />1871 </FileConfiguration>1872 <FileConfiguration1873 Name="English_Rel|Win32"1874 1377 > 1875 1378 <Tool … … 1957 1460 > 1958 1461 <File 1959 RelativePath="..\BasicCompiler_Common\include\logger.h"1960 >1961 </File>1962 <File1963 1462 RelativePath="..\BasicCompiler_Common\include\Namespace.h" 1964 1463 > -
trunk/abdev/BasicCompiler32/Compile_Calc.cpp
r136 r159 619 619 620 620 621 if( varType.IsObject() && Smoothie:: Meta::blittableTypes.IsExist( calcType ) ){621 if( varType.IsObject() && Smoothie::meta.blittableTypes.IsExist( calcType ) ){ 622 622 // Blittable型をオブジェクトとして扱う 623 623 vector<UserProc *> userProcs; 624 Smoothie:: Meta::blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );624 Smoothie::meta.blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs ); 625 625 if( userProcs.size() != 1 ){ 626 626 SetError(); -
trunk/abdev/BasicCompiler32/Compile_Func.cpp
r130 r159 228 228 229 229 //オーバーロードを解決 230 pUserProc=OverloadSolution(name,subs,Smoothie:: Meta::procPointers[ProcPtr_BaseIndex]->Params(), Type() );230 pUserProc=OverloadSolution(name,subs,Smoothie::meta.procPointers[ProcPtr_BaseIndex]->Params(), Type() ); 231 231 232 232 if(!pUserProc){ -
trunk/abdev/BasicCompiler32/Compile_Var.cpp
r140 r159 360 360 // 名前空間を分離 361 361 char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE]; 362 Smoothie:: Meta::namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );362 Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); 363 363 364 364 // 先頭オブジェクトまたはクラス名と入れ子メンバに分割 … … 517 517 } 518 518 519 int typeDefIndex = Smoothie:: Meta::typeDefs.GetIndex( VarName );519 int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName ); 520 520 if( typeDefIndex != -1 ){ 521 521 // TypeDef後の型名だったとき 522 lstrcpy( VarName, Smoothie:: Meta::typeDefs[typeDefIndex].GetBaseName().c_str() );522 lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() ); 523 523 } 524 524 -
trunk/abdev/BasicCompiler32/MakePeHdr.cpp
r142 r159 158 158 159 159 //関数ポインタ情報を初期化 160 Smoothie:: Meta::procPointers.clear();160 Smoothie::meta.procPointers.clear(); 161 161 162 162 // 名前空間情報を取得 163 163 NamespaceScopesCollection::CollectNamespaces( 164 164 Smoothie::Lexical::source.GetBuffer(), 165 Smoothie:: Meta::namespaceScopesCollection165 Smoothie::meta.namespaceScopesCollection 166 166 ); 167 167 … … 169 169 // GetSubInfo関数の中で参照されるオブジェクト名を事前に取得する。 170 170 // ※オブジェクトの内容までは取得しない 171 pobj_DBClass=new C DBClass();171 pobj_DBClass=new Classes(); 172 172 pobj_DBClass->InitNames(); 173 173 174 174 //TypeDef情報を初期化 175 Smoothie:: Meta::typeDefs.Init();175 Smoothie::meta.typeDefs.Init(); 176 176 177 177 //定数情報を取得 -
trunk/abdev/BasicCompiler32/NumOpe.cpp
r135 r159 256 256 Type leftType; 257 257 if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){ 258 if( isClassName == false && Smoothie:: Meta::blittableTypes.IsExist( leftType ) ){258 if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){ 259 259 // 左側のオブジェクト部分がBlittable型のとき 260 260 … … 262 262 lstrcpy( temporary, termLeft ); 263 263 sprintf( termLeft, "%s(%s)", 264 Smoothie:: Meta::blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),264 Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), 265 265 temporary ); 266 266 } -
trunk/abdev/BasicCompiler64/BasicCompiler.vcproj
r140 r159 48 48 Name="VCCLCompilerTool" 49 49 Optimization="0" 50 AdditionalIncludeDirectories="..\ cpplibs\boost;..\BasicCompiler_Common\include"50 AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include" 51 51 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64" 52 52 MinimalRebuild="true" … … 79 79 Name="VCLinkerTool" 80 80 AdditionalOptions="/MACHINE:AMD64" 81 AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib "81 AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib commond.lib" 82 82 OutputFile="../ActiveBasic/BasicCompiler64.exe" 83 83 LinkIncremental="2" 84 84 SuppressStartupBanner="true" 85 AdditionalLibraryDirectories="..\..\jenga\lib\amd64" 85 86 IgnoreDefaultLibraryNames="" 86 87 GenerateDebugInformation="true" … … 104 105 SuppressStartupBanner="true" 105 106 OutputFile="$(OutDir)/$(ProjectName).bsc" 106 />107 <Tool108 Name="VCFxCopTool"109 />110 <Tool111 Name="VCAppVerifierTool"112 />113 <Tool114 Name="VCWebDeploymentTool"115 />116 <Tool117 Name="VCPostBuildEventTool"118 />119 </Configuration>120 <Configuration121 Name="SmallDebug|Win32"122 OutputDirectory="$(ConfigurationName)"123 IntermediateDirectory="$(ConfigurationName)"124 ConfigurationType="1"125 UseOfMFC="0"126 ATLMinimizesCRunTimeLibraryUsage="false"127 CharacterSet="2"128 >129 <Tool130 Name="VCPreBuildEventTool"131 />132 <Tool133 Name="VCCustomBuildTool"134 />135 <Tool136 Name="VCXMLDataGeneratorTool"137 />138 <Tool139 Name="VCWebServiceProxyGeneratorTool"140 />141 <Tool142 Name="VCMIDLTool"143 PreprocessorDefinitions="_DEBUG"144 MkTypLibCompatible="true"145 SuppressStartupBanner="true"146 TargetEnvironment="1"147 TypeLibraryName=".\Debug/BasicCompiler.tlb"148 HeaderFileName=""149 />150 <Tool151 Name="VCCLCompilerTool"152 Optimization="2"153 AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"154 PreprocessorDefinitions="WIN32NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"155 MinimalRebuild="false"156 BasicRuntimeChecks="0"157 RuntimeLibrary="1"158 UsePrecompiledHeader="0"159 PrecompiledHeaderFile=".\SmallDebug/BasicCompiler.pch"160 AssemblerListingLocation=".\SmallDebug/"161 ObjectFile=".\SmallDebug/"162 ProgramDataBaseFileName=".\SmallDebug/"163 BrowseInformation="0"164 WarningLevel="3"165 SuppressStartupBanner="true"166 Detect64BitPortabilityProblems="true"167 DebugInformationFormat="0"168 CallingConvention="0"169 />170 <Tool171 Name="VCManagedResourceCompilerTool"172 />173 <Tool174 Name="VCResourceCompilerTool"175 PreprocessorDefinitions="_DEBUG,JPN"176 Culture="1041"177 />178 <Tool179 Name="VCPreLinkEventTool"180 />181 <Tool182 Name="VCLinkerTool"183 AdditionalOptions="/MACHINE:AMD64"184 AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib"185 OutputFile="../ActiveBasic/BasicCompiler64.exe"186 LinkIncremental="2"187 SuppressStartupBanner="true"188 IgnoreDefaultLibraryNames=""189 GenerateDebugInformation="false"190 ProgramDatabaseFile=".\SmallDebug/BasicCompiler64.pdb"191 SubSystem="2"192 TargetMachine="0"193 />194 <Tool195 Name="VCALinkTool"196 />197 <Tool198 Name="VCManifestTool"199 AdditionalManifestFiles="$(ProjectDir)\manifest.xml"200 EmbedManifest="true"201 />202 <Tool203 Name="VCXDCMakeTool"204 />205 <Tool206 Name="VCBscMakeTool"207 SuppressStartupBanner="true"208 OutputFile="$(OutDir)/$(ProjectName).bsc"209 />210 <Tool211 Name="VCFxCopTool"212 />213 <Tool214 Name="VCAppVerifierTool"215 />216 <Tool217 Name="VCWebDeploymentTool"218 />219 <Tool220 Name="VCPostBuildEventTool"221 />222 </Configuration>223 <Configuration224 Name="English_Rel|Win32"225 OutputDirectory=".\English_Rel"226 IntermediateDirectory=".\English_Rel"227 ConfigurationType="1"228 UseOfMFC="0"229 ATLMinimizesCRunTimeLibraryUsage="false"230 CharacterSet="2"231 >232 <Tool233 Name="VCPreBuildEventTool"234 />235 <Tool236 Name="VCCustomBuildTool"237 />238 <Tool239 Name="VCXMLDataGeneratorTool"240 />241 <Tool242 Name="VCWebServiceProxyGeneratorTool"243 />244 <Tool245 Name="VCMIDLTool"246 PreprocessorDefinitions="NDEBUG"247 MkTypLibCompatible="true"248 SuppressStartupBanner="true"249 TargetEnvironment="1"250 TypeLibraryName=".\English_Rel/BasicCompiler.tlb"251 HeaderFileName=""252 />253 <Tool254 Name="VCCLCompilerTool"255 Optimization="2"256 InlineFunctionExpansion="1"257 AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"258 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;ENG"259 StringPooling="true"260 RuntimeLibrary="0"261 EnableFunctionLevelLinking="true"262 UsePrecompiledHeader="0"263 PrecompiledHeaderFile=".\English_Rel/BasicCompiler.pch"264 AssemblerListingLocation=".\English_Rel/"265 ObjectFile=".\English_Rel/"266 ProgramDataBaseFileName=".\English_Rel/"267 WarningLevel="3"268 SuppressStartupBanner="true"269 />270 <Tool271 Name="VCManagedResourceCompilerTool"272 />273 <Tool274 Name="VCResourceCompilerTool"275 PreprocessorDefinitions="NDEBUG,ENG"276 Culture="1033"277 />278 <Tool279 Name="VCPreLinkEventTool"280 />281 <Tool282 Name="VCLinkerTool"283 AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib"284 OutputFile="../ActiveBasic/BasicCompiler64.exe"285 LinkIncremental="1"286 SuppressStartupBanner="true"287 ProgramDatabaseFile=".\English_Rel/BasicCompiler64.pdb"288 SubSystem="2"289 TargetMachine="1"290 />291 <Tool292 Name="VCALinkTool"293 />294 <Tool295 Name="VCManifestTool"296 AdditionalManifestFiles="$(ProjectDir)\manifest.xml"297 />298 <Tool299 Name="VCXDCMakeTool"300 />301 <Tool302 Name="VCBscMakeTool"303 SuppressStartupBanner="true"304 OutputFile=".\English_Rel/BasicCompiler.bsc"305 107 /> 306 108 <Tool … … 352 154 InlineFunctionExpansion="2" 353 155 FavorSizeOrSpeed="1" 354 AdditionalIncludeDirectories="..\ cpplibs\boost;..\BasicCompiler_Common\include"156 AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include" 355 157 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64" 356 158 MinimalRebuild="false" 357 159 ExceptionHandling="1" 358 160 BasicRuntimeChecks="0" 359 RuntimeLibrary=" 2"161 RuntimeLibrary="0" 360 162 RuntimeTypeInfo="true" 361 163 UsePrecompiledHeader="0" … … 385 187 Name="VCLinkerTool" 386 188 AdditionalOptions="/MACHINE:AMD64" 387 AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib "189 AdditionalDependencies="comctl32.lib psapi.lib bufferoverflowu.lib common.lib" 388 190 OutputFile="../ActiveBasic/BasicCompiler64.exe" 389 191 LinkIncremental="1" 390 192 SuppressStartupBanner="true" 193 AdditionalLibraryDirectories="..\..\jenga\lib\amd64" 391 194 IgnoreDefaultLibraryNames="libcpmtd.lib" 392 195 GenerateDebugInformation="false" … … 482 285 > 483 286 <File 484 RelativePath="..\BasicCompiler_Common\include\logger.h"485 >486 </File>487 <File488 287 RelativePath="..\BasicCompiler_Common\include\Namespace.h" 489 288 > … … 516 315 Name="Prototype" 517 316 > 317 <File 318 RelativePath="..\BasicCompiler_Common\include\Class.h" 319 > 320 </File> 518 321 <File 519 322 RelativePath="..\BasicCompiler_Common\include\Member.h" … … 543 346 <File 544 347 RelativePath="..\BasicCompiler_Common\include\Exception.h" 348 > 349 </File> 350 </Filter> 351 <Filter 352 Name="Module" 353 > 354 <File 355 RelativePath="..\BasicCompiler_Common\include\ObjectModule.h" 545 356 > 546 357 </File> … … 594 405 Name="VCResourceCompilerTool" 595 406 PreprocessorDefinitions="_DEBUG;JPN;$(NoInherit)" 596 />597 </FileConfiguration>598 <FileConfiguration599 Name="SmallDebug|Win32"600 >601 <Tool602 Name="VCResourceCompilerTool"603 PreprocessorDefinitions="_DEBUG;JPN;$(NoInherit)"604 />605 </FileConfiguration>606 <FileConfiguration607 Name="English_Rel|Win32"608 >609 <Tool610 Name="VCResourceCompilerTool"611 PreprocessorDefinitions="NDEBUG;ENG;$(NoInherit)"612 407 /> 613 408 </FileConfiguration> … … 638 433 </FileConfiguration> 639 434 <FileConfiguration 640 Name="SmallDebug|Win32" 435 Name="Release|Win32" 436 > 437 <Tool 438 Name="VCCLCompilerTool" 439 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)" 440 UsePrecompiledHeader="0" 441 BrowseInformation="0" 442 /> 443 </FileConfiguration> 444 </File> 445 <File 446 RelativePath="Compile_Var.cpp" 447 > 448 <FileConfiguration 449 Name="Debug|Win32" 641 450 > 642 451 <Tool … … 648 457 </FileConfiguration> 649 458 <FileConfiguration 650 Name="English_Rel|Win32"651 >652 <Tool653 Name="VCCLCompilerTool"654 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"655 UsePrecompiledHeader="0"656 />657 </FileConfiguration>658 <FileConfiguration659 459 Name="Release|Win32" 660 460 > … … 668 468 </File> 669 469 <File 670 RelativePath=" Compile_Var.cpp"470 RelativePath="MakePeHdr.cpp" 671 471 > 672 472 <FileConfiguration … … 681 481 </FileConfiguration> 682 482 <FileConfiguration 683 Name="SmallDebug|Win32" 483 Name="Release|Win32" 484 > 485 <Tool 486 Name="VCCLCompilerTool" 487 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)" 488 UsePrecompiledHeader="0" 489 BrowseInformation="0" 490 /> 491 </FileConfiguration> 492 </File> 493 <File 494 RelativePath="Register.cpp" 495 > 496 <FileConfiguration 497 Name="Debug|Win32" 684 498 > 685 499 <Tool … … 691 505 </FileConfiguration> 692 506 <FileConfiguration 693 Name="English_Rel|Win32"694 >695 <Tool696 Name="VCCLCompilerTool"697 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"698 UsePrecompiledHeader="0"699 />700 </FileConfiguration>701 <FileConfiguration702 507 Name="Release|Win32" 703 508 > … … 710 515 </FileConfiguration> 711 516 </File> 712 <File713 RelativePath="MakePeHdr.cpp"714 >715 <FileConfiguration716 Name="Debug|Win32"717 >718 <Tool719 Name="VCCLCompilerTool"720 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"721 UsePrecompiledHeader="0"722 BrowseInformation="0"723 />724 </FileConfiguration>725 <FileConfiguration726 Name="SmallDebug|Win32"727 >728 <Tool729 Name="VCCLCompilerTool"730 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"731 UsePrecompiledHeader="0"732 BrowseInformation="0"733 />734 </FileConfiguration>735 <FileConfiguration736 Name="English_Rel|Win32"737 >738 <Tool739 Name="VCCLCompilerTool"740 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"741 UsePrecompiledHeader="0"742 />743 </FileConfiguration>744 <FileConfiguration745 Name="Release|Win32"746 >747 <Tool748 Name="VCCLCompilerTool"749 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"750 UsePrecompiledHeader="0"751 BrowseInformation="0"752 />753 </FileConfiguration>754 </File>755 <File756 RelativePath="Register.cpp"757 >758 <FileConfiguration759 Name="Debug|Win32"760 >761 <Tool762 Name="VCCLCompilerTool"763 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"764 UsePrecompiledHeader="0"765 BrowseInformation="0"766 />767 </FileConfiguration>768 <FileConfiguration769 Name="SmallDebug|Win32"770 >771 <Tool772 Name="VCCLCompilerTool"773 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"774 UsePrecompiledHeader="0"775 BrowseInformation="0"776 />777 </FileConfiguration>778 <FileConfiguration779 Name="English_Rel|Win32"780 >781 <Tool782 Name="VCCLCompilerTool"783 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"784 UsePrecompiledHeader="0"785 />786 </FileConfiguration>787 <FileConfiguration788 Name="Release|Win32"789 >790 <Tool791 Name="VCCLCompilerTool"792 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"793 UsePrecompiledHeader="0"794 BrowseInformation="0"795 />796 </FileConfiguration>797 </File>798 517 <Filter 799 518 Name="Calculation" … … 813 532 </FileConfiguration> 814 533 <FileConfiguration 815 Name="SmallDebug|Win32"816 >817 <Tool818 Name="VCCLCompilerTool"819 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"820 UsePrecompiledHeader="0"821 BrowseInformation="0"822 />823 </FileConfiguration>824 <FileConfiguration825 Name="English_Rel|Win32"826 >827 <Tool828 Name="VCCLCompilerTool"829 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"830 UsePrecompiledHeader="0"831 BrowseInformation="0"832 />833 </FileConfiguration>834 <FileConfiguration835 534 Name="Release|Win32" 836 535 > … … 857 556 </FileConfiguration> 858 557 <FileConfiguration 859 Name="SmallDebug|Win32"860 >861 <Tool862 Name="VCCLCompilerTool"863 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"864 UsePrecompiledHeader="0"865 BrowseInformation="0"866 />867 </FileConfiguration>868 <FileConfiguration869 Name="English_Rel|Win32"870 >871 <Tool872 Name="VCCLCompilerTool"873 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"874 UsePrecompiledHeader="0"875 />876 </FileConfiguration>877 <FileConfiguration878 558 Name="Release|Win32" 879 559 > … … 900 580 </FileConfiguration> 901 581 <FileConfiguration 902 Name="SmallDebug|Win32"903 >904 <Tool905 Name="VCCLCompilerTool"906 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"907 UsePrecompiledHeader="0"908 BrowseInformation="0"909 />910 </FileConfiguration>911 <FileConfiguration912 Name="English_Rel|Win32"913 >914 <Tool915 Name="VCCLCompilerTool"916 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"917 UsePrecompiledHeader="0"918 />919 </FileConfiguration>920 <FileConfiguration921 582 Name="Release|Win32" 922 583 > … … 947 608 </FileConfiguration> 948 609 <FileConfiguration 949 Name="SmallDebug|Win32"950 >951 <Tool952 Name="VCCLCompilerTool"953 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"954 UsePrecompiledHeader="0"955 BrowseInformation="0"956 />957 </FileConfiguration>958 <FileConfiguration959 Name="English_Rel|Win32"960 >961 <Tool962 Name="VCCLCompilerTool"963 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"964 UsePrecompiledHeader="0"965 />966 </FileConfiguration>967 <FileConfiguration968 610 Name="Release|Win32" 969 611 > … … 990 632 </FileConfiguration> 991 633 <FileConfiguration 992 Name="SmallDebug|Win32"993 >994 <Tool995 Name="VCCLCompilerTool"996 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"997 UsePrecompiledHeader="0"998 BrowseInformation="0"999 />1000 </FileConfiguration>1001 <FileConfiguration1002 Name="English_Rel|Win32"1003 >1004 <Tool1005 Name="VCCLCompilerTool"1006 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"1007 UsePrecompiledHeader="0"1008 />1009 </FileConfiguration>1010 <FileConfiguration1011 634 Name="Release|Win32" 1012 635 > … … 1033 656 </FileConfiguration> 1034 657 <FileConfiguration 1035 Name="SmallDebug|Win32"1036 >1037 <Tool1038 Name="VCCLCompilerTool"1039 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"1040 UsePrecompiledHeader="0"1041 BrowseInformation="0"1042 />1043 </FileConfiguration>1044 <FileConfiguration1045 Name="English_Rel|Win32"1046 >1047 <Tool1048 Name="VCCLCompilerTool"1049 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"1050 UsePrecompiledHeader="0"1051 />1052 </FileConfiguration>1053 <FileConfiguration1054 658 Name="Release|Win32" 1055 659 > … … 1076 680 </FileConfiguration> 1077 681 <FileConfiguration 1078 Name="SmallDebug|Win32"1079 >1080 <Tool1081 Name="VCCLCompilerTool"1082 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"1083 UsePrecompiledHeader="0"1084 BrowseInformation="0"1085 />1086 </FileConfiguration>1087 <FileConfiguration1088 Name="English_Rel|Win32"1089 >1090 <Tool1091 Name="VCCLCompilerTool"1092 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"1093 UsePrecompiledHeader="0"1094 />1095 </FileConfiguration>1096 <FileConfiguration1097 682 Name="Release|Win32" 1098 683 > … … 1119 704 </FileConfiguration> 1120 705 <FileConfiguration 1121 Name="SmallDebug|Win32"1122 >1123 <Tool1124 Name="VCCLCompilerTool"1125 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"1126 UsePrecompiledHeader="0"1127 BrowseInformation="0"1128 />1129 </FileConfiguration>1130 <FileConfiguration1131 Name="English_Rel|Win32"1132 >1133 <Tool1134 Name="VCCLCompilerTool"1135 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"1136 UsePrecompiledHeader="0"1137 />1138 </FileConfiguration>1139 <FileConfiguration1140 706 Name="Release|Win32" 1141 707 > … … 1178 744 </FileConfiguration> 1179 745 <FileConfiguration 1180 Name="SmallDebug|Win32"1181 >1182 <Tool1183 Name="VCCLCompilerTool"1184 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"1185 UsePrecompiledHeader="0"1186 BrowseInformation="0"1187 />1188 </FileConfiguration>1189 <FileConfiguration1190 Name="English_Rel|Win32"1191 >1192 <Tool1193 Name="VCCLCompilerTool"1194 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"1195 UsePrecompiledHeader="0"1196 />1197 </FileConfiguration>1198 <FileConfiguration1199 746 Name="Release|Win32" 1200 747 > … … 1237 784 </FileConfiguration> 1238 785 <FileConfiguration 1239 Name="SmallDebug|Win32"1240 >1241 <Tool1242 Name="VCCLCompilerTool"1243 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"1244 UsePrecompiledHeader="0"1245 BrowseInformation="0"1246 />1247 </FileConfiguration>1248 <FileConfiguration1249 Name="English_Rel|Win32"1250 >1251 <Tool1252 Name="VCCLCompilerTool"1253 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"1254 UsePrecompiledHeader="0"1255 />1256 </FileConfiguration>1257 <FileConfiguration1258 786 Name="Release|Win32" 1259 787 > … … 1277 805 UsePrecompiledHeader="0" 1278 806 BrowseInformation="0" 1279 />1280 </FileConfiguration>1281 <FileConfiguration1282 Name="SmallDebug|Win32"1283 >1284 <Tool1285 Name="VCCLCompilerTool"1286 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;JPN;$(NoInherit)"1287 UsePrecompiledHeader="0"1288 BrowseInformation="0"1289 />1290 </FileConfiguration>1291 <FileConfiguration1292 Name="English_Rel|Win32"1293 >1294 <Tool1295 Name="VCCLCompilerTool"1296 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;ENG;$(NoInherit)"1297 UsePrecompiledHeader="0"1298 807 /> 1299 808 </FileConfiguration> … … 1454 963 <FileConfiguration 1455 964 Name="Debug|Win32" 1456 >1457 <Tool1458 Name="VCCLCompilerTool"1459 ObjectFile="$(IntDir)\$(InputName)1.obj"1460 XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"1461 />1462 </FileConfiguration>1463 <FileConfiguration1464 Name="SmallDebug|Win32"1465 >1466 <Tool1467 Name="VCCLCompilerTool"1468 ObjectFile="$(IntDir)\$(InputName)1.obj"1469 XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"1470 />1471 </FileConfiguration>1472 <FileConfiguration1473 Name="English_Rel|Win32"1474 965 > 1475 966 <Tool -
trunk/abdev/BasicCompiler64/Compile_Calc.cpp
r136 r159 227 227 } 228 228 229 if( varType.IsObject() && Smoothie:: Meta::blittableTypes.IsExist( calcType ) ){229 if( varType.IsObject() && Smoothie::meta.blittableTypes.IsExist( calcType ) ){ 230 230 // Blittable型をオブジェクトとして扱う 231 231 vector<UserProc *> userProcs; 232 Smoothie:: Meta::blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );232 Smoothie::meta.blittableTypes.GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs ); 233 233 if( userProcs.size() != 1 ){ 234 234 SetError(); -
trunk/abdev/BasicCompiler64/Compile_Func.cpp
r130 r159 78 78 79 79 //オーバーロードを解決 80 pUserProc=OverloadSolution(name,subs,Smoothie:: Meta::procPointers[ProcPtr_BaseIndex]->Params(), Type() );80 pUserProc=OverloadSolution(name,subs,Smoothie::meta.procPointers[ProcPtr_BaseIndex]->Params(), Type() ); 81 81 82 82 if(!pUserProc){ -
trunk/abdev/BasicCompiler64/Compile_Var.cpp
r140 r159 388 388 // 名前空間を分離 389 389 char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE]; 390 Smoothie:: Meta::namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );390 Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); 391 391 392 392 // 先頭オブジェクトまたはクラス名と入れ子メンバに分割 … … 541 541 } 542 542 543 int typeDefIndex = Smoothie:: Meta::typeDefs.GetIndex( VarName );543 int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName ); 544 544 if( typeDefIndex != -1 ){ 545 545 // TypeDef後の型名だったとき 546 lstrcpy( VarName, Smoothie:: Meta::typeDefs[typeDefIndex].GetBaseName().c_str() );546 lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() ); 547 547 } 548 548 -
trunk/abdev/BasicCompiler64/MakePeHdr.cpp
r142 r159 143 143 144 144 //関数ポインタ情報を初期化 145 Smoothie:: Meta::procPointers.clear();145 Smoothie::meta.procPointers.clear(); 146 146 147 147 // 名前空間情報を取得 148 148 NamespaceScopesCollection::CollectNamespaces( 149 149 Smoothie::Lexical::source.GetBuffer(), 150 Smoothie:: Meta::namespaceScopesCollection150 Smoothie::meta.namespaceScopesCollection 151 151 ); 152 152 … … 154 154 // GetSubInfo関数の中で参照されるオブジェクト名を事前に取得する。 155 155 // ※オブジェクトの内容までは取得しない 156 pobj_DBClass=new C DBClass();156 pobj_DBClass=new Classes(); 157 157 pobj_DBClass->InitNames(); 158 158 159 159 //TypeDef情報を初期化 160 Smoothie:: Meta::typeDefs.Init();160 Smoothie::meta.typeDefs.Init(); 161 161 162 162 //定数情報を取得 -
trunk/abdev/BasicCompiler64/NumOpe.cpp
r140 r159 253 253 Type leftType; 254 254 if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){ 255 if( isClassName == false && Smoothie:: Meta::blittableTypes.IsExist( leftType ) ){255 if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){ 256 256 // 左側のオブジェクト部分がBlittable型のとき 257 257 … … 259 259 lstrcpy( temporary, termLeft ); 260 260 sprintf( termLeft, "%s(%s)", 261 Smoothie:: Meta::blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),261 Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), 262 262 temporary ); 263 263 } -
trunk/abdev/BasicCompiler_Common/Class.cpp
r143 r159 7 7 #endif 8 8 9 C DBClass *pobj_DBClass;9 Classes *pobj_DBClass; 10 10 11 11 const CClass *pobj_CompilingClass; … … 588 588 589 589 590 int C DBClass::hash(const char *name) const{590 int Classes::hash(const char *name) const{ 591 591 int key; 592 592 … … 598 598 } 599 599 600 void C DBClass::DestroyClass(CClass *pobj_c){600 void Classes::DestroyClass(CClass *pobj_c){ 601 601 if(pobj_c->pobj_NextClass){ 602 602 DestroyClass(pobj_c->pobj_NextClass); … … 606 606 } 607 607 608 C DBClass::CDBClass():608 Classes::Classes(): 609 609 pStringClass( NULL ), 610 610 pObjectClass( NULL ), … … 617 617 memset( pobj_ClassHash, 0, MAX_CLASS_HASH * sizeof(CClass *) ); 618 618 } 619 C DBClass::~CDBClass(){619 Classes::~Classes(){ 620 620 int i; 621 621 for(i=0;i<MAX_CLASS_HASH;i++){ … … 626 626 } 627 627 628 void C DBClass::ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection){628 void Classes::ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection){ 629 629 int i; 630 630 for(i=0;i<MAX_CLASS_HASH;i++){ … … 642 642 } 643 643 644 const CClass *C DBClass::Find( const NamespaceScopes &namespaceScopes, const string &name ) const644 const CClass *Classes::Find( const NamespaceScopes &namespaceScopes, const string &name ) const 645 645 { 646 646 int key; … … 669 669 670 670 // TypeDefも見る 671 int index = Smoothie:: Meta::typeDefs.GetIndex( namespaceScopes, name );671 int index = Smoothie::meta.typeDefs.GetIndex( namespaceScopes, name ); 672 672 if( index != -1 ){ 673 Type type = Smoothie:: Meta::typeDefs[index].GetBaseType();673 Type type = Smoothie::meta.typeDefs[index].GetBaseType(); 674 674 if( type.IsObject() ){ 675 675 return &type.GetClass(); … … 679 679 return NULL; 680 680 } 681 const CClass *C DBClass::Find( const string &fullName ) const681 const CClass *Classes::Find( const string &fullName ) const 682 682 { 683 683 char AreaName[VN_SIZE] = ""; //オブジェクト変数 … … 688 688 } 689 689 690 CClass *C DBClass::AddClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine){690 CClass *Classes::AddClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine){ 691 691 ////////////////////////////////////////////////////////////////////////// 692 692 // クラスを追加 … … 735 735 } 736 736 737 void C DBClass::InitNames(void){737 void Classes::InitNames(void){ 738 738 extern char *basbuf; 739 739 int i, i2; … … 741 741 742 742 // Blittable型管理オブジェクトを初期化 743 Smoothie:: Meta::blittableTypes.clear();743 Smoothie::meta.blittableTypes.clear(); 744 744 745 745 // 名前空間管理 … … 858 858 859 859 // Blittable型として登録 860 Smoothie:: Meta::blittableTypes.push_back( BlittableType( blittableType, pClass ) );861 } 862 } 863 } 864 } 865 866 867 void C DBClass::AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,860 Smoothie::meta.blittableTypes.push_back( BlittableType( blittableType, pClass ) ); 861 } 862 } 863 } 864 } 865 866 867 void Classes::AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract, 868 868 bool isVirtual, bool isOverride, char *buffer, int nowLine){ 869 869 int i,i2; … … 987 987 } 988 988 989 BOOL C DBClass::MemberVar_LoopRefCheck(const CClass &objClass){989 BOOL Classes::MemberVar_LoopRefCheck(const CClass &objClass){ 990 990 int i2,bRet=1; 991 991 BOOST_FOREACH( CMember *pMember, objClass.dynamicMembers ){ … … 1010 1010 } 1011 1011 1012 void C DBClass::GetClass_recur(const char *lpszInheritsClass){1012 void Classes::GetClass_recur(const char *lpszInheritsClass){ 1013 1013 extern char *basbuf; 1014 1014 int i,i2,i3,sub_address,top_pos; … … 1461 1461 } 1462 1462 1463 void C DBClass::GetAllClassInfo(void){1463 void Classes::GetAllClassInfo(void){ 1464 1464 //ループ継承チェック用のクラス 1465 1465 pobj_LoopRefCheck=new CLoopRefCheck(); … … 1475 1475 } 1476 1476 1477 void C DBClass::Compile_System_InitializeUserTypes(){1477 void Classes::Compile_System_InitializeUserTypes(){ 1478 1478 char temporary[VN_SIZE]; 1479 1479 … … 1604 1604 1605 1605 1606 CClass *C DBClass::GetStringClassPtr() const1606 CClass *Classes::GetStringClassPtr() const 1607 1607 { 1608 1608 if( !pStringClass ){ … … 1612 1612 return pStringClass; 1613 1613 } 1614 CClass *C DBClass::GetObjectClassPtr() const1614 CClass *Classes::GetObjectClassPtr() const 1615 1615 { 1616 1616 if( !pObjectClass ){ … … 1621 1621 } 1622 1622 1623 void C DBClass::StartCompile( UserProc *pUserProc ){1623 void Classes::StartCompile( UserProc *pUserProc ){ 1624 1624 pCompilingClass = pUserProc->GetParentClassPtr(); 1625 1625 if( pCompilingClass ){ … … 1638 1638 } 1639 1639 } 1640 const CClass *C DBClass::GetNowCompilingClass() const1640 const CClass *Classes::GetNowCompilingClass() const 1641 1641 { 1642 1642 return pCompilingClass; 1643 1643 } 1644 const CMethod *C DBClass::GetNowCompilingMethodInfo(){1644 const CMethod *Classes::GetNowCompilingMethodInfo(){ 1645 1645 return pCompilingMethod; 1646 1646 } … … 1653 1653 ////////////////////// 1654 1654 1655 void C DBClass::Iterator_Init(void){1655 void Classes::Iterator_Init(void){ 1656 1656 if(ppobj_IteClass) HeapDefaultFree(ppobj_IteClass); 1657 1657 … … 1676 1676 } 1677 1677 } 1678 void C DBClass::Iterator_Reset(void){1678 void Classes::Iterator_Reset(void){ 1679 1679 iIteNextNum = 0; 1680 1680 } 1681 BOOL C DBClass::Iterator_HasNext(void){1681 BOOL Classes::Iterator_HasNext(void){ 1682 1682 if(iIteNextNum<iIteMaxNum) return 1; 1683 1683 return 0; 1684 1684 } 1685 CClass *C DBClass::Iterator_GetNext(void){1685 CClass *Classes::Iterator_GetNext(void){ 1686 1686 CClass *pobj_c; 1687 1687 pobj_c=ppobj_IteClass[iIteNextNum]; … … 1689 1689 return pobj_c; 1690 1690 } 1691 int C DBClass::Iterator_GetMaxCount(void){1691 int Classes::Iterator_GetMaxCount(void){ 1692 1692 return iIteMaxNum; 1693 1693 } -
trunk/abdev/BasicCompiler_Common/Class.h
r141 r159 9 9 #include "Procedure.h" 10 10 11 class C DBClass;11 class Classes; 12 12 class CDebugSection; 13 13 class CClass; … … 35 35 { 36 36 friend CMember; 37 friend C DBClass;37 friend Classes; 38 38 friend CDebugSection; 39 39 … … 234 234 235 235 #define MAX_CLASS_HASH 65535 236 class C DBClass{236 class Classes{ 237 237 int hash(const char *name) const; 238 238 void DestroyClass(CClass *pobj_c); … … 240 240 CClass *pobj_ClassHash[MAX_CLASS_HASH]; 241 241 242 C DBClass();243 ~C DBClass();242 Classes(); 243 ~Classes(); 244 244 245 245 const CClass *Find( const string &fullName ) const; … … 301 301 302 302 303 extern C DBClass *pobj_DBClass;303 extern Classes *pobj_DBClass; 304 304 extern const CClass *pobj_CompilingClass; -
trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp
r141 r159 115 115 116 116 //イテレータをリセット 117 extern C DBClass *pobj_DBClass;117 extern Classes *pobj_DBClass; 118 118 pobj_DBClass->Iterator_Reset(); 119 119 … … 136 136 // TypeDef情報 137 137 ////////////////// 138 *(long *)(buffer+i2)=(int)Smoothie:: Meta::typeDefs.size();139 i2+=sizeof(long); 140 for(i3=0;i3<(int)Smoothie:: Meta::typeDefs.size();i3++){141 lstrcpy(buffer+i2,Smoothie:: Meta::typeDefs[i3].GetName().c_str() );142 i2+=lstrlen(buffer+i2)+1; 143 144 lstrcpy(buffer+i2,Smoothie:: Meta::typeDefs[i3].GetBaseName().c_str() );138 *(long *)(buffer+i2)=(int)Smoothie::meta.typeDefs.size(); 139 i2+=sizeof(long); 140 for(i3=0;i3<(int)Smoothie::meta.typeDefs.size();i3++){ 141 lstrcpy(buffer+i2,Smoothie::meta.typeDefs[i3].GetName().c_str() ); 142 i2+=lstrlen(buffer+i2)+1; 143 144 lstrcpy(buffer+i2,Smoothie::meta.typeDefs[i3].GetBaseName().c_str() ); 145 145 i2+=lstrlen(buffer+i2)+1; 146 146 … … 482 482 /////////////////////////////////////////// 483 483 484 this->pobj_DBClass=new C DBClass();484 this->pobj_DBClass=new Classes(); 485 485 486 486 int iMaxClassCount; … … 494 494 } 495 495 496 extern C DBClass *pobj_DBClass;496 extern Classes *pobj_DBClass; 497 497 pobj_DBClass=this->pobj_DBClass; 498 498 … … 503 503 504 504 //初期化 505 Smoothie:: Meta::typeDefs.clear();505 Smoothie::meta.typeDefs.clear(); 506 506 507 507 //個数を取得 … … 513 513 514 514 // 名前空間に未対応 515 Smoothie:: Meta::typeDefs.push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2 ) );515 Smoothie::meta.typeDefs.push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2 ) ); 516 516 517 517 i2+=lstrlen(buffer+i2)+1; … … 943 943 944 944 // クラス情報 945 extern C DBClass *pobj_DBClass;945 extern Classes *pobj_DBClass; 946 946 pobj_DBClass=this->pobj_DBClass; 947 947 -
trunk/abdev/BasicCompiler_Common/DebugSection.h
r100 r159 32 32 33 33 // クラス情報 34 C DBClass *pobj_DBClass;34 Classes *pobj_DBClass; 35 35 36 36 //定数を取得 -
trunk/abdev/BasicCompiler_Common/Diagnose.cpp
r135 r159 63 63 64 64 // イテレータをリセット 65 extern C DBClass *pobj_DBClass;65 extern Classes *pobj_DBClass; 66 66 pobj_DBClass->Iterator_Reset(); 67 67 … … 103 103 104 104 // イテレータをリセット 105 extern C DBClass *pobj_DBClass;105 extern Classes *pobj_DBClass; 106 106 pobj_DBClass->Iterator_Reset(); 107 107 -
trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp
r135 r159 323 323 Type leftType; 324 324 if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){ 325 if( isClassName == false && Smoothie:: Meta::blittableTypes.IsExist( leftType ) ){325 if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){ 326 326 // 左側のオブジェクト部分がBlittable型のとき 327 327 … … 329 329 lstrcpy( temporary, termLeft ); 330 330 sprintf( termLeft, "%s(%s)", 331 Smoothie:: Meta::blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),331 Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(), 332 332 temporary ); 333 333 -
trunk/abdev/BasicCompiler_Common/Subroutine.cpp
r143 r159 199 199 GetVarType(fullCallName,type,false); 200 200 201 ProcPointer *pProcPtr = Smoothie:: Meta::procPointers[type.GetIndex()];201 ProcPointer *pProcPtr = Smoothie::meta.procPointers[type.GetIndex()]; 202 202 resultType = pProcPtr->ReturnType(); 203 203 … … 869 869 pProcPointer->SetParamsAndReturnType( paramStr.c_str(), nowLine ); 870 870 871 Smoothie:: Meta::procPointers.push_back( pProcPointer );872 873 return (int)Smoothie:: Meta::procPointers.size()-1;871 Smoothie::meta.procPointers.push_back( pProcPointer ); 872 873 return (int)Smoothie::meta.procPointers.size()-1; 874 874 } 875 875 void DeleteProcPtrInfo(void){ 876 BOOST_FOREACH( ProcPointer *pProcPointer, Smoothie:: Meta::procPointers ){876 BOOST_FOREACH( ProcPointer *pProcPointer, Smoothie::meta.procPointers ){ 877 877 delete pProcPointer; 878 878 } 879 879 880 Smoothie:: Meta::procPointers.clear();880 Smoothie::meta.procPointers.clear(); 881 881 } 882 882 -
trunk/abdev/BasicCompiler_Common/Type.cpp
r140 r159 102 102 // TypeDefされた型 103 103 //////////////////// 104 int i=Smoothie:: Meta::typeDefs.GetIndex( typeName );104 int i=Smoothie::meta.typeDefs.GetIndex( typeName ); 105 105 if(i!=-1){ 106 type = Smoothie:: Meta::typeDefs[i].GetBaseType();106 type = Smoothie::meta.typeDefs[i].GetBaseType(); 107 107 return true; 108 108 } … … 502 502 } 503 503 else{ 504 if( Smoothie:: Meta::procPointers[index]->ReturnType().IsNull() ){504 if( Smoothie::meta.procPointers[index]->ReturnType().IsNull() ){ 505 505 return "*Sub"; 506 506 } -
trunk/abdev/BasicCompiler_Common/VariableOpe.cpp
r140 r159 220 220 if(lpIndex==-1) lstrcpy(name,"VoidPtr"); 221 221 else{ 222 if( Smoothie:: Meta::procPointers[lpIndex]->ReturnType().IsNull() )222 if( Smoothie::meta.procPointers[lpIndex]->ReturnType().IsNull() ) 223 223 lstrcpy(name,"*Sub"); 224 224 else lstrcpy(name,"*Function"); … … 645 645 // 名前空間を分離 646 646 char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE]; 647 Smoothie:: Meta::namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );647 Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName ); 648 648 649 649 // 先頭オブジェクトまたはクラス名と入れ子メンバに分割 … … 738 738 } 739 739 740 int typeDefIndex = Smoothie:: Meta::typeDefs.GetIndex( VarName );740 int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName ); 741 741 if( typeDefIndex != -1 ){ 742 742 // TypeDef後の型名だったとき 743 lstrcpy( VarName, Smoothie:: Meta::typeDefs[typeDefIndex].GetBaseName().c_str() );743 lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() ); 744 744 } 745 745 -
trunk/abdev/BasicCompiler_Common/include/Smoothie.h
r143 r159 2 2 3 3 #include "Source.h" 4 #include "../TypeDef.h" 5 #include "Namespace.h" 4 #include "ObjectModule.h" 6 5 7 6 class Smoothie{ … … 33 32 }; 34 33 35 // プロジェクト中に存在するメタ情報36 class Meta{37 public:38 // 名前空間39 static NamespaceScopesCollection namespaceScopesCollection;40 41 // クラス42 43 // TypeDef44 static TypeDefCollection typeDefs;45 46 // 関数ポインタ47 static vector<ProcPointer *> procPointers;48 49 // blittable型50 static BlittableTypes blittableTypes;51 };52 53 34 // コンパイル中に一時的に利用する 54 35 class Temp{ … … 58 39 }; 59 40 41 // プロジェクト中に存在するメタ情報 42 static Meta meta; 43 60 44 static bool isFullCompile; 61 45 }; -
trunk/abdev/BasicCompiler_Common/src/Member.cpp
r138 r159 57 57 58 58 //イテレータをリセット 59 extern C DBClass *pobj_DBClass;59 extern Classes *pobj_DBClass; 60 60 pobj_DBClass->Iterator_Reset(); 61 61 -
trunk/abdev/BasicCompiler_Common/src/Namespace.cpp
r143 r159 103 103 void NamespaceScopesCollection::Imports( const string &namespaceStr ){ 104 104 NamespaceScopes namespaceScopes( namespaceStr ); 105 if( !Smoothie:: Meta::namespaceScopesCollection.IsExist( namespaceScopes ) ){105 if( !Smoothie::meta.namespaceScopesCollection.IsExist( namespaceScopes ) ){ 106 106 SetError(64,namespaceStr.c_str(),cp ); 107 107 return; -
trunk/abdev/BasicCompiler_Common/src/Smoothie.cpp
r143 r159 19 19 NamespaceScopes Smoothie::Lexical::liveingNamespaceScopes; 20 20 21 TypeDefCollection Smoothie::Meta::typeDefs; 22 vector<ProcPointer *> Smoothie::Meta::procPointers; 23 NamespaceScopesCollection Smoothie::Meta::namespaceScopesCollection; 21 Meta Smoothie::meta; 24 22 NamespaceScopesCollection Smoothie::Temp::importedNamespaces; 25 BlittableTypes Smoothie::Meta::blittableTypes;26 23 27 24 bool Smoothie::isFullCompile = false;
Note:
See TracChangeset
for help on using the changeset viewer.
