fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-12-19 06:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/utils/hbtest/rt_hvm.prg
  * harbour/utils/hbtest/rt_hvma.prg
    * updated error messages for compilation with -z (no shortcut
      optimization)
This commit is contained in:
Przemyslaw Czerpak
2008-12-19 05:52:37 +00:00
parent 4c56ab22f8
commit f5d3211787
3 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -8,6 +8,12 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-12-19 06:55 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/utils/hbtest/rt_hvm.prg
* harbour/utils/hbtest/rt_hvma.prg
* updated error messages for compilation with -z (no shortcut
optimization)
2008-12-19 04:30 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbmysql/tmysql.prg
* harbour/contrib/hbpgsql/pgrdd.prg

13
harbour/utils/hbtest/rt_hvm.prg
View File

@@ -57,12 +57,6 @@
PROCEDURE Main_HVM()
/* NOTE: CA-Cl*pper PP fails on these
TEST_LINE( "1" .AND. "2" , "E BASE 1066 Argument error conditional " )
TEST_LINE( "1" .AND. .F. , .F. )
TEST_LINE( "A" > 1 , "E BASE 1075 Argument error > F:S" )
*/
/* VALTYPE() */
TEST_LINE( ValType( scString ) , "C" )
@@ -487,6 +481,7 @@ PROCEDURE Main_HVM()
TEST_LINE( "" == suNIL , .F. )
TEST_LINE( suNIL == "" , .F. )
TEST_LINE( scString == NIL , .F. )
TEST_LINE( "A" == 1 , "E 1 BASE 1070 Argument error (==) OS:0 #:0 A:2:C:A;N:1 F:S" )
TEST_LINE( scString == 1 , "E 1 BASE 1070 Argument error (==) OS:0 #:0 A:2:C:HELLO;N:1 F:S" )
TEST_LINE( soObject == "" , "E 1 BASE 1070 Argument error (==) OS:0 #:0 A:2:O:ERROR Object;C: F:S" )
TEST_LINE( soObject == soObject , .T. )
@@ -501,6 +496,7 @@ PROCEDURE Main_HVM()
TEST_LINE( NIL = NIL , .T. )
TEST_LINE( scString = NIL , .F. )
TEST_LINE( "A" = 1 , "E 1 BASE 1071 Argument error (=) OS:0 #:0 A:2:C:A;N:1 F:S" )
TEST_LINE( scString = 1 , "E 1 BASE 1071 Argument error (=) OS:0 #:0 A:2:C:HELLO;N:1 F:S" )
TEST_LINE( soObject = "" , "E 1 BASE 1071 Argument error (=) OS:0 #:0 A:2:O:ERROR Object;C: F:S" )
TEST_LINE( soObject = soObject , "E 1 BASE 1071 Argument error (=) OS:0 #:0 A:2:O:ERROR Object;O:ERROR Object F:S" )
@@ -515,6 +511,7 @@ PROCEDURE Main_HVM()
TEST_LINE( NIL != NIL , .F. )
TEST_LINE( scString != NIL , .T. )
TEST_LINE( "A" != 1 , "E 1 BASE 1072 Argument error (<>) OS:0 #:0 A:2:C:A;N:1 F:S" )
TEST_LINE( scString != 1 , "E 1 BASE 1072 Argument error (<>) OS:0 #:0 A:2:C:HELLO;N:1 F:S" )
TEST_LINE( soObject != "" , "E 1 BASE 1072 Argument error (<>) OS:0 #:0 A:2:O:ERROR Object;C: F:S" )
TEST_LINE( soObject != soObject , "E 1 BASE 1072 Argument error (<>) OS:0 #:0 A:2:O:ERROR Object;O:ERROR Object F:S" )
@@ -529,6 +526,7 @@ PROCEDURE Main_HVM()
TEST_LINE( NIL < NIL , "E 1 BASE 1073 Argument error (<) OS:0 #:0 A:2:U:NIL;U:NIL F:S" )
TEST_LINE( scString < NIL , "E 1 BASE 1073 Argument error (<) OS:0 #:0 A:2:C:HELLO;U:NIL F:S" )
TEST_LINE( "A" < 1 , "E 1 BASE 1073 Argument error (<) OS:0 #:0 A:2:C:A;N:1 F:S" )
TEST_LINE( scString < 1 , "E 1 BASE 1073 Argument error (<) OS:0 #:0 A:2:C:HELLO;N:1 F:S" )
TEST_LINE( soObject < "" , "E 1 BASE 1073 Argument error (<) OS:0 #:0 A:2:O:ERROR Object;C: F:S" )
TEST_LINE( soObject < soObject , "E 1 BASE 1073 Argument error (<) OS:0 #:0 A:2:O:ERROR Object;O:ERROR Object F:S" )
@@ -543,6 +541,7 @@ PROCEDURE Main_HVM()
TEST_LINE( NIL <= NIL , "E 1 BASE 1074 Argument error (<=) OS:0 #:0 A:2:U:NIL;U:NIL F:S" )
TEST_LINE( scString <= NIL , "E 1 BASE 1074 Argument error (<=) OS:0 #:0 A:2:C:HELLO;U:NIL F:S" )
TEST_LINE( "A" <= 1 , "E 1 BASE 1074 Argument error (<=) OS:0 #:0 A:2:C:A;N:1 F:S" )
TEST_LINE( scString <= 1 , "E 1 BASE 1074 Argument error (<=) OS:0 #:0 A:2:C:HELLO;N:1 F:S" )
TEST_LINE( soObject <= "" , "E 1 BASE 1074 Argument error (<=) OS:0 #:0 A:2:O:ERROR Object;C: F:S" )
TEST_LINE( soObject <= soObject , "E 1 BASE 1074 Argument error (<=) OS:0 #:0 A:2:O:ERROR Object;O:ERROR Object F:S" )
@@ -557,6 +556,7 @@ PROCEDURE Main_HVM()
TEST_LINE( NIL > NIL , "E 1 BASE 1075 Argument error (>) OS:0 #:0 A:2:U:NIL;U:NIL F:S" )
TEST_LINE( scString > NIL , "E 1 BASE 1075 Argument error (>) OS:0 #:0 A:2:C:HELLO;U:NIL F:S" )
TEST_LINE( "A" > 1 , "E 1 BASE 1075 Argument error (>) OS:0 #:0 A:2:C:A;N:1 F:S" )
TEST_LINE( scString > 1 , "E 1 BASE 1075 Argument error (>) OS:0 #:0 A:2:C:HELLO;N:1 F:S" )
TEST_LINE( soObject > "" , "E 1 BASE 1075 Argument error (>) OS:0 #:0 A:2:O:ERROR Object;C: F:S" )
TEST_LINE( soObject > soObject , "E 1 BASE 1075 Argument error (>) OS:0 #:0 A:2:O:ERROR Object;O:ERROR Object F:S" )
@@ -571,6 +571,7 @@ PROCEDURE Main_HVM()
TEST_LINE( NIL >= NIL , "E 1 BASE 1076 Argument error (>=) OS:0 #:0 A:2:U:NIL;U:NIL F:S" )
TEST_LINE( scString >= NIL , "E 1 BASE 1076 Argument error (>=) OS:0 #:0 A:2:C:HELLO;U:NIL F:S" )
TEST_LINE( "A" >= 1 , "E 1 BASE 1076 Argument error (>=) OS:0 #:0 A:2:C:A;N:1 F:S" )
TEST_LINE( scString >= 1 , "E 1 BASE 1076 Argument error (>=) OS:0 #:0 A:2:C:HELLO;N:1 F:S" )
TEST_LINE( soObject >= "" , "E 1 BASE 1076 Argument error (>=) OS:0 #:0 A:2:O:ERROR Object;C: F:S" )
TEST_LINE( soObject >= soObject , "E 1 BASE 1076 Argument error (>=) OS:0 #:0 A:2:O:ERROR Object;O:ERROR Object F:S" )

