Changeset 814 in dev for branches/egtra/ab5.0/abdev/BasicCompiler_Common/src
- Timestamp:
- Mar 19, 2011, 1:29:12 AM (14 years ago)
- Location:
- branches/egtra/ab5.0/abdev/BasicCompiler_Common/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp
r625 r814 3 3 using namespace ActiveBasic::Compiler; 4 4 5 bool LexicalAnalyzer::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection ) 5 using boost::numeric_cast; 6 7 bool LexicalAnalyzer::CollectNamespaces(char const* source, NamespaceScopesCollection &namespaceScopesCollection) 6 8 { 7 int i, i2;8 char temporary[1024];9 10 9 bool isSuccessful = true; 11 10 … … 13 12 NamespaceScopes namespaceScopes; 14 13 15 for(i=0;;i++){ 14 for (int i = 0; ; i++) 15 { 16 16 if(source[i]=='\0') break; 17 17 18 18 if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){ 19 for(i+=2,i2=0;;i2++,i++){ 20 if( IsCommandDelimitation( source[i] ) ){ 21 temporary[i2]=0; 22 break; 23 } 24 temporary[i2]=source[i]; 19 i+=2; 20 char const* p = &source[i]; 21 while (!IsCommandDelimitation(source[i])) 22 { 23 ++i; 25 24 } 26 namespaceScopes.push_back( temporary);25 namespaceScopes.push_back(std::string(p, &source[i])); 27 26 28 27 if( !namespaceScopesCollection.IsExist( namespaceScopes ) ){ … … 46 45 } 47 46 48 if( namespaceScopes.size() > 0){47 if( !namespaceScopes.empty() ){ 49 48 compiler.errorMessenger.Output( 63, NULL, cp ); 50 49 isSuccessful = false; -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp
r803 r814 15 15 void LexicalAnalyzer::CollectClassesForNameOnly( const char *source, Classes &classes ) 16 16 { 17 int i , i2;17 int i2; 18 18 char temporary[VN_SIZE]; 19 19 … … 25 25 compiler.GetNamespaceSupporter().ClearImportedNamespaces(); 26 26 27 for(i =0;;i++){27 for(int i=0;;i++){ 28 28 if(source[i]=='\0') break; 29 29 30 30 if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){ 31 for(i+=2,i2=0;;i2++,i++){ 32 if( IsCommandDelimitation( source[i] ) ){ 33 temporary[i2]=0; 34 break; 35 } 36 temporary[i2]=source[i]; 37 } 38 namespaceScopes.push_back( temporary ); 31 i+=2; 32 char const* p = &source[i]; 33 while (!IsCommandDelimitation(source[i])) 34 { 35 ++i; 36 } 37 namespaceScopes.push_back(std::string(p, &source[i])); 39 38 40 39 continue; … … 52 51 } 53 52 else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){ 54 for(i+=2,i2=0;;i2++,i++){55 if( IsCommandDelimitation( source[i] ) ){56 temporary[i2]=0;57 break;58 }59 temporary[i2]=source[i];60 }61 if ( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ))62 { 63 compiler.errorMessenger.Output(64, temporary,i);53 i+=2; 54 char const* p = &source[i]; 55 while (!IsCommandDelimitation(source[i])) 56 { 57 ++i; 58 } 59 std::string s(p, &source[i]); 60 if (!compiler.GetNamespaceSupporter().ImportsNamespace(s)) 61 { 62 compiler.errorMessenger.Output(64, s.c_str(), i); 64 63 } 65 64 … … 1518 1517 else 1519 1518 { 1520 for( int i=0; i<pInterface->GetDynamicMethods().size(); i++ )1519 for( std::size_t i=0; i<pInterface->GetDynamicMethods().size(); i++ ) 1521 1520 { 1522 1521 if( pInterface->GetDynamicMethods()[i]->IsAbstract() != pExpandedInterface->GetDynamicMethods()[i]->IsAbstract() ) -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Const.cpp
r803 r814 85 85 86 86 int i2; 87 char temporary[1024];88 87 89 88 // 名前空間管理 … … 91 90 namespaceScopes.clear(); 92 91 93 for(int i=0;;i++){ 92 for (int i = 0; ; ++i) 93 { 94 94 if( source[i] == '\0' ) break; 95 95 96 96 if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){ 97 for(i+=2,i2=0;;i2++,i++){ 98 if( IsCommandDelimitation( source[i] ) ){ 99 temporary[i2]=0; 100 break; 101 } 102 temporary[i2]=source[i]; 103 } 104 namespaceScopes.push_back( temporary ); 97 i+=2; 98 char const* p = &source[i]; 99 while (!IsCommandDelimitation(source[i])) 100 { 101 ++i; 102 } 103 namespaceScopes.push_back(std::string(p, &source[i])); 105 104 106 105 continue; … … 131 130 } 132 131 132 char const* beginTemp = &source[i]; 133 char const* endTemp = &source[i]; 134 133 135 for(i2=0;;i++,i2++){ 134 136 if(source[i]=='\"'){ 135 temporary[i2]=source[i];136 137 for(i++,i2++;;i++,i2++){ 137 temporary[i2]=source[i];138 138 if(source[i]=='\"') break; 139 139 } … … 141 141 } 142 142 if(IsCommandDelimitation(source[i])){ 143 temporary[i2]=0;143 endTemp = beginTemp + i2; 144 144 break; 145 145 } 146 temporary[i2]=source[i];147 146 } 148 147 149 148 //名前を取得 150 char name[VN_SIZE];149 char const* nameEnd; 151 150 for(i2=0;;i2++){ 152 if( temporary[i2]=='\0'){151 if(beginTemp[i2]=='\0'){ 153 152 compiler.errorMessenger.Output(10,"Const",cp); 154 153 return; 155 154 } 156 if( temporary[i2]=='='||temporary[i2]=='('){157 name [i2]=0;155 if(beginTemp[i2]=='='||beginTemp[i2]=='('){ 156 nameEnd = beginTemp + i2; 158 157 break; 159 158 } 160 name[i2]=temporary[i2];161 }159 } 160 std::string name(beginTemp, nameEnd); 162 161 163 162 //重複チェック … … 165 164 || compiler.GetObjectModule().meta.GetGlobalConsts().IsExistDuplicationKeyName( name ) ) 166 165 { 167 compiler.errorMessenger.Output(15, name,cp);166 compiler.errorMessenger.Output(15, name, cp); 168 167 return; 169 168 } 170 169 171 if( temporary[i2] == '=' )170 if( beginTemp[i2] == '=' ) 172 171 { 173 172 // 定数 174 const char *expression = temporary + i2 + 1;173 std::string expression(beginTemp + i2 + 1, endTemp); 175 174 176 175 _int64 i64data; 177 176 Type resultType; 178 if( StaticCalculation(false, expression , 0, &i64data, resultType) )177 if( StaticCalculation(false, expression.c_str(), 0, &i64data, resultType) ) 179 178 { 180 179 consts.Add( Symbol( namespaceScopes, name ), i64data, resultType ); … … 184 183 { 185 184 // 定数マクロ 186 const char *params = temporary + i2;187 if( !constMacros.Add( Symbol( namespaceScopes, name ), params ) )185 std::string params(beginTemp + i2, endTemp); 186 if( !constMacros.Add( Symbol( namespaceScopes, name ), params.c_str() ) ) 188 187 { 189 188 compiler.errorMessenger.Output( 1, NULL, i ); … … 208 207 } 209 208 210 bool LexicalAnalyzer::ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char *dest ) 211 { 212 extern HANDLE hHeap; 213 int i2,i3,i4,num; 209 bool LexicalAnalyzer::ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char *dest, std::size_t destSize ) 210 { 211 std::string s; 212 auto ret = ConstMacroToExpression(constMacro, parameterStr, s); 213 strcpy_s(dest, destSize, s.c_str()); 214 return ret; 215 } 216 217 bool LexicalAnalyzer::ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, std::string& dest ) 218 { 219 int i2,i3; 214 220 char temporary[VN_SIZE]; 215 char *pParms[MAX_PARMS];216 num=0;221 std::vector<std::string> Parms; 222 dest.reserve(8192); 217 223 i2=0; 218 224 while(1){ 219 225 i2=GetOneParameter(parameterStr,i2,temporary); 220 226 221 pParms[num]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1); 222 lstrcpy(pParms[num],temporary); 223 224 num++; 227 Parms.push_back(temporary); 228 225 229 if(parameterStr[i2]=='\0') break; 226 230 } 227 if( num!= constMacro.GetParameters().size() ){231 if( Parms.size() != constMacro.GetParameters().size() ){ 228 232 extern int cp; 229 for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);230 233 compiler.errorMessenger.Output(10,constMacro.GetName().c_str(),cp); 231 lstrcpy(dest,"0");234 dest = '0'; 232 235 return true; 233 236 } 234 237 235 238 i2=0; 236 i4=0;237 239 while(1){ 238 240 … … 253 255 if( i3 == (int)constMacro.GetParameters().size() ){ 254 256 //パラメータでないとき 255 lstrcpy(dest+i4,temporary); 256 i4+=lstrlen(temporary); 257 dest += temporary; 257 258 } 258 259 else{ 259 260 //パラメータのとき 260 lstrcpy(dest+i4,pParms[i3]); 261 i4+=lstrlen(pParms[i3]); 261 dest += Parms[i3]; 262 262 } 263 263 264 264 //演算子をコピー 265 for(;;i2++ ,i4++){265 for(;;i2++){ 266 266 if( constMacro.GetExpression()[i2] == 1 ){ 267 dest [i4++]= constMacro.GetExpression()[i2++];268 dest [i4]= constMacro.GetExpression()[i2];267 dest += constMacro.GetExpression()[i2++]; 268 dest += constMacro.GetExpression()[i2]; 269 269 continue; 270 270 } 271 271 if(IsVariableTopChar( constMacro.GetExpression()[i2] )) break; 272 dest [i4]= constMacro.GetExpression()[i2];272 dest += constMacro.GetExpression()[i2]; 273 273 if( constMacro.GetExpression()[i2] == '\0' ) break; 274 274 } … … 277 277 } 278 278 279 for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);280 281 279 return true; 282 280 } -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp
r803 r814 5 5 void LexicalAnalyzer::CollectDelegates( const char *source, Delegates &delegates ) 6 6 { 7 int i2;8 char temporary[VN_SIZE];9 10 7 // 名前空間管理 11 8 NamespaceScopes &namespaceScopes = compiler.GetNamespaceSupporter().GetLivingNamespaceScopes(); … … 15 12 compiler.GetNamespaceSupporter().ClearImportedNamespaces(); 16 13 17 int length = lstrlen( source ); 18 for( int i=0; i<length; i++ ) 14 for (int i=0; source[i] != '\0'; i++) 19 15 { 20 16 if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){ 21 for(i+=2,i2=0;;i2++,i++){ 22 if( IsCommandDelimitation( source[i] ) ){ 23 temporary[i2]=0; 24 break; 25 } 26 temporary[i2]=source[i]; 27 } 28 namespaceScopes.push_back( temporary ); 17 i+=2; 18 char const* p = &source[i]; 19 while (!IsCommandDelimitation(source[i])) 20 { 21 ++i; 22 } 23 namespaceScopes.push_back(std::string(p, &source[i])); 29 24 30 25 continue; … … 42 37 } 43 38 else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){ 44 for(i+=2,i2=0;;i2++,i++){45 if( IsCommandDelimitation( source[i] ) ){46 temporary[i2]=0;47 break;48 }49 temporary[i2]=source[i];50 }51 if ( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ))52 { 53 compiler.errorMessenger.Output(64, temporary,i);39 i+=2; 40 char const* p = &source[i]; 41 while (!IsCommandDelimitation(source[i])) 42 { 43 ++i; 44 } 45 std::string s(p, &source[i]); 46 if (!compiler.GetNamespaceSupporter().ImportsNamespace(s)) 47 { 48 compiler.errorMessenger.Output(64, s.c_str(), i); 54 49 } 55 50 … … 112 107 { 113 108 compiler.errorMessenger.Output(-104,name,nowLine); 114 lstrcpy( returnTypeName, "Double" );109 strcpy( returnTypeName, "Double" ); 115 110 } 116 111 } -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp
r750 r814 913 913 914 914 if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){ 915 for(i+=2,i2=0;;i2++,i++){ 916 if( IsCommandDelimitation( source[i] ) ){ 917 temporary[i2]=0; 918 break; 919 } 920 temporary[i2]=source[i]; 921 } 922 namespaceScopes.push_back( temporary ); 915 i+=2; 916 char const* p = &source[i]; 917 while (!IsCommandDelimitation(source[i])) 918 { 919 ++i; 920 } 921 namespaceScopes.push_back(std::string(p, &source[i])); 923 922 924 923 continue; … … 936 935 } 937 936 else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){ 938 for(i+=2,i2=0;;i2++,i++){939 if( IsCommandDelimitation( source[i] ) ){940 temporary[i2]=0;941 break;942 }943 temporary[i2]=source[i];944 }945 if ( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ))946 { 947 compiler.errorMessenger.Output(64, temporary,cp);937 i+=2; 938 char const* p = &source[i]; 939 while (!IsCommandDelimitation(source[i])) 940 { 941 ++i; 942 } 943 std::string s(p, &source[i]); 944 if (!compiler.GetNamespaceSupporter().ImportsNamespace(s)) 945 { 946 compiler.errorMessenger.Output(64, s.c_str(), i); 948 947 } 949 948 -
branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_TypeDef.cpp
r812 r814 4 4 #include "Compiler.h" 5 5 #include "StrOperation.h" 6 #include <boost/algorithm/string/predicate.hpp> 6 7 7 8 using namespace ActiveBasic::Compiler; 8 9 9 void LexicalAnalyzer::AddTypeDef( TypeDefCollection &typeDefs, const NamespaceScopes &namespaceScopes, const std::string&expression, int nowLine )10 void LexicalAnalyzer::AddTypeDef( TypeDefCollection &typeDefs, const NamespaceScopes &namespaceScopes, const boost::iterator_range<char const*> &expression, int nowLine ) 10 11 { 11 int i; 12 char temporary[VN_SIZE]; 12 auto name = boost::find<boost::return_begin_found>(expression, '='); 13 13 14 for(i=0;;i++){ 15 if(expression[i]=='='||expression[i]=='\0'){ 16 temporary[i]=0; 17 break; 18 } 19 temporary[i]=expression[i]; 20 } 21 22 if(expression[i]!='='){ 23 compiler.errorMessenger.Output(10,"TypeDef",nowLine); 14 if (boost::end(name) == boost::end(expression)) 15 { 16 compiler.errorMessenger.Output(10, "TypeDef", nowLine); 24 17 return; 25 18 } 26 19 27 const char *pTemp =expression.c_str()+i+1;20 const char *pTemp = expression.begin() + boost::size(name) + 1; 28 21 29 22 //識別文字のエラーチェック(新しい型) 30 i=0; 31 for(;;i++){ 32 if(temporary[i]=='\0') break; 33 if( !( IsVariableChar( temporary[i], true) ) ){ 34 compiler.errorMessenger.Output(10,"TypeDef",nowLine); 35 return; 36 } 23 if (!boost::algorithm::all(name, [](char c) {return IsVariableChar(c, true);})) 24 { 25 compiler.errorMessenger.Output(10, "TypeDef", nowLine); 26 return; 37 27 } 38 28 … … 45 35 } 46 36 } 47 else{ 48 i=0; 37 else 38 { 39 int i=0; 49 40 while(pTemp[i]=='*') i++; 50 for(;;i++){ 51 if(pTemp[i]=='\0') break; 52 if( !( IsVariableChar( pTemp[i], true) ) ) 53 { 54 compiler.errorMessenger.Output(10,"TypeDef",nowLine); 55 return; 56 } 41 if (!boost::algorithm::all(name, [](char c) {return IsVariableChar(c, true);})) 42 { 43 compiler.errorMessenger.Output(10,"TypeDef",nowLine); 44 return; 57 45 } 58 46 } 59 47 48 std::string baseName(pTemp, expression.end()); 49 60 50 //識別子が重複している場合はエラーにする 61 if(lstrcmp(temporary,pTemp)==0){ 51 if (boost::algorithm::equals(name, baseName)) 52 { 62 53 compiler.errorMessenger.Output(1,NULL,nowLine); 63 54 return; … … 71 62 72 63 Type baseType; 73 if( !compiler.StringToType( pTemp, baseType ) )64 if( !compiler.StringToType( baseName, baseType ) ) 74 65 { 75 compiler.errorMessenger.Output(3, pTemp, nowLine );66 compiler.errorMessenger.Output(3, baseName, nowLine ); 76 67 return; 77 68 } … … 79 70 typeDefs.push_back( 80 71 TypeDef( 81 Symbol( namespaceScopes, temporary),82 pTemp,72 Symbol(namespaceScopes, boost::copy_range<std::string>(name)), 73 baseName, 83 74 baseType 84 75 ) … … 94 85 compiler.GetNamespaceSupporter().ClearImportedNamespaces(); 95 86 96 int i=-1, i2; 97 char temporary[VN_SIZE]; 98 while(1){ 99 100 i++; 101 87 for (int i = 0; ; ++i) 88 { 102 89 if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){ 103 for(i+=2,i2=0;;i2++,i++){ 104 if( IsCommandDelimitation( source[i] ) ){ 105 temporary[i2]=0; 106 break; 107 } 108 temporary[i2]=source[i]; 90 i+=2; 91 char const* p = &source[i]; 92 while (!IsCommandDelimitation(source[i])) 93 { 94 ++i; 109 95 } 110 namespaceScopes.push_back( temporary);96 namespaceScopes.push_back(std::string(p, &source[i])); 111 97 112 98 continue; … … 124 110 } 125 111 else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){ 126 for(i+=2,i2=0;;i2++,i++){ 127 if( IsCommandDelimitation( source[i] ) ){ 128 temporary[i2]=0; 129 break; 130 } 131 temporary[i2]=source[i]; 112 i+=2; 113 char const* p = &source[i]; 114 while (!IsCommandDelimitation(source[i])) 115 { 116 ++i; 132 117 } 133 if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) ) 118 std::string s(p, &source[i]); 119 if (!compiler.GetNamespaceSupporter().ImportsNamespace(s)) 134 120 { 135 compiler.errorMessenger.Output(64, temporary,i);121 compiler.errorMessenger.Output(64, s.c_str(), i); 136 122 } 137 123 … … 148 134 char temporary[VN_SIZE]; 149 135 if(source[i+1]==ESC_TYPEDEF){ 150 int i2 = 0; 151 for(i+=2;;i2++,i++){ 152 if(source[i]=='\n'){ 153 temporary[i2]=0; 154 break; 155 } 156 temporary[i2]=source[i]; 157 if(source[i]=='\0') break; 136 i+=2; 137 char const* p = &source[i]; 138 while (!IsCommandDelimitation(source[i])) 139 { 140 ++i; 158 141 } 159 AddTypeDef( typeDefs, namespaceScopes, temporary, i ); 160 142 AddTypeDef(typeDefs, namespaceScopes, boost::make_iterator_range(p, &source[i]), i); 161 143 continue; 162 144 } … … 172 154 } 173 155 174 Type baseType;175 if( !compiler.StringToType( "Long", baseType ) )176 {177 throw;178 }179 180 156 typeDefs.push_back( 181 157 TypeDef( 182 158 Symbol( namespaceScopes, temporary ), 183 159 "Long", 184 baseType160 Type(DEF_LONG) 185 161 ) 186 162 );
Note:
See TracChangeset
for help on using the changeset viewer.