Changeset 735 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp (modified) (9 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp

@@ -6 +6 @@
 
 class CDefine{
-    std::vector<std::string> names;
+    stdext::hash_set<std::string> names;
 public:
-    void Free();
+//  void Free();
     void Init( bool isDebug, bool isDll, bool isUnicode, int majorVer );
 
-    BOOL add(char const *name);
-    BOOL undef(char const *name);
-    BOOL check(char const *name);
+    bool add(char const *name);
+    bool undef(char const *name);
+    bool check(char const *name);
     void preprocessor_ifdef(char *buffer,bool isNot);
     void DirectiveIfdef(char *buffer);
@@ -84 +84 @@
     add(temporary);
 }
-BOOL CDefine::add(char const *name)
+bool CDefine::add(char const *name)
 {
-    //重複チェック
-    if(check(name)) return 0;
-
-    //追加
-    names.push_back( name );
-
-    return 1;
-}
-BOOL CDefine::undef(char const *name){
-    std::vector<std::string>::iterator i = names.begin();
-    BOOST_FOREACH( const std::string &temp, names ){
-        if( temp == name ){
-            names.erase( i );
-            return 1;
-        }
-        i++;
-    }
-
-    return 0;
-}
-BOOL CDefine::check(char const *name){
-
-    //重複チェック
-    BOOST_FOREACH( const std::string &temp, names ){
-        if( temp == name ){
-            return 1;
-        }
-    }
-    return 0;
+    return names.insert(name).second;
+}
+bool CDefine::undef(char const *name){
+    return names.erase(name) > 0;
+}
+bool CDefine::check(char const *name){
+    return names.find(name) != names.end();
 }
 
@@ -167 +145 @@
 
     //#ifdefの行を消去
-    Text::SlideString(buffer+i,-i);
-    i=0;
+    memset(buffer,' ',static_cast<size_t>(i));
 
     BOOL bElse=0;
@@ -304 +281 @@
                     temporary[i3]=buffer[i2];
                 }
-
                 add(temporary);
-
-                i2-=i;
-
                 //ディレクティブを消去
-                Text::SlideString(buffer+i+i2,-i2);
+                memset(buffer+i,' ',static_cast<size_t>(i2-i));
+                i=i2;
             }
             if(memicmp(buffer+i,"#undef",6)==0){
-                i2=i+7;
+                i2=i+6;
                 while(buffer[i2]==' '||buffer[i2]=='\t') i2++;
 
@@ -323 +297 @@
                     temporary[i3]=buffer[i2];
                 }
-
                 undef(temporary);
-
-                i2-=i;
-
                 //ディレクティブを消去
-                Text::SlideString(buffer+i+i2,-i2);
+                memset(buffer+i,' ',static_cast<size_t>(i2-i));
+                i=i2;
             }
             else if(memicmp(buffer+i,"#ifdef",6)==0){
@@ -367 +338 @@
 
     return true;
+}
+
+//改行コードのCRLFをLFに変換
+int ChangeReturnCodeImpl(char *buffer)
+{
+    int i;
+    for(i=0;buffer[i]!='\0';i++){
+        if(buffer[i]=='\r'&&buffer[i+1]=='\n'){
+            buffer[i]=' ';
+        }
+    }
+    return i;
 }
 
@@ -418 +401 @@
 #endif
 
-    //改行コードのCRLFをLFに変換
-    for(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);
 
     length = i;
@@ -471 +449 @@
         if(buffer[i]=='\0') break;
     }
-    strcpy(buffer,temporary);
+    std::swap(buffer,temporary);
     free(temporary);
 }
@@ -683 +661 @@
     //カッコ'('直下の改行
     while(buffer[0]=='\n'){
-        Text::SlideString(buffer+1,-1);
+        buffer[0]=' ';
         (*pRnum)++;
     }