(Pes) add new invarA + remove an ill-advised heuristic from mkA

This commit is contained in:
Inari Listenmaa
2019-05-15 15:24:49 +02:00
parent 6e3cbfaa8e
commit 06d3bdc834

View File

@@ -323,9 +323,7 @@ oper
mkA = overload { mkA = overload {
mkA : Str -> A -- Regular adjective, same adj and adv forms. mkA : Str -> A -- Regular adjective, same adj and adv forms.
= \str -> lin A (case str of { = \str -> lin A (mkAdj str str) ;
_ + " " + _ => mkAdj str str str ;
_ => mkAdj str str }) ;
mkA : Str-> Str -> A -- Takes adj and adv forms mkA : Str-> Str -> A -- Takes adj and adv forms
= \str,adv -> lin A (mkAdj str adv); = \str,adv -> lin A (mkAdj str adv);
mkA : (pos,compar,adv : Str) -> A -- positive, comparative and adverb mkA : (pos,compar,adv : Str) -> A -- positive, comparative and adverb
@@ -334,6 +332,10 @@ oper
= \a,c -> lin A2 (mkAdj a a ** {c2 = c}) = \a,c -> lin A2 (mkAdj a a ** {c2 = c})
} ; } ;
-- Mostly for things that are not really adjectives, like adverbials /IL
invarA : Str -> A = \str ->
lin A (<mkAdj str str : Adjective> ** {s = \\_,_ => str}) ;
prefixA a = a ** {isPre=True}; prefixA a = a ** {isPre=True};
preA : (adj,adv : Str) -> A = \adj,adv -> preA : (adj,adv : Str) -> A = \adj,adv ->