@@ -45,48 +45,48 @@ path& path::replace_extension(path const& replacement) {
4545
4646string_view_t path::__root_name () const {
4747 auto PP = PathParser::CreateBegin (__pn_);
48- if (PP.State == PathParser::PS_InRootName)
48+ if (PP.State_ == PathParser::PS_InRootName)
4949 return *PP;
5050 return {};
5151}
5252
5353string_view_t path::__root_directory () const {
5454 auto PP = PathParser::CreateBegin (__pn_);
55- if (PP.State == PathParser::PS_InRootName)
55+ if (PP.State_ == PathParser::PS_InRootName)
5656 ++PP;
57- if (PP.State == PathParser::PS_InRootDir)
57+ if (PP.State_ == PathParser::PS_InRootDir)
5858 return *PP;
5959 return {};
6060}
6161
6262string_view_t path::__root_path_raw () const {
6363 auto PP = PathParser::CreateBegin (__pn_);
64- if (PP.State == PathParser::PS_InRootName) {
64+ if (PP.State_ == PathParser::PS_InRootName) {
6565 auto NextCh = PP.peek ();
6666 if (NextCh && isSeparator (*NextCh)) {
6767 ++PP;
6868 return createView (__pn_.data (), &PP.RawEntry .back ());
6969 }
7070 return PP.RawEntry ;
7171 }
72- if (PP.State == PathParser::PS_InRootDir)
72+ if (PP.State_ == PathParser::PS_InRootDir)
7373 return *PP;
7474 return {};
7575}
7676
7777static bool ConsumeRootName (PathParser* PP) {
7878 static_assert (PathParser::PS_BeforeBegin == 1 && PathParser::PS_InRootName == 2 , " Values for enums are incorrect" );
79- while (PP->State <= PathParser::PS_InRootName)
79+ while (PP->State_ <= PathParser::PS_InRootName)
8080 ++(*PP);
81- return PP->State == PathParser::PS_AtEnd;
81+ return PP->State_ == PathParser::PS_AtEnd;
8282}
8383
8484static bool ConsumeRootDir (PathParser* PP) {
8585 static_assert (PathParser::PS_BeforeBegin == 1 && PathParser::PS_InRootName == 2 && PathParser::PS_InRootDir == 3 ,
8686 " Values for enums are incorrect" );
87- while (PP->State <= PathParser::PS_InRootDir)
87+ while (PP->State_ <= PathParser::PS_InRootDir)
8888 ++(*PP);
89- return PP->State == PathParser::PS_AtEnd;
89+ return PP->State_ == PathParser::PS_AtEnd;
9090}
9191
9292string_view_t path::__relative_path () const {
@@ -248,7 +248,7 @@ path path::lexically_relative(const path& base) const {
248248 auto PP = PathParser::CreateBegin (__pn_);
249249 auto PPBase = PathParser::CreateBegin (base.__pn_ );
250250 auto CheckIterMismatchAtBase = [&]() {
251- return PP.State != PPBase.State && (PP.inRootPath () || PPBase.inRootPath ());
251+ return PP.State_ != PPBase.State_ && (PP.inRootPath () || PPBase.inRootPath ());
252252 };
253253 if (PP.inRootName () && PPBase.inRootName ()) {
254254 if (*PP != *PPBase)
@@ -267,7 +267,7 @@ path path::lexically_relative(const path& base) const {
267267 // Find the first mismatching element
268268 auto PP = PathParser::CreateBegin (__pn_);
269269 auto PPBase = PathParser::CreateBegin (base.__pn_ );
270- while (PP && PPBase && PP.State == PPBase.State && *PP == *PPBase) {
270+ while (PP && PPBase && PP.State_ == PPBase.State_ && *PP == *PPBase) {
271271 ++PP;
272272 ++PPBase;
273273 }
@@ -380,7 +380,7 @@ path::iterator path::begin() const {
380380 auto PP = PathParser::CreateBegin (__pn_);
381381 iterator it;
382382 it.__path_ptr_ = this ;
383- it.__state_ = static_cast <path::iterator::_ParserState>(PP.State );
383+ it.__state_ = static_cast <path::iterator::_ParserState>(PP.State_ );
384384 it.__entry_ = PP.RawEntry ;
385385 it.__stashed_elem_ .__assign_view (*PP);
386386 return it;
@@ -396,7 +396,7 @@ path::iterator path::end() const {
396396path::iterator& path::iterator::__increment () {
397397 PathParser PP (__path_ptr_->native (), __entry_, __state_);
398398 ++PP;
399- __state_ = static_cast <_ParserState>(PP.State );
399+ __state_ = static_cast <_ParserState>(PP.State_ );
400400 __entry_ = PP.RawEntry ;
401401 __stashed_elem_.__assign_view (*PP);
402402 return *this ;
@@ -405,7 +405,7 @@ path::iterator& path::iterator::__increment() {
405405path::iterator& path::iterator::__decrement () {
406406 PathParser PP (__path_ptr_->native (), __entry_, __state_);
407407 --PP;
408- __state_ = static_cast <_ParserState>(PP.State );
408+ __state_ = static_cast <_ParserState>(PP.State_ );
409409 __entry_ = PP.RawEntry ;
410410 __stashed_elem_.__assign_view (*PP);
411411 return *this ;
0 commit comments