From da27b3e46e08a32a9f9fb624697eb1f0a771367d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 11 Oct 1999 08:54:05 +0000
Subject: [PATCH] 19991011-10:40 GMT+1

---
 harbour/ChangeLog       |  9 +++++++++
 harbour/source/vm/hvm.c | 18 +++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6952c72edf..af1c800ee5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+19991011-10:40 GMT+1 Victor Szel <info@szelvesz.hu>
+   * source/vm/hvm.c
+     ! __vmVarSList() <-> __vmVarSGet(), the function names were mistakenly
+       exchanged, not OK.
+     % __vmVarSGet() - Simplified.
+   * source/vm/hvm.c
+     ! HB_P_NOOP - Caused an infinite loop, fixed. (again)
+     % hb_vmPlus(), hb_vmMinus() - Two returns from inside removed. (again)
+
 19991011-10:04 GMT+1 Antonio Linares <alinares@fivetech.com>
    * source/rtl/classes.c
      + little change to fix Super accesses
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 25f06d6ddc..ee210a9607 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -959,6 +959,7 @@ void hb_vmExecute( BYTE * pCode, PHB_SYMB pSymbols )
 
          case HB_P_NOOP:
             /* Intentionally do nothing */
+            w += 1
             break;
 
          default:
@@ -1059,7 +1060,6 @@ static void hb_vmPlus( void )
             pItem2->item.asString.value = NULL;
          }
          hb_stackPop();
-         return;
       }
       else
          hb_errRT_BASE( EG_STROVERFLOW, 1209, NULL, "+" );
@@ -1160,7 +1160,6 @@ static void hb_vmMinus( void )
             pItem2->item.asString.value = NULL;
          }
          hb_stackPop();
-         return;
       }
       else
          hb_errRT_BASE( EG_STROVERFLOW, 1210, NULL, "-" );
@@ -3474,12 +3473,12 @@ HARBOUR HB___XHELP( void )
 }
 
 /* $Doc$
- * $FuncName$     <aStat> __vmVarSGet()
+ * $FuncName$     <aStat> __vmVarSList()
  * $Description$  Return the statics array
  *
  *                Please aClone before assignments
  * $End$ */
-HARBOUR HB___VMVARSGET( void )
+HARBOUR HB___VMVARSLIST( void )
 {
    PHB_ITEM pStatics = hb_arrayClone( &s_aStatics );
 
@@ -3488,14 +3487,11 @@ HARBOUR HB___VMVARSGET( void )
 }
 
 /* $Doc$
- * $FuncName$     <xStat> __vmVarSList(<nStatic>)
+ * $FuncName$     <xStat> __vmVarSGet(<nStatic>)
  * $Description$  Return a specified statics
  * $End$ */
-HARBOUR HB___VMVARSLIST( void )
+HARBOUR HB___VMVARSGET( void )
 {
-   USHORT uiStatic = hb_parni( 1 );
-   PHB_ITEM pStatic = s_aStatics.item.asArray.value->pItems +
-                      hb_stack.iStatics + uiStatic - 1;
-
-   hb_itemReturn( pStatic );
+   hb_itemReturn( s_aStatics.item.asArray.value->pItems +
+                  hb_stack.iStatics + hb_parni( 1 ) - 1 );
 }