Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Delegate.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_Delegate.cpp (modified) (6 diffs)

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

@@ -5 +5 @@
 void LexicalAnalyzer::CollectDelegates( const char *source, Delegates &delegates )
 {
-    int i2;
-    char temporary[VN_SIZE];
-
     // 名前空間管理
     NamespaceScopes &namespaceScopes = compiler.GetNamespaceSupporter().GetLivingNamespaceScopes();
@@ -15 +12 @@
     compiler.GetNamespaceSupporter().ClearImportedNamespaces();
 
-    int length = lstrlen( source );
-    for( int i=0; i<length; i++ )
+    for (int i=0; source[i] != '\0'; i++)
     {
         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;
@@ -42 +37 @@
         }
         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);
             }
 
@@ -112 +107 @@
                 {
                     compiler.errorMessenger.Output(-104,name,nowLine);
-                    lstrcpy( returnTypeName, "Double" );
+                    strcpy( returnTypeName, "Double" );
                 }
             }
@@ -127 +122 @@
     Jenga::Common::SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" );
 
-    delegates.Iterator_Reset();
-    while( delegates.Iterator_HasNext() )
-    {
-        const Delegate &dg = *delegates.Iterator_GetNext();
+    foreach (auto pDelegate, delegates)
+    {
+        const Delegate &dg = *pDelegate;
 
         if( dg.IsExternal() )
@@ -263 +257 @@
 void LexicalAnalyzer::RefleshDelegatesParameterAndReturnType( Delegates &delegates )
 {
-    delegates.Iterator_Reset();
-    while( delegates.Iterator_HasNext() )
-    {
-        Delegate &dg = *delegates.Iterator_GetNext();
-        RefleshDelegateParameterAndReturnType( dg );
-    }
-}
+    foreach (auto *pDelegate, delegates)
+    {
+        RefleshDelegateParameterAndReturnType(*pDelegate);
+    }
+}