Changeset 73 in dev for BasicCompiler_Common/NumOpe_GetType.cpp
- Timestamp:
- Mar 16, 2007, 11:07:14 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
BasicCompiler_Common/NumOpe_GetType.cpp
r69 r73 193 193 pobj_c=(CClass *)index_stack[sp-2]; 194 194 195 std::vector<S UBINFO*> subs;195 std::vector<SubInfo *> subs; 196 196 pobj_c->EnumMethod( idCalc, subs ); 197 197 if( subs.size() == 0 ){ … … 230 230 if(idCalc==CALC_EQUAL) lstrcpy(temporary,"=="); 231 231 else GetCalcName(idCalc,temporary); 232 S UBINFO*psi;232 SubInfo *psi; 233 233 psi=OverloadSolution(temporary,subs,ppi,iParmNum,pBaseTypeInfo); 234 234 … … 240 240 else{ 241 241 //オーバーロードされていないが、パラメータ個数が一致しないとき 242 if(iParmNum!=psi-> ParmNum){242 if(iParmNum!=psi->params.size()){ 243 243 HeapDefaultFree(ppi); 244 244 return 0; … … 299 299 } 300 300 301 int NumOpe_GetType (char *Command,TYPEINFO *pBaseType,LONG_PTR *plpIndex){301 int NumOpe_GetType_Old( const char *Command,TYPEINFO *pBaseType,LONG_PTR *plpIndex){ 302 302 extern int cp; 303 303 int i,i2,i3,i4; … … 454 454 455 455 //マクロ関数の場合 456 i2=NumOpe_GetType (temp3,NULL,&index_stack[sp]);456 i2=NumOpe_GetType_Old(temp3,NULL,&index_stack[sp]); 457 457 458 458 if(!IS_LITERAL(index_stack[sp])){ … … 740 740 return RetType; 741 741 } 742 743 bool NumOpe_GetType( const char *expression, const Type &baseType, Type &resultType ){ 744 TYPEINFO baseTypeInfo = { 745 baseType.GetBasicType(), 746 baseType.GetIndex() 747 }; 748 LONG_PTR lpIndex; 749 int basicType = NumOpe_GetType_Old( expression, 750 baseType.IsNull() ? NULL:&baseTypeInfo, 751 &lpIndex ); 752 753 resultType.SetBasicType( basicType ); 754 resultType.SetIndex( lpIndex ); 755 756 return ( basicType != -1 ); 757 }
Note:
See TracChangeset
for help on using the changeset viewer.