diff options
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/trans.icl | 6 | ||||
| -rw-r--r-- | frontend/type.dcl | 3 | ||||
| -rw-r--r-- | frontend/type.icl | 15 | ||||
| -rw-r--r-- | frontend/typesupport.icl | 8 |
4 files changed, 9 insertions, 23 deletions
diff --git a/frontend/trans.icl b/frontend/trans.icl index c536762..d55413c 100644 --- a/frontend/trans.icl +++ b/frontend/trans.icl @@ -1241,12 +1241,6 @@ coercionsToAttrEnv attr_vars {coer_demanded, coer_offered} , ur_attr_ineqs :: ![AttrCoercion] } -// XXX unused! -instance == AttributeVar -where - (==) av1 av2 = av1.av_info_ptr==av2.av_info_ptr - - readableCoercions {coer_demanded} = [ (i, readable coer_demanded.[i]) \\ i<-[0..size coer_demanded - 1] ] where diff --git a/frontend/type.dcl b/frontend/type.dcl index 621ba84..e28ff04 100644 --- a/frontend/type.dcl +++ b/frontend/type.dcl @@ -10,9 +10,6 @@ typeProgram ::!{! Group} !Int !*{# FunDef} !IndexRange !(Optional Bool) !Common addPropagationAttributesToAType :: {#CommonDefs} !AType !*PropState -> *(!AType,Int,!*PropState); -buildCurriedType :: [AType] AType TypeAttribute [AttrCoercion] Int - -> (AType,[AttrCoercion],Int) // AA: exported from the module - :: PropState = { prop_type_heaps :: !.TypeHeaps , prop_td_infos :: !.TypeDefInfos diff --git a/frontend/type.icl b/frontend/type.icl index 8c7f98e..07772ba 100644 --- a/frontend/type.icl +++ b/frontend/type.icl @@ -1022,8 +1022,6 @@ where emptyIdent =: { id_name = "", id_info = nilPtr } -buildCurriedType :: [AType] AType TypeAttribute [AttrCoercion] Int - -> (AType,[AttrCoercion],Int) //AA: exported from the module buildCurriedType [] type cum_attr attr_env attr_store = (type, attr_env, attr_store) buildCurriedType [at=:{at_attribute}:ats] type cum_attr attr_env attr_store @@ -1773,11 +1771,14 @@ where = ({tc_class = tc_class_symb, tc_types = [fresh_var], tc_var = new_var_ptr}, (var_heap, type_var_heap)) -specification_error type err +specification_error type type1 err # err = errorHeading "Type error" err format = { form_properties = cAttributed, form_attr_position = No} - = { err & ea_file = err.ea_file <<< " specified type conflicts with derived type " - <:: (format, type, Yes initialTypeVarBeautifulizer) <<< '\n' } + = { err & ea_file = err.ea_file <<< " specified type " + <:: (format, type1, Yes initialTypeVarBeautifulizer) + <<< "conflicts with derived type " + <:: (format, type, Yes initialTypeVarBeautifulizer) + <<< '\n' } cleanUpAndCheckFunctionTypes [] _ _ start_index _ defs type_contexts coercion_env attr_partition type_var_env attr_var_env (fun_defs, ts) @@ -1844,7 +1845,9 @@ where = ({ fun_env & [fun] = CheckedType type_with_lifted_arg_types}, attr_var_env, type_heaps, expr_heap, error) // ---> ("check_function_type", clean_fun_type, fun_type, type_with_lifted_arg_types) # (printable_type, th_attrs) = beautifulizeAttributes clean_fun_type type_heaps.th_attrs - = (fun_env, attr_var_env, { type_heaps & th_attrs = th_attrs }, expr_heap, specification_error printable_type error) + # (printable_type1, th_attrs) = beautifulizeAttributes fun_type th_attrs + + = (fun_env, attr_var_env, { type_heaps & th_attrs = th_attrs }, expr_heap, specification_error printable_type printable_type1 error) where add_lifted_arg_types arity_diff args1 args2 | arity_diff > 0 diff --git a/frontend/typesupport.icl b/frontend/typesupport.icl index e9010e5..1638e1e 100644 --- a/frontend/typesupport.icl +++ b/frontend/typesupport.icl @@ -675,14 +675,6 @@ NewAttrVarId attr_var_store = newIdent AttrVarIdTable.[attr_var_store] = newIdent ("u" +++ toString attr_var_store) - - -instance == AttributeVar -where - (==) av1 av2 = av1.av_info_ptr == av2.av_info_ptr - - - class equiv a :: !a !a !*TypeHeaps -> (!Bool, !*TypeHeaps) instance equiv AType |