COMP/CMSDIST/root-5.30-00-TSchemaRuleProcessor-nested-space.patch

--- branches/v5-30-00-patches/core/metautils/inc/TSchemaRuleProcessor.h 2011/08/22 20:01:47     40663
+++ branches/v5-30-00-patches/core/metautils/inc/TSchemaRuleProcessor.h 2011/08/22 22:59:25     40664
@@ -88,9 +88,10 @@
                  
                   // Split between the typename and the membername
                   // Take in consideration template names.
-                  for(std::string::size_type i=0; i<elem.size(); ++i) {
-                     if (elem[i]=='<') { ++level; }
-                     else if (elem[i]=='>') { --level; }
+                  for(std::string::size_type j=elem.size(); j>0; --j) {
+                     std::string::size_type i = j-1;
+                     if (elem[i]=='<') { --level; }
+                     else if (elem[i]=='>') { ++level; }
                      else if (level == 0 && isspace(elem[i])) {
                         type = elem.substr( 0, i );
                         // At the first iteration we know we have a space.
Revision:	1.1
Committed:	Tue Aug 30 16:59:41 2011 UTC (13 years, 7 months ago) by wmtan
Branch:	MAIN
CVS Tags:	bld_1364477047_CmsTC_slc5_amd64_gcc434, bld_1363597235_CmsTC_slc5_amd64_gcc434, bld_1361358843_CmsTC_slc5_amd64_gcc434, bld_1360935597_CmsTC_slc5_amd64_gcc434, davidlt_20130206_1149-62X, davidlt_20130206_0909-62X, davidlt_20130205_1939-62X, eulisse_20130128_1430-62X, eulisse_20130128_1043-62X, bld_1358942699_CmsTC_slc5_amd64_gcc434, bld_1358853292_CmsTC_slc5_amd64_gcc434, TW20120428p, TW20120417a, TW20120416a, TW20120410b, TW20120410a, TW20120327b, TW20120327a, davidlt_20120327_1112-51X-gcc470, davidlt_1-51X-gcc470, TW20120326a, TW20120322a, HG1203i, TW20120321c, TW20120321b, TW20120321a, CMSSW_5_1_3, TW20120320b, TW20120320a, daForCMSSW_5_1_3-osx106_amd64_gcc462, daForCMSSW_5_1_3-slc5_amd64_gcc462, TW20120319k, TW20120319j, TW20120319i, TW20120319h, TW20120319g, TW20120319f, TW20120319e, TW20120319d, TW20120319c, TW20120319b, TW20120319a, davidlt_20120314_1059-51X-gcc462, TW20120313a, davidlt_20120312_1508-51X-gcc462, TW20120309h, TW20120309g, TW20120309f, TW20120309e, TW20120309d, TW20120309c, TW20120309b, TW20120309a, TW20120308b, TW20120308a, CMSSW_5_1_2_patch1, daForCMSSW_5_1_2_patch1-slc5_amd64_gcc462, davidlt_20120307_1529-51X-gcc462, TW20120307a, CMSSW_5_1_2_ONLINE, fw20120305-cmssw512-gcc462onl, CMSSW_5_1_1_patch2_ONLINE, HG1203h, TW20120305b, CMSSW_5_1_1_patch3, daForCMSSW_5_1_1_patch3-slc5_amd64_gcc462, fw20120302-cmssw511p2-gcc461onl, HG1203g, HG1203f, BOOTSTRAP_slc6_amd64_gcc462, CMSSW_5_1_2, daForCMSSW_5_1_2-osx106_amd64_gcc462, daForCMSSW_5_1_2-slc5_amd64_gcc462, davidlt_20120224_2132-51X-gcc462, HG1203e, CMSSW_5_1_1_ONLINE, HG1203d, fw20120222-cmssw511-gcc461onl-3, fw20120222-cmssw511-gcc461onl-2, fw20120222-cmssw511-gcc461onl, fw20120221-gcc461onl, sm120221, CMSSW_5_1_1_patch2, HG1203c, daForCMSSW_5_1_1_patch2-slc5_amd64_gcc462, HG1203b, CMSSW_5_1_1_patch1, daForCMSSW_5_1_1_patch1-slc5_amd64_gcc462, TW20120216b, TW20120216a, vs20120215-51X-gcc462, vs20120215-51X, vs20120215-50X-gcc461-ports, vs20120215-50X, vs20120215-50X-ports, da20120214-50X-ports, da20120214-50X, da20120214-50X-gcc461-ports, HG1201d, CMSSW_5_1_1, CMSSW_5_0_1_patch3-gcc461-ports, CMSSW_5_0_1_patch3, HG1203a, daForCMSSW_5_0_1_patch3b-slc5_amd64_gcc461, daForCMSSW_5_0_1_patch3b-slc5_amd64_gcc434, daForCMSSW_5_1_1b-osx106_amd64_gcc462, daForCMSSW_5_1_1b-slc5_amd64_gcc462, da20120213-51X-gcc462, daForCMSSW_5_1_1-osx106_amd64_gcc462, daForCMSSW_5_0_1_patch3-slc5_amd64_gcc434, daForCMSSW_5_1_1-slc5_amd64_gcc462, TW20120210a, TW20120209a, CMSSW_5_0_1_patch2-gcc461-ports, CMSSW_5_0_1_patch2, TW20120207b, vs20120207a-51X, da20120207b-51X-gcc462, da20120207-51X-gcc462, daForCMSSW_5_0_1_patch2c-slc5_amd64_gcc461, daForCMSSW_5_0_1_patch2c-slc5_amd64_gcc434, daForCMSSW_5_0_1_patch2-slc5_amd64_gcc461, daForCMSSW_5_0_1_patch2b-slc5_amd64_gcc434, vs20120207-51X, daForCMSSW_5_0_1_patch2-slc5_amd64_gcc434, TW20120207a, da20120206-50X-gcc461-ports, da20120206-50X, da20120206-50X-ports, da20120205-50X-gcc461-ports, da20120205-50X-ports, da20120205-50X, da20120205-51X, fw20120205-cmssw50x-online, CMSSW_5_0_1_ONLINE, ge20120204-51X-gcc462-lion, ge20120204-51X-gcc462, geForCMSSW_5_2_0_pre2_TS113282_TS115242, HG1201c, CMSSW_5_0_1_patch1-gcc461-ports, CMSSW_5_0_1_patch1, bld_1328198772_crab_slc5_amd64_gcc461, CMSSW_5_0_0_patch2-gcc461-ports, CMSSW_5_0_0_patch2, fw20120202cmssw501online, fw20120201cmssw501online, TW20120130b, TW20120130a, CMSSW_5_0_1-ports, CMSSW_5_0_1-gcc461-ports, CMSSW_5_0_1, da20120129-50X-ports, da20120129-50X, da20120129-50X-gcc461-ports, TW20120127b, TW20120127a, CMSSW_5_0_0_ONLINE-cms, fw20120127gcc461cmssw500onl, fw20120126gcc461cmssw500onl, CMSSW_5_2_0_pre2_TS113282, daFor520pre2TS113282, daFor520pre2TS113042, fw20120125gcc461cmssw500onl, TW20120125a, bld_1327424666_crab-client3_slc5_amd64_gcc461, HG1201b, da20120124-52X, bld_1327416353_crab-server3_slc5_amd64_gcc461, bld_1327397075_cmsbuilder_slc5_amd64_gcc461, da20120123-52X, da20120123-51X, TW20120123a, da20120123-50X-ports, da20120123-50X, da20120123-50X-gcc461-ports, CMSSW_5_0_0_patch1-gcc461-ports, CMSSW_5_0_0_patch1, CMSSW_5_2_0_pre2, TW20120120a, daFor520pre2, da20120120-52X, TW20120119b, TW20120119a, bld_1326980038_cmsbuild_slc5_amd64_gcc461, TW20120118a, CMSSW_5_2_0_pre1, daFor520pre1, CMSSW_5_1_0_pre2, daFor510pre2, da20120116-52X, da20120112b-51X, da20120112b-52X, da20120112-50X-ports, da20120112-50X, da20120112-50X-gcc461-ports, da20120112-51X, da20120112-52X, CMSSW_5_0_0_ONLINE, bld_1326280382_cmsBuilder_slc5_amd64_gcc461, bld_1326274893_cmsBuilder_slc5_amd64_gcc461, bld_1326273864_asyncstageout_slc5_amd64_gcc461, da20120110-50X-ports, da20120110-50X, da20120110-50X-gcc461-ports, da20120110-51X, fw20120110gcc461cmssw500onl, da20120110-52X, da20120109b-51X, da20120109b-52X, da20120109-52X, da20120108-52X-ports, da20120108-52X, da20120108-52X-gcc461-ports, da20120106-52X-ports, da20120106-52X, da20120106-52X-gcc461-ports, sm120105onl500, CMSSW_5_0_0_g4emtest, sm111222a-onlgcc461, sm111222-onlgcc461, CMSSW_5_0_0-ports, da20111220-50X-ports, da20111220-50X, da20111220-50X-gcc461-ports, da20111219-50X-ports, da20111219-50X, da20111219-50X-gcc461-ports, bld_1324281658_cmsweb_osx106_amd64_gcc461, sjgFor510pre1, CMSSW_5_1_0_pre1-gcc461-ports, sjgFor510pre1d-gcc461-ports, sjgFor510pre1c-gcc461-ports, sjgFor510pre1b-gcc461-ports, HG1201a, daFor510pre1c-gcc461-ports, sjgFor500-ports, CMSSW_5_0_0-gcc461-ports, CMSSW_5_0_0, sjgFor500-gcc461-ports, sjgFor500, daFor510pre1b-gcc461-ports, az20111214-50X-gcc461-ports, az20111214-50X-ports, az20111214-50X, HG1112d, vs20111213-50X-ports, vs20111213-50X, daFor510pre1-gcc461-ports, sjgFor510pre1-gcc461-ports, fwFor500pre7-online, CMSSW_5_0_0_pre7pythia424, sjgFor500pre7p424b, sjgFor500pre7p424, CMSSW_5_0_0_pre7, CMSSW_5_0_0_pre7-gcc461-ports, bld_1323333807_CmsTC_slc5_amd64_gcc461, sjgFor500pre7-ports, sjgFor500pre7-gcc461-ports, sjgFor500pre7, da20111206b-50X-gcc461-ports, da20111206-50X-gcc461-ports, da20111205-50X-ports, da20111205-50X-gcc461-ports, da20111205-50X, sjg20111204b-50X, sjg20111204-50X, da20111202-50X-ports, da20111202-50X-gcc461-ports, da20111202-50X, vs20111201-50X-ports, da20111201f-50X-gcc461-ports, da20111201e-50X-gcc461-ports, vs20111201c-50X, vs20111201temp-50X, da20111201d-50X-gcc461-ports, vs20111201b-50X, da20111201c-50X-gcc461-ports, vs20111201-50X, da20111201c-50X-ports, HG1112c, da20111201b-50X-ports, da20111201b-50X-gcc461-ports, da20111201b-50X, da20111201-50X-gcc461-ports, da20111201-50X, da20111130-50X-ports, da20111130-50X-gcc461-ports, da20111130-50X, TW20111129e, TW20111129d, TW20111129c, TW20111129a, CMSSW_5_0_0_pre6g494, TW20111128c, da20111128-50X-ports, da20111128-50X-gcc461-ports, da20111128-50X, TW20111128b, sjgFor500pre6gcc494, TW20111128a, az20111126-50X-gcc461-ports, az20111126-50X-ports, az20111126-50X, sm20111126-50X-gcc461-ports, sm20111126-50X-ports, sm20111126-50X, az20111125-50X-ports, az20111125-50X-gcc461-ports, az20111125-50X, az20111124-50X-ports, az20111124-50X-gcc461-ports, az20111124-50X, az20111123-50X-gcc461-ports, az20111123-50X-ports, az20111123-50X, HG1112b, CMSSW_5_0_0_pre6, CMSSW_5_0_0_pre6-ports, CMSSW_5_0_0_pre6-gcc461-ports, sjgFor500pre6-ports, sjgFor500pre6-gcc461-ports, sjgFor500pre6, TW20111122a, sm20111121-50X-gcc461-ports, sm20111121-50X, sm20111121-50X-ports, az20111121-50X-ports, TW20111120a, az20111118b-50X-gcc461-ports, az20111118b-50X-ports, az20111118-50X-ports, TW20111118c, bld_1321637643_reqmon_slc5_amd64_gcc461, TW20111118b, sm20111118-50X-gcc461-ports, TW20111118a, az20111117b-50X-gcc461-ports, az20111117b-50X-ports, az20111117b-50X, az20111117-50X-gcc461-ports, HG1111e, az20111117-50X-ports, az20111117-50X, az20111116-50X-gcc461-ports, az20111116-50X-ports, az20111116-50X, bld_1321455789_happyface_slc5_amd64_gcc461, bld_1321454935_happyface_slc5_amd64_gcc461, TW20111115d, TW20111115c, TW20111115b, az20111115b-50X-gcc461-ports, az20111115b-50X-ports, az20111115-50X-gcc461-ports, az20111115-50X-ports, TW20111115a, sm111115-onlgcc461, az20111115-50X, CMSSW_5_0_0_pre5_root532rc1, azFor500pre5r532rc1, az20111111b-50X, az20111111-50X, HG1112a, sjg111108-50X-gcc461-ports, az20111108-50X-gcc461-ports, az20111108-50X-ports, az20111108-50X, CMSSW_5_0_0_pre5-ports, CMSSW_5_0_0_pre5, CMSSW_5_0_0_pre5-gcc461-ports, sjgFor500pre5-50X-gcc461-ports, sjgFor500pre5-ports, sjgFor500pre5, fwFor500pre4-online, TW20111103a, az20111102b-50X-ports, az20111102b-50X-gcc461-ports, az20111102b-50X, az20111102-50X, TW20111101e, TW20111101d, TW20111101c, TW20111101b, TW20111101a, az20111031c-50X-gcc461-ports, az20111031c-50X-ports, az20111031c-50X, az20111031b-50X, az20111031-50X, TW20111028a, az20111027c-50X-gcc461-ports, CMSSW_5_0_0_pre4-gcc461-ports, CMSSW_5_0_0_pre4-ports, CMSSW_5_0_0_pre4, az20111027b-50X-gcc461-ports, az20111027b-50X-ports, az20111027b-50X, az20111027-50X-gcc461-ports, az20111027-50X-ports, az20111027-50X, sjgFor500pre4-gcc461-ports, sjgFor500pre4-ports, sjgFor500pre4, az20111026-50X-gcc461-ports, az20111026-50X-ports, az20111026-50X, az20111025-50X-gcc461-ports, az20111025-50X-ports, az20111025-50X, bld_1319551575_PHEDEX-combined-agents_slc5_amd64_gcc461, sm20111025-50X-ports, sm20111025-50X-gcc461-ports, sm20111025-50X, az20111024-50X-gcc461-ports, az20111024-50X-ports, az20111024-50X, az20111022-50X, sjg111021c-50X-gcc461-ports, sjg111021b-50X-ports, sjg111021b-50X-gcc461-ports, sjg111021d-50X, sjg111021c-50X, sjg111021-50X-gcc461-ports, sjg111021-50X-ports, sjg111021b-50X, sjg111021-50X, az20111020-50X-gcc461-ports, CMSSW_5_0_0_pre3, CMSSW_5_0_0_pre3-gcc461-ports, CMSSW_5_0_0_pre3-ports, HG1111d, sjgFor500pre3-gcc461-ports, sjgFor500pre3-ports, sjgFor500pre3, TW20111017d, TW20111017c, TW20111017b, TW20111017a, sjgFor500pre2d-gcc461-ports, sjgFor500pre2c-gcc461-ports, sjgFor500pre2b-gcc461-ports, TW20111016a, TW20111015a, bld_1318622241_wmagent_slc5_amd64_gcc434, az20111014b-50X-gcc461-ports, az20111014-50X-ports, az20111014-50X, TW20111014a, az20111014-50X-gcc461-ports, bld_1318524794_asyncstageout_slc5_amd64_gcc434, bld_1318523430_cmsweb_slc5_amd64_gcc434, HG1111c-gcc434, HG1111c, sjgFor500pre2-gcc461-ports, az20111012-50X-ports, az20111012-50X, bld_1318424717_crab-server3_slc5_amd64_gcc434, bld_1318423430_asyncstageout_slc5_amd64_gcc434, LT20111012a, bld_1318410594_crab-server3_slc5_amd64_gcc434, az20111011c-50X-gcc461-ports, az20111011b-50X-gcc461-ports, az20111011b-50X-ports, az20111011b-50X, az20111011a-50X-gcc461-ports, az20111011a-50X-ports, az20111011a-50X, az20111011-50X, az20111010-50X-gcc461-ports, HG1111b, CMSSW_5_0_0_pre2, CMSSW_5_0_0_pre2-ports, sjgFor500pre2-ports, sjgFor500pre2, az20111007-50X-gcc461-ports, az20111007-50X-ports, az20111007-50X, az20111005-50X-gcc461-ports, HG1111a-gcc434, HG1111a, az20111004a-50X-gcc461-ports, az20111004-50X-gcc461-ports, az20111003-50X-gcc461-ports, az20110930a-50X-gcc461-ports, az20110930-50X-gcc461-ports, ge20110930-gcc461-ports, CMSSW_5_0_0_pre1-ports, az20110929a-50X-gcc461-ports, sjgFor500pre1-ports, az20110929-50X-ports, az20110929-50X-gcc461-ports, ge20110929-gcc461-ports, LT20110929b, LT20110928b, az20110928a-50X-gcc461-ports, az20110928a-50X-ports, az20110928a-50X, az20110928-50X-gcc461-ports, az20110928-50X-ports, az20110928-50X, az20110928-50X-461-ports, az20110926-50X-ports, az20110926a-50X-gcc461-ports, az20110926-gcc461-ports, ge20110926-gcc461-ports, CMSSW_5_0_0_pre1, sjgFor500pre1b, sjgFor500pre1, az20110922c-50X, ge20110923-gcc461-ports, az20110922c-50X-ports, az20110922b-50X-ports, az20110922b-50X, ge20110922b-gcc461-ports, az20110922a-50X-ports, az20110922a-50X, az20110922-50X, ge20110922-gcc461-ports, ge20110921-gcc461-ports, az20110920-50X-ports, az20110920-50X, ge20110919-gcc461, az20110918-50X-ports, az20110918-50X, az20110916c-50X-ports, az20110916c-50X, az20110916b-50X, az20110916a-50X, az20110916-50X, HG1109c-osx, ge20110914-gcc461, az20110912-50X-ports, az20110912-50X, sm20110912-50X-ports, sm20110912-50X, az20110908-50X-ports, az20110908-50X, az20110907c-50X, az20110907c-50X-ports, az20110907b-50X, sm20110907-50X-ports, sm20110907-50X, az20110906a-50X-ports, az20110906-50X-ports, az20110904-50X-ports, az20110904-50X, az20110902b-50X-ports, az20110902b-50X, az20110902a-50X, az20110902-50X-ports, az20110902-50X, az20110831-50X-ports, az20110831-50X, HEAD
Log Message:	Fix for nested spaces in types in evolution rules
#	Content
1	--- branches/v5-30-00-patches/core/metautils/inc/TSchemaRuleProcessor.h 2011/08/22 20:01:47 40663
2	+++ branches/v5-30-00-patches/core/metautils/inc/TSchemaRuleProcessor.h 2011/08/22 22:59:25 40664
3	@@ -88,9 +88,10 @@
4
5	// Split between the typename and the membername
6	// Take in consideration template names.
7	- for(std::string::size_type i=0; i<elem.size(); ++i) {
8	- if (elem[i]=='<') { ++level; }
9	- else if (elem[i]=='>') { --level; }
10	+ for(std::string::size_type j=elem.size(); j>0; --j) {
11	+ std::string::size_type i = j-1;
12	+ if (elem[i]=='<') { --level; }
13	+ else if (elem[i]=='>') { ++level; }
14	else if (level == 0 && isspace(elem[i])) {
15	type = elem.substr( 0, i );
16	// At the first iteration we know we have a space.