From a3bc2c4cf076f7c0e2000c545a7d3c17e1c6a503 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 15 Oct 2015 15:01:38 +0000 Subject: [PATCH] revised comments in Construction so that some functions can be shown in absfun doc --- lib/src/abstract/Construction.gf | 40 ++++++++++++++++---------------- lib/src/german/ParadigmsGer.gf | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/src/abstract/Construction.gf b/lib/src/abstract/Construction.gf index 754ce46c3..d2aacc4fb 100644 --- a/lib/src/abstract/Construction.gf +++ b/lib/src/abstract/Construction.gf @@ -38,28 +38,28 @@ fun -- containers - bottle_of_CN : NP -> CN ; -- bottle of beer / flaska öl (Swe) - cup_of_CN : NP -> CN ; -- cup of tea / kupillinen teetä (Fin) - glass_of_CN : NP -> CN ; + bottle_of_CN : NP -> CN ; --- bottle of beer / flaska öl (Swe) + cup_of_CN : NP -> CN ; --- cup of tea / kupillinen teetä (Fin) + glass_of_CN : NP -> CN ; --- glass of wine / lasillinen viiniä (Fin) -- idiomatic expressions - few_X_short_of_Y : NP -> CN -> CN -> S ; -- NP is a few X's short of a Y / NP:llä ei ole kaikki X:t Y:ssä (Fin) + few_X_short_of_Y : NP -> CN -> CN -> S ; --- NP is a few X's short of a Y / NP:llä ei ole kaikki X:t Y:ssä (Fin) {- ---- postponed -- spatial deixis and motion verbs -- verbs like `walk' or `run' can take both: there or to there - where_go_QCl : NP -> QCl ; -- where did X go / vart gick X (Swe) - where_come_from_QCl : NP -> QCl ; -- where did X come from / mistä X tuli (Fin) + where_go_QCl : NP -> QCl ; --- where did X go / vart gick X (Swe) + where_come_from_QCl : NP -> QCl ; --- where did X come from / mistä X tuli (Fin) - go_here_VP : VP ; -- X went here / X gick hit (Swe) - come_here_VP : VP ; -- X came here / X tuli tänne (Fin) - come_from_here_VP : VP ; -- X came from here / X tuli täältä (Fin) + go_here_VP : VP ; --- X went here / X gick hit (Swe) + come_here_VP : VP ; --- X came here / X tuli tänne (Fin) + come_from_here_VP : VP ; --- X came from here / X tuli täältä (Fin) - go_there_VP : VP ; -- X went here / X gick dit (Swe) - come_there_VP : VP ; -- X came there / X tuli sinne (Fin) - come_from_there_VP : VP ; -- X came from there / X tuli sieltä (Fin) + go_there_VP : VP ; --- X went here / X gick dit (Swe) + come_there_VP : VP ; --- X came there / X tuli sinne (Fin) + come_from_there_VP : VP ; --- X came from there / X tuli sieltä (Fin) -} @@ -86,8 +86,8 @@ fun monthYearAdv : Month -> Year -> Adv ; -- in May 2013 dayMonthYearAdv : Monthday -> Month -> Year -> Adv ; -- on 17 May 2013 - intYear : Int -> Year ; - intMonthday : Int -> Monthday ; + intYear : Int -> Year ; -- (year) 1963 + intMonthday : Int -> Monthday ; -- 31th (March) -- languages @@ -99,14 +99,14 @@ fun -- coercions to RGL categories - weekdayN : Weekday -> N ; - monthN : Month -> N ; + weekdayN : Weekday -> N ; -- (this) Monday + monthN : Month -> N ; -- (this) November - weekdayPN : Weekday -> PN ; - monthPN : Month -> PN ; + weekdayPN : Weekday -> PN ; -- Monday (is free) + monthPN : Month -> PN ; -- March (is cold) - languageNP : Language -> NP ; - languageCN : Language -> CN ; + languageNP : Language -> NP ; -- French (is easy) + languageCN : Language -> CN ; -- (my) French ---------------------------------------------- ---- lexicon of special names diff --git a/lib/src/german/ParadigmsGer.gf b/lib/src/german/ParadigmsGer.gf index 355d49138..3f87f1a81 100644 --- a/lib/src/german/ParadigmsGer.gf +++ b/lib/src/german/ParadigmsGer.gf @@ -286,7 +286,7 @@ mkV2 : overload { -- Three-place (ditransitive) verbs need two prepositions, of which -- the first one or both can be absent. - accdatV3 : V -> V3 ; -- geben + acc + dat + accdatV3 : V -> V3 ; -- geben + dat + acc dirV3 : V -> Prep -> V3 ; -- senden + acc + nach mkV3 : overload { @@ -585,7 +585,7 @@ mkV2 : overload { } ; dirV3 v p = mkV3 v (mkPrep [] accusative) p ; - accdatV3 v = dirV3 v (mkPrep [] dative) ; + accdatV3 v = mkV3 v (mkPrep [] dative) (mkPrep [] accusative) ; mkVS v = v ** {lock_VS = <>} ; mkVQ v = v ** {lock_VQ = <>} ;