Changeset 531 in dev for trunk/ab5.0/abdev

Timestamp:

May 2, 2008, 2:56:06 PM (17 years ago)

Author:

dai_9181

Message:

SourceTemplateクラスをLexicalAnalyzerクラスのインナークラスにした

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/LexicalAnalyzer.h (modified) (1 diff)
• include/Source.h (modified) (1 diff)
• src/LexicalAnalyzer.cpp (modified) (1 diff)
• src/Source.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

@@ -6 +6 @@
 class LexicalAnalyzer
 {
+    class SourceTemplate
+    {
+        std::string source;
+    public:
+        SourceTemplate( const std::string &filePath );
+        ~SourceTemplate()
+        {
+        }
+
+        std::string GetResult( const std::map<std::string,std::string> &values );
+    };
+
 public:
 

trunk/ab5.0/abdev/BasicCompiler_Common/include/Source.h

@@ -252 +252 @@
 };
 typedef std::vector<BasicSource> BasicSources;
-
-class SourceTemplate
-{
-    std::string source;
-public:
-    SourceTemplate( const std::string &filePath );
-    ~SourceTemplate()
-    {
-    }
-
-    std::string GetResult( const std::map<std::string,std::string> &values );
-};

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp

@@ -2 +2 @@
 
 using namespace ActiveBasic::Compiler;
+
+LexicalAnalyzer::SourceTemplate::SourceTemplate( const std::string &filePath )
+{
+    Jenga::Common::File file = Jenga::Common::File( GetApplicationBaseFullPath( filePath ) );
+    source = file.Read();
+}
+std::string LexicalAnalyzer::SourceTemplate::GetResult( const std::map<std::string,std::string> &values )
+{
+    std::string result = source;
+
+    std::map<std::string,std::string>::const_iterator it = values.begin();
+    while( it != values.end() )
+    {
+        while( true )
+        {
+            std::string::size_type index = result.find( it->first );
+            if( index == std::string::npos )
+            {
+                break;
+            }
+
+            result = result.substr( 0, index ) + it->second + result.substr( index + it->first.length() );
+        }
+        it++;
+    }
+
+    return result;
+}
+
 
 bool LexicalAnalyzer::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )

trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp

@@ -1023 +1023 @@
     return 1;
 }
-
-
-SourceTemplate::SourceTemplate( const std::string &filePath )
-{
-    Jenga::Common::File file = Jenga::Common::File( GetApplicationBaseFullPath( filePath ) );
-    source = file.Read();
-}
-std::string SourceTemplate::GetResult( const std::map<std::string,std::string> &values )
-{
-    std::string result = source;
-
-    std::map<std::string,std::string>::const_iterator it = values.begin();
-    while( it != values.end() )
-    {
-        while( true )
-        {
-            std::string::size_type index = result.find( it->first );
-            if( index == std::string::npos )
-            {
-                break;
-            }
-
-            result = result.substr( 0, index ) + it->second + result.substr( index + it->first.length() );
-        }
-        it++;
-    }
-
-    return result;
-}