From 3b35de952aeb1bcadbca0445afcdfce2aca9c739 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 28 Mar 2013 15:54:21 +0100
Subject: [PATCH] use :__enumIsLast()

---
 ChangeLog.txt                             | 7 +++++++
 contrib/hbnetio/utils/hbnetio/netiomgm.hb | 4 ++--
 src/rtl/hbdoc.prg                         | 2 +-
 src/rtl/hbfilehi.prg                      | 6 +++---
 tests/stripeol.hb                         | 2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 35edb68a5a..c1f5d59756 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-28 15:53 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbnetio/utils/hbnetio/netiomgm.hb
+  * src/rtl/hbdoc.prg
+  * src/rtl/hbfilehi.prg
+  * tests/stripeol.hb
+    % use :__enumIsLast()
+
 2013-03-28 14:51 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.es_PE.po
   * utils/hbmk2/hbmk2.hu_HU.po
diff --git a/contrib/hbnetio/utils/hbnetio/netiomgm.hb b/contrib/hbnetio/utils/hbnetio/netiomgm.hb
index 1aca078724..b4f67ff7b8 100644
--- a/contrib/hbnetio/utils/hbnetio/netiomgm.hb
+++ b/contrib/hbnetio/utils/hbnetio/netiomgm.hb
@@ -307,7 +307,7 @@ STATIC FUNCTION XToStrX( xValue )
 
       FOR EACH tmp IN xValue
          cRetVal += XToStrX( tmp )
-         IF tmp:__enumIndex() < Len( tmp:__enumBase() )
+         IF ! tmp:__enumIsLast()
             cRetVal += ", "
          ENDIF
       NEXT
@@ -320,7 +320,7 @@ STATIC FUNCTION XToStrX( xValue )
 
       FOR EACH tmp IN xValue
          cRetVal += tmp:__enumKey() + " => " + XToStrX( tmp )
-         IF tmp:__enumIndex() < Len( tmp:__enumBase() )
+         IF ! tmp:__enumIsLast()
             cRetVal += ", "
          ENDIF
       NEXT
diff --git a/src/rtl/hbdoc.prg b/src/rtl/hbdoc.prg
index 143539b5ee..1aa5ab1694 100644
--- a/src/rtl/hbdoc.prg
+++ b/src/rtl/hbdoc.prg
@@ -321,7 +321,7 @@ FUNCTION __hbdoc_FilterOut( cFile )
                ENDIF
                IF nEmpty < 2
                   cOK += cLine
-                  IF cLine:__enumIndex() < Len( cLine:__enumBase() )
+                  IF ! cLine:__enumIsLast()
                      cOK += hb_eol()
                   ENDIF
                ENDIF
diff --git a/src/rtl/hbfilehi.prg b/src/rtl/hbfilehi.prg
index feff500921..c862e7b232 100644
--- a/src/rtl/hbfilehi.prg
+++ b/src/rtl/hbfilehi.prg
@@ -66,7 +66,7 @@ FUNCTION hb_PathNormalize( cPath )
 
          IF cDir == "." .OR. ;
             ( Empty( cDir ) .AND. ;
-            cDir:__enumIndex() < Len( cDir:__enumBase() ) .AND. ;
+            ! cDir:__enumIsLast() .AND. ;
             ( cDir:__enumIndex() > 2 .OR. ;
             ( cDir:__enumIndex() == 2 .AND. ! Empty( aDir[ 1 ] ) ) ) )
 
@@ -76,7 +76,7 @@ FUNCTION hb_PathNormalize( cPath )
             ! Empty( cDir ) .AND. ;
             ! _ISDRIVESPEC( cDir )
 
-            IF cDir:__enumIndex() < Len( cDir:__enumBase() ) .AND. ;
+            IF ! cDir:__enumIsLast() .AND. ;
                aDir[ cDir:__enumIndex() + 1 ] == ".."
                hb_ADel( aDir, cDir:__enumIndex() + 1, .T. )
                hb_ADel( aDir, cDir:__enumIndex(), .T. )
@@ -87,7 +87,7 @@ FUNCTION hb_PathNormalize( cPath )
       cPath := ""
       FOR EACH cDir IN aDir
          cPath += cDir
-         IF cDir:__enumIndex() < Len( cDir:__enumBase() )
+         IF ! cDir:__enumIsLast()
             cPath += hb_ps()
          ENDIF
       NEXT
diff --git a/tests/stripeol.hb b/tests/stripeol.hb
index b6a1dc4537..874bf628e1 100644
--- a/tests/stripeol.hb
+++ b/tests/stripeol.hb
@@ -31,7 +31,7 @@ FUNCTION __stripeol( cFile )
 
    FOR EACH cLine IN hb_ATokens( StrTran( StrTran( cFile, Chr( 13 ) ), Chr( 9 ), " " ), Chr( 10 ) )
       cOK += RTrim( cLine )
-      IF cLine:__enumIndex() < Len( cLine:__enumBase )
+      IF ! cLine:__enumIsLast()
          cOK += hb_eol()
       ENDIF
    NEXT