From 9440d323b03679901a205cd858c5e3996546da67 Mon Sep 17 00:00:00 2001 From: Ryszard Glab Date: Wed, 8 Nov 2000 17:28:24 +0000 Subject: [PATCH] ChangeLog 2000-11-08 18:25 UTC+0100 --- harbour/ChangeLog | 16 ++++++++++++++++ harbour/source/vm/macro.c | 9 ++++++--- harbour/tests/dbevalts.prg | 2 +- harbour/tests/newrdd.prg | 18 +++++++++--------- harbour/tests/testbrdb.prg | 2 +- harbour/tests/testlbl.prg | 2 +- harbour/tests/testrpt.prg | 2 +- harbour/tests/tstalias.prg | 2 +- harbour/tests/tstdbi.prg | 2 +- 9 files changed, 37 insertions(+), 18 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5fde00e06a..1a6f5e9633 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,19 @@ +2000-11-08 18:25 UTC+0100 Ryszard Glab + + *source/vm/macro.c + *fixed support for field variables in TYPE() function + + *tests/dbevalts.prg + *tests/newrdd.prg + *tests/testbrdb.prg + *tests/testlbl.prg + *tests/testrpt.prg + *tests/tstalias.prg + *tests/tstdbi.prg + *All file names should be written in lower case + NOTE: newrdd.prg still creates file in upper case since it is + hardcode somwhere in the RDD code + 2000-11-08 15:40 UTC+0100 Ryszard Glab *include/hbapi.h diff --git a/harbour/source/vm/macro.c b/harbour/source/vm/macro.c index e87228b21c..21f667bbdd 100644 --- a/harbour/source/vm/macro.c +++ b/harbour/source/vm/macro.c @@ -834,9 +834,12 @@ static void hb_compMemvarCheck( char * szVarName, HB_MACRO_DECL ) */ if( hb_memvarScope( szVarName, strlen( szVarName ) + 1 ) <= HB_MV_ERROR ) { - /* there is no memvar variable visible at this moment */ - HB_MACRO_DATA->status |= HB_MACRO_UNKN_VAR; - HB_MACRO_DATA->status &= ~HB_MACRO_CONT; /* don't run this pcode */ + if( ! hb_dynsymFind( szVarName ) ) + { + /* there is no memvar or field variable visible at this moment */ + HB_MACRO_DATA->status |= HB_MACRO_UNKN_VAR; + HB_MACRO_DATA->status &= ~HB_MACRO_CONT; /* don't run this pcode */ + } } } } diff --git a/harbour/tests/dbevalts.prg b/harbour/tests/dbevalts.prg index 539350e56a..df8f9e5d62 100644 --- a/harbour/tests/dbevalts.prg +++ b/harbour/tests/dbevalts.prg @@ -5,7 +5,7 @@ FUNCTION Main() LOCAL nCount - USE Test + USE test dbGoto( 4 ) ? RecNo() diff --git a/harbour/tests/newrdd.prg b/harbour/tests/newrdd.prg index d9e952cd88..461337b175 100644 --- a/harbour/tests/newrdd.prg +++ b/harbour/tests/newrdd.prg @@ -12,7 +12,7 @@ function Main() SET EXCLUSIVE OFF CLS - dbUseArea( .T., "DBF", "Test", "TESTDBF", .T., .F. ) + dbUseArea( .T., "DBF", "test", "TESTDBF", .T., .F. ) ? "RecCount:", TESTDBF->( RecCount() ) ? "Used:", TESTDBF->( Used() ) ? "Select:", TESTDBF->( Select() ) @@ -209,19 +209,19 @@ function Main() InKey( 0 ) CLS - ? 'dbCreate( "NewRdd", { { "First_Name", "C", 20, 0 }, ;' + ? 'dbCreate( "newrdd", { { "First_Name", "C", 20, 0 }, ;' ? ' { "Age", "N", 3, 0 }, ;' ? ' { "Date", "D", 8, 0 }, ;' ? ' { "Rate", "N", 6, 2 }, ;' ? ' { "Memo", "M", 10, 0 }, ;' - ? ' { "Student", "L", 1, 0 } },, .T., "NEWRDD" )' + ? ' { "Student", "L", 1, 0 } },, .T., "newrdd" )' ? 'SET CENTURY ON' - dbCreate( "NewRdd", { { "First_Name", "C", 20, 0 }, ; + dbCreate( "newrdd", { { "First_Name", "C", 20, 0 }, ; { "Age", "N", 3, 0 }, ; { "Date", "D", 8, 0 }, ; { "Rate", "N", 6, 2 }, ; { "Memo", "M", 10, 0 }, ; - { "Student", "L", 1, 0 } },, .T., "NEWRDD" ) + { "Student", "L", 1, 0 } },, .T., "newrdd" ) SET CENTURY ON ? "lUpdate:", NEWRDD->( lUpdate() ) @@ -301,13 +301,13 @@ function Main() CLS ? 'NEWRDD->( dbCloseArea() )' - ? 'dbUseArea( .T., "DBF", "NewRdd", "NEWRDD", .F., .F. )' + ? 'dbUseArea( .T., "DBF", "newrdd", "NEWRDD", .F., .F. )' ? 'nI := 1' ? 'NEWRDD->( __dbPack( { || QOut( nI ), nI++ } ) )' ? '? "RecCount:", NEWRDD->( RecCount() )' ? "" NEWRDD->( dbCloseArea() ) - dbUseArea( .T., "DBF", "NewRdd", "NEWRDD", .F., .F. ) + dbUseArea( .T., "DBF", "newrdd", "NEWRDD", .F., .F. ) ? "Press any key to continue..." InKey( 0 ) @@ -335,7 +335,7 @@ function Main() ? 'NEWRDD->( dbCloseArea() )' ? 'SORT ON FIRST /DC, AGE /D TO NEWRDD' - ? 'dbUseArea( .T., "DBF", "NewRdd", "NEWRDD", .F., .F. )' + ? 'dbUseArea( .T., "DBF", "newrdd", "NEWRDD", .F., .F. )' ? '? "RecCount:", NEWRDD->( RecCount() )' ? 'for nI := 1 to 8' ? ' ? NEWRDD->FIRST, NEWRDD->AGE' @@ -357,7 +357,7 @@ function Main() Select( "TESTDBF" ) SORT ON FIRST /DC, AGE /D TO NEWRDD - dbUseArea( .T., "DBF", "NewRdd", "NEWRDD", .F., .F. ) + dbUseArea( .T., "DBF", "newrdd", "NEWRDD", .F., .F. ) ? "RecCount:", NEWRDD->( RecCount() ) for nI := 1 to 8 ? NEWRDD->FIRST, NEWRDD->AGE diff --git a/harbour/tests/testbrdb.prg b/harbour/tests/testbrdb.prg index 1e2247b303..e7f69e6f8c 100644 --- a/harbour/tests/testbrdb.prg +++ b/harbour/tests/testbrdb.prg @@ -10,7 +10,7 @@ function Main() cColor := SETCOLOR("W+/B") CLS - USE Test + USE test Browse() SETCOLOR(cColor) diff --git a/harbour/tests/testlbl.prg b/harbour/tests/testlbl.prg index e06402318f..46a6fecfd6 100644 --- a/harbour/tests/testlbl.prg +++ b/harbour/tests/testlbl.prg @@ -4,7 +4,7 @@ FUNCTION MAIN() - USE Test New + USE test New LABEL FORM TEST diff --git a/harbour/tests/testrpt.prg b/harbour/tests/testrpt.prg index fb4c8f8580..5c28fe951d 100644 --- a/harbour/tests/testrpt.prg +++ b/harbour/tests/testrpt.prg @@ -4,7 +4,7 @@ FUNCTION() MAIN - USE Test New + USE test New Report FORM TEST diff --git a/harbour/tests/tstalias.prg b/harbour/tests/tstalias.prg index b3bf6c51a9..9d2e617277 100644 --- a/harbour/tests/tstalias.prg +++ b/harbour/tests/tstalias.prg @@ -4,7 +4,7 @@ FUNCTION Main() - USE TEST + USE test REPLACE Age WITH 1 ? FIELD->Age diff --git a/harbour/tests/tstdbi.prg b/harbour/tests/tstdbi.prg index c804347d9c..15108cfca2 100644 --- a/harbour/tests/tstdbi.prg +++ b/harbour/tests/tstdbi.prg @@ -13,7 +13,7 @@ funct main() local i local cStr := "" - USE "TEST" NEW + USE "test" NEW for i := 1 to 100 cStr += Str( i ) + " " + xToStr( DbInfo( i ) ) + CRLF