diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7546a79bca..df74d4d11c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,15 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ +2001-12-28 18:36 UTC+0100 Antonio Linares + * source/vm/extend.c + + New function hb_extIsArray() added + function to be called from pcode DLLs to detect if the extend system + is going to use an array item + + * source/vm/maindllp.c + + extend system for pcode DLLs implementation started + 2001-12-28 23:30 UTC+0700 Andi Jahja * hrbdll.bc * hrbdll.vc diff --git a/harbour/utils/hbmake/ffile1.prg b/harbour/utils/hbmake/ffile1.prg index f2dfbb1773..7dbbf7b588 100644 --- a/harbour/utils/hbmake/ffile1.prg +++ b/harbour/utils/hbmake/ffile1.prg @@ -56,11 +56,11 @@ *+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北 *+ -*+ Class FileBase +*+ Class HBMake_FileBase *+ *+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北 *+ -CLASS FileBase FROM FileMan +CLASS HBMake_FileBase FROM FileMan DATA nOpenMode // Holds the value to use when opening the file DATA nCreateMode // Holds the value to use when creating the file @@ -100,7 +100,7 @@ ENDCLASS Returns: Self Purpose: Constructor */ -METHOD new( cName ) CLASS FileBase +METHOD new( cName ) CLASS HBMake_FileBase super:new() // first thing to do is check to see if there is a valid file @@ -121,7 +121,7 @@ METHOD new( cName ) CLASS FileBase on the value of ::nSkipLength which holds the skipping base. This class's purpose is to do one byte movements. */ -METHOD fskip( nRecords ) CLASS FileBase +METHOD fskip( nRecords ) CLASS HBMake_FileBase DEFAULT nRecords TO 1 @@ -148,7 +148,7 @@ METHOD fskip( nRecords ) CLASS FileBase Returns: Self Purpose: Move the byte pointer to the top of the file */ -METHOD fgotop() CLASS FileBase +METHOD fgotop() CLASS HBMake_FileBase IF ::noDosError() .AND. ::nDosHandle > 0 ::nPosition := FSEEK( ::nDosHandle, 0, 0 ) @@ -164,7 +164,7 @@ METHOD fgotop() CLASS FileBase Returns: Self Purpose: Move hte byte pointer of the file to tbe bottom. */ -METHOD fgoBottom() CLASS FileBase +METHOD fgoBottom() CLASS HBMake_FileBase IF ::noDosError() .AND. ::nDosHandle > 0 ::nPosition := FSEEK( ::nDosHandle, 0, 2 ) @@ -180,7 +180,7 @@ METHOD fgoBottom() CLASS FileBase Returns: Self Purpose: To close the file */ -METHOD closefile() CLASS FileBase +METHOD closefile() CLASS HBMake_FileBase IF ::noDosError() .AND. ::nDosHandle > 0 FCLOSE( ::nDosHandle ) @@ -198,7 +198,7 @@ METHOD closefile() CLASS FileBase Purpose: To return the contents of the file at the current position based on the length of ::nSkipLength. */ -METHOD retrieve() CLASS FileBase +METHOD retrieve() CLASS HBMake_FileBase LOCAL cReturn // as char LOCAL nMoved // as int @@ -218,7 +218,7 @@ METHOD retrieve() CLASS FileBase Purpose: To write out to the contents of the file the value in the parameter . */ -METHOD FWRITE( cChar ) CLASS FileBase +METHOD FWRITE( cChar ) CLASS HBMake_FileBase IF ::noDosError() .AND. ::nDosHandle > 0 IF cChar IS pCHARACTER @@ -239,7 +239,7 @@ METHOD FWRITE( cChar ) CLASS FileBase within the file. It is also based on the value stored to the ::nSkipLength instance variable */ -METHOD fgoto( nValue ) CLASS FileBase +METHOD fgoto( nValue ) CLASS HBMake_FileBase IF ::noDosError() .AND. ::nDosHandle > 0 IF nValue IS pNUMERIC @@ -269,7 +269,7 @@ METHOD fgoto( nValue ) CLASS FileBase Returns: Self Purpose: Creates the specified file with the proper access code */ -METHOD Create() CLASS FileBase +METHOD Create() CLASS HBMake_FileBase LOCAL nFile // as int @@ -289,7 +289,7 @@ METHOD Create() CLASS FileBase Returns: Self Purpose: Opens the file with the proper access code */ -METHOD FOPEN() CLASS FileBase +METHOD FOPEN() CLASS HBMake_FileBase IF ::noDosError() ::nDosHandle :=::openfile( ::cName, ::nOpenMode ) @@ -301,7 +301,7 @@ METHOD FOPEN() CLASS FileBase RETURN ( self ) -METHOD fappendByte( cByte ) CLASS FileBase +METHOD fappendByte( cByte ) CLASS HBMake_FileBase DEFAULT cByte TO "" @@ -319,7 +319,7 @@ METHOD fappendByte( cByte ) CLASS FileBase RETURN ( self ) // End of File: FFile1.prg -METHOD OPEN() CLASS FileBase +METHOD OPEN() CLASS HBMake_FileBase Self:nDosHandle := Self:openfile( ::cName, ::nOpenMode ) ::nEndOfFile := FSEEK( Self:nDosHandle, 0, 2 ) @@ -335,7 +335,7 @@ METHOD OPEN() CLASS FileBase Returns: Self Purpose: Move the byte pointer to the top of the file */ -METHOD gotop() CLASS FileBase +METHOD gotop() CLASS HBMake_FileBase IF Self:noDosError() .AND. Self:nDosHandle > 0 ::fgotop() @@ -349,7 +349,7 @@ METHOD gotop() CLASS FileBase Returns: Self Purpose: Move hte byte pointer of the file to tbe bottom. */ -METHOD goBottom() CLASS FileBase +METHOD goBottom() CLASS HBMake_FileBase LOCAL cBuffer // as char LOCAL lWithCRLF := pFALSE // as logical @@ -383,7 +383,7 @@ METHOD goBottom() CLASS FileBase /* Should not any more exist here ... Not sure so I just keep it remed */ /* JFL in all case it is not anymore declared from the Class */ /* -METHOD FCLOSE() CLASS FileBase +METHOD FCLOSE() CLASS HBMake_FileBase IF Self:noDosError() .AND. Self:nDosHandle > 0 FCLOSE( Self:nDosHandle ) @@ -401,7 +401,7 @@ METHOD FCLOSE() CLASS FileBase Purpose: To write out to the contents of the file the value in the parameter . */ -METHOD WRITE( cChar ) CLASS FileBase +METHOD WRITE( cChar ) CLASS HBMake_FileBase IF Self:noDosError() .AND. Self:nDosHandle > 0 IF cChar IS pCHARACTER @@ -437,7 +437,7 @@ METHOD WRITE( cChar ) CLASS FileBase /* /* -METHOD Buffget( lForward ) CLASS FileBase +METHOD Buffget( lForward ) CLASS HBMake_FileBase LOCAL cBuffer // as char LOCAL nLocation // as int @@ -492,7 +492,7 @@ METHOD Buffget( lForward ) CLASS FileBase If is not passed or if it an empty line with 0 bytes in length, the function will not operate. */ -METHOD appendLine( cLine ) CLASS FileBase +METHOD appendLine( cLine ) CLASS HBMake_FileBase DEFAULT cLine TO "" @@ -521,7 +521,7 @@ METHOD appendLine( cLine ) CLASS FileBase This class's purpose is to do one byte movements. */ -METHOD SKIP( nRecords ) CLASS FileBase +METHOD SKIP( nRecords ) CLASS HBMake_FileBase LOCAL nCount := 0 // as int @@ -557,7 +557,7 @@ METHOD SKIP( nRecords ) CLASS FileBase within the file. It is also based on the value stored to the Self:nSkipLength instance variable */ -METHOD GOTO( nValue ) CLASS FileBase +METHOD GOTO( nValue ) CLASS HBMake_FileBase LOCAL cLine := "" // as char LOCAL nCount := 0 // as int @@ -602,7 +602,7 @@ RETURN ( nCount ) // End of File: FFile2.prg -METHOD BufferGet( lForward ) CLASS FileBase +METHOD BufferGet( lForward ) CLASS HBMake_FileBase LOCAL cBuffer // as char LOCAL nLocation // as int diff --git a/harbour/utils/hbmake/ft_funcs.prg b/harbour/utils/hbmake/ft_funcs.prg index 38b2cf9688..47ce6b1236 100644 --- a/harbour/utils/hbmake/ft_funcs.prg +++ b/harbour/utils/hbmake/ft_funcs.prg @@ -66,9 +66,9 @@ DECLARE FT_MKDIR( CDIR AS STRING ) //AS USUAL DECLARE StrPos( cBuffer AS STRING ) AS NUMERIC DECLARE GetNumberofTableItems( cBuffer AS STRING ) AS NUMERIC DECLARE FREADline( nH AS NUMERIC, @cB AS STRING, nMaxLine AS NUMERIC ) -//DECLARE FILEBASE() AS OBJECT -DECLARE FILEBASE ; - New( cname AS STRING) AS CLASS FILEBASE; +//DECLARE HBMAKE_FILEBASE() AS OBJECT +DECLARE HBMAKE_FILEBASE ; + New( cname AS STRING) AS CLASS HBMAKE_FILEBASE; FOPEN() AS OBJECT; closefile() AS OBJECT; fskip( OPTIONAL n AS NUMERIC) AS OBJECT; @@ -110,9 +110,9 @@ FUNCTION FT_FUSE( cFile AS STRING, nMode AS NUMERIC) ENDIF IF cFile <> Nil IF nMode <> 0 - theHandle := FileBase():new( cFile ):open() + theHandle := HBMake_FileBase():new( cFile ):open() ELSE - theHandle := FileBase():new( cFile ):open() + theHandle := HBMake_FileBase():new( cFile ):open() ENDIF ENDIF nHandle:= theHandle:nHan diff --git a/harbour/utils/hbmake/hbmutils.prg b/harbour/utils/hbmake/hbmutils.prg index 2e041915c4..b8531e47f4 100644 --- a/harbour/utils/hbmake/hbmutils.prg +++ b/harbour/utils/hbmake/hbmutils.prg @@ -10,7 +10,7 @@ DECLARE GetBccDir() as String DECLARE GetVccDir() as String DECLARE GetMakeDir() as String DECLARE HB_ARGV( n as numeric ) as string -declare filedate( c as String ) as string +declare hbmake_filedate( c as String ) as string declare listasArray2( cString as String, cSep as String ) as Array #endif Function GetSourceFiles( lSubdir ) @@ -217,13 +217,13 @@ Function GetSourceDirMacros() Next Return amacros -Function filedate( cFileName ) +Function hbmake_filedate( cFileName ) Local aFiles := Directory( cFileName ) Return If( Len( aFiles ) == 1, aFiles[ 1, 3 ], Ctod( '' ) ) -Function filetime( cFileName ) +Function hbmake_filetime( cFileName ) Local aFiles := Directory( cFileName )