ncurses 5.6

[ncurses.git] / Ada95 / samples / sample-explanation.adb

diff --git a/Ada95/samples/sample-explanation.adb b/Ada95/samples/sample-explanation.adb
index eb7f45779004962b50dbfdb2b1651a46a8f2c89c..12a8deb69b6a404d67094bc359c109f3ce9505b4 100644 (file)
--- a/Ada95/samples/sample-explanation.adb
+++ b/Ada95/samples/sample-explanation.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------

--- Copyright (c) 1998 Free Software Foundation, Inc.                        --
+-- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              --

 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --
 --                                                                          --
 -- Permission is hereby granted, free of charge, to any person obtaining a  --
 -- copy of this software and associated documentation files (the            --


@@ -33,10 +33,11 @@
 -- sale, use or other dealings in this Software without prior written       --
 -- authorization.                                                           --
 ------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written       --
 -- authorization.                                                           --
 ------------------------------------------------------------------------------

---  Author: Juergen Pfeifer <Juergen.Pfeifer@T-Online.de> 1996
+--  Author:  Juergen Pfeifer, 1996

 --  Version Control
 --  Version Control

---  $Revision: 1.9 $
---  Binding Version 00.93
+--  $Revision: 1.20 $
+--  $Date: 2006/06/25 14:30:22 $
+--  Binding Version 01.00

 ------------------------------------------------------------------------------
 --  Poor mans help system. This scans a sequential file for key lines and
 --  then reads the lines up to the next key. Those lines are presented in
 ------------------------------------------------------------------------------
 --  Poor mans help system. This scans a sequential file for key lines and
 --  then reads the lines up to the next key. Those lines are presented in


@@ -57,7 +58,7 @@ package body Sample.Explanation is
    Help_Keys : constant String := "HELPKEYS";
    In_Help   : constant String := "INHELP";
 
    Help_Keys : constant String := "HELPKEYS";
    In_Help   : constant String := "INHELP";
 

-   File_Name : String := "explain.msg";
+   File_Name : constant String := "explain.msg";

    F : File_Type;
 
    type Help_Line;
    F : File_Type;
 
    type Help_Line;


@@ -116,7 +117,7 @@ package body Sample.Explanation is
       Current  : Help_Line_Access;
       Top_Line : Help_Line_Access;
 
       Current  : Help_Line_Access;
       Top_Line : Help_Line_Access;
 

-      Has_More : Boolean;
+      Has_More : Boolean := True;

 
       procedure Unknown_Key
       is
 
       procedure Unknown_Key
       is


@@ -299,7 +300,6 @@ package body Sample.Explanation is
       Root    : Help_Line_Access := null;
       Current : Help_Line_Access;
       Tail    : Help_Line_Access := null;
       Root    : Help_Line_Access := null;
       Current : Help_Line_Access;
       Tail    : Help_Line_Access := null;

-      Save    : String_Access;

 
       function Next_Line return Boolean;
 
 
       function Next_Line return Boolean;
 


@@ -318,7 +318,7 @@ package body Sample.Explanation is
       Reset (F);
       Outer :
       loop
       Reset (F);
       Outer :
       loop

-         exit when not Next_Line;
+         exit Outer when not Next_Line;

          if Last = (1 + Key'Length) and then Key = Buffer (2 .. Last)
            and then Buffer (1) = '#' then
             loop
          if Last = (1 + Key'Length) and then Key = Buffer (2 .. Last)
            and then Buffer (1) = '#' then
             loop


@@ -406,4 +406,3 @@ package body Sample.Explanation is
 begin
    Open (F, In_File, File_Name);
 end Sample.Explanation;
 begin
    Open (F, In_File, File_Name);
 end Sample.Explanation;

-