Changeset 206 in dev for trunk/abdev/BasicCompiler64/OperatorProc.cpp

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

File:

• trunk/abdev/BasicCompiler64/OperatorProc.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler64/OperatorProc.cpp

@@ +1 @@
+#include "stdafx.h"
+
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -16 +20 @@
 
         //call DestructorProcAddr
-        op_call( method->pUserProc );
+        op_call( &method->GetUserProc() );
     }
 
@@ -23 +27 @@
 
     //call free
-    extern UserProc *pSub_free;
+    extern const UserProc *pSub_free;
     op_call(pSub_free);
 }
 
-int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp){
+int CallOperatorProc(BYTE idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp){
     //オーバーロードされたオペレータ関数を呼び出す
     CClass *pobj_c;
     pobj_c=(CClass *)index_stack[sp-2];
 
-    std::vector<UserProc *> subs;
+    std::vector<const UserProc *> subs;
     pobj_c->GetMethods().Enum( idCalc, subs );
     if( subs.size() == 0 ){
@@ -58 +62 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType );
+    const UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType );
 
     if(!pUserProc){
@@ -118 +122 @@
 
             //call calloc
-            extern UserProc *pSub_calloc;
+            extern const UserProc *pSub_calloc;
             op_call(pSub_calloc);
 
@@ -319 +323 @@
 void CallIndexerGetterProc(int reg,const CClass *pobj_Class,char *ObjectName,char *Parameter,Type &resultType ){
 
-    std::vector<UserProc *> subs;
+    std::vector<const UserProc *> subs;
     pobj_Class->GetMethods().Enum( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){