forked from GitHub/gf-rgl
use consistent lin X everywhere
This commit is contained in:
@@ -143,16 +143,16 @@ oper
|
||||
\\conj => glue (np.s ! Bare) (conjTable ! NStar ! conj ! np.p) ;
|
||||
-- Versions with commas, no repeated conjunctions
|
||||
|
||||
baseNPcomma : NP -> NP -> ListNP = \x,y -> y ** {
|
||||
baseNPcomma : NP -> NP -> ListNP = \x,y -> lin ListNP y ** {
|
||||
firstNP = \\conj => x.s ! Bare ++ BIND ++ "," ;
|
||||
} ;
|
||||
|
||||
consNPcomma : NP -> ListNP -> ListNP = \x,xs -> xs ** {
|
||||
consNPcomma : NP -> ListNP -> ListNP = \x,xs -> lin ListNP xs ** {
|
||||
firstNP = \\conj =>
|
||||
x.s ! Bare ++ BIND ++ "," ++ xs.firstNP ! conj ;
|
||||
} ;
|
||||
|
||||
conjNPcomma : Conj -> ListNP -> NP = \co,xs -> xs ** {
|
||||
conjNPcomma : Conj -> ListNP -> NP = \co,xs -> lin NP xs ** {
|
||||
s = \\nf => co.s1
|
||||
++ xs.firstNP ! co.c
|
||||
++ co.s2
|
||||
|
||||
@@ -91,7 +91,7 @@ lin come_V = mkV "오다" ;
|
||||
-- lin dig_V = mkV "" ;
|
||||
-- lin dirty_A = mkA "" ;
|
||||
-- lin distance_N3 = mkN "" ;
|
||||
lin do_V2 = mkV2 do_V ;
|
||||
lin do_V2 = mkV2 (lin V do_V) ;
|
||||
-- lin doctor_N = mkN "" ;
|
||||
-- lin dog_N = mkN "" ;
|
||||
-- lin door_N = mkN "" ;
|
||||
@@ -209,7 +209,7 @@ lin laugh_V = mkV "웃다" ;
|
||||
-- lin leave_V2 = mkV2 "" ;
|
||||
-- lin leg_N = mkN "" ;
|
||||
-- lin lie_V = mkV "" ;
|
||||
lin like_V2 = mkV2 (mkV "좋아" do_V) topic object ;
|
||||
lin like_V2 = mkV2 (mkV "좋아" (lin V do_V)) topic object ;
|
||||
-- lin listen_V2 = mkV2 "" ;
|
||||
-- lin live_V = mkV "";
|
||||
-- lin liver_N = mkN "" ;
|
||||
@@ -319,7 +319,7 @@ lin shirt_N = mkN "셔츠" "벌" ;
|
||||
-- lin shop_N = mkN "" ;
|
||||
lin short_A = mkA "키가" small_A ; -- "height is small"
|
||||
-- lin silver_N = mkN "" ;
|
||||
lin sing_V = mkV "노래" do_V ;
|
||||
lin sing_V = mkV "노래" (lin V do_V) ;
|
||||
-- lin sister_N = mkN "" ;
|
||||
-- lin sit_V = mkV "" ;
|
||||
-- lin skin_N = mkN "" ;
|
||||
|
||||
@@ -169,16 +169,16 @@ oper
|
||||
= \x1,x2,x3,x4 -> lin V (mkVerbReg x1 x2 x3 x4) ;
|
||||
} ;
|
||||
|
||||
copula = ResKor.copula ;
|
||||
copula = lin V ResKor.copula ;
|
||||
|
||||
-- regV : Str -> Verb = \s -> case s of {
|
||||
-- } ;
|
||||
|
||||
mkV2 = overload {
|
||||
mkV2 : (plain : Str) -> V2 = \v2 -> lin V2 (mkVerb2 v2) ;
|
||||
mkV2 : V -> V2 = vtov2 ;
|
||||
mkV2 : V -> V2 = \v -> lin V2 (vtov2 v) ;
|
||||
mkV2 : V -> (subj,obj : CaseParticle) -> V2 = \v,sc,c2 ->
|
||||
vtov2 v ** {sc = sc ; c2 = c2} ;
|
||||
lin V2 (vtov2 v ** {sc = sc ; c2 = c2}) ;
|
||||
} ;
|
||||
|
||||
mkV3 = overload {
|
||||
|
||||
Reference in New Issue
Block a user