Browse Source

* made it compilable

florian 26 years ago
parent
commit
2494f7667f
3 changed files with 17 additions and 7 deletions
  1. 6 2
      fcl/inc/parser.inc
  2. 6 3
      fcl/inc/streams.inc
  3. 5 2
      fcl/inc/strings.inc

+ 6 - 2
fcl/inc/parser.inc

@@ -260,6 +260,7 @@ var
   P                : PChar;
   P                : PChar;
 begin
 begin
   CheckToken(toSymbol);
   CheckToken(toSymbol);
+
   P := FSourcePtr;
   P := FSourcePtr;
   while P^ = '.' do
   while P^ = '.' do
   begin
   begin
@@ -299,7 +300,7 @@ Function TParser.TokenString: string;
 var
 var
   L                : Integer;
   L                : Integer;
   StrBuf           : array[0..1023] of Char;
   StrBuf           : array[0..1023] of Char;
-begin 
+begin
   if FToken = toString then begin
   if FToken = toString then begin
     L := FStringPtr - FTokenPtr 
     L := FStringPtr - FTokenPtr 
   end else begin
   end else begin
@@ -316,7 +317,10 @@ begin
 end;
 end;
 {
 {
   $Log$
   $Log$
-  Revision 1.4  1998-10-30 14:52:51  michael
+  Revision 1.5  1999-01-28 23:55:41  florian
+    * made it compilable
+
+  Revision 1.4  1998/10/30 14:52:51  michael
   + Added format in interface
   + Added format in interface
   + Some errors in parser fixed, it uses exceptions now
   + Some errors in parser fixed, it uses exceptions now
   + Strings now has no more syntax errors.
   + Strings now has no more syntax errors.

+ 6 - 3
fcl/inc/streams.inc

@@ -344,7 +344,7 @@ function TCustomMemoryStream.Read(var Buffer; Count: Longint): Longint;
 
 
 begin
 begin
   Result:=0;
   Result:=0;
-  If FSize>0 and FPosition<Fsize then
+  If (FSize>0) and (FPosition<Fsize) then
     begin
     begin
     Result:=FSize-FPosition;
     Result:=FSize-FPosition;
     If Result>Count then Result:=Count;
     If Result>Count then Result:=Count;
@@ -610,7 +610,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.8  1998-10-02 22:41:30  michael
+  Revision 1.9  1999-01-28 23:55:42  florian
+    * made it compilable
+
+  Revision 1.8  1998/10/02 22:41:30  michael
   + Added exceptions for error handling
   + Added exceptions for error handling
 
 
   Revision 1.7  1998/08/24 12:38:24  michael
   Revision 1.7  1998/08/24 12:38:24  michael
@@ -634,4 +637,4 @@ end;
   Revision 1.1  1998/05/04 14:30:12  michael
   Revision 1.1  1998/05/04 14:30:12  michael
   * Split file according to Class; implemented dummys for all methods, so unit compiles.
   * Split file according to Class; implemented dummys for all methods, so unit compiles.
 
 
-}
+}

+ 5 - 2
fcl/inc/strings.inc

@@ -888,7 +888,7 @@ end;
 Procedure TStringList.Sort; 
 Procedure TStringList.Sort; 
 
 
 begin
 begin
-  If Not Sorted and FCount>1 then
+  If Not Sorted and (FCount>1) then
     begin
     begin
     Changing;
     Changing;
     QuickSOrt(0,FCount-1);
     QuickSOrt(0,FCount-1);
@@ -898,7 +898,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.8  1998-11-13 09:40:16  michael
+  Revision 1.9  1999-01-28 23:55:43  florian
+    * made it compilable
+
+  Revision 1.8  1998/11/13 09:40:16  michael
   + Restored old version
   + Restored old version
 
 
   Revision 1.6  1998/11/09 10:07:24  michael
   Revision 1.6  1998/11/09 10:07:24  michael