Changeset 75 in dev for BasicCompiler64/Opcode.h

Timestamp:

Mar 20, 2007, 4:36:16 AM (17 years ago)

Author:

dai_9181

Message:

TYPEINFO→Typeへのリファクタリングを実施。64bitはほぼ完了。32bitが全般的に未完成。

File:

• BasicCompiler64/Opcode.h (modified) (10 diffs)

BasicCompiler64/Opcode.h

@@ -251 +251 @@
 
 //NumOpe.cpp
-int NumOpe(int *pReg,const char *Command,int BaseType,LONG_PTR lpBaseIndex,LONG_PTR *plpIndex,BOOL *pbUseHeap=0);
+bool NumOpe( int *pReg,
+           const char *Command,
+           const Type &baseType,
+           Type &resultType,
+           BOOL *pbUseHeap = NULL );
 
 //NumOpe_Arithmetic.cpp
@@ -286 +290 @@
 //Compile_Set_Var.cpp
 BOOL IsUse_r11(RELATIVE_VAR *pRelativeVar);
-void SetStructVariableFromRax(LONG_PTR lpVarIndex,int CalcType,LONG_PTR lpCalcIndex,RELATIVE_VAR *pRelativeVar,BOOL bUseHeap);
+void SetStructVariableFromRax( const Type &varType, const Type &calcType, RELATIVE_VAR *pRelativeVar,BOOL bUseHeap);
 void SetRealVariable(int VarType, int CalcType, RELATIVE_VAR *pRelativeVar);
 void SetBooleanVariable(int type,RELATIVE_VAR *pRelative);
@@ -307 +311 @@
 
 //Compile_Object.cpp
-void Operator_New( CClass &classObj, const char *objectSizeStr, const char *parameter,const TYPEINFO &baseTypeInfo );
-int Operator_New(const char *Parameter,LONG_PTR *plpIndex,const TYPEINFO &baseTypeInfo );
+void Operator_New( const CClass &classObj, const char *objectSizeStr, const char *parameter,const Type &baseTypeInfo );
 void OpcodeDelete(const char *Parameter, bool isSweeping);
 
@@ -314 +317 @@
 void GetWithName(char *buffer);
 void SetThisPtrToReg(int reg);
-BOOL GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss=0);
-BOOL SetInitGlobalData(int offset,int type,LONG_PTR lpIndex,int *SubScripts,char *InitBuf);
+bool GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss = NULL);
+bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,char *InitBuf);
 #define DIMFLAG_INITDEBUGVAR            0x01
 #define DIMFLAG_NONCALL_CONSTRACTOR     0x02
 #define DIMFLAG_STATIC                  0x04
 #define DIMFLAG_CONST                   0x08
-void dim(bool isRef, char *VarName,int *SubScripts,TYPEINFO &TypeInfo,int TypeSize,char *InitBuf,char *ConstractParameter,DWORD dwFlags);
-void OpcodeDim(char *Parameter,DWORD dwFlag);
+void dim(bool isRef, char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags);
 void SetVarPtrToReg(int reg,RELATIVE_VAR *pRelativeVar);
 
@@ -333 +335 @@
 class ParamImpl{
     char *Parms[255];
-    TYPEINFO types[255];
+    vector<Type> types;
     int ParmsNum;
 
-    TYPEINFO ReturnTypeInfo;
+    Type returnType;
 
     //一時オブジェクト管理用
@@ -345 +347 @@
 public:
     ParamImpl(const char *buffer);
-    ParamImpl(const PARAMETER_INFO *pParamInfo, const int ParmNum);
+    ParamImpl(const Parameters &params);
     ~ParamImpl();
-    void SetReturnType(TYPEINFO *pTypeInfo);
+    void SetReturnType( const Type &returnType );
 
 private:
-    BOOL _overload_check( Parameters &params, TYPEINFO *pReturnTypeInfo,int overload_level);
-    SubInfo *OverloadSolutionWithReturnType( const char *name, std::vector<SubInfo *> &subs );
+    bool _overload_check( int level, const Parameters &params, const Type &returnType );
+    UserProc *OverloadSolutionWithReturnType( const char *name, std::vector<UserProc *> &subs );
 public:
-    SubInfo *OverloadSolution( const char *name, std::vector<SubInfo *> &subs );
-
-    BOOL ErrorCheck(const char *FuncName,PARAMETER_INFO *ppi,int pi_num,int SecondParmNum);
-    void MacroParameterSupport(PARAMETER_INFO *ppi);
-    void SetStructParameter(int reg,CClass *pobj_Class,LPSTR Parameter);
+    UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs );
+
+    bool ErrorCheck( const string &procName, const Parameters &params, int SecondParmNum = -1 );
+    void MacroParameterSupport( const Parameters &params );
+    void SetStructParameter( int reg, const Type &baseType, const char *expression );
+    void SetParameter( const string &procName, const Parameters &params, int SecondParmNum = -1 );
 
     //一時オブジェクトパラメータの生成と破棄
