diff options
| author | johnvg | 2011-04-15 10:57:01 +0000 |
|---|---|---|
| committer | johnvg | 2011-04-15 10:57:01 +0000 |
| commit | 6f0bd29ec38b3d3ad41d5cbec0e1f3f131d607a4 (patch) | |
| tree | d03ac01910d4a8cb2dee079bf1b8eacdb7ac1766 /frontend/comparedefimp.icl | |
| parent | use type FunSpecials instead of Specials for specials of functions (diff) | |
remove field icl_copied_from_dcl from type IclModule
git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1923 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
Diffstat (limited to 'frontend/comparedefimp.icl')
| -rw-r--r-- | frontend/comparedefimp.icl | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/frontend/comparedefimp.icl b/frontend/comparedefimp.icl index b1d835f..5a70a1c 100644 --- a/frontend/comparedefimp.icl +++ b/frontend/comparedefimp.icl @@ -7,11 +7,11 @@ import syntax, checksupport, compare_constructor, utilities, StdCompare , comp_attr_var_heap :: !.AttrVarHeap , comp_error :: !.ErrorAdmin } - + type_def_error = "type definition in the impl module conflicts with the def module" class_def_error = "class definition in the impl module conflicts with the def module" instance_def_error = "instance definition in the impl module conflicts with the def module" -generic_def_error = "generic definition in the impl module conflicts with the def module" +generic_def_error = "generic definition in the impl module conflicts with the def module" compareError message pos error_admin = popErrorAdmin (checkError "" message (pushErrorAdmin pos error_admin)) @@ -431,19 +431,17 @@ class CorrespondenceNumber a where initial_hwn hwn_heap = { hwn_heap = hwn_heap, hwn_number = 0 } -compareDefImp :: !Int !DclModule !(Optional {#Index}) !Int !*IclModule !*{#*{#FunDef}} !*Heaps !*ErrorAdmin - -> (!.IclModule,!.{#.{#FunDef}},!.Heaps,!.ErrorAdmin) -compareDefImp main_dcl_module_n main_dcl_module No n_exported_global_functions icl_module macro_defs heaps error_admin +compareDefImp :: !Int !DclModule !(Optional {#Index}) !CopiedDefinitions !Int !*IclModule !*{#*{#FunDef}} !*Heaps !*ErrorAdmin + -> (!.IclModule,!.{#.{#FunDef}},!.Heaps,!.ErrorAdmin) +compareDefImp main_dcl_module_n main_dcl_module No _ n_exported_global_functions icl_module macro_defs heaps error_admin = (icl_module, macro_defs,heaps, error_admin) -compareDefImp main_dcl_module_n main_dcl_module (Yes macro_conversion_table) n_exported_global_functions icl_module macro_defs heaps error_admin +compareDefImp main_dcl_module_n main_dcl_module (Yes macro_conversion_table) {copied_type_defs,copied_class_defs,copied_generic_defs} n_exported_global_functions icl_module macro_defs heaps error_admin // | Trace_array icl_module.icl_functions // && Trace_array macro_defs.[main_dcl_module_n] # {dcl_functions,dcl_macros,dcl_common} = main_dcl_module - {icl_common, icl_functions, icl_copied_from_dcl = {copied_type_defs,copied_class_defs,copied_generic_defs}} - = icl_module - {hp_var_heap, hp_expression_heap, hp_type_heaps={th_vars, th_attrs}} - = heaps + {icl_common, icl_functions} = icl_module + {hp_var_heap, hp_expression_heap, hp_type_heaps={th_vars, th_attrs}} = heaps { com_cons_defs=icl_com_cons_defs, com_type_defs = icl_com_type_defs, com_selector_defs=icl_com_selector_defs, com_class_defs = icl_com_class_defs, com_member_defs=icl_com_member_defs, com_instance_defs = icl_com_instance_defs, |