diff options
| author | johnvg | 2011-02-02 12:32:24 +0000 |
|---|---|---|
| committer | johnvg | 2011-02-02 12:32:24 +0000 |
| commit | fbce047043b0fb8faa1532f762966a07f2c49077 (patch) | |
| tree | c9bccea0ff365b69d913d402967b9c6d7ba90029 | |
| parent | remove building ArgEnv (diff) | |
fix test for predefined module index in write_type_info,
requires new linkers
git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@1828 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
| -rw-r--r-- | frontend/convertDynamics.icl | 2 | ||||
| -rw-r--r-- | frontend/type_io.dcl | 1 | ||||
| -rw-r--r-- | frontend/type_io.icl | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/frontend/convertDynamics.icl b/frontend/convertDynamics.icl index 3d7ee97..c4fbd9b 100644 --- a/frontend/convertDynamics.icl +++ b/frontend/convertDynamics.icl @@ -45,11 +45,9 @@ fatal function_name message write_tcl_file main_dcl_module_n dcl_mods=:{[main_dcl_module_n] = main_dcl_module} icl_common_defs tcl_file directly_imported_dcl_modules type_heaps predefined_symbols imported_types var_heap common_defs icl_mod - # (pre_mod, predefined_symbols) = predefined_symbols![PD_PredefinedModule] # write_type_info_state2 = { WriteTypeInfoState | wtis_n_type_vars = 0 - , wtis_predefined_module_def = pre_mod.pds_module , wtis_common_defs = common_defs , wtis_type_defs = imported_types , wtis_collected_conses = [] diff --git a/frontend/type_io.dcl b/frontend/type_io.dcl index c5f45cb..7d91b73 100644 --- a/frontend/type_io.dcl +++ b/frontend/type_io.dcl @@ -14,7 +14,6 @@ import trans :: WriteTypeInfoState = { wtis_n_type_vars :: !Int - , wtis_predefined_module_def :: !Index , wtis_common_defs :: !{#CommonDefs} , wtis_type_defs :: !.{#{#CheckedTypeDef}} , wtis_collected_conses :: !ImportedConstructors diff --git a/frontend/type_io.icl b/frontend/type_io.icl index 47ac9c2..36f7d12 100644 --- a/frontend/type_io.icl +++ b/frontend/type_io.icl @@ -27,7 +27,6 @@ F a b :== b; :: WriteTypeInfoState = { wtis_n_type_vars :: !Int - , wtis_predefined_module_def :: !Index , wtis_common_defs :: !{#CommonDefs} , wtis_type_defs :: !.{#{#CheckedTypeDef}} , wtis_collected_conses :: !ImportedConstructors @@ -397,9 +396,8 @@ where instance WriteTypeInfo TypeSymbIdent where - write_type_info tsi=:{type_ident,type_arity,type_index={glob_module,glob_object}} tcl_file wtis=:{wtis_predefined_module_def} - # is_type_without_definition - = glob_module == wtis_predefined_module_def + write_type_info tsi=:{type_ident,type_arity,type_index={glob_module,glob_object}} tcl_file wtis + # is_type_without_definition = glob_module == cPredefinedModuleIndex # tcl_file = fwritec (if is_type_without_definition TypeSymbIdentWithoutDefinition TypeSymbIdentWithDefinition) tcl_file |