-    int NewTempParameters( const char *FuncName,PARAMETER_INFO *ppi,int pi_num,int SecondParmNum );
+    int NewTempParameters( const string &procName, const Parameters &params, int SecondParmNum = -1 );
     void DeleteTempParameters();
-
-    void SetParameter(const char *FuncName,PARAMETER_INFO *ppi,int pi_num,int SecondParmNum);
 
     void BackupParameter(int pi_num);
@@ -384 +385 @@
 void AddLocalVarAddrSchedule();
 #define PROCFLAG_NEW    1
-int Opcode_CallProcPtr(char *variable,char *Parameter,PROCPTRINFO *pi,LONG_PTR *plpIndex);
-void Opcode_CallProc(const char *Parameter,SubInfo *psi,DWORD dwFlags,char *ObjectName,int RefType);
-int Opcode_CallDllProc(char *Parameter,DECLAREINFO *pdi,LONG_PTR *plpIndex);
+bool Opcode_CallProcPtr(const char *variable, const char *lpszParms,ProcPointer *pProcPointer);
+bool Opcode_CallProc(const char *Parameter,UserProc *pUserProc,DWORD dwFlags,const char *ObjectName,int RefType);
+bool Opcode_CallDllProc( const char *lpszParms,DllProc *pDllProc);
 
 //Compile_ProcOp.cpp
@@ -394 +395 @@
 int GetFunctionType(int FuncNum);
 int GetFunctionFromName(char *FuncName);
-void Opcode_CallFunc( const char *Parameter, const int FuncNum, TYPEINFO &ReturnTypeInfo );
+bool Opcode_CallFunc( const char *Parameter, const int FuncNum, Type &ReturnTypeInfo, bool isCallOn = true );
 
 //OperatorProc.cpp
-void FreeTempObject(int reg,CClass *pobj_c);
-int CallOperatorProc(int idCalc,TYPEINFO *pBaseTypeInfo,int *type,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
-void CallCastOperatorProc(int reg,int &CalcType,LONG_PTR &lpCalcIndex,BOOL bCalcUseHeap,int ToType,LONG_PTR lpToIndex);
-void CallIndexerGetterProc(int reg,CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo);
+void FreeTempObject(int reg,const CClass *pobj_c);
+int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
+void CallCastOperatorProc(int reg,Type &calcType,BOOL bCalcUseHeap,const Type &toType);
+void CallIndexerGetterProc(int reg,const CClass *pobj_Class,char *ObjectName,char *Parameter,Type &resultType);
 
 //Compile_Statement.cpp
@@ -411 +412 @@
 void OpcodeContinue(void);
 void OpcodeExitSub(void);
-void OpcodeSelect(char *Parameter);
+void OpcodeSelect( const char *Parameter );
 void OpcodeCase(char *Parameter);
 void OpcodeGosub(char *Parameter);
@@ -512 +513 @@
 void op_fld_ptr_esp(int type);
 void op_zero_reg(int reg);
-void op_call( SubInfo *psi );
-void op_call( DECLAREINFO *pdi );
+void op_call( UserProc *pUserProc );
+void op_call( DllProc *pDllProc );