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

Timestamp:

Mar 19, 2012, 1:59:48 AM (13 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_Class.cpp (modified) (6 diffs)

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

@@ -15 +15 @@
 void LexicalAnalyzer::CollectClassesForNameOnly( const char *source, Classes &classes )
 {
-    int i, i2;
+    int i2;
     char temporary[VN_SIZE];
 
@@ -25 +25 @@
     compiler.GetNamespaceSupporter().ClearImportedNamespaces();
 
-    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];
-            }
-            namespaceScopes.push_back( temporary );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            namespaceScopes.push_back(std::string(p, &source[i]));
 
             continue;
@@ -52 +51 @@
         }
         else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
-            {
-                compiler.errorMessenger.Output(64,temporary,i );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            std::string s(p, &source[i]);
+            if (!compiler.GetNamespaceSupporter().ImportsNamespace(s))
+            {
+                compiler.errorMessenger.Output(64, s.c_str(), i);
             }
 
@@ -1348 +1347 @@
     delete pobj_LoopRefCheck;
     pobj_LoopRefCheck=0;
-
-    // イテレータの準備
-    classes.Iterator_Init();
 }
 
@@ -1412 +1408 @@
 
     compiler.GetObjectModule().meta.GetUserProcs().Put( pUserProc );
-    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Init();
 
     LexicalAnalyzer::AddMethod(
@@ -1522 +1517 @@
         else
         {
-            for( int i=0; i<pInterface->GetDynamicMethods().size(); i++ )
+            for( std::size_t i=0; i<pInterface->GetDynamicMethods().size(); i++ )
             {
                 if( pInterface->GetDynamicMethods()[i]->IsAbstract() != pExpandedInterface->GetDynamicMethods()[i]->IsAbstract() )