68
harbour/utils/hbtest/rt_hvma.prg
View File

@@ -248,6 +248,7 @@ PROCEDURE Main_HVMA()
/* With the shortcut optimization *ON* */
TEST_LINE( "1" .AND. "2" , "E 1 BASE 1066 Argument error (conditional) OS:0 #:0 A:1:C:1 " )
TEST_LINE( 1 .AND. 2 , "E 1 BASE 1066 Argument error (conditional) OS:0 #:0 A:1:N:1 " )
TEST_LINE( NIL .AND. NIL , "E 1 BASE 1066 Argument error (conditional) OS:0 #:0 A:1:U:NIL " )
TEST_LINE( scString .AND. scString , "E 1 BASE 1066 Argument error (conditional) OS:0 #:0 A:1:C:HELLO " )
@@ -265,10 +266,12 @@ PROCEDURE Main_HVMA()
TEST_LINE( .F. .AND. NIL , .F. )
TEST_LINE( .F. .AND. {} , .F. )
TEST_LINE( .F. .AND. {|| NIL } , .F. )
TEST_LINE( "1" .AND. .F. , .F. )
TEST_LINE( 1 .AND. .F. , .F. )
TEST_LINE( 1.567 .AND. .F. , .F. )
TEST_LINE( scString .AND. .F. , .F. )
TEST_LINE( "1" .OR. "2" , "E 1 BASE 1066 Argument error (conditional) OS:0 #:0 A:1:C:1 " )
TEST_LINE( 1 .OR. 2 , "E 1 BASE 1066 Argument error (conditional) OS:0 #:0 A:1:N:1 " )
TEST_LINE( .F. .OR. 2 , 2 )
TEST_LINE( .F. .OR. 1.678 , 1.678 )
@@ -276,6 +279,7 @@ PROCEDURE Main_HVMA()
TEST_LINE( .T. .OR. 2 , .T. )
TEST_LINE( .T. .OR. 1.678 , .T. )
TEST_LINE( .T. .OR. scString , .T. )
TEST_LINE( "1" .OR. .F. , "1" )
TEST_LINE( 1 .OR. .F. , 1 )
TEST_LINE( 1.0 .OR. .F. , 1.0 )
TEST_LINE( scString .OR. .F. , "HELLO" )
@@ -284,37 +288,41 @@ PROCEDURE Main_HVMA()
/* With the shortcut optimization *OFF* (/z switch) */
TEST_LINE( 1 .AND. 2 , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( NIL .AND. NIL , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( scString .AND. scString , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .T. .AND. 1 , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .T. .AND. 1.567 , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .T. .AND. scString , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .T. .AND. HB_SToD("") , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .T. .AND. NIL , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .T. .AND. {} , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .T. .AND. {|| NIL } , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .F. .AND. 1 , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .F. .AND. 1.567 , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .F. .AND. scString , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .F. .AND. HB_SToD("") , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .F. .AND. NIL , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .F. .AND. {} , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( .F. .AND. {|| NIL } , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( 1 .AND. .F. , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( 1.567 .AND. .F. , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( scString .AND. .F. , "E BASE 1078 Argument error .AND. F:S" )
TEST_LINE( "1" .AND. "2" , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:C:1;C:2 F:S" )
TEST_LINE( 1 .AND. 2 , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:N:1;N:2 F:S" )
TEST_LINE( NIL .AND. NIL , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:U:NIL;U:NIL F:S" )
TEST_LINE( scString .AND. scString , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:C:HELLO;C:HELLO F:S" )
TEST_LINE( .T. .AND. 1 , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.T.;N:1 F:S" )
TEST_LINE( .T. .AND. 1.567 , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.T.;N:1.567 F:S" )
TEST_LINE( .T. .AND. scString , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.T.;C:HELLO F:S" )
TEST_LINE( .T. .AND. HB_SToD("") , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.T.;D: F:S" )
TEST_LINE( .T. .AND. NIL , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.T.;U:NIL F:S" )
TEST_LINE( .T. .AND. {} , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.T.;A:{.[0].} F:S" )
TEST_LINE( .T. .AND. {|| NIL } , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.T.;B:{||...} F:S" )
TEST_LINE( .F. .AND. 1 , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.F.;N:1 F:S" )
TEST_LINE( .F. .AND. 1.567 , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.F.;N:1.567 F:S" )
TEST_LINE( .F. .AND. scString , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.F.;C:HELLO F:S" )
TEST_LINE( .F. .AND. HB_SToD("") , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.F.;D: F:S" )
TEST_LINE( .F. .AND. NIL , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.F.;U:NIL F:S" )
TEST_LINE( .F. .AND. {} , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.F.;A:{.[0].} F:S" )
TEST_LINE( .F. .AND. {|| NIL } , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:L:.F.;B:{||...} F:S" )
TEST_LINE( "1" .AND. .F. , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:C:1;L:.F. F:S" )
TEST_LINE( 1 .AND. .F. , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:N:1;L:.F. F:S" )
TEST_LINE( 1.567 .AND. .F. , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:N:1.567;L:.F. F:S" )
TEST_LINE( scString .AND. .F. , "E 1 BASE 1078 Argument error (.AND.) OS:0 #:0 A:2:C:HELLO;L:.F. F:S" )
TEST_LINE( 1 .OR. 2 , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( .F. .OR. 2 , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( .F. .OR. 1.678 , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( .F. .OR. scString , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( .T. .OR. 2 , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( .T. .OR. 1.678 , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( .T. .OR. scString , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( 1 .OR. .F. , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( 1.0 .OR. .F. , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( scString .OR. .F. , "E BASE 1079 Argument error .OR. F:S" )
TEST_LINE( "1" .OR. "2" , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:C:1;C:2 F:S" )
TEST_LINE( 1 .OR. 2 , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:N:1;N:2 F:S" )
TEST_LINE( .F. .OR. 2 , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:L:.F.;N:2 F:S" )
TEST_LINE( .F. .OR. 1.678 , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:L:.F.;N:1.678 F:S" )
TEST_LINE( .F. .OR. scString , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:L:.F.;C:HELLO F:S" )
TEST_LINE( .T. .OR. 2 , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:L:.T.;N:2 F:S" )
TEST_LINE( .T. .OR. 1.678 , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:L:.T.;N:1.678 F:S" )
TEST_LINE( .T. .OR. scString , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:L:.T.;C:HELLO F:S" )
TEST_LINE( "1" .OR. .F. , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:C:1;L:.F. F:S" )
TEST_LINE( 1 .OR. .F. , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:N:1;L:.F. F:S" )
TEST_LINE( 1.0 .OR. .F. , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:N:1.0;L:.F. F:S" )
TEST_LINE( scString .OR. .F. , "E 1 BASE 1079 Argument error (.OR.) OS:0 #:0 A:2:C:HELLO;L:.F. F:S" )
ENDIF