small fixes and additions

This commit is contained in:
Inari Listenmaa
2017-10-02 16:05:25 +02:00
parent 4cdbb0ec89
commit 1c9e90f74d
4 changed files with 18 additions and 9 deletions

View File

@@ -333,9 +333,9 @@ oper
Hauek => mkVForms "zeuden" } ; Hauek => mkVForms "zeuden" } ;
_ => table { _ => table {
Ni => mkVForms "nago" ; Ni => mkVForms "nago" ;
Hi _ => mkVForms "hago" ; Hi _ => mkVForms "hago" "hagoe" ;
Zu => mkVForms "zaude" ; Zu => mkVForms "zaude" ;
Hau => mkVForms "dago" ; Hau => mkVForms "dago" "dagoe" ;
Gu => mkVForms "gaude" ; Gu => mkVForms "gaude" ;
Zuek => mkVForms "zaudete" ; Zuek => mkVForms "zaudete" ;
Hauek => mkVForms "daude" } Hauek => mkVForms "daude" }

View File

@@ -29,8 +29,8 @@ concrete AdjectiveEus of Adjective = CatEus ** open ResEus, Prelude in {
neureBuru : NounPhrase = empty_NP ** neureBuru : NounPhrase = empty_NP **
{ s = \\cas => neure ++ "buru" { s = \\cas => neure ++ "buru"
++ artDef ! getNum agr ! cas ! FinalVow ; ++ artDef ! getNum agr ! cas ! FinalVow ;
agr = agr } -- neure buruekin eskondua naiz / agr = agr } -- neure buruekin ezkondua naiz /
-- geure buruekin eskonduak gara -- geure buruekin ezkonduak gara
in applyPost a2.compl neureBuru ++ a2.s ! AF Posit ; in applyPost a2.compl neureBuru ++ a2.s ! AF Posit ;
typ = Bare } ; typ = Bare } ;
@@ -59,7 +59,10 @@ concrete AdjectiveEus of Adjective = CatEus ** open ResEus, Prelude in {
-- phrases, although the semantics is only clear for some adjectives. -- phrases, although the semantics is only clear for some adjectives.
-- : AP -> SC -> AP ; -- good that she is here -- : AP -> SC -> AP ; -- good that she is here
SentAP ap sc = ap ; --TODO SentAP ap sc = ap ** {
s = \\agr => sc.s ++ ap.s ! agr ;
typ = Bare
} ;
-- An adjectival phrase can be modified by an *adadjective*, such as "very". -- An adjectival phrase can be modified by an *adadjective*, such as "very".
@@ -72,7 +75,9 @@ concrete AdjectiveEus of Adjective = CatEus ** open ResEus, Prelude in {
-- It can also be postmodified by an adverb, typically a prepositional phrase. -- It can also be postmodified by an adverb, typically a prepositional phrase.
-- : AP -> Adv -> AP ; -- warm by nature -- : AP -> Adv -> AP ; -- warm by nature
AdvAP ap adv = ap ; --TODO AdvAP ap adv = ap **
{ s = \\agr => ap.s ! agr ++ adv.s ;
typ = Bare } ;

View File

@@ -7,10 +7,13 @@ concrete IdiomEus of Idiom = CatEus ** open Prelude, ResEus in {
-- often different even in closely related languages. -- often different even in closely related languages.
lin lin
{-
ImpersCl : VP -> Cl ; -- it is hot
GenericCl : VP -> Cl ; -- one sleeps
-- : VP -> Cl ; -- it is hot
ImpersCl = clFromVP empty_NP ;
-- : VP -> Cl ; -- one sleeps
GenericCl = clFromVP empty_NP ;
{-
CleftNP : NP -> RS -> Cl ; -- it is I who did it CleftNP : NP -> RS -> Cl ; -- it is I who did it
CleftAdv : Adv -> S -> Cl ; -- it is here she slept CleftAdv : Adv -> S -> Cl ; -- it is here she slept

View File

@@ -372,6 +372,7 @@ oper
--to be used in linref, PhraseEus ... anything where a VP is turned into string! --to be used in linref, PhraseEus ... anything where a VP is turned into string!
linVP : VerbPhrase -> Str = linVPTense Pres Pres ; linVP : VerbPhrase -> Str = linVPTense Pres Pres ;
-- TODO: fix trinkoak
linVPTense : Tense -> Tense -> VerbPhrase -> Str = linVPTense : Tense -> Tense -> VerbPhrase -> Str =
\tnsPrc,tnsAux,vp -> \tnsPrc,tnsAux,vp ->
let prc = case vp.val of { let prc = case vp.val of {