Move intended-for-the-user extensions ext_cur.

compiler/file_names.m:
    Move all intended-for-the-user extensions from the ext_cur_ngs group
    to the ext_cur group, meaning their files always get put into the current
    directory.

compiler/du_type_layout.m:
compiler/generate_dep_d_files.m:
compiler/make.file_names.m:
compiler/mercury_compile_front_end.m:
compiler/mercury_compile_make_hlds.m:
compiler/mode_constraints.m:
compiler/xml_documentation.m:
    Conform to the change above.

compiler/du_type_layout.m

@@ -4479,7 +4479,7 @@ maybe_show_type_repns(ModuleInfo, TypeCtorsTypeDefns, !IO) :-
 
         module_info_get_name(ModuleInfo, ModuleName),
         module_name_to_file_name_create_dirs(Globals, $pred,
-            ext_cur_ngs(ext_cur_ngs_user_type_repns),
+            ext_cur(ext_cur_user_type_repns),
             ModuleName, TypeRepnFileName, !IO),
         io.open_output(TypeRepnFileName, TypeRepnFileResult, !IO),
         (

compiler/file_names.m

@@ -292,12 +292,22 @@
 
             % Compiler-generated files that are intended to be read
             % by the programmer.
+    ;       ext_cur_user_defn_ext           % ".defn_extents"
+    ;       ext_cur_user_defn_lc            % ".defn_line_counts"
+    ;       ext_cur_user_defns              % ".defns"
     ;       ext_cur_user_depgraph           % ".dependency_graph"
     ;       ext_cur_user_err                % ".err"
     ;       ext_cur_user_hlds_dump          % ".hlds_dump"
+    ;       ext_cur_user_imports_graph      % ".imports_graph"
+    ;       ext_cur_user_lct                % ".local_call_tree"
+    ;       ext_cur_user_lct_order          % ".local_call_tree_order"
     ;       ext_cur_user_mlds_dump          % ".mlds_dump"
+    ;       ext_cur_user_mode_constr        % ".mode_constraints"
     ;       ext_cur_user_order              % ".order"
-    ;       ext_cur_user_ugly.              % ".ugly"
+    ;       ext_cur_user_order_to           % ".order_trans_opt"
+    ;       ext_cur_user_type_repns         % ".type_repns"
+    ;       ext_cur_user_ugly               % ".ugly"
+    ;       ext_cur_user_xml.               % ".xml"
 
 :- type ext_cur_ngs
             % Compiler-generated interface files, and the timestamp files
@@ -310,19 +320,6 @@
     ;       ext_cur_ngs_int_date_int12      % ".date"
     ;       ext_cur_ngs_int_date_int3       % ".date3"
 
-            % Compiler-generated files that are intended to be read
-            % by the programmer.
-    ;       ext_cur_ngs_user_defn_ext       % ".defn_extents"
-    ;       ext_cur_ngs_user_defn_lc        % ".defn_line_counts"
-    ;       ext_cur_ngs_user_defns          % ".defns"
-    ;       ext_cur_ngs_user_imports_graph  % ".imports_graph"
-    ;       ext_cur_ngs_user_lct            % ".local_call_tree"
-    ;       ext_cur_ngs_user_lct_order      % ".local_call_tree_order"
-    ;       ext_cur_ngs_user_mode_constr    % ".mode_constraints"
-    ;       ext_cur_ngs_user_order_to       % ".order_trans_opt"
-    ;       ext_cur_ngs_user_type_repns     % ".type_repns"
-    ;       ext_cur_ngs_user_xml            % ".xml"
-
             % Compiler-generated files that are designed to be bodily included
             % in Mmakefiles.
     ;       ext_cur_ngs_mf_d                % ".d"
@@ -767,12 +764,22 @@ ext_cur_extension(ext_cur_pmt_javas,                ".javas").
 ext_cur_extension(ext_cur_pmt_opts,                 ".opts").
 ext_cur_extension(ext_cur_pmt_realclean,            ".realclean").
 ext_cur_extension(ext_cur_pmt_trans_opts,           ".trans_opts").
+ext_cur_extension(ext_cur_user_defn_ext,            ".defn_extents").
+ext_cur_extension(ext_cur_user_defn_lc,             ".defn_line_counts").
+ext_cur_extension(ext_cur_user_defns,               ".defns").
 ext_cur_extension(ext_cur_user_depgraph,            ".dependency_graph").
 ext_cur_extension(ext_cur_user_err,                 ".err").
 ext_cur_extension(ext_cur_user_hlds_dump,           ".hlds_dump").
+ext_cur_extension(ext_cur_user_imports_graph,       ".imports_graph").
+ext_cur_extension(ext_cur_user_lct,                 ".local_call_tree").
+ext_cur_extension(ext_cur_user_lct_order,           ".local_call_tree_order").
 ext_cur_extension(ext_cur_user_mlds_dump,           ".mlds_dump").
+ext_cur_extension(ext_cur_user_mode_constr,         ".mode_constraints").
 ext_cur_extension(ext_cur_user_order,               ".order").
+ext_cur_extension(ext_cur_user_order_to,            ".order_trans_opt").
+ext_cur_extension(ext_cur_user_type_repns,          ".type_repns").
 ext_cur_extension(ext_cur_user_ugly,                ".ugly").
+ext_cur_extension(ext_cur_user_xml,                 ".xml").
 
 :- pred ext_cur_ngs_extension_dir(ext_cur_ngs::in,
     string::out, string::out) is det.
@@ -784,25 +791,7 @@ ext_cur_ngs_extension_dir(ext_cur_ngs_int_int3,         ".int3",    "int3s").
 ext_cur_ngs_extension_dir(ext_cur_ngs_int_date_int0,    ".date0",   "date0s").
 ext_cur_ngs_extension_dir(ext_cur_ngs_int_date_int12,   ".date",    "dates").
 ext_cur_ngs_extension_dir(ext_cur_ngs_int_date_int3,    ".date3",   "date3s").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_defn_ext,
-    ".defn_extents", "defn_extentss").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_defn_lc,
-    ".defn_line_counts", "defn_line_countss").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_defns,
-    ".defns", "defnss").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_imports_graph,
-    ".imports_graph", "imports_graphs").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_lct,
-    ".local_call_tree", "local_call_trees").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_lct_order,
-    ".local_call_tree_order", "local_call_tree_orders").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_mode_constr,
-    ".mode_constraints", "mode_constraintss").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_order_to,
-    ".order_trans_opt", "order_trans_opts").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_type_repns,
-    ".type_repns", "type_repnss").
-ext_cur_ngs_extension_dir(ext_cur_ngs_user_xml,  ".xml", "xmls").
+
 ext_cur_ngs_extension_dir(ext_cur_ngs_mf_d,      ".d",   "ds").
 % The next two deviations below from the "delete initial dot, add final 's'"
 % rule are intentional, though I (zs) don't know the reason for the second.

