mirror of
				https://gitlab.com/freepascal.org/fpc/source.git
				synced 2025-10-26 16:33:45 +01:00 
			
		
		
		
	* fixed readansistring
* fixed constants
This commit is contained in:
		
							parent
							
								
									d481b39c72
								
							
						
					
					
						commit
						36f83c7bf8
					
				| @ -36,7 +36,7 @@ const | ||||
|   SDuplicateClass = 'A Class with name %s exists already'; | ||||
|   SNoComSupport = '%s is not registered as COM-Class'; | ||||
|   SLineTooLong = 'Line too long'; | ||||
|   | ||||
| 
 | ||||
|   SInvalidPropertyValue = 'Invalid property value'; | ||||
|   SInvalidPropertyPath = 'Invalid property path'; | ||||
|   SUnknownProperty = 'Unknown property'; | ||||
| @ -114,19 +114,16 @@ const | ||||
|   SFixedColTooBig = 'The number of fixed Columns must be less than the Column count'; | ||||
|   SFixedRowTooBig = 'The number of fixed Rows must be less that the Row count'; | ||||
|   SInvalidStringGridOp = 'Es können keine Zeilen des ''Grids'' gelöscht oder eingefügt werden'; | ||||
|   //!!! SParseError = '%s in Line %d';
 | ||||
|   SParseError = ' in line '; | ||||
|    | ||||
|   SParseError = '%s in Line %d'; | ||||
| 
 | ||||
|   SIdentifierExpected = 'Identifier expected'; | ||||
|   SStringExpected = 'String expected'; | ||||
|   SNumberExpected = 'Number expected'; | ||||
| 
 | ||||
|   //!!! SCharExpected = '%s expected';
 | ||||
|   SCharExpected = ' excpected'; | ||||
|    | ||||
|   //!!! SSymbolExpected = '%s expected';
 | ||||
|   SSymbolExpected = ' expected'; | ||||
|    | ||||
|   SCharExpected = '%s expected'; | ||||
| 
 | ||||
|   SSymbolExpected = '%s expected'; | ||||
| 
 | ||||
|   SInvalidNumber = 'Invalid numerical value'; | ||||
|   SInvalidString = 'Invalid string constant'; | ||||
|   SInvalidProperty = 'Invalid property value'; | ||||
|  | ||||
| @ -12,8 +12,6 @@ | ||||
| 
 | ||||
|  **********************************************************************} | ||||
| 
 | ||||
| {!!!TSE 21.09.1998}   | ||||
| { Sorry, error messages are in german languae at this time} | ||||
| const | ||||
|   SAssignError = '%s kann nicht zu  %s zugewiesen werden'; | ||||
|   SFCreateError = 'Datei %s kann nicht erstellt werden'; | ||||
| @ -39,7 +37,7 @@ const | ||||
|   SNoComSupport = '%s wurde nicht als COM-Klasse registriert'; | ||||
|   SInvalidInteger = '''''%s'''' ist kein gültiger Integerwert'; | ||||
|   SLineTooLong = 'Zeile zu lang'; | ||||
|   | ||||
| 
 | ||||
|   SInvalidPropertyValue = 'Ungültiger Wert der Eigenschaft'; | ||||
|   SInvalidPropertyPath = 'Ungültiger Pfad für Eigenschaft'; | ||||
|   SUnknownProperty = 'Eigenschaft existiert nicht'; | ||||
| @ -117,19 +115,16 @@ const | ||||
|   SFixedColTooBig = 'Die Anzahl fester Spalten muß kleiner sein als die Spaltenanzahl'; | ||||
|   SFixedRowTooBig = 'Die Anzahl fester Zeilen muß kleiner sein als die Zeilenanzahl'; | ||||
|   SInvalidStringGridOp = 'Es können keine Zeilen des ''Grids'' gelöscht oder eingefügt werden'; | ||||
|   //!!! SParseError = '%s in Zeile %d';
 | ||||
|   SParseError = ' in Zeile '; | ||||
|    | ||||
|   SParseError = '%s in Zeile %d'; | ||||
| 
 | ||||
|   SIdentifierExpected = 'Bezeichner erwartet'; | ||||
|   SStringExpected = 'String erwartet'; | ||||
|   SNumberExpected = 'Zahl erwartet'; | ||||
| 
 | ||||
|   //!!! SCharExpected = '%s erwartet';
 | ||||
