Commit 9d97aca7 authored by Sjaak Smetsers's avatar Sjaak Smetsers

Bug fixes: beauti... : alternative for TFA added.

parent 89f6a5f2
......@@ -1113,12 +1113,7 @@ where
# file_opt_beautifulizer
= case st_arity of
0
-> writeType file opt_beautifulizer (bracket_arrow_type st_result.at_type form, st_result)
with
bracket_arrow_type (_ --> _) form
= setProperty form cBrackets
bracket_arrow_type _ form
= form
-> writeType file opt_beautifulizer (form, st_result)
_
# (file, opt_beautifulizer)
= writeType file opt_beautifulizer (form, st_args)
......@@ -1145,7 +1140,6 @@ where
| group_var==ai_demanded
= grouped group_var [ai_offered:accu] ineqs
=[{ ig_offered = accu, ig_demanded = group_var}: grouped ai_demanded [ai_offered] ineqs]
:: InequalityGroup =
{ ig_offered :: ![AttributeVar]
......@@ -1399,14 +1393,14 @@ where
| checkProperty form cCommaSeparator
= show_elem elem_number (clearProperty form cCommaSeparator) type file_opt_beautifulizer
| checkProperty form cArrowSeparator
= show_elem elem_number (clearProperty (clearProperty form cArrowSeparator) cBrackets) type file_opt_beautifulizer
= show_elem elem_number (clearProperty form cArrowSeparator) type file_opt_beautifulizer
| checkProperty form cAndSeparator
= show_elem elem_number (clearProperty form cAndSeparator) type file_opt_beautifulizer
= show_elem elem_number (setProperty form cBrackets) type file_opt_beautifulizer
show_list elem_number form [type : types] file_opt_beautifulizer
# (elem_format, seperator)
= if (checkProperty form cCommaSeparator) (clearProperty form cCommaSeparator, ",")
(if (checkProperty form cArrowSeparator) (setProperty (clearProperty form cArrowSeparator) cBrackets, " -> ")
(if (checkProperty form cArrowSeparator) (clearProperty form cArrowSeparator, " -> ")
(if (checkProperty form cAndSeparator) (clearProperty form cAndSeparator, " & ")
(setProperty form cBrackets, " ")))
(file, opt_beautifulizer)
......@@ -1900,6 +1894,8 @@ instance performOnTypeVars Type
//..AA
performOnTypeVars f (cv :@: at) st
= performOnTypeVars f cv (performOnTypeVars f at st)
performOnTypeVars f (TFA vars type) st
= performOnTypeVars f type st
performOnTypeVars f _ st
= st
......@@ -1946,6 +1942,8 @@ instance performOnAttrVars Type
//..AA
performOnAttrVars f (_ :@: at) st
= performOnAttrVars f at st
performOnAttrVars f (TFA vars type) st
= performOnAttrVars f type st
performOnAttrVars f _ st
= st
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment