diff options
-rw-r--r-- | frontend/typesupport.dcl | 4 | ||||
-rw-r--r-- | frontend/typesupport.icl | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/frontend/typesupport.dcl b/frontend/typesupport.dcl index c25fe97..579730a 100644 --- a/frontend/typesupport.dcl +++ b/frontend/typesupport.dcl @@ -12,9 +12,9 @@ from unitype import Coercions, CoercionTree, AttributePartition, CT_Empty errorHeading :: !String !*ErrorAdmin -> *ErrorAdmin // MW4 was:class (<::) infixl a :: !*File (!Format, !a) -> *File -(<::) infixl :: !*File (!Format, !a, !Optional TypeVarBeautifulizer) -> *File | writeType a +(<::) infixl :: !*File !(!Format, !a, !Optional TypeVarBeautifulizer) -> *File | writeType a -class writeType a :: !*File !(Optional TypeVarBeautifulizer) (!Format, !a) -> (!*File, !Optional TypeVarBeautifulizer) +class writeType a :: !*File !(Optional TypeVarBeautifulizer) !(!Format, !a) -> (!*File, !Optional TypeVarBeautifulizer) :: Format = { form_properties :: !BITVECT diff --git a/frontend/typesupport.icl b/frontend/typesupport.icl index b75b8c8..dd1c077 100644 --- a/frontend/typesupport.icl +++ b/frontend/typesupport.icl @@ -138,7 +138,10 @@ where cleanUpTypeAttribute _ cui av=:(TA_Var _) cus = (av, cus) - + +cleanUpTypeAttribute _ cui type_attribute cus + = abort ("cleanUpTypeAttribute "+++toString type_attribute) + instance clean_up Type where clean_up cui (TempV tv_number) cus @@ -1136,12 +1139,12 @@ checkProperty form property :== not (form.form_properties bitand property == 0) setProperty form property :== {form & form_properties = form.form_properties bitor property} clearProperty form property :== {form & form_properties = form.form_properties bitand (bitnot property)} -(<::) infixl :: !*File (!Format, !a, !Optional TypeVarBeautifulizer) -> *File | writeType a +(<::) infixl :: !*File !(!Format, !a, !Optional TypeVarBeautifulizer) -> *File | writeType a (<::) file (format, a, opt_beautifulizer) # (file, _) = writeType file opt_beautifulizer (format, a) = file -class writeType a :: !*File !(Optional TypeVarBeautifulizer) (!Format, !a) -> (!*File, !Optional TypeVarBeautifulizer) +class writeType a :: !*File !(Optional TypeVarBeautifulizer) !(!Format, !a) -> (!*File, !Optional TypeVarBeautifulizer) instance writeType AttributeVar where |