|   SCharExpected = ' erwartet'; | ||||
|    | ||||
|   //!!! SSymbolExpected = '%s erwartet';
 | ||||
|   SSymbolExpected = ' erwartet'; | ||||
|    | ||||
|   SCharExpected = '%s erwartet'; | ||||
| 
 | ||||
|   SSymbolExpected = '%s erwartet'; | ||||
| 
 | ||||
|   SInvalidNumber = 'Ungültiger numerischer Wert'; | ||||
|   SInvalidString = 'Ungültige Stringkonstante'; | ||||
|   SInvalidProperty = 'Ungültiger Wert der Eigenschaft'; | ||||
|  | ||||
| @ -114,18 +114,15 @@ const | ||||
|   SFixedColTooBig = 'El numero de columnas fijas tiene que ser menor que el contador Column'; | ||||
|   SFixedRowTooBig = 'El numero de filas fijas tiene que ser menor que el contador Row'; | ||||
| {?}  SInvalidStringGridOp = 'Es können keine Zeilen des ''Grids'' gelöscht oder eingefügt werden'; | ||||
|   //!!! SParseError = '%s en Linia %d';
 | ||||
|   SParseError = ' en linia '; | ||||
|   SParseError = '%s en Linia %d'; | ||||
| 
 | ||||
|   SIdentifierExpected = 'Falta identificador'; | ||||
|   SStringExpected = 'Falta string'; | ||||
|   SNumberExpected = 'Falta numero'; | ||||
| 
 | ||||
|   //!!! SCharExpected = 'Falta %s';
 | ||||
|   SCharExpected = ' falta'; | ||||
|   SCharExpected = 'Falta %s'; | ||||
| 
 | ||||
|   //!!! SSymbolExpected = 'Falta %s';
 | ||||
|   SSymbolExpected = ' falta'; | ||||
|   SSymbolExpected = 'Falta %s'; | ||||
| 
 | ||||
|   SInvalidNumber = 'Valor numerico no valido'; | ||||
|   SInvalidString = 'Constante string no valida'; | ||||
|  | ||||
| @ -219,21 +219,22 @@ | ||||
|     end; | ||||
| 
 | ||||
|   Function TStream.ReadAnsiString : String; | ||||
| 
 | ||||
|     Type PByte = ^Byte; | ||||
| 
 | ||||
|     Var TheSize : Longint; | ||||
|         P : PByte ; | ||||
| 
 | ||||
| 
 | ||||
|   Type | ||||
|     PByte = ^Byte; | ||||
|   Var | ||||
|     TheSize : Longint; | ||||
|     P : PByte ; | ||||
|   begin | ||||
|     ReadBuffer (TheSize,SizeOf(TheSize)); | ||||
|     SetLength(Result,Size); | ||||
|     SetLength(Result,TheSize); | ||||
|     // Illegal typecast if no AnsiStrings defined.
 | ||||
|     ReadBuffer (Pointer(Result)^,Size); | ||||
|     P:=Pointer(Result)+Size; | ||||
|     p^:=0; | ||||
|     end; | ||||
|     if TheSize>0 then | ||||
|      begin | ||||
|        ReadBuffer (Pointer(Result)^,TheSize); | ||||
|        P:=Pointer(Result)+TheSize; | ||||
|        p^:=0; | ||||
|      end; | ||||
|    end; | ||||
| 
 | ||||
|   Procedure TStream.WriteAnsiString (S : String); | ||||
| 
 | ||||
| @ -480,7 +481,7 @@ procedure TMemoryStream.SetSize(NewSize: Longint); | ||||
| begin | ||||
|   SetCapacity (NewSize); | ||||
|   FSize:=NewSize; | ||||
|   IF FPosition>FSize then  | ||||
|   IF FPosition>FSize then | ||||
|     FPosition:=FSize; | ||||
| end; | ||||
| 
 | ||||
| @ -619,7 +620,11 @@ end; | ||||
| 
 | ||||
| { | ||||
|   $Log$ | ||||
|   Revision 1.15  1999-09-13 08:35:16  fcl | ||||
|   Revision 1.16  1999-10-03 19:38:06  peter | ||||
|     * fixed readansistring | ||||
|     * fixed constants | ||||
| 
 | ||||
|   Revision 1.15  1999/09/13 08:35:16  fcl | ||||
|   * Changed some argument names (Root->ARoot etc.) because the new compiler | ||||
|     now performs more ambiguity checks  (sg) | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 peter
						peter