Changeset 380 in dev
- Timestamp:
- Dec 18, 2007, 2:51:10 AM (17 years ago)
- Location:
- trunk/abdev
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abdev/BasicCompiler32/Compile_Statement.cpp
r374 r380 600 600 bool isError = false; 601 601 602 //レキシカルスコープをレベルアップ603 compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );604 605 602 //第1パラメータを取得 606 603 char variable[VN_SIZE]; … … 615 612 i=GetOneParameter(Parameter,i,collectionVar); 616 613 614 //レキシカルスコープをレベルアップ 615 compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR ); 616 617 617 if( !GetVarType( variable, resultType, false ) ) 618 618 { … … 626 626 // 未定義の場合は自動的に定義する 627 627 sprintf(temporary,"%s%c%c%s", variable, 1, ESC_AS, collectionType.GetActualGenericType(0).GetClass().GetFullName().c_str() ); 628 MessageBox(0,temporary,"test",0);629 628 OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR); 630 629 } … … 653 652 654 653 // Currentプロパティから現在の値を取得 655 // TODO: 型指定が未完成 656 sprintf( temporary, "%s=%s.Current As String", variable, collectionVar ); 654 sprintf( temporary, "%s=%s.Current", variable, collectionVar ); 657 655 Compile( temporary ); 658 656 -
trunk/abdev/BasicCompiler64/Compile_Statement.cpp
r375 r380 490 490 i=GetOneParameter(Parameter,i,collectionVar); 491 491 492 //レキシカルスコープをレベルアップ 493 compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR ); 494 492 495 if( !GetVarType( variable, resultType, false ) ) 493 496 { … … 501 504 // 未定義の場合は自動的に定義する 502 505 sprintf(temporary,"%s%c%c%s", variable, 1, ESC_AS, collectionType.GetActualGenericType(0).GetClass().GetFullName().c_str() ); 503 MessageBox(0,temporary,"test",0);504 506 OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR); 505 507 } … … 525 527 const PertialSchedule *pTempPertialSchedule = compiler.codeGenerator.op_je( 0, sizeof(long), true ); 526 528 527 //レキシカルスコープをレベルアップ528 compiler.codeGenerator.lexicalScopes.Start( compiler.codeGenerator.GetNativeCodeSize(), LexicalScope::SCOPE_TYPE_FOR );529 530 529 // Currentプロパティから現在の値を取得 531 // TODO: 型指定が未完成 532 sprintf( temporary, "%s=%s.Current As String", variable, collectionVar ); 530 sprintf( temporary, "%s=%s.Current", variable, collectionVar ); 533 531 Compile( temporary ); 534 532 -
trunk/abdev/BasicCompiler_Common/include/ver.h
r371 r380 6 6 // バージョン付加文字列 7 7 #ifdef _AMD64_ 8 #define VER_INFO "(x64) (rev.3 82)"8 #define VER_INFO "(x64) (rev.396)" 9 9 #else 10 #define VER_INFO "(rev.3 82)"10 #define VER_INFO "(rev.396)" 11 11 #endif -
trunk/abdev/BasicCompiler_Common/src/Class.cpp
r379 r380 1227 1227 } 1228 1228 1229 std::vector<const CClass *> classes; 1229 1230 const CClass *pClass = GetHashArrayElement( name.c_str() ); 1230 1231 while( pClass ) … … 1232 1233 if( pClass->IsEqualSymbol( namespaceScopes, name ) ){ 1233 1234 //名前空間とクラス名が一致した 1234 return pClass;1235 classes.push_back( pClass ); 1235 1236 } 1236 1237 pClass = pClass->GetChainNext(); 1238 } 1239 if( classes.size() > 0 ) 1240 { 1241 // 複数の名前空間の中に同一のクラス名が存在する場合があるので、アクセス可能で尚且つ階層が一番深いものをチョイスする 1242 pClass = classes.front(); 1243 1244 BOOST_FOREACH( const CClass *pTempClass, classes ) 1245 { 1246 if( pClass->GetNamespaceScopes().size() < pTempClass->GetNamespaceScopes().size() ) 1247 { 1248 pClass = pTempClass; 1249 } 1250 } 1251 1252 return pClass; 1237 1253 } 1238 1254 -
trunk/abdev/ProjectEditor/Common.h
r367 r380 66 66 #define APPLICATION_NAME "ActiveBasic 5.0" 67 67 #define VERSION_APPLI_NAME APPLICATION_NAME 68 #define VERSION_STRING "5.00.00 (rev.3 79)"68 #define VERSION_STRING "5.00.00 (rev.396)" 69 69 70 70 #endif -
trunk/abdev/ProjectEditor/EndPairCommandComplement.cpp
r366 r380 71 71 if(lstrcmpi(temporary,"Enum")==0) return COM_ENUM; 72 72 if(lstrcmpi(temporary,"For")==0) return COM_FOR; 73 if(lstrcmpi(temporary,"Foreach")==0) return COM_FOR; 73 74 if(lstrcmpi(temporary,"Function")==0) return COM_FUNCTION; 74 75 if(lstrcmpi(temporary,"Namespace")==0) return COM_NAMESPACE; -
trunk/abdev/ProjectEditor/SubOperation.cpp
r364 r380 512 512 if(lstrcmpi(str,"Finally")==0) return -1; 513 513 if(lstrcmpi(str,"For")==0) return COM_FOR; 514 if(lstrcmpi(str,"Foreach")==0) return -1; 514 515 if(lstrcmpi(str,"Function")==0) return COM_FUNCTION; 515 516 } -
trunk/abdev/ProjectEditor/TextEditor_KeyEvent.cpp
r366 r380 70 70 lstrcmpi(temporary,"Enum")==0|| 71 71 lstrcmpi(temporary,"For")==0|| 72 lstrcmpi(temporary,"Foreach")==0|| 72 73 lstrcmpi(temporary,"Function")==0|| 73 74 lstrcmpi(temporary,"Namespace")==0||
Note:
See TracChangeset
for help on using the changeset viewer.