[m-rev.] diff: remove some unneeded stuff from the structure of items
Zoltan Somogyi
zs at csse.unimelb.edu.au
Fri Feb 15 15:59:06 AEDT 2008
Make some long-overdue simplifications.
compiler/prog_item.m:
Delete the varset from item_module_defn_infos, since it wasn't being
used anywhere.
compiler/prog_data.m:
compiler/prog_item.m:
Remove all the stuff related to importing predicates, functions,
ADTs, operators, etc, which have never been implemented. (If we
ever wanted to implement them, we would need different code anyway.)
Keep only the stuff relating to importing modules.
compiler/*.m:
Conform to the changes above.
Zoltan.
cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/libatomic_ops-1.2
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/doc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/hpc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ibmc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/icc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/msftc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/sunc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/tests
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing boehm_gc/windows-untested
cvs diff: Diffing boehm_gc/windows-untested/vc60
cvs diff: Diffing boehm_gc/windows-untested/vc70
cvs diff: Diffing boehm_gc/windows-untested/vc71
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
Index: compiler/equiv_type.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/equiv_type.m,v
retrieving revision 1.80
diff -u -b -r1.80 equiv_type.m
--- compiler/equiv_type.m 15 Feb 2008 02:26:54 -0000 1.80
+++ compiler/equiv_type.m 15 Feb 2008 03:17:22 -0000
@@ -175,7 +175,7 @@
build_eqv_map([Item | Items], !EqvMap, !EqvInstMap) :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
ModuleDefn = md_abstract_imported
->
skip_abstract_imported_items(Items, AfterSkipItems),
@@ -209,7 +209,7 @@
skip_abstract_imported_items([Item0 | Items0], Items) :-
(
Item0 = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
is_section_defn(ModuleDefn) = yes,
ModuleDefn \= md_abstract_imported
->
@@ -254,7 +254,7 @@
replace_in_item_list(ModuleName, Location0, [Item0 | Items0],
EqvMap, EqvInstMap, !ReplItems, !RecompInfo, !UsedModules, !Specs) :-
( Item0 = item_module_defn(ItemModuleDefn) ->
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
(
ModuleDefn = md_interface,
Location = eqv_type_in_interface
Index: compiler/make_hlds_passes.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make_hlds_passes.m,v
retrieving revision 1.76
diff -u -b -r1.76 make_hlds_passes.m
--- compiler/make_hlds_passes.m 15 Feb 2008 02:26:55 -0000 1.76
+++ compiler/make_hlds_passes.m 15 Feb 2008 04:28:42 -0000
@@ -443,15 +443,15 @@
list(error_spec)::in, list(error_spec)::out) is det.
add_pass_1_module_defn(ItemModuleDefn, !Status, !ModuleInfo, !Specs) :-
- ItemModuleDefn = item_module_defn_info(_VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
( module_defn_update_import_status(ModuleDefn, StatusPrime) ->
!:Status = StatusPrime
- ; ModuleDefn = md_import(list_module(Specifiers)) ->
+ ; ModuleDefn = md_import(ModuleSpecifiers) ->
!.Status = item_status(IStat, _),
- add_module_specifiers(Specifiers, IStat, !ModuleInfo)
- ; ModuleDefn = md_use(list_module(Specifiers)) ->
+ add_module_specifiers(ModuleSpecifiers, IStat, !ModuleInfo)
+ ; ModuleDefn = md_use(ModuleSpecifiers) ->
!.Status = item_status(IStat, _),
- add_module_specifiers(Specifiers, IStat, !ModuleInfo)
+ add_module_specifiers(ModuleSpecifiers, IStat, !ModuleInfo)
; ModuleDefn = md_include_module(_) ->
true
; ModuleDefn = md_external(MaybeBackend, External) ->
@@ -657,7 +657,7 @@
add_item_decl_pass_2(Item, !Status, !ModuleInfo, !Specs) :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( module_defn_update_import_status(ModuleDefn, NewStatus) ->
!:Status = NewStatus
;
@@ -1125,7 +1125,7 @@
add_pass_3_module_defn(ItemModuleDefn, !Status, !ModuleInfo, !QualInfo,
!Specs) :-
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( ModuleDefn = md_version_numbers(ModuleName, ModuleVersionNumbers) ->
% Record the version numbers for each imported module
% if smart recompilation is enabled.
Index: compiler/mercury_to_mercury.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/mercury_to_mercury.m,v
retrieving revision 1.326
diff -u -b -r1.326 mercury_to_mercury.m
--- compiler/mercury_to_mercury.m 15 Feb 2008 02:26:55 -0000 1.326
+++ compiler/mercury_to_mercury.m 15 Feb 2008 04:29:15 -0000
@@ -620,9 +620,9 @@
io::di, io::uo) is det.
mercury_output_item_module_defn(_, ItemModuleDefn, !IO) :-
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
maybe_output_line_number(Context, !IO),
- mercury_output_module_defn(VarSet, ModuleDefn, Context, !IO).
+ mercury_output_module_defn(ModuleDefn, Context, !IO).
:- pred mercury_output_item_clause(bool::in, item_clause_info::in,
io::di, io::uo) is det.
@@ -1105,29 +1105,21 @@
%-----------------------------------------------------------------------------%
-:- pred mercury_output_module_defn(prog_varset::in, module_defn::in,
+:- pred mercury_output_module_defn(module_defn::in,
term.context::in, io::di, io::uo) is det.
-mercury_output_module_defn(_VarSet, ModuleDefn, _Context, !IO) :-
+mercury_output_module_defn(ModuleDefn, _Context, !IO) :-
(
- ModuleDefn = md_import(Imported),
- ( Imported = list_module(ImportedModules) ->
+ ModuleDefn = md_import(ImportedModules),
io.write_string(":- import_module ", !IO),
mercury_write_module_spec_list(ImportedModules, !IO),
io.write_string(".\n", !IO)
;
- unexpected(this_file, "mercury_output_module_defn: import")
- )
- ;
- ModuleDefn = md_use(Used),
- ( Used = list_module(UsedModules) ->
+ ModuleDefn = md_use(UsedModules),
io.write_string(":- use_module ", !IO),
mercury_write_module_spec_list(UsedModules, !IO),
io.write_string(".\n", !IO)
;
- unexpected(this_file, "mercury_output_module_defn: use")
- )
- ;
ModuleDefn = md_interface,
io.write_string(":- interface.\n", !IO)
;
Index: compiler/module_qual.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/module_qual.m,v
retrieving revision 1.163
diff -u -b -r1.163 module_qual.m
--- compiler/module_qual.m 15 Feb 2008 02:26:56 -0000 1.163
+++ compiler/module_qual.m 15 Feb 2008 04:30:10 -0000
@@ -263,7 +263,7 @@
collect_mq_info([Item | Items], !Info) :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
ModuleDefn = md_transitively_imported
->
% Don't process the transitively imported items (from `.int2' files).
@@ -322,7 +322,7 @@
)
;
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
process_module_defn(ModuleDefn, !Info)
;
Item = item_promise(ItemPromise),
@@ -438,26 +438,10 @@
id_set_insert(NeedQualifier, mq_id(ModuleName, Arity), Modules0, Modules),
mq_info_set_modules(Modules, !Info).
-:- pred add_imports(sym_list::in, mq_info::in, mq_info::out) is det.
+:- pred add_imports(list(module_specifier)::in, mq_info::in, mq_info::out)
+ is det.
add_imports(Imports, !Info) :-
- (
- Imports = list_module(ImportedModules),
- add_imports_2(ImportedModules, !Info)
- ;
- ( Imports = list_sym(_)
- ; Imports = list_pred(_)
- ; Imports = list_func(_)
- ; Imports = list_cons(_)
- ; Imports = list_op(_)
- ; Imports = list_adt(_)
- ; Imports = list_type(_)
- )
- ).
-
-:- pred add_imports_2(list(sym_name)::in, mq_info::in, mq_info::out) is det.
-
-add_imports_2(Imports, !Info) :-
mq_info_get_import_status(!.Info, Status),
% Modules imported from the the private interface of ancestors of
@@ -481,8 +465,7 @@
(
Status = mq_status_exported
->
- mq_info_get_unused_interface_modules(!.Info,
- UnusedIntModules0),
+ mq_info_get_unused_interface_modules(!.Info, UnusedIntModules0),
set.insert_list(UnusedIntModules0, Imports, UnusedIntModules),
mq_info_set_unused_interface_modules(UnusedIntModules, !Info)
;
@@ -712,9 +695,9 @@
Continue = yes
;
Item0 = item_module_defn(ItemModuleDefn0),
- ItemModuleDefn0 = item_module_defn_info(A, ModuleDefn, Context),
+ ItemModuleDefn0 = item_module_defn_info(ModuleDefn, Context),
update_import_status(ModuleDefn, !Info, Continue),
- ItemModuleDefn = item_module_defn_info(A, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn)
;
Item0 = item_pred_decl(ItemPredDecl0),
Index: compiler/modules.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.444
diff -u -b -r1.444 modules.m
--- compiler/modules.m 15 Feb 2008 02:26:56 -0000 1.444
+++ compiler/modules.m 15 Feb 2008 04:32:43 -0000
@@ -1512,7 +1512,7 @@
strip_imported_items_2([], !RevItems).
strip_imported_items_2([Item | Items], !RevItems) :-
( Item = item_module_defn(ItemModuleDefn) ->
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
(
( ModuleDefn = md_imported(_)
; ModuleDefn = md_used(_)
@@ -1644,7 +1644,6 @@
:- type module_specifier_in_defn
---> module_specifier_in_defn(
- prog_varset,
prog_context,
module_specifier
).
@@ -1677,19 +1676,17 @@
:- func wrap_import_module_spec(module_specifier_in_defn) = item.
wrap_import_module_spec(ModuleSpecInDefn) = Item :-
- ModuleSpecInDefn = module_specifier_in_defn(VarSet, Context, ModuleSpec),
- ImportModules = list_module([ModuleSpec]),
- ModuleDefn = md_import(ImportModules),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ModuleSpecInDefn = module_specifier_in_defn(Context, ModuleSpec),
+ ModuleDefn = md_import([ModuleSpec]),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn).
:- func wrap_use_module_spec(module_specifier_in_defn) = item.
wrap_use_module_spec(ModuleSpecInDefn) = Item :-
- ModuleSpecInDefn = module_specifier_in_defn(VarSet, Context, ModuleSpec),
- ImportModules = list_module([ModuleSpec]),
- ModuleDefn = md_use(ImportModules),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ModuleSpecInDefn = module_specifier_in_defn(Context, ModuleSpec),
+ ModuleDefn = md_use([ModuleSpec]),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn).
:- pred do_standardize_impl_items(list(item)::in, bool::in, bool::out,
@@ -1703,19 +1700,19 @@
do_standardize_impl_items([Item | Items], !Unexpected,
!RevRemainderItems, !ImportSpecs, !UseSpecs, !TypeDefns) :-
( Item = item_module_defn(ItemModuleDefn) ->
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
(
ModuleDefn = md_import(ImportModules),
- ( ImportModules = list_module([ModuleSpec]) ->
- insert_module_spec(VarSet, Context, ModuleSpec, !ImportSpecs)
+ ( ImportModules = [ModuleSpec] ->
+ insert_module_spec(Context, ModuleSpec, !ImportSpecs)
;
unexpected(this_file,
"do_standardize_impl_items: non-singleton-module import")
)
;
ModuleDefn = md_use(UseModules),
- ( UseModules = list_module([ModuleSpec]) ->
- insert_module_spec(VarSet, Context, ModuleSpec, !UseSpecs)
+ ( UseModules = [ModuleSpec] ->
+ insert_module_spec(Context, ModuleSpec, !UseSpecs)
;
unexpected(this_file,
"do_standardize_impl_items: non-singleton-module use")
@@ -1748,21 +1745,20 @@
do_standardize_impl_items(Items, !Unexpected,
!RevRemainderItems, !ImportSpecs, !UseSpecs, !TypeDefns).
-:- pred insert_module_spec(prog_varset::in, prog_context::in,
- module_specifier::in,
+:- pred insert_module_spec(prog_context::in, module_specifier::in,
list(module_specifier_in_defn)::in, list(module_specifier_in_defn)::out)
is det.
-insert_module_spec(VarSet, Context, NewModuleSpec, [], [New]) :-
- New = module_specifier_in_defn(VarSet, Context, NewModuleSpec).
-insert_module_spec(VarSet, Context, NewModuleSpec, [Head | Tail], Result) :-
- Head = module_specifier_in_defn(_, _, HeadModuleSpec),
+insert_module_spec(Context, NewModuleSpec, [], [New]) :-
+ New = module_specifier_in_defn(Context, NewModuleSpec).
+insert_module_spec(Context, NewModuleSpec, [Head | Tail], Result) :-
+ Head = module_specifier_in_defn(_, HeadModuleSpec),
compare(CompareSymName, NewModuleSpec, HeadModuleSpec),
( CompareSymName = (<) ->
- New = module_specifier_in_defn(VarSet, Context, NewModuleSpec),
+ New = module_specifier_in_defn(Context, NewModuleSpec),
Result = [New, Head | Tail]
;
- insert_module_spec(VarSet, Context, NewModuleSpec, Tail, NewTail),
+ insert_module_spec(Context, NewModuleSpec, Tail, NewTail),
Result = [Head | NewTail]
).
@@ -1828,13 +1824,13 @@
is_not_unnecessary_impl_import(NecessaryImports, Item) :-
( Item = item_module_defn(ItemModuleDefn) ->
- ItemModuleDefn = item_module_defn_info(_, Defn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
(
- ( Defn = md_use(Module)
- ; Defn = md_import(Module)
+ ( ModuleDefn = md_use(Modules)
+ ; ModuleDefn = md_import(Modules)
)
->
- ( Module = list_module([ModuleName]) ->
+ ( Modules = [ModuleName] ->
set.member(ModuleName, NecessaryImports)
;
unexpected(this_file, "is_not_unnecessary_impl_import: " ++
@@ -2035,7 +2031,7 @@
!RevIntItems, !RevImplItems, !IntTypesMap, !ImplTypesMap) :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
(
ModuleDefn = md_interface,
NewInInterface = yes
@@ -2276,7 +2272,7 @@
split_clauses_and_decls([Item | Items], !:ClauseItems, !:InterfaceItems) :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( ModuleDefn = md_interface
; ModuleDefn = md_implementation
)
@@ -2384,7 +2380,7 @@
Item = item_nothing(_)
;
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
ModuleDefn \= md_include_module(_)
)
->
@@ -2456,7 +2452,7 @@
),
recompilation.version.compute_version_numbers(Timestamp,
InterfaceItems0, MaybeOldItems, VersionNumbers),
- VersionNumberItemModuleDefn = item_module_defn_info(varset.init,
+ VersionNumberItemModuleDefn = item_module_defn_info(
md_version_numbers(ModuleName, VersionNumbers),
term.context_init),
VersionNumberItem = item_module_defn(VersionNumberItemModuleDefn),
@@ -2464,7 +2460,7 @@
InterfaceItems0 = [FirstItem | InterfaceItems1],
FirstItem = item_module_defn(FirstItemModuleDefn),
FirstItemModuleDefn =
- item_module_defn_info(_, FirstModuleDefn, _),
+ item_module_defn_info(FirstModuleDefn, _),
FirstModuleDefn = md_interface
->
InterfaceItems = [FirstItem, VersionNumberItem
@@ -2958,8 +2954,7 @@
Module = Module0 ^ items := Items.
make_pseudo_decl(PseudoDecl) = Item :-
- ItemModuleDefn = item_module_defn_info(varset.init, PseudoDecl,
- term.context_init),
+ ItemModuleDefn = item_module_defn_info(PseudoDecl, term.context_init),
Item = item_module_defn(ItemModuleDefn).
%-----------------------------------------------------------------------------%
@@ -6928,15 +6923,15 @@
% so we need to search the item list again to find them.
FindImports = (pred(Item::in, ImportInfo::out) is semidet :-
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
(
- ModuleDefn = md_import(list_module(Mods)),
+ ModuleDefn = md_import(ItemModuleSpecs),
DeclName = "import_module"
;
- ModuleDefn = md_use(list_module(Mods)),
+ ModuleDefn = md_use(ItemModuleSpecs),
DeclName = "use_module"
),
- list.member(ImportedModule, Mods),
+ list.member(ImportedModule, ItemModuleSpecs),
ImportInfo = DeclName - Context
),
list.filter_map(FindImports, Items, ImportInfos),
@@ -7076,12 +7071,12 @@
replace_section_decl(IntStatusItem, ImpStatusItem, Item0, Item) :-
(
Item0 = item_module_defn(ItemModuleDefn0),
- ItemModuleDefn0 = item_module_defn_info(_, Defn0, _),
+ ItemModuleDefn0 = item_module_defn_info(ModuleDefn0, _),
(
- Defn0 = md_interface,
+ ModuleDefn0 = md_interface,
ItemPrime = IntStatusItem
;
- Defn0 = md_implementation,
+ ModuleDefn0 = md_implementation,
ItemPrime = ImpStatusItem
)
->
@@ -7129,7 +7124,7 @@
get_children_2([Item | Items], !IncludeDeps) :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
ModuleDefn = md_include_module(Modules)
->
!:IncludeDeps = !.IncludeDeps ++ Modules
@@ -7154,7 +7149,7 @@
get_accessible_children_2(_, [], !IncludeDeps).
get_accessible_children_2(!.Visible, [Item | Items], !IncludeDeps) :-
( Item = item_module_defn(ItemModuleDefn) ->
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
(
( ModuleDefn = md_abstract_imported
; ModuleDefn = md_opt_imported
@@ -7242,14 +7237,14 @@
get_dependencies_implementation([Item | Items],
!IntImportDeps, !IntUseDeps, !ImpImportDeps, !ImpUseDeps) :-
( Item = item_module_defn(ItemModuleDefn) ->
- ItemModuleDefn = item_module_defn_info(_VarSet, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( ModuleDefn = md_interface ->
get_dependencies_interface(Items,
!IntImportDeps, !IntUseDeps, !ImpImportDeps, !ImpUseDeps)
;
- ( ModuleDefn = md_import(list_module(Modules)) ->
+ ( ModuleDefn = md_import(Modules) ->
!:ImpImportDeps = !.ImpImportDeps ++ Modules
- ; ModuleDefn = md_use(list_module(Modules)) ->
+ ; ModuleDefn = md_use(Modules) ->
!:ImpUseDeps = !.ImpUseDeps ++ Modules
;
true
@@ -7273,14 +7268,14 @@
get_dependencies_interface([Item | Items],
!IntImportDeps, !IntUseDeps, !ImpImportDeps, !ImpUseDeps) :-
( Item = item_module_defn(ItemModuleDefn) ->
- ItemModuleDefn = item_module_defn_info(_VarSet, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( ModuleDefn = md_implementation ->
get_dependencies_implementation(Items,
!IntImportDeps, !IntUseDeps, !ImpImportDeps, !ImpUseDeps)
;
- ( ModuleDefn = md_import(list_module(Modules)) ->
+ ( ModuleDefn = md_import(Modules) ->
!:IntImportDeps = !.IntImportDeps ++ Modules
- ; ModuleDefn = md_use(list_module(Modules)) ->
+ ; ModuleDefn = md_use(Modules) ->
!:IntUseDeps = !.IntUseDeps ++ Modules
;
true
@@ -7378,7 +7373,7 @@
% Check for a `module' declaration, which signals the start
% of a nested module.
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
ModuleDefn = md_module(SubModuleName)
->
% Parse in the items for the nested submodule.
@@ -7395,7 +7390,7 @@
% Replace the nested submodule with an `include_module' declaration.
IncludeSubModModuleDefn = md_include_module([SubModuleName]),
- IncludeSubModItemModuleDefn = item_module_defn_info(VarSet,
+ IncludeSubModItemModuleDefn = item_module_defn_info(
IncludeSubModModuleDefn, Context),
IncludeSubModItem = item_module_defn(IncludeSubModItemModuleDefn),
ThisModuleItems = [IncludeSubModItem | ThisModuleItems0],
@@ -7403,7 +7398,7 @@
;
% Check for a matching `end_module' declaration.
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_VarSet, ModuleDefn, _Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _Context),
ModuleDefn = md_end_module(EndModuleName),
EndModuleName = ModuleName
->
@@ -7418,7 +7413,7 @@
% interface section, and report an error if there is an
% `implementation' section inside an `interface' section.
( Item = item_module_defn(ItemModuleDefn) ->
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
( ModuleDefn = md_interface ->
!:InInterface = yes
; ModuleDefn = md_implementation ->
@@ -7512,7 +7507,7 @@
is_duplicate_error(Duplicates, Items, SubModuleName - Context) :-
list.member(Item, Items),
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
(
ModuleDefn = md_module(SubModuleName)
;
@@ -7626,7 +7621,7 @@
!.InInterface, !RevIntItems, AddImplItem, !RevImplItems) :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( ModuleDefn = md_interface
; ModuleDefn = md_implementation
; ModuleDefn = md_imported(_)
@@ -7899,7 +7894,7 @@
Include = yes
;
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
(
% XXX Some of these should yield an exception.
( ModuleDefn = md_module(_)
@@ -8138,7 +8133,7 @@
interface_or_import_marker(Item) :-
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( ModuleDefn = md_interface
; ModuleDefn = md_implementation
).
@@ -8152,7 +8147,7 @@
import_or_use_item(Item) :-
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( ModuleDefn = md_import(_)
; ModuleDefn = md_use(_)
).
@@ -8176,28 +8171,28 @@
(
CurPos = in_interface,
Item1 = item_module_defn(ItemModuleDefn1),
- ItemModuleDefn1 = item_module_defn_info(_, md_implementation, _),
+ ItemModuleDefn1 = item_module_defn_info(md_implementation, _),
Item2 = item_module_defn(ItemModuleDefn2),
- ItemModuleDefn2 = item_module_defn_info(_, md_interface, _)
+ ItemModuleDefn2 = item_module_defn_info(md_interface, _)
->
filter_unnecessary_flips(Items0, CurPos, Items)
;
CurPos = in_implementation,
Item1 = item_module_defn(ItemModuleDefn1),
- ItemModuleDefn1 = item_module_defn_info(_, md_interface, _),
+ ItemModuleDefn1 = item_module_defn_info(md_interface, _),
Item2 = item_module_defn(ItemModuleDefn2),
- ItemModuleDefn2 = item_module_defn_info(_, md_implementation, _)
+ ItemModuleDefn2 = item_module_defn_info(md_implementation, _)
->
filter_unnecessary_flips(Items0, CurPos, Items)
;
(
Item1 = item_module_defn(ItemModuleDefn1),
- ItemModuleDefn1 = item_module_defn_info(_, md_implementation, _)
+ ItemModuleDefn1 = item_module_defn_info(md_implementation, _)
->
NextPos = in_implementation
;
Item1 = item_module_defn(ItemModuleDefn1),
- ItemModuleDefn1 = item_module_defn_info(_, md_interface, _)
+ ItemModuleDefn1 = item_module_defn_info(md_interface, _)
->
NextPos = in_interface
;
@@ -8253,7 +8248,7 @@
:- pred import_or_use(item::in) is semidet.
import_or_use(item_module_defn(ItemModuleDefn)) :-
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
( ModuleDefn = md_import(_)
; ModuleDefn = md_use(_)
).
@@ -8279,7 +8274,7 @@
reorderable_item(Item) = Reorderable :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
Reorderable = reorderable_module_defn(ModuleDefn)
;
Item = item_pragma(ItemPragma),
@@ -8382,7 +8377,7 @@
chunkable_item(Item) = Chunkable :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, _),
Chunkable = chunkable_module_defn(ModuleDefn)
;
Item = item_pragma(ItemPragma),
Index: compiler/prog_data.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_data.m,v
retrieving revision 1.205
diff -u -b -r1.205 prog_data.m
--- compiler/prog_data.m 15 Feb 2008 02:26:57 -0000 1.205
+++ compiler/prog_data.m 15 Feb 2008 04:51:04 -0000
@@ -1607,56 +1607,6 @@
; import_locn_ancestor_private_interface.
% The item is from the private interface of an ancestor module.
-:- type sym_list
- ---> list_sym(list(sym_specifier))
- ; list_pred(list(pred_specifier))
- ; list_func(list(func_specifier))
- ; list_cons(list(cons_specifier))
- ; list_op(list(op_specifier))
- ; list_adt(list(adt_specifier))
- ; list_type(list(type_specifier))
- ; list_module(list(module_specifier)).
-
-:- type sym_specifier
- ---> spec_sym(sym_name_specifier)
- ; spec_typed_sym(typed_cons_specifier)
- ; spec_pred(pred_specifier)
- ; spec_func(func_specifier)
- ; spec_cons(cons_specifier)
- ; spec_op(op_specifier)
- ; spec_adt(adt_specifier)
- ; spec_type(type_specifier)
- ; spec_module(module_specifier).
-
-:- type pred_specifier
- ---> predspec_sym(sym_name_specifier)
- ; predspec_name_args(sym_name, list(mer_type)).
-
-:- type func_specifier == cons_specifier.
-:- type cons_specifier
- ---> consspec_sym(sym_name_specifier)
- ; consspec_typed(typed_cons_specifier).
-
-:- type typed_cons_specifier
- ---> name_args(sym_name, list(mer_type))
- ; name_res(sym_name_specifier, mer_type)
- ; name_args_res(sym_name, list(mer_type), mer_type).
-
-:- type adt_specifier == sym_name_specifier.
-:- type type_specifier == sym_name_specifier.
-
-:- type op_specifier
- ---> opspec_sym(sym_name_specifier)
- ; opspec_fixity(sym_name_specifier, fixity).
- % operator fixity specifiers not yet implemented
-
-:- type fixity
- ---> infix
- ; prefix
- ; postfix
- ; binary_prefix
- ; binary_postfix.
-
:- type sym_name_specifier
---> name(sym_name)
; name_arity(sym_name, arity).
@@ -1697,18 +1647,15 @@
impl_used_modules :: set(module_name)
).
- %
% Initialize the used_modules structure.
%
:- func used_modules_init = used_modules.
- %
% Given a sym_name call add_all_modules on the module part of the name.
%
:- pred add_sym_name_module(item_visibility::in, sym_name::in,
used_modules::in, used_modules::out) is det.
- %
% Given a module name add the module and all of its parent modules
% to the used_modules.
%
Index: compiler/prog_io.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_io.m,v
retrieving revision 1.289
diff -u -b -r1.289 prog_io.m
--- compiler/prog_io.m 15 Feb 2008 02:26:57 -0000 1.289
+++ compiler/prog_io.m 15 Feb 2008 04:47:30 -0000
@@ -587,7 +587,7 @@
RevItems0 = [Item | RevItemsPrime],
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
ModuleDefn = md_end_module(ModuleName)
->
RevItems = RevItemsPrime,
@@ -613,7 +613,7 @@
(
!.Items = [Item | !:Items],
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, md_module(ModuleName1), _)
+ ItemModuleDefn = item_module_defn_info(md_module(ModuleName1), _)
->
% Check that the end module declaration (if any) matches
% the begin module declaration.
@@ -779,8 +779,7 @@
% Check if the first term was a `:- module' decl.
MaybeFirstItem = read_item_ok(FirstItem),
FirstItem = item_module_defn(FirstItemModuleDefn),
- FirstItemModuleDefn = item_module_defn_info(_VarSet, ModuleDefn,
- FirstContext),
+ FirstItemModuleDefn = item_module_defn_info(ModuleDefn, FirstContext),
ModuleDefn = md_module(StartModuleName)
->
% If so, then check that it matches the expected module name,
@@ -840,9 +839,8 @@
item::out) is det.
make_module_decl(ModuleName, Context, Item) :-
- varset.init(EmptyVarSet),
ModuleDefn = md_module(ModuleName),
- ItemInfo = item_module_defn_info(EmptyVarSet, ModuleDefn, Context),
+ ItemInfo = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemInfo).
:- pred maybe_add_warning(bool::in, read_term::in, term.context::in,
@@ -970,7 +968,7 @@
;
Item = item_module_defn(ItemModuleDefn)
->
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
( ModuleDefn = md_module(NestedModuleName) ->
!:ModuleName = NestedModuleName,
!:Items = [Item | !.Items]
@@ -980,19 +978,16 @@
ParentModuleName),
!:ModuleName = ParentModuleName,
!:Items = [Item | !.Items]
- ; ModuleDefn = md_import(list_module(Modules)) ->
- ImportItems = list.map(
- make_pseudo_import_module_decl(VarSet, Context),
+ ; ModuleDefn = md_import(Modules) ->
+ ImportItems = list.map(make_pseudo_import_module_decl(Context),
Modules),
!:Items = ImportItems ++ !.Items
- ; ModuleDefn = md_use(list_module(Modules)) ->
- UseItems = list.map(
- make_pseudo_use_module_decl(VarSet, Context),
+ ; ModuleDefn = md_use(Modules) ->
+ UseItems = list.map(make_pseudo_use_module_decl(Context),
Modules),
!:Items = UseItems ++ !.Items
; ModuleDefn = md_include_module(Modules) ->
- IncludeItems = list.map(
- make_pseudo_include_module_decl(VarSet, Context),
+ IncludeItems = list.map(make_pseudo_include_module_decl(Context),
Modules),
!:Items = IncludeItems ++ !.Items
;
@@ -1002,28 +997,25 @@
!:Items = [Item | !.Items]
).
-:- func make_pseudo_import_module_decl(prog_varset, prog_context,
- module_specifier) = item.
+:- func make_pseudo_import_module_decl(prog_context, module_specifier) = item.
-make_pseudo_import_module_decl(Varset, Context, ModuleSpecifier) = Item :-
- ModuleDefn = md_import(list_module([ModuleSpecifier])),
- ItemModuleDefn = item_module_defn_info(Varset, ModuleDefn, Context),
+make_pseudo_import_module_decl(Context, ModuleSpecifier) = Item :-
+ ModuleDefn = md_import([ModuleSpecifier]),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn).
-:- func make_pseudo_use_module_decl(prog_varset, prog_context,
- module_specifier) = item.
+:- func make_pseudo_use_module_decl(prog_context, module_specifier) = item.
-make_pseudo_use_module_decl(Varset, Context, ModuleSpecifier) = Item :-
- ModuleDefn = md_use(list_module([ModuleSpecifier])),
- ItemModuleDefn = item_module_defn_info(Varset, ModuleDefn, Context),
+make_pseudo_use_module_decl(Context, ModuleSpecifier) = Item :-
+ ModuleDefn = md_use([ModuleSpecifier]),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn).
-:- func make_pseudo_include_module_decl(prog_varset, prog_context, module_name)
- = item.
+:- func make_pseudo_include_module_decl(prog_context, module_name) = item.
-make_pseudo_include_module_decl(Varset, Context, ModuleSpecifier) = Item :-
+make_pseudo_include_module_decl(Context, ModuleSpecifier) = Item :-
ModuleDefn = md_include_module([ModuleSpecifier]),
- ItemModuleDefn = item_module_defn_info(Varset, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn).
%-----------------------------------------------------------------------------%
@@ -1226,143 +1218,36 @@
parse_inst_decl(ModuleName, VarSet, InstDecl, Context, Result0),
check_no_attributes(Result0, Attributes, Result).
-process_decl(_ModuleName, VarSet, "import_module", [ModuleSpec], Attributes,
+process_decl(_ModuleName, _VarSet, "import_module", [ModuleSpec], Attributes,
Context, Result) :-
- parse_symlist_decl(parse_module_specifier, make_module, make_import,
- ModuleSpec, Attributes, VarSet, Context, Result).
+ parse_symlist_decl(parse_module_specifier, make_import,
+ ModuleSpec, Attributes, Context, Result).
-process_decl(_ModuleName, VarSet, "use_module", [ModuleSpec], Attributes,
+process_decl(_ModuleName, _VarSet, "use_module", [ModuleSpec], Attributes,
Context, Result) :-
- parse_symlist_decl(parse_module_specifier, make_module, make_use,
- ModuleSpec, Attributes, VarSet, Context, Result).
+ parse_symlist_decl(parse_module_specifier, make_use,
+ ModuleSpec, Attributes, Context, Result).
-process_decl(_ModuleName, VarSet, "export_module", [ModuleSpec], Attributes,
+process_decl(_ModuleName, _VarSet, "export_module", [ModuleSpec], Attributes,
Context, Result) :-
- parse_symlist_decl(parse_module_specifier, make_module, make_export,
- ModuleSpec, Attributes, VarSet, Context, Result).
+ parse_symlist_decl(parse_module_specifier, make_export,
+ ModuleSpec, Attributes, Context, Result).
-process_decl(_ModuleName, VarSet, "import_sym", [SymSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_symbol_specifier, make_sym, make_import,
- SymSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "use_sym", [SymSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_symbol_specifier, make_sym, make_use,
- SymSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "export_sym", [SymSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_symbol_specifier, make_sym, make_export,
- SymSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "import_pred", [PredSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_predicate_specifier, make_pred, make_import,
- PredSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "use_pred", [PredSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_predicate_specifier, make_pred, make_use,
- PredSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "export_pred", [PredSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_predicate_specifier, make_pred, make_export,
- PredSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "import_func", [FuncSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_function_specifier, make_func, make_import,
- FuncSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "use_func", [FuncSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_function_specifier, make_func, make_use,
- FuncSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "export_func", [FuncSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_function_specifier, make_func, make_export,
- FuncSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "import_cons", [ConsSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_constructor_specifier, make_cons, make_import,
- ConsSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "use_cons", [ConsSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_constructor_specifier, make_cons, make_use,
- ConsSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "export_cons", [ConsSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_constructor_specifier, make_cons, make_export,
- ConsSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "import_type", [TypeSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_type_specifier, make_type, make_import,
- TypeSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "use_type", [TypeSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_type_specifier, make_type, make_use,
- TypeSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "export_type", [TypeSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_type_specifier, make_type, make_export,
- TypeSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "import_adt", [ADT_Spec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_adt_specifier, make_adt, make_import,
- ADT_Spec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "use_adt", [ADT_Spec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_adt_specifier, make_adt, make_use,
- ADT_Spec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "export_adt", [ADT_Spec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_adt_specifier, make_adt, make_export,
- ADT_Spec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "import_op", [OpSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_op_specifier, make_op, make_import,
- OpSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "use_op", [OpSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_op_specifier, make_op, make_use,
- OpSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet, "export_op", [OpSpec], Attributes,
- Context, Result) :-
- parse_symlist_decl(parse_op_specifier, make_op, make_export,
- OpSpec, Attributes, VarSet, Context, Result).
-
-process_decl(_ModuleName, VarSet0, "interface", [], Attributes, Context,
+process_decl(_ModuleName, _VarSet, "interface", [], Attributes, Context,
Result) :-
- varset.coerce(VarSet0, VarSet),
- ItemModuleDefn = item_module_defn_info(VarSet, md_interface, Context),
+ ItemModuleDefn = item_module_defn_info(md_interface, Context),
Item = item_module_defn(ItemModuleDefn),
Result0 = ok1(Item),
check_no_attributes(Result0, Attributes, Result).
-process_decl(_ModuleName, VarSet0, "implementation", [], Attributes, Context,
+process_decl(_ModuleName, _VarSet, "implementation", [], Attributes, Context,
Result) :-
- varset.coerce(VarSet0, VarSet),
- ItemModuleDefn = item_module_defn_info(VarSet, md_implementation, Context),
+ ItemModuleDefn = item_module_defn_info(md_implementation, Context),
Item = item_module_defn(ItemModuleDefn),
Result0 = ok1(Item),
check_no_attributes(Result0, Attributes, Result).
-process_decl(ModuleName, VarSet, "external", Args, Attributes, Context,
+process_decl(ModuleName, _VarSet, "external", Args, Attributes, Context,
Result) :-
(
Args = [PredSpec],
@@ -1381,18 +1266,16 @@
),
parse_implicitly_qualified_symbol_name_specifier(ModuleName, PredSpec,
Result0),
- process_maybe1(make_external(VarSet, MaybeBackend, Context), Result0,
- Result1),
+ process_maybe1(make_external(MaybeBackend, Context), Result0, Result1),
check_no_attributes(Result1, Attributes, Result).
-process_decl(DefaultModuleName, VarSet0, "module", [ModuleName], Attributes,
+process_decl(DefaultModuleName, _VarSet, "module", [ModuleName], Attributes,
Context, Result) :-
parse_module_name(DefaultModuleName, ModuleName, Result0),
(
Result0 = ok1(ModuleNameSym),
- varset.coerce(VarSet0, VarSet),
ModuleDefn = md_module(ModuleNameSym),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn),
Result1 = ok1(Item)
;
@@ -1401,14 +1284,13 @@
),
check_no_attributes(Result1, Attributes, Result).
-process_decl(DefaultModuleName, VarSet0, "include_module", [ModuleNames],
+process_decl(DefaultModuleName, _VarSet, "include_module", [ModuleNames],
Attributes, Context, Result) :-
parse_list(parse_module_name(DefaultModuleName), ModuleNames, Result0),
(
Result0 = ok1(ModuleNameSyms),
- varset.coerce(VarSet0, VarSet),
ModuleDefn = md_include_module(ModuleNameSyms),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn),
Result1 = ok1(Item)
;
@@ -1417,7 +1299,7 @@
),
check_no_attributes(Result1, Attributes, Result).
-process_decl(DefaultModuleName, VarSet0, "end_module", [ModuleName],
+process_decl(DefaultModuleName, _VarSet, "end_module", [ModuleName],
Attributes, Context, Result) :-
% The name in an `end_module' declaration not inside the scope of the
% module being ended, so the default module name here is the parent
@@ -1429,9 +1311,8 @@
parse_module_name(ParentOfDefaultModuleName, ModuleName, Result0),
(
Result0 = ok1(ModuleNameSym),
- varset.coerce(VarSet0, VarSet),
ModuleDefn = md_end_module(ModuleNameSym),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn),
Result1 = ok1(Item)
;
@@ -1490,7 +1371,7 @@
),
check_no_attributes(Result1, Attributes, Result).
-process_decl(ModuleName, VarSet0, "version_numbers",
+process_decl(ModuleName, _VarSet, "version_numbers",
[VersionNumberTerm, ModuleNameTerm, VersionNumbersTerm],
Attributes, Context, Result) :-
parse_module_specifier(ModuleNameTerm, ModuleNameResult),
@@ -1505,10 +1386,8 @@
Result0),
(
Result0 = ok1(VersionNumbers),
- varset.coerce(VarSet0, VarSet),
ModuleDefn = md_version_numbers(ModuleName, VersionNumbers),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn,
- Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn),
Result1 = ok1(Item),
check_no_attributes(Result1, Attributes, Result)
@@ -1670,13 +1549,12 @@
Context),
Item = item_type_defn(ItemTypeDefn).
-:- pred make_external(varset::in, maybe(backend)::in, prog_context::in,
+:- pred make_external(maybe(backend)::in, prog_context::in,
sym_name_specifier::in, item::out) is det.
-make_external(VarSet0, MaybeBackend, Context, SymSpec, Item) :-
- varset.coerce(VarSet0, VarSet),
+make_external(MaybeBackend, Context, SymSpec, Item) :-
ModuleDefn = md_external(MaybeBackend, SymSpec),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn).
:- pred get_is_solver_type(is_solver_type::out,
@@ -3974,28 +3852,23 @@
:- type maker(T1, T2) == pred(T1, T2).
:- mode maker == (pred(in, out) is det).
-:- pred parse_symlist_decl(parser(T)::parser, maker(list(T), sym_list)::maker,
- maker(sym_list, module_defn)::maker,
- term::in, decl_attrs::in, varset::in, prog_context::in, maybe1(item)::out)
- is det.
+:- pred parse_symlist_decl(parser(module_specifier)::parser,
+ maker(list(module_specifier), module_defn)::maker,
+ term::in, decl_attrs::in, prog_context::in, maybe1(item)::out) is det.
-parse_symlist_decl(ParserPred, MakeSymListPred, MakeModuleDefnPred,
- Term, Attributes, VarSet, Context, Result) :-
+parse_symlist_decl(ParserPred, MakeModuleDefnPred, Term, Attributes, Context,
+ Result) :-
parse_list(ParserPred, Term, Result0),
- process_maybe1(make_module_defn(MakeSymListPred, MakeModuleDefnPred,
- VarSet, Context), Result0, Result1),
+ process_maybe1(make_module_defn(MakeModuleDefnPred, Context),
+ Result0, Result1),
check_no_attributes(Result1, Attributes, Result).
-:- pred make_module_defn(maker(T, sym_list)::maker,
- maker(sym_list, module_defn)::maker, varset::in, prog_context::in,
- T::in, item::out) is det.
+:- pred make_module_defn(maker(list(module_specifier), module_defn)::maker,
+ prog_context::in, list(module_specifier)::in, item::out) is det.
-make_module_defn(MakeSymListPred, MakeModuleDefnPred, VarSet0, Context,
- T, Item) :-
- varset.coerce(VarSet0, VarSet),
- call(MakeSymListPred, T, SymList),
- call(MakeModuleDefnPred, SymList, ModuleDefn),
- ItemModuleDefn = item_module_defn_info(VarSet, ModuleDefn, Context),
+make_module_defn(MakeModuleDefnPred, Context, ModuleSpecs, Item) :-
+ call(MakeModuleDefnPred, ModuleSpecs, ModuleDefn),
+ ItemModuleDefn = item_module_defn_info(ModuleDefn, Context),
Item = item_module_defn(ItemModuleDefn).
%-----------------------------------------------------------------------------%
@@ -4016,133 +3889,6 @@
%-----------------------------------------------------------------------------%
-:- pred make_module(list(module_specifier)::in, sym_list::out) is det.
-make_module(X, list_module(X)).
-
-:- pred make_sym(list(sym_specifier)::in, sym_list::out) is det.
-make_sym(X, list_sym(X)).
-
-:- pred make_pred(list(pred_specifier)::in, sym_list::out) is det.
-make_pred(X, list_pred(X)).
-
-:- pred make_func(list(func_specifier)::in, sym_list::out) is det.
-make_func(X, list_func(X)).
-
-:- pred make_cons(list(cons_specifier)::in, sym_list::out) is det.
-make_cons(X, list_cons(X)).
-
-:- pred make_type(list(type_specifier)::in, sym_list::out) is det.
-make_type(X, list_type(X)).
-
-:- pred make_adt(list(adt_specifier)::in, sym_list::out) is det.
-make_adt(X, list_adt(X)).
-
-:- pred make_op(list(op_specifier)::in, sym_list::out) is det.
-make_op(X, list_op(X)).
-
-%-----------------------------------------------------------------------------%
-%
-% A symbol specifier is one of
-%
-% SymbolNameSpecifier
-% Matches any symbol matched by the SymbolNameSpecifier.
-% TypedConstructorSpecifier
-% Matches any constructors matched by the
-% TypedConstructorSpecifier.
-% cons(ConstructorSpecifier)
-% Matches only constructors.
-% pred(PredSpecifier)
-% Matches only predicates, ie. constructors of type `pred'.
-% adt(SymbolNameSpecifier)
-% Matches only type names.
-% type(SymbolNameSpecifier)
-% Matches type names matched by the SymbolNameSpecifier,
-% and also matches any constructors for the matched type names.
-% op(SymbolNameSpecifier)
-% Matches only operators.
-% module(ModuleSpecifier)
-% Matches all symbols in the specified module.
-
-:- pred parse_symbol_specifier(term::in, maybe1(sym_specifier)::out) is det.
-
-parse_symbol_specifier(MainTerm, Result) :-
- ( MainTerm = term.functor(term.atom(Functor), [Term], _Context) ->
- ( Functor = "cons" ->
- parse_constructor_specifier(Term, Result0),
- process_maybe1(make_cons_symbol_specifier, Result0, Result)
- ; Functor = "pred" ->
- parse_predicate_specifier(Term, Result0),
- process_maybe1(make_pred_symbol_specifier, Result0, Result)
- ; Functor = "func" ->
- parse_function_specifier(Term, Result0),
- process_maybe1(make_func_symbol_specifier, Result0, Result)
- ; Functor = "type" ->
- parse_type_specifier(Term, Result0),
- process_maybe1(make_type_symbol_specifier, Result0, Result)
- ; Functor = "adt" ->
- parse_adt_specifier(Term, Result0),
- process_maybe1(make_adt_symbol_specifier, Result0, Result)
- ; Functor = "op" ->
- parse_op_specifier(Term, Result0),
- process_maybe1(make_op_symbol_specifier, Result0, Result)
- ; Functor = "module" ->
- parse_module_specifier(Term, Result0),
- process_maybe1(make_module_symbol_specifier, Result0, Result)
- ;
- parse_constructor_specifier(MainTerm, Result0),
- process_maybe1(make_cons_symbol_specifier, Result0, Result)
- )
- ;
- parse_constructor_specifier(MainTerm, Result0),
- process_maybe1(make_cons_symbol_specifier, Result0, Result)
- ).
-
- % Once we've parsed the appropriate type of symbol specifier, we need to
- % convert it to a sym_specifier.
- %
-:- pred make_pred_symbol_specifier(pred_specifier::in, sym_specifier::out)
- is det.
-
-make_pred_symbol_specifier(PredSpec, spec_pred(PredSpec)).
-
-:- pred make_func_symbol_specifier(func_specifier::in, sym_specifier::out)
- is det.
-
-make_func_symbol_specifier(FuncSpec, spec_func(FuncSpec)).
-
-:- pred make_cons_symbol_specifier(cons_specifier::in, sym_specifier::out)
- is det.
-
-make_cons_symbol_specifier(ConsSpec, spec_cons(ConsSpec)).
-
-:- pred make_type_symbol_specifier(type_specifier::in, sym_specifier::out)
- is det.
-
-make_type_symbol_specifier(TypeSpec, spec_type(TypeSpec)).
-
-:- pred make_adt_symbol_specifier(adt_specifier::in, sym_specifier::out)
- is det.
-
-make_adt_symbol_specifier(ADT_Spec, spec_adt(ADT_Spec)).
-
-:- pred make_op_symbol_specifier(op_specifier::in, sym_specifier::out) is det.
-
-make_op_symbol_specifier(OpSpec, spec_op(OpSpec)).
-
-:- pred make_module_symbol_specifier(module_specifier::in, sym_specifier::out)
- is det.
-
-make_module_symbol_specifier(ModuleSpec, spec_module(ModuleSpec)).
-
-:- pred cons_specifier_to_sym_specifier(cons_specifier::in,
- sym_specifier::out) is det.
-
-cons_specifier_to_sym_specifier(consspec_sym(SymSpec), spec_sym(SymSpec)).
-cons_specifier_to_sym_specifier(consspec_typed(SymSpec),
- spec_typed_sym(SymSpec)).
-
-%-----------------------------------------------------------------------------%
-
% A ModuleSpecifier is just an sym_name.
%
:- pred parse_module_specifier(term::in, maybe1(module_specifier)::out) is det.
@@ -4170,126 +3916,6 @@
%-----------------------------------------------------------------------------%
- % A ConstructorSpecifier is one of
- % SymbolNameSpecifier
- % TypedConstructorSpecifier
- %
- % A TypedConstructorSpecifier is one of
- % SymbolNameSpecifier::Type
- % Matches only constructors with the specified result type.
- % SymbolName(ArgType1, ..., ArgTypeN)
- % Matches only constructors with the specified argument types.
- % SymbolName(ArgType1, ..., ArgTypeN)::Type
- % Matches only constructors with the specified argument
- % and result types.
- %
-:- pred parse_constructor_specifier(term::in, maybe1(cons_specifier)::out)
- is det.
-
-parse_constructor_specifier(Term, Result) :-
- (
- Term = term.functor(term.atom("::"), [NameArgsTerm, TypeTerm],
- _Context)
- ->
- parse_arg_types_specifier(NameArgsTerm, NameArgsResult),
- parse_type(TypeTerm, TypeResult),
- process_typed_constructor_specifier(NameArgsResult, TypeResult, Result)
- ;
- parse_arg_types_specifier(Term, TermResult),
- process_maybe1(make_untyped_cons_spec, TermResult, Result)
- ).
-
-%-----------------------------------------------------------------------------%
-
- % A PredicateSpecifier is one of
- % SymbolName(ArgType1, ..., ArgTypeN)
- % Matches only predicates with the specified argument types.
- % SymbolNameSpecifier
- %
-:- pred parse_predicate_specifier(term::in, maybe1(pred_specifier)::out)
- is det.
-
-parse_predicate_specifier(Term, Result) :-
- ( Term = term.functor(term.atom("/"), [_, _], _Context) ->
- parse_symbol_name_specifier(Term, NameResult),
- process_maybe1(make_arity_predicate_specifier, NameResult, Result)
- ;
- parse_qualified_term(Term, Term, "predicate specifier", TermResult),
- process_typed_predicate_specifier(TermResult, Result)
- ).
-
-:- pred process_typed_predicate_specifier(maybe_functor::in,
- maybe1(pred_specifier)::out) is det.
-
-process_typed_predicate_specifier(ok2(Name, Args0), Result) :-
- (
- Args0 = [],
- Result = ok1(predspec_sym(name(Name)))
- ;
- Args0 = [_ | _],
- parse_types(Args0, ArgsResult),
- (
- ArgsResult = ok1(Args),
- Result = ok1(predspec_name_args(Name, Args))
- ;
- ArgsResult = error1(Errors),
- Result = error1(Errors)
- )
- ).
-process_typed_predicate_specifier(error2(Errors), error1(Errors)).
-
-:- pred make_arity_predicate_specifier(sym_name_specifier::in,
- pred_specifier::out) is det.
-
-make_arity_predicate_specifier(Result, predspec_sym(Result)).
-
-%-----------------------------------------------------------------------------%
-
- % Parsing the name & argument types of a constructor specifier is exactly
- % the same as parsing a predicate specifier...
- %
-:- pred parse_arg_types_specifier(term::in, maybe1(pred_specifier)::out)
- is det.
-
-parse_arg_types_specifier(Term, Result) :-
- ( Term = term.functor(term.atom("/"), [_, _], _Context) ->
- parse_symbol_name_specifier(Term, NameResult),
- process_maybe1(make_arity_predicate_specifier, NameResult, Result)
- ;
- parse_qualified_term(Term, Term, "constructor specifier", TermResult),
- process_typed_predicate_specifier(TermResult, Result)
- ).
-
- % ... but we have to convert the result back into the appropriate format.
- %
-:- pred process_typed_constructor_specifier(maybe1(pred_specifier)::in,
- maybe1(mer_type)::in, maybe1(cons_specifier)::out) is det.
-
-process_typed_constructor_specifier(error1(Errors1), error1(Errors2),
- error1(Errors1 ++ Errors2)).
-process_typed_constructor_specifier(error1(Errors), ok1(_), error1(Errors)).
-process_typed_constructor_specifier(ok1(_), error1(Errors), error1(Errors)).
-process_typed_constructor_specifier(ok1(NameArgs), ok1(ResType),
- ok1(Result)) :-
- process_typed_cons_spec_2(NameArgs, ResType, Result).
-
-:- pred process_typed_cons_spec_2(pred_specifier::in, mer_type::in,
- cons_specifier::out) is det.
-
-process_typed_cons_spec_2(predspec_sym(Name), Res,
- consspec_typed(name_res(Name, Res))).
-process_typed_cons_spec_2(predspec_name_args(Name, Args), Res,
- consspec_typed(name_args_res(Name, Args, Res))).
-
-:- pred make_untyped_cons_spec(pred_specifier::in, cons_specifier::out) is det.
-
-make_untyped_cons_spec(predspec_sym(Name),
- consspec_sym(Name)).
-make_untyped_cons_spec(predspec_name_args(Name, Args),
- consspec_typed(name_args(Name, Args))).
-
-%-----------------------------------------------------------------------------%
-
% A SymbolNameSpecifier is one of
% SymbolName
% SymbolName/Arity
@@ -4493,58 +4119,20 @@
%
% Predicates used to convert a sym_list to a program item.
-:- pred make_use(sym_list::in, module_defn::out) is det.
+:- pred make_use(list(module_specifier)::in, module_defn::out) is det.
make_use(Syms, md_use(Syms)).
-:- pred make_import(sym_list::in, module_defn::out) is det.
+:- pred make_import(list(module_specifier)::in, module_defn::out) is det.
make_import(Syms, md_import(Syms)).
-:- pred make_export(sym_list::in, module_defn::out) is det.
+:- pred make_export(list(module_specifier)::in, module_defn::out) is det.
make_export(Syms, md_export(Syms)).
%-----------------------------------------------------------------------------%
- % A FuncSpecifier is just a constructur name specifier.
- %
-:- pred parse_function_specifier(term::in, maybe1(func_specifier)::out) is det.
-
-parse_function_specifier(Term, Result) :-
- parse_constructor_specifier(Term, Result).
-
- % A TypeSpecifier is just a symbol name specifier.
- %
-:- pred parse_type_specifier(term::in, maybe1(sym_name_specifier)::out) is det.
-
-parse_type_specifier(Term, Result) :-
- parse_symbol_name_specifier(Term, Result).
-
- % An ADT_Specifier is just a symbol name specifier.
- %
-:- pred parse_adt_specifier(term::in, maybe1(sym_name_specifier)::out) is det.
-
-parse_adt_specifier(Term, Result) :-
- parse_symbol_name_specifier(Term, Result).
-
-%-----------------------------------------------------------------------------%
-
- % For the moment, an OpSpecifier is just a symbol name specifier.
- % XXX We should allow specifying the fixity of an operator
- %
-:- pred parse_op_specifier(term::in, maybe1(op_specifier)::out) is det.
-
-parse_op_specifier(Term, Result) :-
- parse_symbol_name_specifier(Term, R),
- process_maybe1(make_op_specifier, R, Result).
-
-:- pred make_op_specifier(sym_name_specifier::in, op_specifier::out) is det.
-
-make_op_specifier(X, opspec_sym(X)).
-
-%-----------------------------------------------------------------------------%
-
:- func convert_constructor_arg_list(module_name, list(term)) =
maybe1(list(constructor_arg)).
Index: compiler/prog_item.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/prog_item.m,v
retrieving revision 1.31
diff -u -b -r1.31 prog_item.m
--- compiler/prog_item.m 15 Feb 2008 02:26:58 -0000 1.31
+++ compiler/prog_item.m 15 Feb 2008 04:56:00 -0000
@@ -106,7 +106,6 @@
:- type item_module_defn_info
---> item_module_defn_info(
- module_defn_varset :: prog_varset,
module_defn_module_defn :: module_defn,
module_defn_context :: prog_context
).
@@ -854,9 +853,9 @@
; md_external(maybe(backend), sym_name_specifier)
- ; md_export(sym_list)
- ; md_import(sym_list)
- ; md_use(sym_list)
+ ; md_export(list(module_specifier))
+ ; md_import(list(module_specifier))
+ ; md_use(list(module_specifier))
; md_include_module(list(module_name))
Index: compiler/recompilation.check.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/recompilation.check.m,v
retrieving revision 1.41
diff -u -b -r1.41 recompilation.check.m
--- compiler/recompilation.check.m 15 Feb 2008 02:26:58 -0000 1.41
+++ compiler/recompilation.check.m 15 Feb 2008 03:16:04 -0000
@@ -694,12 +694,10 @@
MaybeUsedItemsTerm = yes(UsedItemsTerm),
Items = [InterfaceItem, VersionNumberItem | OtherItems],
InterfaceItem = item_module_defn(InterfaceItemModuleDefn),
- InterfaceItemModuleDefn =
- item_module_defn_info(_, md_interface, _),
+ InterfaceItemModuleDefn = item_module_defn_info(md_interface, _),
VersionNumberItem = item_module_defn(VersionNumberItemModuleDefn),
VersionNumberItemModuleDefn =
- item_module_defn_info(_, md_version_numbers(_, VersionNumbers),
- _)
+ item_module_defn_info(md_version_numbers(_, VersionNumbers), _)
->
check_module_used_items(ImportedModuleName, NeedQualifier,
RecordedTimestamp, UsedItemsTerm, VersionNumbers,
Index: compiler/recompilation.version.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/recompilation.version.m,v
retrieving revision 1.62
diff -u -b -r1.62 recompilation.version.m
--- compiler/recompilation.version.m 15 Feb 2008 02:26:58 -0000 1.62
+++ compiler/recompilation.version.m 15 Feb 2008 03:16:28 -0000
@@ -70,9 +70,9 @@
MaybeOldItems = yes(OldItems0),
OldItems0 = [FirstItem, VersionNumberItem | OldItems],
FirstItem = item_module_defn(FirstItemModuleDefn),
- FirstItemModuleDefn = item_module_defn_info(_, md_interface, _),
+ FirstItemModuleDefn = item_module_defn_info(md_interface, _),
VersionNumberItem = item_module_defn(VersionNumberItemModuleDefn),
- VersionNumberItemModuleDefn = item_module_defn_info(_,
+ VersionNumberItemModuleDefn = item_module_defn_info(
md_version_numbers(_, OldVersionNumbers), _)
->
OldVersionNumbers = version_numbers(OldItemVersionNumbers,
@@ -270,12 +270,12 @@
gather_items_2(Item, !Section, !Info) :-
(
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, md_interface, _)
+ ItemModuleDefn = item_module_defn_info(md_interface, _)
->
!:Section = section_interface
;
Item = item_module_defn(ItemModuleDefn),
- ItemModuleDefn = item_module_defn_info(_, md_implementation, _)
+ ItemModuleDefn = item_module_defn_info(md_implementation, _)
->
!:Section = section_implementation
;
@@ -696,10 +696,10 @@
item_is_unchanged(Item1, Item2) = Unchanged :-
(
Item1 = item_module_defn(ItemModuleDefn1),
- ItemModuleDefn1 = item_module_defn_info(_, ModuleDefn, _),
+ ItemModuleDefn1 = item_module_defn_info(ModuleDefn, _),
(
Item2 = item_module_defn(ItemModuleDefn2),
- ItemModuleDefn2 = item_module_defn_info(_, ModuleDefn, _)
+ ItemModuleDefn2 = item_module_defn_info(ModuleDefn, _)
->
Unchanged = yes
;
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing debian/patches
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/base64
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/fixed
cvs diff: Diffing extras/gator
cvs diff: Diffing extras/gator/generations
cvs diff: Diffing extras/gator/generations/1
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/easyx
cvs diff: Diffing extras/graphics/easyx/samples
cvs diff: Diffing extras/graphics/mercury_allegro
cvs diff: Diffing extras/graphics/mercury_allegro/examples
cvs diff: Diffing extras/graphics/mercury_allegro/samples
cvs diff: Diffing extras/graphics/mercury_allegro/samples/demo
cvs diff: Diffing extras/graphics/mercury_allegro/samples/mandel
cvs diff: Diffing extras/graphics/mercury_allegro/samples/pendulum2
cvs diff: Diffing extras/graphics/mercury_allegro/samples/speed
cvs diff: Diffing extras/graphics/mercury_glut
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/gears
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/log4m
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/moose/tests
cvs diff: Diffing extras/mopenssl
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/net
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/posix/samples
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/solver_types
cvs diff: Diffing extras/solver_types/library
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/windows_installer_generator
cvs diff: Diffing extras/windows_installer_generator/sample
cvs diff: Diffing extras/windows_installer_generator/sample/images
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing extras/xml_stylesheets
cvs diff: Diffing java
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing mdbcomp
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/standalone_c
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/solver_types
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing slice
cvs diff: Diffing ssdb
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/par_conj
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/trailing
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to: mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions: mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------
More information about the reviews
mailing list