Changeset 735 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

Aug 25, 2008, 5:26:44 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

改行コード変換などを高速化

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• Intermediate_Step1.cpp (modified) (10 diffs)
• src/Compiler.cpp (modified) (2 diffs)
• src/LexicalAnalyzer_Delegate.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -7 +7 @@
 void ChangeReturnCode(char *buffer)
 {
-    int i;
-
     bool isMustChange = false;
-    for( i=0; ; i++ ){
+    for( int i=0; ; i++ ){
         if( buffer[i] == '\0' ){
             break;
@@ -53 +51 @@
 #endif
 
-    //改行コードのCRLFをLFに変換
-    for(int i=0,i2=0;;i++,i2++){
-        if(buffer[i]=='\r'&&buffer[i+1]=='\n') i++;
-        buffer[i2]=buffer[i];
-        if(buffer[i]=='\0') break;
-    }
+    ChangeReturnCodeImpl(buffer);
 }
 void DeleteComment(char *buffer){   //注釈「'」の取り除き
     int i,i2,i3,IsStr;
-    char *temporary;
-    temporary=(char *)GlobalAlloc(GMEM_FIXED,lstrlen(buffer)+1);
+    char *temporary=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,lstrlen(buffer)+1);
     for(i=0,i2=0,i3=0,IsStr=0;;i++,i2++){
         if(buffer[i]=='\"') IsStr^=1;
         if(buffer[i]=='\n'||buffer[i]=='\0'){
-            i2--;
-            while(temporary[i2]==' '||temporary[i2]=='\t') i2--;
-            i2++;
+            if(i2 > 0){
+                i2--;
+                while(temporary[i2]==' '||temporary[i2]=='\t') i2--;
+                i2++;
+            }
 
             if(i3){
@@ -105 +99 @@
     }
     lstrcpy(buffer,temporary);
-    GlobalFree(temporary);
+    HeapDefaultFree(temporary);
 }
 void CheckParenthesis(char *buffer){
@@ -237 +231 @@
     return 1;
 }
+
+inline int FindLineEnd(char const *basbuf, int i2){
+    for(;;i2++){
+        if(basbuf[i2]=='\n'||basbuf[i2]=='\0') break;
+    }
+    return i2;
+}
+
 void DirectiveCheck(void){
     extern char *basbuf;
@@ -273 +275 @@
                 compiler.staticLibraryFilePaths.push_back( temporary );
 
-                for(;;i2++){
-                    if(basbuf[i2]=='\n'||basbuf[i2]=='\0') break;
-                }
+                i2 = FindLineEnd(basbuf, i2);
                 SlideString(basbuf+i2,i-i2);
             }
@@ -284 +284 @@
                 compiler.SetCoreMark( true );
 
-                for(;;i2++){
-                    if(basbuf[i2]=='\n'||basbuf[i2]=='\0') break;
-                }
+                i2 = FindLineEnd(basbuf, i2);
                 SlideString(basbuf+i2,i-i2);
             }
@@ -292 +290 @@
                 //#noprompt
                 //旧機能なので、無視
-                for(;;i2++){
-                    if(basbuf[i2]=='\n'||basbuf[i2]=='\0') break;
-                }
+                i2 = FindLineEnd(basbuf, i2);
                 SlideString(basbuf+i2,i-i2);
             }
@@ -300 +296 @@
                 //#strict
                 //旧機能なので、無視
-                for(;;i2++){
-                    if(basbuf[i2]=='\n'||basbuf[i2]=='\0') break;
-                }
+                i2 = FindLineEnd(basbuf, i2);
                 SlideString(basbuf+i2,i-i2);
             }
@@ -308 +302 @@
                 //#struct code
                 //旧機能なので、無視
-                for(;;i2++){
-                    if(basbuf[i2]=='\n'||basbuf[i2]=='\0') break;
-                }
+                i2 = FindLineEnd(basbuf, i2);
                 SlideString(basbuf+i2,i-i2);
             }
@@ -332 +324 @@
                 lstrcpy(ResourceFileName,temporary);
 
-                for(;;i2++){
-                    if(basbuf[i2]=='\n'||basbuf[i2]=='\0') break;
-                }
+                i2 = FindLineEnd(basbuf, i2);
                 SlideString(basbuf+i2,i-i2);
             }

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

@@ -346 +346 @@
         tempType.PtrLevelDown();
 
-        return (std::string)"*" + TypeToString( tempType );
+        return '*' + TypeToString( tempType );
     }
     else if( type.IsObject() || type.IsStruct() )
@@ -370 +370 @@
                     if( actualGenericTypesName.size() )
                     {
-                        actualGenericTypesName += ",";
+                        actualGenericTypesName += ',';
                     }
                     actualGenericTypesName += typeParameter.ToString();
                 }
 
-                result += "<" + actualGenericTypesName + ">";
+                result += '<' + actualGenericTypesName + '>';
             }
 

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

@@ -142 +142 @@
         if( dg.GetNamespaceScopes().size() )
         {
-            std::string namespaceScopesCommandStr = "";
-            std::string endNamespaceScopesCommandStr = "";
+            std::string namespaceScopesCommandStr;
+            std::string endNamespaceScopesCommandStr;
             BOOST_FOREACH( const std::string &namespaceStr, dg.GetNamespaceScopes() )
             {
                 if( namespaceScopesCommandStr.size() )
                 {
-                    namespaceScopesCommandStr += ":";
-                    endNamespaceScopesCommandStr += ":";
+                    namespaceScopesCommandStr += ':';
+                    endNamespaceScopesCommandStr += ':';
                 }
                 namespaceScopesCommandStr += "Namespace " + namespaceStr;