diff options
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/check.icl | 2 | ||||
| -rw-r--r-- | frontend/checktypes.icl | 4 | ||||
| -rw-r--r-- | frontend/generics1.icl | 4 | ||||
| -rw-r--r-- | frontend/syntax.dcl | 7 | ||||
| -rw-r--r-- | frontend/type_io.icl | 4 |
5 files changed, 10 insertions, 11 deletions
diff --git a/frontend/check.icl b/frontend/check.icl index 3f73e35..a018117 100644 --- a/frontend/check.icl +++ b/frontend/check.icl @@ -1495,7 +1495,7 @@ renumber_icl_definitions_as_dcl_definitions (Yes icl_to_dcl_index_table) icl_siz # com_selector_defs=reorder_and_enlarge_array com_selector_defs n_dictionary_selectors icl_to_dcl_index_table.[cSelectorDefs] {sd_ident=dummy_ident,sd_field=dummy_ident,sd_type=dummy_symbol_type,sd_exi_vars=[],sd_field_nr=0,sd_type_index=0,sd_type_ptr=nilPtr,sd_pos=NoPos} # com_cons_defs=reorder_and_enlarge_array com_cons_defs n_dictionary_constructors icl_to_dcl_index_table.[cConstructorDefs] - {cons_ident=dummy_ident,cons_type=dummy_symbol_type,cons_arg_vars=[],cons_priority=NoPrio,cons_index= -1,cons_type_index= -1,cons_exi_vars=[],cons_type_ptr=nilPtr,cons_pos=NoPos} + {cons_ident=dummy_ident,cons_type=dummy_symbol_type,cons_arg_vars=[],cons_priority=NoPrio,cons_number= -1,cons_type_index= -1,cons_exi_vars=[],cons_type_ptr=nilPtr,cons_pos=NoPos} # com_class_defs=reorder_array com_class_defs icl_to_dcl_index_table.[cClassDefs] # com_member_defs=reorder_array com_member_defs icl_to_dcl_index_table.[cMemberDefs] # com_instance_defs=reorder_array com_instance_defs icl_to_dcl_index_table.[cInstanceDefs] diff --git a/frontend/checktypes.icl b/frontend/checktypes.icl index 98bd02e..c2ccb0f 100644 --- a/frontend/checktypes.icl +++ b/frontend/checktypes.icl @@ -375,7 +375,7 @@ where attr_vars = add_universal_attr_vars st_args free_attrs cons_type = { cons_def.cons_type & st_vars = free_vars, st_args = st_args, st_result = type_lhs, st_attr_vars = attr_vars, st_attr_env = st_attr_env } (new_type_ptr, ti_var_heap) = newPtr VI_Empty ti.ti_var_heap - cons_def = { cons_def & cons_type = cons_type, cons_index = cons_index, cons_type_index = cti.cti_type_index, cons_exi_vars = exi_vars, + cons_def = { cons_def & cons_type = cons_type, cons_number = cons_index, cons_type_index = cti.cti_type_index, cons_exi_vars = exi_vars, cons_type_ptr = new_type_ptr, cons_arg_vars = cons_arg_vars } = ({ ts & ts_cons_defs.[ds_index] = cons_def}, { ti & ti_var_heap = ti_var_heap }, { cs & cs_symbol_table=symbol_table }) where @@ -1570,7 +1570,7 @@ where , cons_type = { st_vars = [], st_args = reverse rev_field_types, st_args_strictness = first_n_strict nr_of_fields, st_result = rec_type, st_arity = nr_of_fields, st_context = [], st_attr_vars = [], st_attr_env = [] } , cons_priority = NoPrio - , cons_index = 0 + , cons_number = 0 , cons_type_index = index_type , cons_exi_vars = [] , cons_arg_vars = [] diff --git a/frontend/generics1.icl b/frontend/generics1.icl index c652e73..adf8210 100644 --- a/frontend/generics1.icl +++ b/frontend/generics1.icl @@ -688,7 +688,7 @@ where = (fun, heaps) build_cons_dsc group_index type_def_info_ds field_dsc_dss cons_info_ds cons_ds (modules, heaps) - # ({cons_ident, cons_type, cons_priority,cons_index}, modules) + # ({cons_ident, cons_type, cons_priority,cons_number}, modules) = modules! [td_module].com_cons_defs.[cons_ds.ds_index] # name_expr = makeStringExpr cons_ident.id_name # arity_expr = makeIntExpr cons_type.st_arity @@ -697,7 +697,7 @@ where # (type_expr, heaps) = make_type_expr cons_type heaps # (field_exprs, heaps) = mapSt (\x st->buildFunApp main_module_index x [] st) field_dsc_dss heaps # (fields_expr, heaps) = makeListExpr field_exprs predefs heaps - # cons_index_expr = makeIntExpr cons_index + # cons_index_expr = makeIntExpr cons_number # (body_expr, heaps) = buildPredefConsApp PD_CGenericConsDescriptor [ name_expr diff --git a/frontend/syntax.dcl b/frontend/syntax.dcl index 3ceb5fc..e40484f 100644 --- a/frontend/syntax.dcl +++ b/frontend/syntax.dcl @@ -907,7 +907,7 @@ cNonRecursiveAppl :== False , cons_type :: !SymbolType , cons_arg_vars :: ![[ATypeVar]] , cons_priority :: !Priority - , cons_index :: !Index + , cons_number :: !Index , cons_type_index :: !Index , cons_exi_vars :: ![ATypeVar] , cons_type_ptr :: !VarInfoPtr @@ -1199,8 +1199,7 @@ instance toString KindInfo | PE_DynamicPattern !ParsedExpr !DynamicType | PE_Dynamic !ParsedExpr !(Optional DynamicType) - | PE_Generic !Ident !TypeKind /* AA: For generics, kind indexed identifier */ - + | PE_Generic !Ident !TypeKind /* AA: For generics, kind indexed identifier */ | PE_Empty :: ParsedSelection = PS_Record !Ident !OptionalRecordName @@ -1478,7 +1477,7 @@ ParsedSelectorToSelectorDef sd_type_index ps :== st_attr_env = [], st_attr_vars = [] }} ParsedConstructorToConsDef pc :== - { cons_ident = pc.pc_cons_ident, cons_pos = pc.pc_cons_pos, cons_priority = pc.pc_cons_prio, cons_index = NoIndex, cons_type_index = NoIndex, + { cons_ident = pc.pc_cons_ident, cons_pos = pc.pc_cons_pos, cons_priority = pc.pc_cons_prio, cons_number = NoIndex, cons_type_index = NoIndex, cons_type = { st_vars = [], st_args = pc.pc_arg_types, st_args_strictness=pc.pc_args_strictness, st_result = MakeAttributedType TE, st_arity = pc.pc_cons_arity, st_context = [], st_attr_env = [], st_attr_vars = []}, cons_exi_vars = pc.pc_exi_vars, cons_type_ptr = nilPtr, cons_arg_vars = [] } diff --git a/frontend/type_io.icl b/frontend/type_io.icl index 0205293..77d2176 100644 --- a/frontend/type_io.icl +++ b/frontend/type_io.icl @@ -60,7 +60,7 @@ where instance WriteTypeInfo ConsDef where - write_type_info {cons_ident,cons_type,cons_arg_vars,cons_priority,cons_index,cons_type_index,cons_exi_vars} tcl_file wtis=:{wtis_n_type_vars} + write_type_info {cons_ident,cons_type,cons_arg_vars,cons_priority,cons_number,cons_type_index,cons_exi_vars} tcl_file wtis=:{wtis_n_type_vars} // normalize ... # (th_vars,wtis) = sel_type_var_heap wtis @@ -78,7 +78,7 @@ where # (tcl_file,wtis) = write_type_info cons_arg_vars tcl_file wtis # (tcl_file,wtis) - = write_type_info cons_index tcl_file wtis + = write_type_info cons_number tcl_file wtis # (tcl_file,wtis) = write_type_info cons_type_index tcl_file wtis |