From ed374848109f2c87dc5bc269e822f70dc902bc26 Mon Sep 17 00:00:00 2001 From: inoussa Date: Mon, 11 Oct 2010 12:22:23 +0000 Subject: [PATCH] Replace property "store" prefix by sWST_PROP_STORE_PREFIX( = 'wstHas_') git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1339 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- wst/trunk/ws_helper/pascal_parser_intf.pas | 1 + wst/trunk/ws_helper/ws_parser_imp.pas | 6 +++--- wst/trunk/wst_types.pas | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wst/trunk/ws_helper/pascal_parser_intf.pas b/wst/trunk/ws_helper/pascal_parser_intf.pas index 0ba87d5b8..144cf276b 100644 --- a/wst/trunk/ws_helper/pascal_parser_intf.pas +++ b/wst/trunk/ws_helper/pascal_parser_intf.pas @@ -29,6 +29,7 @@ const sARRAY_STYLE_SCOPED = 'ARRAY_STYLE_SCOPED'; sARRAY_STYLE_EMBEDDED = 'ARRAY_STYLE_EMBEDDED'; sARRAY_IS_COLLECTION = 'ARRAY_COLLECTION'; + sWST_PROP_STORE_PREFIX = 'wstHas_'; sXSD_NS = 'http://www.w3.org/2001/XMLSchema'; diff --git a/wst/trunk/ws_helper/ws_parser_imp.pas b/wst/trunk/ws_helper/ws_parser_imp.pas index 5e4e6664f..2edbf7db5 100644 --- a/wst/trunk/ws_helper/ws_parser_imp.pas +++ b/wst/trunk/ws_helper/ws_parser_imp.pas @@ -952,7 +952,7 @@ var locProp.ReadAccessorName := 'F' + locProp.Name; locProp.WriteAccessorName := 'F' + locProp.Name; if ( locMinOccur = 0 ) then begin - locProp.StoredAccessorName := 'Has' + locProp.Name; + locProp.StoredAccessorName := sWST_PROP_STORE_PREFIX + locProp.Name; end else if ( locMinOccur = -1 ) then begin locProp.StoredAccessorName := 'False'; end else begin @@ -1190,7 +1190,7 @@ begin end; if AnsiSameText(propTyp.StoredAccessorName,'False') then locStrBuffer := s_prohibited - else if AnsiSameText(Copy(propTyp.StoredAccessorName,1,3),'Has') then + else if AnsiSameText(Copy(propTyp.StoredAccessorName,1,3),sWST_PROP_STORE_PREFIX) then locStrBuffer := s_optional else locStrBuffer := s_required; @@ -1313,7 +1313,7 @@ var FSymbols.SetPropertyAsAttribute(locAttObj,True); case locStoreOptIdx of 0 : locAttObj.StoredAccessorName := 'True'; - 1 : locAttObj.StoredAccessorName := 'Has' + locAttObj.Name; + 1 : locAttObj.StoredAccessorName := sWST_PROP_STORE_PREFIX + locAttObj.Name; 2 : locAttObj.StoredAccessorName := 'False'; end; end; diff --git a/wst/trunk/wst_types.pas b/wst/trunk/wst_types.pas index 85cd5f24f..9efcbfcb6 100644 --- a/wst/trunk/wst_types.pas +++ b/wst/trunk/wst_types.pas @@ -51,3 +51,4 @@ begin end; end. +