[GODCC][COMMITTED] Use joined access clauses

[Jose E. Marchesi]

---
 src/godcc.a68 | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/godcc.a68 b/src/godcc.a68
index 0d789f7..24a85f0 100644
--- a/src/godcc.a68
+++ b/src/godcc.a68
@@ -17,6 +17,9 @@
   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 }
 
+access Globals,
+       JSON,
+       Argp
 begin string godcc_version = "1.0";
 
       { Diagnostics.  }
@@ -32,8 +35,8 @@ begin string godcc_version = "1.0";
             stop
       end;
 
-      access Globals ( error := godcc_error );
-      access JSON  ( json_error := godcc_error );
+      error := godcc_error;
+      json_error := godcc_error;
       
       { --help and --version  }
 
@@ -79,20 +82,18 @@ Report bugs to: jemarch@gnu.org'n");
 
       { Main program.  }
 
-      access Argp
-      begin argp (2, []ArgOpt ((" ", "help", false, do_help),
-                               (" ", "version", false, do_version),
-                               ("q", "quiet", false, (string arg) bool:
-                                                        (be_quiet := true; true))),
-                  (int pos, string no_opt_arg) bool:
-                     if no_opt_arg = "list"
-                     then access List (godcc_list (pos)); false
-                     elif no_opt_arg = "compile"
-                     then access Compile (godcc_compile (pos)); false
-                     elif no_opt_arg = "format"
-                     then access Format (godcc_format (pos)); false
-                     else godcc_error ("unknown subcommand " + no_opt_arg); skip
-                     fi,
-                  godcc_error)
-      end
+      argp (2, []ArgOpt ((" ", "help", false, do_help),
+                         (" ", "version", false, do_version),
+                         ("q", "quiet", false, (string arg) bool:
+                                                  (be_quiet := true; true))),
+            (int pos, string no_opt_arg) bool:
+               if no_opt_arg = "list"
+               then access List (godcc_list (pos)); false
+               elif no_opt_arg = "compile"
+               then access Compile (godcc_compile (pos)); false
+               elif no_opt_arg = "format"
+               then access Format (godcc_format (pos)); false
+               else godcc_error ("unknown subcommand " + no_opt_arg); skip
+               fi,
+            godcc_error)
 end
-- 
2.30.2