msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

(Eng) use Extend instead of Extra in Construction

Browse Source
This commit is contained in:
odanoburu
2018-05-16 11:20:22 -03:00
parent c50360078f
commit c49048203d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/english/ConstructionEng.gf
View File

@@ -1,7 +1,7 @@
--# -path=.:../abstract --# -path=.:../abstract
concrete ConstructionEng of Construction = CatEng ** concrete ConstructionEng of Construction = CatEng **
open SyntaxEng, SymbolicEng, ParadigmsEng, (L = LexiconEng), (E = ExtraEng), (G = GrammarEng), (R = ResEng), (S = StructuralEng), Prelude in { open SyntaxEng, SymbolicEng, ParadigmsEng, (L = LexiconEng), (E = ExtendEng), (G = GrammarEng), (R = ResEng), (S = StructuralEng), Prelude in {
lin lin
@@ -23,7 +23,7 @@ lin
-- some more things -- some more things
weather_adjCl ap = mkCl (mkVP (lin AP ap)) ; weather_adjCl ap = mkCl (mkVP (lin AP ap)) ;
is_right_VP = mkVP (ParadigmsEng.mkA "right") ; is_right_VP = mkVP (ParadigmsEng.mkA "right") ;
is_wrong_VP = mkVP (ParadigmsEng.mkA "wrong") ; is_wrong_VP = mkVP (ParadigmsEng.mkA "wrong") ;
@@ -34,18 +34,18 @@ lin
cup_of_CN np = mkCN (lin N2 (mkN2 "cup")) (lin NP np) ; cup_of_CN np = mkCN (lin N2 (mkN2 "cup")) (lin NP np) ;
glass_of_CN np = mkCN (lin N2 (mkN2 "glass")) (lin NP np) ; glass_of_CN np = mkCN (lin N2 (mkN2 "glass")) (lin NP np) ;
few_X_short_of_Y np x y = few_X_short_of_Y np x y =
let let
xs : Str = x.s ! R.Pl ! R.Nom ; xs : Str = x.s ! R.Pl ! R.Nom ;
a_y : Str = (mkNP a_Det y).s ! R.NCase R.Nom ; a_y : Str = (mkNP a_Det y).s ! R.NCase R.Nom ;
in in
mkS (mkCl np (mkAdv ("a few" ++ xs ++ "short of" ++ a_y))) ; mkS (mkCl np (mkAdv ("a few" ++ xs ++ "short of" ++ a_y))) ;
{- {-
-- spatial deixis and motion verbs -- spatial deixis and motion verbs
where_go_QCl np = mkQCl where_IAdv (mkCl np (mkVP L.go_V)) ; where_go_QCl np = mkQCl where_IAdv (mkCl np (mkVP L.go_V)) ;
where_come_from_QCl np = mkQCl from_where_IAdv (mkCl np (mkVP L.go_V)) ; where_come_from_QCl np = mkQCl from_where_IAdv (mkCl np (mkVP L.go_V)) ;
go_here_VP = mkVP (mkVP L.go_V) S.here_Adv ; go_here_VP = mkVP (mkVP L.go_V) S.here_Adv ;
come_here_VP = mkVP (mkVP L.come_V) S.here_Adv ; come_here_VP = mkVP (mkVP L.come_V) S.here_Adv ;
come_from_here_VP = mkVP (mkVP L.come_V) (mkAdv "from here") ; come_from_here_VP = mkVP (mkVP L.come_V) (mkAdv "from here") ;
@@ -67,7 +67,7 @@ lincat
Month = N ; Month = N ;
Year = NP ; Year = NP ;
lin lin
timeunitAdv n time = timeunitAdv n time =
let n_card : Card = n ; let n_card : Card = n ;
n_hours_NP : NP = mkNP n_card time ; n_hours_NP : NP = mkNP n_card time ;
in SyntaxEng.mkAdv for_Prep n_hours_NP | mkAdv (n_hours_NP.s ! R.npNom) ; in SyntaxEng.mkAdv for_Prep n_hours_NP | mkAdv (n_hours_NP.s ! R.npNom) ;
@@ -122,9 +122,9 @@ lin friday_Weekday = mkN "Friday" ;
lin saturday_Weekday = mkN "Saturday" ; lin saturday_Weekday = mkN "Saturday" ;
lin sunday_Weekday = mkN "Sunday" ; lin sunday_Weekday = mkN "Sunday" ;
lin january_Month = mkN "January" ; lin january_Month = mkN "January" ;
lin february_Month = mkN "February" ; lin february_Month = mkN "February" ;
lin march_Month = mkN "March" ; lin march_Month = mkN "March" ;
lin april_Month = mkN "April" ; lin april_Month = mkN "April" ;
lin may_Month = mkN "May" ; lin may_Month = mkN "May" ;
lin june_Month = mkN "June" ; lin june_Month = mkN "June" ;