Changeset 73 in dev for BasicCompiler_Common/common.h

Timestamp:

Mar 16, 2007, 11:07:14 PM (18 years ago)

Author:

dai_9181

Message:

Parameterクラスを適用。32bit側は動くようになったので、64bitのほうを調整する。

File:

• BasicCompiler_Common/common.h (modified) (8 diffs)

BasicCompiler_Common/common.h

@@ -155 +155 @@
 #include "Parameter.h"
 
+// プロシージャ管理用のクラス
+#include "Procedure.h"
+
 
 
@@ -229 +232 @@
 };
 
-#define SUBTYPE_SUB         1
-#define SUBTYPE_FUNCTION    2
-#define SUBTYPE_MACRO       3
-struct SUBINFO{
-    DWORD dwType;
-
-    //クラス情報
-    CClass *pobj_ParentClass;
-
-    long id;
-
-    char *name;
-    long address;
-
-    //パラメータ
-    PARAMETER_INFO *pParmInfo;
-    int ParmNum;
-    int SecondParmNum;
-    PARAMETER_INFO *pRealParmInfo;
-    int RealParmNum;
-    int RealSecondParmNum;
-
-    /*
-    //パラメータ
-    Parameters params;
-    int SecondParmNum;
-    Parameters realParams;
-    int RealSecondParmNum;*/
-
-    //戻り値
-    int ReturnType;
-    union{
-        LONG_PTR ReturnIndex;
-        CClass *Return_pobj_c;
-    }u;
-    bool isReturnRef;
-
-    DWORD CompileAddress;
-    DWORD EndOpAddr;
-    VARIABLE *pVar;
-    int VarNum;
-
-    BOOL bExport;
-    BOOL bCdecl;
-    BOOL bVirtual;
-    BOOL bUse;
-    BOOL bCompile;
-    BOOL bSystem;
-
-    SUBINFO *pNextData;
-};
 #define DECLARE_DYNAMIC 1
 #define DECLARE_STATIC  2
@@ -435 +387 @@
 CONSTINFO *GetConstHash(char *name);
 DECLAREINFO *GetDeclareHash(char *name);
-SUBINFO *GetSubHash(const char *name,BOOL bError=0);
-SUBINFO *GetMethodHash(char *ObjectName,char *MethodName,char *Parameter,BOOL bError=0);
-void GetOverloadSubHash( const char *lpszName, std::vector<SUBINFO *> &subs );
+SubInfo *GetSubHash(const char *name,BOOL bError=0);
+SubInfo *GetMethodHash(char *ObjectName,char *MethodName,char *Parameter,BOOL bError=0);
+void GetOverloadSubHash( const char *lpszName, std::vector<SubInfo *> &subs );
 
 //Object.cpp
@@ -444 +396 @@
 
 //Overload.sbp
-SUBINFO *OverloadSolutionWithStrParam(
+SubInfo *OverloadSolutionWithStrParam(
     const char *name,
-    std::vector<SUBINFO *> &subs,
+    std::vector<SubInfo *> &subs,
     const char *Parameter,
     const char *ObjectName,
     TYPEINFO *pReturnTypeInfo);
-SUBINFO *OverloadSolution(
+SubInfo *OverloadSolution(
     const char *name,
-    std::vector<SUBINFO *> &subs,
+    std::vector<SubInfo *> &subs,
     const PARAMETER_INFO *ppi,
     const int ParmNum,
@@ -464 +416 @@
 void Debugger_Pause(void);
 ULONG_PTR rva_to_real(DWORD p);
-SUBINFO *GetSubFromObp(ULONG_PTR pos);
+SubInfo *GetSubFromObp(ULONG_PTR pos);
 void ReadOpBuffer();
 void DebugProgram(void);
@@ -561 +513 @@
 DWORD GetConstValue(char *name,double *dbl,char *buffer,LONG_PTR *plpIndex);
 bool IsStringObjectType(const TYPEINFO &TypeInfo);
-BOOL IsStringSubsituation(CClass *pobj_c);
 int IsStrCalculation(char *Command);
 BYTE GetCalcId(const char *Command,int *pi);
@@ -567 +518 @@
                        char *values[255],long calc[255],long stack[255]);
 
-//NumOpe_GetType.cpp
+//NumOpe_GetType_Old.cpp
 int AutoBigCast(int BaseType,int CalcType);
 BOOL CheckCalcType(int idCalc,int *type,int sp);
-int NumOpe_GetType(char *Command,TYPEINFO *pBaseType,LONG_PTR *plpIndex);
+int NumOpe_GetType_Old( const char *Command, TYPEINFO *pBaseTypeInfo, LONG_PTR *plpIndex );
+bool NumOpe_GetType( const char *expression, const Type &baseType, Type &resultType );
 
 //Subroutine.cpp
@@ -583 +535 @@
 bool GetReturnTypeOfIndexerGetterProc(CClass *pobj_Class,TYPEINFO &RetTypeInfo);
 BOOL CompareParameter(PARAMETER_INFO *ppi1,int pi_num1,PARAMETER_INFO *ppi2,int pi_num2);
-SUBINFO *AddSubData(char *buffer,int NowLine,BOOL bVirtual,CClass *pobj_c,BOOL bStatic=0);
+SubInfo *AddSubData(char *buffer,int NowLine,BOOL bVirtual,CClass *pobj_c,BOOL bStatic=0);
 void GetSubInfo(void);
-void DeleteSubInfo(SUBINFO **ppSubHash,char **ppMacroNames,int MacroNum);
+void DeleteSubInfo(SubInfo **ppSubHash,char **ppMacroNames,int MacroNum);
 void DeleteDeclareInfo(void);
 int AddProcPtrInfo(char *buffer,DWORD dwProcType);