Fix help and error messages

malaise · Jan 22, 2024 · a2b162b · a2b162b
1 parent 613c886
commit a2b162b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/usr/geo_codes/geohash/t_geohash.adb b/usr/geo_codes/geohash/t_geohash.adb
@@ -7,10 +7,10 @@ procedure T_Geohash is
     Basic_Proc.Put_Line_Output (
         "Usage: " & Argument.Get_Program_Name & " <command>");
     Basic_Proc.Put_Line_Output (
-        "  <commnd> ::= <encode> | <decode> | <precision> | <neighbors>"
-      & " | <checksup> | <help>");
+        "  <commnd> ::= <encode> | <decode> | <bounds> | <adjacents> | <help>");
     Basic_Proc.Put_Line_Output ("  <encode>    ::= -c <coord> <precision>");
     Basic_Proc.Put_Line_Output ("  <coord>     ::= <lat> <lon>");
+    Basic_Proc.Put_Line_Output ("  <precision> ::= 1..12");
     Basic_Proc.Put_Line_Output ("  <decode>    ::= -d <code>");
     Basic_Proc.Put_Line_Output ("  <bounds>    ::= -B <code>");
     Basic_Proc.Put_Line_Output ("  <adjacents> ::= -A <code>");
@@ -79,6 +79,5 @@ exception
     Basic_Proc.Put_Line_Output ("ERROR: Invalid argument");
     Help;
     Basic_Proc.Set_Error_Exit_Code;
-raise;
 end T_Geohash;
 
diff --git a/usr/geo_codes/geohash36/t_geohash36.adb b/usr/geo_codes/geohash36/t_geohash36.adb
@@ -7,15 +7,16 @@ procedure T_Geohash36 is
     Basic_Proc.Put_Line_Output (
         "Usage: " & Argument.Get_Program_Name & " <command>");
     Basic_Proc.Put_Line_Output (
-        "  <commnd> ::= <encode> | <decode> | <precision> | <neighbors>"
+        "  <commnd> ::= <encode> | <decode> | <precision_of> | <neighbors>"
       & " | <checksup> | <help>");
-    Basic_Proc.Put_Line_Output ("  <encode>    ::= -c <coord> <precision>");
-    Basic_Proc.Put_Line_Output ("  <coord>     ::= <lat> <lon>");
-    Basic_Proc.Put_Line_Output ("  <decode>    ::= -d <code>");
-    Basic_Proc.Put_Line_Output ("  <precision> ::= -P <precision>");
-    Basic_Proc.Put_Line_Output ("  <neighbors> ::= -N <code>");
-    Basic_Proc.Put_Line_Output ("  <checksum>  ::= -C <code>");
-    Basic_Proc.Put_Line_Output ("  <help>      ::= -h");
+    Basic_Proc.Put_Line_Output ("  <encode>       ::= -c <coord> <precision>");
+    Basic_Proc.Put_Line_Output ("  <coord>        ::= <lat> <lon>");
+    Basic_Proc.Put_Line_Output ("  <precision>    ::= 1..15");
+    Basic_Proc.Put_Line_Output ("  <decode>       ::= -d <code>");
+    Basic_Proc.Put_Line_Output ("  <precision_of> ::= -P <precision>");
+    Basic_Proc.Put_Line_Output ("  <neighbors>    ::= -N <code>");
+    Basic_Proc.Put_Line_Output ("  <checksum>     ::= -C <code>");
+    Basic_Proc.Put_Line_Output ("  <help>         ::= -h");
   end Help;
 
   procedure Encode (Coord : in Geohash36.Coordinate;
@@ -84,6 +85,5 @@ exception
     Basic_Proc.Put_Line_Output ("ERROR: Invalid argument");
     Help;
     Basic_Proc.Set_Error_Exit_Code;
-raise;
 end T_Geohash36;
 
diff --git a/usr/geo_codes/mapcode/t_mapcode.apb b/usr/geo_codes/mapcode/t_mapcode.apb
@@ -174,7 +174,7 @@ procedure T_Mapcode is
 
 begin
   if Ada.Command_Line.Argument_Count = 0 then
-    Usage;
+    raise Argument_Error;
   end if;
   I := 1;
   while I <= Ada.Command_Line.Argument_Count loop
@@ -433,8 +433,10 @@ exception
     Ada.Text_Io.Put_Line (Ada.Text_Io.Standard_Error, "Raised Unknown_Language");
     Ada.Command_Line.Set_Exit_Status (1);
   when Argument_Error =>
-    Ada.Text_Io.Put_Line (Ada.Text_Io.Standard_Error, "Invalid Argument");
+    Ada.Text_Io.Put_Line (Ada.Text_Io.Standard_Error,
+                          "ERROR: Invalid Argument");
     Ada.Command_Line.Set_Exit_Status (2);
+    Usage;
   when others =>
     Ada.Command_Line.Set_Exit_Status (2);
     raise;