From 36f83c7bf8ed7e37ae67798ce9dc2cb8afa51bcd Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 3 Oct 1999 19:38:06 +0000
Subject: [PATCH]   * fixed readansistring   * fixed constants

---
 fcl/inc/constse.inc | 17 +++++++----------
 fcl/inc/constsg.inc | 19 +++++++------------
 fcl/inc/constss.inc |  9 +++------
 fcl/inc/streams.inc | 33 +++++++++++++++++++--------------
 4 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/fcl/inc/constse.inc b/fcl/inc/constse.inc
index f4da6cd885..8c446a496e 100644
--- a/fcl/inc/constse.inc
+++ b/fcl/inc/constse.inc
@@ -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';
diff --git a/fcl/inc/constsg.inc b/fcl/inc/constsg.inc
index 9db208e086..0ff91fdde7 100644
--- a/fcl/inc/constsg.inc
+++ b/fcl/inc/constsg.inc
@@ -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';
diff --git a/fcl/inc/constss.inc b/fcl/inc/constss.inc
index 81ede6609e..6a4e02e8a1 100644
--- a/fcl/inc/constss.inc
+++ b/fcl/inc/constss.inc
@@ -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';
diff --git a/fcl/inc/streams.inc b/fcl/inc/streams.inc
index 82fdd61157..b6024bb72d 100644
--- a/fcl/inc/streams.inc
+++ b/fcl/inc/streams.inc
@@ -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)