CVS difference for arm/progs/arm_inp.adb

Differences between 1.7 and version 1.8
Log of other versions for file arm/progs/arm_inp.adb

--- arm/progs/arm_inp.adb	2011/08/17 00:31:56	1.7
+++ arm/progs/arm_inp.adb	2011/10/18 23:27:29	1.8
@@ -4,7 +4,7 @@
 package body ARM_Input is
 
     --
-    -- Ada reference manual formatter.
+    -- Ada reference manual formatter (ARM_Form).
     --
     -- This package contains the abstract definition of reading an input file
     -- or other entity, and routines to lex the input entities.
@@ -14,21 +14,9 @@
     -- P.O. Box 1512, Madison WI  53701
     -- E-Mail: randy@rrsoftware.com
     --
-    -- AXE Consultants grants to all users the right to use/modify this
-    -- formatting tool for non-commercial purposes. (ISO/IEC JTC 1 SC 22 WG 9
-    -- activities are explicitly included as "non-commercial purposes".)
-    -- Commercial uses of this software and its source code, including but not
-    -- limited to documents for sale and sales of modified versions of this
-    -- tool, are prohibited without the prior written permission of
-    -- AXE Consultants. All rights not explicitly granted above are reserved
-    -- by AXE Consultants.
-    --
-    -- You use this tool and/or its source code on the condition that you indemnify and hold harmless
-    -- AXE Consultants, its agents, and employees, from any and all liability
-    -- or damages to yourself or your hardware or software, or third parties,
-    -- including attorneys' fees, court costs, and other related costs and
-    -- expenses, arising out of your use of this tool and/or source code irrespective of the
-    -- cause of said liability.
+    -- ARM_Form is free software: you can redistribute it and/or modify
+    -- it under the terms of the GNU General Public License version 3
+    -- as published by the Free Software Foundation.
     --
     -- AXE CONSULTANTS MAKES THIS TOOL AND SOURCE CODE AVAILABLE ON AN "AS IS"
     -- BASIS AND MAKES NO WARRANTY, EXPRESS OR IMPLIED, AS TO THE ACCURACY,
@@ -37,6 +25,15 @@
     -- CONSEQUENTIAL, INDIRECT, INCIDENTAL, EXEMPLARY, OR SPECIAL DAMAGES,
     -- EVEN IF AXE CONSULTANTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
     -- DAMAGES.
+    --
+    -- A copy of the GNU General Public License is available in the file
+    -- gpl-3-0.txt in the standard distribution of the ARM_Form tool.
+    -- Otherwise, see <http://www.gnu.org/licenses/>.
+    --
+    -- If the GPLv3 license is not satisfactory for your needs, a commercial
+    -- use license is available for this tool. Contact Randy at AXE Consultants
+    -- for more information.
+    --
     -- ---------------------------------------
     --
     -- Edit History:
@@ -50,6 +47,7 @@
     --  8/16/11 - RLB - Added code so that looping operations stop when
     --			the input is empty. (Otherwise, bad comments cause
     --			an infinite loop.)
+    -- 10/18/11 - RLB - Changed to GPLv3 license.
 
     function Is_Open_Char (Open_Char : in Character) return Boolean is
 	-- Return True if character is a parameter opening character
@@ -186,6 +184,8 @@
         Ch : Character;
         Start_Ch : Character;
         Start_Ch_Count : Natural := 0;
+	Start_Line : constant String := ARM_Input.Line_String (Input_Object);
+	    -- Save this in case of severe error.
     begin
 	if Close_Char = '"' then
 	    Start_Ch := Character'Val(128);
@@ -216,8 +216,8 @@
 --Ada.Text_IO.Put_Line ("?? Skip: Close found, cnt=" & Natural'Image(Start_Ch_Count) & " on line " &
 --   ARM_Input.Line_String (Input_Object));
 	    elsif Ch = Ascii.SUB then -- End of file, quit immediately.
-	        Ada.Text_IO.Put_Line ("  ** End of file when skipping to end on line " &
-			ARM_Input.Line_String (Input_Object));
+	        Ada.Text_IO.Put_Line ("  ** End of file when skipping to end, started on line " &
+			Start_Line);
 		exit;
 	    end if;
 	    -- Ignore everything until the end character

Questions? Ask the ACAA Technical Agent