Changeset 331 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Sep 27, 2007, 1:47:46 AM (17 years ago)

Author:

dai_9181

Message:

AddressOfの左辺値を加味した処理を簡潔にした

Location:

trunk/abdev/BasicCompiler_Common

Files:

• BasicCompiler.h (modified) (1 diff)
• NumOpe_GetType.cpp (modified) (5 diffs)
• Object.cpp (modified) (2 diffs)
• Subroutine.cpp (modified) (3 diffs)
• common.h (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/BasicCompiler.h

@@ -61 +61 @@
 
 
-//関数ポインタのベース タイプ インデックス（左辺の関数ポインタのパラメータを参考に、オーバーロードを解決）
-LONG_PTR ProcPtr_BaseIndex;
-
-
 int cp;
 

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -301 +301 @@
 }
 
-bool GetTermType( const char *term, Type &resultType, bool &isLiteral, bool *pIsClassName )
+bool GetTermType( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, bool *pIsClassName )
 {
     char parameter[VN_SIZE];
@@ -330 +330 @@
         bool isClassName = false;
         Type leftType;
-        if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
+        if( GetTermType( termLeft, Type(), leftType, isLiteral, &isClassName ) ){
             if( isClassName == false && compiler.GetObjectModule().meta.GetBlittableTypes().IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
@@ -340 +340 @@
                     temporary );
 
-                if( !GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
+                if( !GetTermType( termLeft, Type(), leftType, isLiteral, &isClassName ) ){
                     goto globalArea;
                 }
@@ -446 +446 @@
             ////////////////
 
-            if( !CallProc(idProc,pProc,procName,parameter, resultType, false ) ){
+            if( !CallProc(idProc,pProc,procName,parameter, baseType, resultType, false ) ){
                 return false;
             }
@@ -716 +716 @@
 
                     bool isLiteral = true;
-                    if( GetTermType( term, resultType, isLiteral ) ){
+                    if( GetTermType( term, baseType, resultType, isLiteral ) ){
                         type_stack[sp] = resultType.GetBasicType();
                         index_stack[sp] = resultType.GetIndex();

trunk/abdev/BasicCompiler_Common/Object.cpp

@@ -60 +60 @@
                 temporary,
                 Parameter,
+                Type(),         // baseTypeはなし
                 dummyType );
 
@@ -72 +73 @@
             temporary,
             Parameter,
+            Type(),         // baseTypeはなし
             dummyType );
     }

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -115 +115 @@
 }
 
-bool CallProc( int kind, const void *pProc, const char *fullCallName, const char *lpszParms, Type &resultType, bool isCallOn ){
-
+bool CallProc( int kind, const void *pProc, const char *fullCallName, const char *lpszParms, const Type &baseType, Type &resultType, bool isCallOn )
+{
     //GetSubHash内でエラー提示が行われた場合
     if(pProc==(Procedure *)-1){
@@ -178 +178 @@
         int FuncId = (int)(_int64)pProc;
 
-        if( !Opcode_CallFunc( lpszParms, FuncId, resultType, isCallOn ) ){
+        if( !Opcode_CallFunc( lpszParms, FuncId, baseType, resultType, isCallOn ) ){
             return false;
         }
@@ -212 +212 @@
         }
 
-        return CallProc( PROC_DEFAULT, pInfo, tempName, lpszParms, resultType, isCallOn );
+        return CallProc( PROC_DEFAULT, pInfo, tempName, lpszParms, baseType, resultType, isCallOn );
     }
     else{

trunk/abdev/BasicCompiler_Common/common.h

@@ -347 +347 @@
 int AutoBigCast(int BaseType,int CalcType);
 BOOL CheckCalcType(int idCalc,int *type,int sp);
-bool GetTermType( const char *term, Type &resultType, bool &isLiteral, bool *pIsClassName = NULL );
+bool GetTermType( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, bool *pIsClassName = NULL );
 bool NumOpe_GetType( const char *expression, const Type &baseType, Type &resultType, bool *pIsLiteralCalculation = NULL );
 
@@ -354 +354 @@
 int GetProc(char *name,void **ppInfo);
 void SplitObjectName(const char *name,char *ObjectName, ReferenceKind &referenceFind );
-bool CallProc( int kind, const void *pProc, const char *fullCallName, const char *lpszParms, Type &resultType, bool isCallOn = true );
+bool CallProc( int kind, const void *pProc, const char *fullCallName, const char *lpszParms, const Type &baseType, Type &resultType, bool isCallOn = true );
 bool CallPropertyMethod( const char *variable, const char *rightSide, Type &resultType);
 bool GetReturnTypeOfPropertyMethod( const char *variable, const char *rightSide, Type &resultType );