GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 03:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

revised comments in Construction so that some functions can be shown in absfun doc

Browse Source
This commit is contained in:
aarne
2015-10-15 15:01:38 +00:00
parent 38c6bbc71b
commit a3bc2c4cf0
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/src/abstract/Construction.gf
View File

@@ -38,28 +38,28 @@ fun
-- containers -- containers
bottle_of_CN : NP -> CN ; -- bottle of beer / flaska öl (Swe) bottle_of_CN : NP -> CN ; --- bottle of beer / flaska öl (Swe)
cup_of_CN : NP -> CN ; -- cup of tea / kupillinen teetä (Fin) cup_of_CN : NP -> CN ; --- cup of tea / kupillinen teetä (Fin)
glass_of_CN : NP -> CN ; glass_of_CN : NP -> CN ; --- glass of wine / lasillinen viiniä (Fin)
-- idiomatic expressions -- 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 ---- postponed
-- spatial deixis and motion verbs -- spatial deixis and motion verbs
-- verbs like `walk' or `run' can take both: there or to there -- 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_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_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) go_here_VP : VP ; --- X went here / X gick hit (Swe)
come_here_VP : VP ; -- X came here / X tuli tänne (Fin) 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) 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) go_there_VP : VP ; --- X went here / X gick dit (Swe)
come_there_VP : VP ; -- X came there / X tuli sinne (Fin) come_there_VP : VP ; --- X came there / X tuli sinne (Fin)
come_from_there_VP : VP ; -- X came from there / X tuli sieltä (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 monthYearAdv : Month -> Year -> Adv ; -- in May 2013
dayMonthYearAdv : Monthday -> Month -> Year -> Adv ; -- on 17 May 2013 dayMonthYearAdv : Monthday -> Month -> Year -> Adv ; -- on 17 May 2013
intYear : Int -> Year ; intYear : Int -> Year ; -- (year) 1963
intMonthday : Int -> Monthday ; intMonthday : Int -> Monthday ; -- 31th (March)
-- languages -- languages
@@ -99,14 +99,14 @@ fun
-- coercions to RGL categories -- coercions to RGL categories
weekdayN : Weekday -> N ; weekdayN : Weekday -> N ; -- (this) Monday
monthN : Month -> N ; monthN : Month -> N ; -- (this) November
weekdayPN : Weekday -> PN ; weekdayPN : Weekday -> PN ; -- Monday (is free)
monthPN : Month -> PN ; monthPN : Month -> PN ; -- March (is cold)
languageNP : Language -> NP ; languageNP : Language -> NP ; -- French (is easy)
languageCN : Language -> CN ; languageCN : Language -> CN ; -- (my) French
---------------------------------------------- ----------------------------------------------
---- lexicon of special names ---- lexicon of special names

4
lib/src/german/ParadigmsGer.gf
View File

@@ -286,7 +286,7 @@ mkV2 : overload {
-- Three-place (ditransitive) verbs need two prepositions, of which -- Three-place (ditransitive) verbs need two prepositions, of which
-- the first one or both can be absent. -- 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 dirV3 : V -> Prep -> V3 ; -- senden + acc + nach
mkV3 : overload { mkV3 : overload {
@@ -585,7 +585,7 @@ mkV2 : overload {
} ; } ;
dirV3 v p = mkV3 v (mkPrep [] accusative) p ; 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 = <>} ; mkVS v = v ** {lock_VS = <>} ;
mkVQ v = v ** {lock_VQ = <>} ; mkVQ v = v ** {lock_VQ = <>} ;