compiler/generate_dep_d_files.m

@@ -309,8 +309,7 @@ generate_dependencies(Globals, Mode, Search, ModuleName, DepsMap0,
         (
             OutputOrder = yes,
             output_module_order(Globals, ModuleName,
-                ext_cur_ngs(ext_cur_ngs_user_order_to),
-                TransOptDepsOrdering0, !IO)
+                ext_cur(ext_cur_user_order_to), TransOptDepsOrdering0, !IO)
         ;
             OutputOrder = no
         ),
@@ -393,8 +392,7 @@ maybe_output_imports_graph(Globals, ModuleName, IntDepsGraph, ImpDepsGraph,
     (
         ImportsGraph = yes,
         module_name_to_file_name_create_dirs(Globals, $pred,
-            ext_cur_ngs(ext_cur_ngs_user_imports_graph),
-            ModuleName, FileName, !IO),
+            ext_cur(ext_cur_user_imports_graph), ModuleName, FileName, !IO),
         (
             Verbose = no,
             MaybeProgressStream = no

compiler/make.file_names.m

@@ -272,7 +272,7 @@ target_type_to_target_extension(Target, TargetExt) :-
         TargetExt = extension(ext_cur_ngs_gs(ObjExt))
     ;
         Target = module_target_xml_doc,
-        TargetExt = extension(ext_cur_ngs(ext_cur_ngs_user_xml))
+        TargetExt = extension(ext_cur(ext_cur_user_xml))
     ;
         Target = module_target_foreign_object(PIC, Lang),
         TargetExt = foreign_obj(PIC, Lang)

compiler/mercury_compile_front_end.m

@@ -1203,11 +1203,9 @@ maybe_write_call_tree(ProgressStream, ErrorStream, Verbose, Stats,
             "% Writing call_tree...", !IO),
         module_info_get_name(HLDS, ModuleName),
         module_name_to_file_name_create_dirs(Globals, $pred,
-            ext_cur_ngs(ext_cur_ngs_user_lct),
-            ModuleName, TreeFileName, !IO),
+            ext_cur(ext_cur_user_lct), ModuleName, TreeFileName, !IO),
         module_name_to_file_name_create_dirs(Globals, $pred,
-            ext_cur_ngs(ext_cur_ngs_user_lct_order),
-            ModuleName, OrderFileName, !IO),
+            ext_cur(ext_cur_user_lct_order), ModuleName, OrderFileName, !IO),
         io.open_output(TreeFileName, TreeResult, !IO),
         (
             TreeResult = ok(TreeFileStream),

compiler/mercury_compile_make_hlds.m

@@ -641,7 +641,7 @@ maybe_write_definitions(ProgressStream, ErrorStream, Verbose, Stats,
             "% Writing definitions...", !IO),
         module_info_get_name(HLDS, ModuleName),
         module_name_to_file_name_create_dirs(Globals, $pred,
-            ext_cur_ngs(ext_cur_ngs_user_defns), ModuleName, FileName, !IO),
+            ext_cur(ext_cur_user_defns), ModuleName, FileName, !IO),
         io.open_output(FileName, Res, !IO),
         (
             Res = ok(FileStream),
@@ -674,7 +674,7 @@ maybe_write_definition_line_counts(ProgressStream, ErrorStream, Verbose, Stats,
             "% Writing definition line counts...", !IO),
         module_info_get_name(HLDS, ModuleName),
         module_name_to_file_name_create_dirs(Globals, $pred,
-            ext_cur_ngs(ext_cur_ngs_user_defn_lc), ModuleName, FileName, !IO),
+            ext_cur(ext_cur_user_defn_lc), ModuleName, FileName, !IO),
         io.open_output(FileName, Res, !IO),
         (
             Res = ok(FileStream),
@@ -706,7 +706,7 @@ maybe_write_definition_extents(ProgressStream, ErrorStream, Verbose, Stats,
             "% Writing definition extents...", !IO),
         module_info_get_name(HLDS, ModuleName),
         module_name_to_file_name_create_dirs(Globals, $pred,
-            ext_cur_ngs(ext_cur_ngs_user_defn_ext), ModuleName, FileName, !IO),
+            ext_cur(ext_cur_user_defn_ext), ModuleName, FileName, !IO),
         io.open_output(FileName, Res, !IO),
         (
             Res = ok(FileStream),

compiler/mode_constraints.m

@@ -198,7 +198,7 @@ dump_abstract_constraints(ModuleInfo, ConstraintVarSet, ModeConstraints,
     module_info_get_globals(ModuleInfo, Globals),
     module_info_get_name(ModuleInfo, ModuleName),
     module_name_to_file_name_create_dirs(Globals, $pred,
-        ext_cur_ngs(ext_cur_ngs_user_mode_constr), ModuleName, FileName, !IO),
+        ext_cur(ext_cur_user_mode_constr), ModuleName, FileName, !IO),
     OutputFile = FileName,
 
     io.open_output(OutputFile, IOResult, !IO),

compiler/xml_documentation.m

@@ -94,7 +94,7 @@ xml_documentation(ModuleInfo, !IO) :-
     module_info_get_globals(ModuleInfo, Globals),
     module_info_get_name(ModuleInfo, ModuleName),
     module_name_to_file_name_create_dirs(Globals, $pred,
-        ext_cur_ngs(ext_cur_ngs_user_xml), ModuleName, FileName, !IO),
+        ext_cur(ext_cur_user_xml), ModuleName, FileName, !IO),
 
     lookup_module_source_file(ModuleName, MaybeSrcFileName, !IO),
     (