Changeset 332 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Sep 27, 2007, 3:37:06 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• BasicCompiler.h (modified) (1 diff)
• Intermediate_Step1.cpp (modified) (1 diff)
• Subroutine.cpp (modified) (1 diff)
• include/Type.h (modified) (1 diff)
• src/Type.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/BasicCompiler.h

@@ -61 +61 @@
 
 
+//デリゲートのベース タイプ インデックス（コンストラクトされるデリゲートのパラメータを参考に、オーバーロードを解決）
+const Delegate *pConstructingDelegate;
+
+
 int cp;
 

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -8 +8 @@
 #include "../BasicCompiler_Common/common.h"
 
-void ChangeReturnCode(char *buffer){
+void ChangeReturnCode(char *buffer)
+{
+    int i;
+
+    bool isMustChange = false;
+    for( i=0; ; i++ ){
+        if( buffer[i] == '\0' ){
+            break;
+        }
+        if( buffer[i]=='\n' )
+        {
+            if( i>0 )
+            {
+                if( buffer[i-1] == '\r' )
+                {
+                    isMustChange = true;
+                }
+            }
+        }
+    }
+
+    if( !isMustChange )
+    {
+        // 改行コードの変換は必要ない
+        return;
+    }
 
 #ifdef _DEBUG

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -77 +77 @@
     }
 
-    if( type.IsObject() && type.GetClass().IsDelegate() )
+    if( type.IsDelegate() )
     {
         // デリゲート

trunk/abdev/BasicCompiler_Common/include/Type.h

@@ -188 +188 @@
     bool IsVoidPtr() const;
     bool IsAny() const;
+    bool IsDelegate() const;
 
     // オブジェクトや構造体など、メンバを持つ型かどうかを判別する

trunk/abdev/BasicCompiler_Common/src/Type.cpp

@@ -442 +442 @@
     }
     return false;
+}
+
+bool Type::IsDelegate() const
+{
+    return ( IsObject() && GetClass().IsDelegate() );
 }