Changeset 505 in dev for trunk/ab5.0/abdev/ab_common

Timestamp:

Apr 28, 2008, 7:28:47 PM (17 years ago)

Author:

dai_9181

Message:

NamespaceScopes、NamespaceScopesCollectionクラスをab_commonプロジェクトに移動した。

Location:

trunk/ab5.0/abdev/ab_common

Files:

• ab_common.vcproj (modified) (6 diffs)
• include (added)
• include/Namespace.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/Namespace.h ) (6 diffs)
• src (added)
• src/Namespace.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/Namespace.cpp ) (1 diff)
• stdafx.h (modified) (2 diffs)

trunk/ab5.0/abdev/ab_common/ab_common.vcproj

@@ -41 +41 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
-                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;include"
                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                 MinimalRebuild="true"
@@ -104 +104 @@
             <Tool
                 Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                 RuntimeLibrary="0"
@@ -165 +165 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
-                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;include"
                 PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
                 MinimalRebuild="true"
@@ -228 +228 @@
             <Tool
                 Name="VCCLCompilerTool"
-                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                 RuntimeLibrary="0"
@@ -313 +313 @@
                 </FileConfiguration>
             </File>
+            <Filter
+                Name="Lexical"
+                >
+                <File
+                    RelativePath=".\include\Namespace.h"
+                    >
+                </File>
+            </Filter>
         </Filter>
         <Filter
@@ -327 +335 @@
                 >
             </File>
+            <Filter
+                Name="Lexical"
+                >
+                <File
+                    RelativePath=".\src\Namespace.cpp"
+                    >
+                </File>
+            </Filter>
         </Filter>
         <Filter

trunk/ab5.0/abdev/ab_common/include/Namespace.h

@@ -5 +5 @@
 #include <boost/foreach.hpp>
 
-#include <BoostSerializationSupport.h>
 
-using namespace std;
+namespace ActiveBasic{ namespace Common{ namespace Lexical{
 
-class NamespaceScopes : public vector<string>
+
+class NamespaceScopes : public std::vector<std::string>
 {
     // XMLシリアライズ用
@@ -22 +22 @@
 public:
     NamespaceScopes(){}
-    NamespaceScopes( const string &namespaceStr );
+    NamespaceScopes( const std::string &namespaceStr );
     ~NamespaceScopes(){}
 
-    string ToString() const
+    std::string ToString() const
     {
-        string namespaceStr;
-        const vector<string> &me = *this;
+        std::string namespaceStr;
+        const std::vector<std::string> &me = *this;
 
         bool isFirst = true;
-        BOOST_FOREACH( const string &itemStr, me ){
+        BOOST_FOREACH( const std::string &itemStr, me ){
             if( isFirst ){
                 isFirst = false;
@@ -45 +45 @@
 
     // 等しいかをチェック
-    bool IsEqual( const string &name ) const
+    bool IsEqual( const std::string &name ) const
     {
         if( ToString() == name ){
@@ -82 +82 @@
 };
 
-class NamespaceScopesCollection : public vector<NamespaceScopes>
+class NamespaceScopesCollection : public std::vector<NamespaceScopes>
 {
     // XMLシリアライズ用
@@ -103 +103 @@
         return false;
     }
-    bool IsExist( const string &namespaceStr ) const
+    bool IsExist( const std::string &namespaceStr ) const
     {
         return IsExist( NamespaceScopes( namespaceStr ) );
@@ -123 +123 @@
     void SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const;
 };
+
+
+}}}

trunk/ab5.0/abdev/ab_common/src/Namespace.cpp

@@ -4 +4 @@
 
 
-NamespaceScopes::NamespaceScopes( const string &namespaceStr ){
+using namespace ActiveBasic::Common::Lexical;
+
+
+NamespaceScopes::NamespaceScopes( const std::string &namespaceStr ){
     if( namespaceStr.size() == 0 ){
         return;
     }
 
-    string::size_type i = 0;
+    std::string::size_type i = 0;
     while( true ){
-        string::size_type i2 = namespaceStr.find( '.', i );
+        std::string::size_type i2 = namespaceStr.find( '.', i );
 
-        string tempName = namespaceStr.substr( i, i2-i );
+        std::string tempName = namespaceStr.substr( i, i2-i );
 
         push_back( tempName );
 
-        if( i2 == string::npos ){
+        if( i2 == std::string::npos ){
             break;
         }

trunk/ab5.0/abdev/ab_common/stdafx.h

@@ -21 +21 @@
 //boost libraries
 #include <boost/foreach.hpp>
+#include <boost/serialization/serialization.hpp>
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/export.hpp>
 
 #include <jenga/include/common/CmdLine.h>
@@ -29 +32 @@
 
 #include "Environment.h"
+
+#include <Namespace.h>