Changeset 552 in dev for trunk

Timestamp:

May 5, 2008, 12:53:13 AM (17 years ago)

Author:

dai_9181

Message:

LexicalAnalyzerクラスでBasicSourceクラスを使用しないようにした。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/include/LexicalAnalyzer.h (modified) (1 diff)
• BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp (modified) (5 diffs)
• BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp (modified) (1 diff)
• compiler_x86/MakePeHdr.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

@@ -54 +54 @@
     // グローバルプロシージャを収集する
     static UserProc* ParseUserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic, char *interfaceName = NULL );
-    static void CollectProcedures( const BasicSource &source, UserProcs &userProcs, DllProcs &dllProcs );
+    static void CollectProcedures( const char *source, UserProcs &userProcs, DllProcs &dllProcs );
 
     // デリゲートを収集する
-    static void CollectDelegates( const BasicSource &source, Delegates &delegates );
+    static void CollectDelegates( const char *source, Delegates &delegates );
     static std::string GenerateDelegatesSourceCode( const Delegates &delegates );
     static void RefleshDelegatesParameterAndReturnType( Delegates &delegates );

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

@@ -3 +3 @@
 using namespace ActiveBasic::Compiler;
 
-void LexicalAnalyzer::CollectDelegates( const BasicSource &source, Delegates &delegates )
+void LexicalAnalyzer::CollectDelegates( const char *source, Delegates &delegates )
 {
     int i2;
@@ -16 +16 @@
     importedNamespaces.clear();
 
-    for( int i=0; i<source.GetLength(); i++ )
+    int length = lstrlen( source );
+    for( int i=0; i<length; i++ )
     {
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
@@ -81 +82 @@
             // 名前
             char name[VN_SIZE];
-            GetIdentifierToken( name, source.GetBuffer(), i );
+            GetIdentifierToken( name, source, i );
 
             if( source[i] != '(' )
@@ -91 +92 @@
             // パラメータ文字列
             char paramStr[8192];
-            i += GetStringInPare( paramStr, source.GetBuffer() + i, true );
+            i += GetStringInPare( paramStr, source + i, true );
 
             // 戻り値の型の文字列
@@ -98 +99 @@
             {
                 i += 2;
-                GetCommandToken( returnTypeName, source.GetBuffer(), i );
+                GetCommandToken( returnTypeName, source, i );
 
                 if( procKind != Procedure::Function )

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

@@ -177 +177 @@
 }
 
-void LexicalAnalyzer::CollectProcedures( const BasicSource &source, UserProcs &userProcs, DllProcs &dllProcs )
+void LexicalAnalyzer::CollectProcedures( const char *source, UserProcs &userProcs, DllProcs &dllProcs )
 {
     extern HANDLE hHeap;

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -163 +163 @@
     {
         ActiveBasic::Compiler::LexicalAnalyzer::CollectDelegates(
-            compiler.GetObjectModule().GetCurrentSource(),
+            compiler.GetObjectModule().GetCurrentSource().GetBuffer(),
             compiler.GetObjectModule().meta.GetDelegates()
         );
@@ -208 +208 @@
     compiler.SetCompilingClass( NULL );
     ActiveBasic::Compiler::LexicalAnalyzer::CollectProcedures(
-        compiler.GetObjectModule().GetCurrentSource(),
+        compiler.GetObjectModule().GetCurrentSource().GetBuffer(),
         compiler.GetObjectModule().meta.GetUserProcs(),
         compiler.GetObjectModule().meta.GetDllProcs()