Changeset 584 in dev for trunk/ab5.0/abdev/compiler_x64/NumOpe.cpp
- Timestamp:
- May 10, 2008, 12:19:15 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ab5.0/abdev/compiler_x64/NumOpe.cpp
r528 r584 426 426 427 427 if( pIsClassName ){ 428 if( compiler.GetObjectModule().meta. GetClasses().Find( termFull ) ){428 if( compiler.GetObjectModule().meta.FindClassSupportedTypeDef( termFull ) ){ 429 429 *pIsClassName = true; 430 430 return true; … … 442 442 443 443 if(lstrcmpi(termFull,"This")==0 && isProcedureCallOnly == false ){ 444 if( compiler.pCompilingClass == NULL)444 if( !compiler.IsCompilingClass() ) 445 445 { 446 446 compiler.errorMessenger.Output(142,NULL,cp); … … 449 449 450 450 //Thisオブジェクト 451 resultType.SetType( DEF_OBJECT, compiler.pCompilingClass);451 resultType.SetType( DEF_OBJECT, &compiler.GetCompilingClass() ); 452 452 453 453 SetThisPtrToReg( UseReg ); … … 527 527 } 528 528 529 ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find( procName ); 529 ConstMacro *pConstMacro = compiler.GetObjectModule().meta.GetGlobalConstMacros().Find( 530 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( procName ) 531 ); 530 532 if( pConstMacro ) 531 533 { 532 if( pConstMacro->GetCalcBuffer(parameter, temporary ) )534 if( ActiveBasic::Compiler::LexicalAnalyzer::ConstMacroToExpression( *pConstMacro, parameter, temporary ) ) 533 535 { 534 536 ///////////////////////// … … 1143 1145 ////////////// 1144 1146 1145 i3 = compiler.GetObjectModule().meta.GetGlobalConsts().GetBasicType(term); 1147 i3 = compiler.GetObjectModule().meta.GetGlobalConsts().GetBasicType( 1148 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term ) 1149 ); 1146 1150 if(i3){ 1147 if( compiler.GetObjectModule().meta.GetGlobalConsts().IsStringPtr( term) ){1151 if( compiler.GetObjectModule().meta.GetGlobalConsts().IsStringPtr( ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term ) ) ){ 1148 1152 //リテラル文字列 1149 1153 … … 1166 1170 } 1167 1171 1168 double dbl = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData(term); 1172 double dbl = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData( 1173 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term ) 1174 ); 1169 1175 memcpy(&i64data,&dbl,sizeof(double)); 1170 1176 … … 1180 1186 if(IsRealNumberType(i3)){ 1181 1187 //実数 1182 double dbl = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData(term); 1188 double dbl = compiler.GetObjectModule().meta.GetGlobalConsts().GetDoubleData( 1189 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term ) 1190 ); 1183 1191 memcpy(&i64data,&dbl,sizeof(double)); 1184 1192 goto Literal; … … 1186 1194 else if(IsWholeNumberType(i3)){ 1187 1195 //整数 1188 i64data = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData(term); 1196 i64data = compiler.GetObjectModule().meta.GetGlobalConsts().GetWholeData( 1197 ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( term ) 1198 ); 1189 1199 goto Literal; 1190 1200 }
Note:
See TracChangeset
for help on using the changeset viewer.