Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp (modified) (3 diffs)

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

@@ -3 +3 @@
 using namespace ActiveBasic::Compiler;
 
-bool LexicalAnalyzer::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )
+using boost::numeric_cast;
+
+bool LexicalAnalyzer::CollectNamespaces(char const* source, NamespaceScopesCollection &namespaceScopesCollection)
 {
-    int i, i2;
-    char temporary[1024];
-
     bool isSuccessful = true;
 
@@ -13 +12 @@
     NamespaceScopes namespaceScopes;
 
-    for(i=0;;i++){
+    for (int i = 0; ; i++)
+    {
         if(source[i]=='\0') break;
 
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
             }
-            namespaceScopes.push_back( temporary );
+            namespaceScopes.push_back(std::string(p, &source[i]));
 
             if( !namespaceScopesCollection.IsExist( namespaceScopes ) ){
@@ -46 +45 @@
     }
 
-    if( namespaceScopes.size() > 0 ){
+    if( !namespaceScopes.empty() ){
         compiler.errorMessenger.Output( 63, NULL, cp );
         isSuccessful = false;