Merge branch 'GrammaticalFramework:master' into master

This commit is contained in:
Meowyam
2023-03-08 10:09:02 +08:00
committed by GitHub
4 changed files with 12 additions and 27 deletions

View File

@@ -86,7 +86,7 @@ lin cow_N = mkN "embu" ;
---- ----
-- D -- D
-- lin day_N = mkN "" ; lin day_N = mkN "hari" ;
-- lin die_V = mkV "" ; -- lin die_V = mkV "" ;
-- lin dig_V = mkV "" ; -- lin dig_V = mkV "" ;
-- lin dirty_A = mkA "" ; -- lin dirty_A = mkA "" ;
@@ -423,7 +423,7 @@ lin woman_N = mkN "perempuan" ;
-- lin wood_N = mkN "" ; -- lin wood_N = mkN "" ;
-- lin worm_N = mkN "" ; -- lin worm_N = mkN "" ;
lin write_V2 = mkV2 "tulis" ; lin write_V2 = mkV2 "tulis" ;
-- lin year_N = mkN "" ; lin year_N = mkN "tahun" ;
-- lin yellow_A = mkA "" ; -- lin yellow_A = mkA "" ;
lin young_A = mkA "muda" ; lin young_A = mkA "muda" ;

View File

@@ -58,7 +58,6 @@ oper OrdDigits : Digits -> Ord = notYet "OrdDigits" ;
oper OrdNumeral : Numeral -> Ord = notYet "OrdNumeral" ; oper OrdNumeral : Numeral -> Ord = notYet "OrdNumeral" ;
oper OrdNumeralSuperl : Numeral -> A -> Ord = notYet "OrdNumeralSuperl" ; oper OrdNumeralSuperl : Numeral -> A -> Ord = notYet "OrdNumeralSuperl" ;
oper OrdSuperl : A -> Ord = notYet "OrdSuperl" ; oper OrdSuperl : A -> Ord = notYet "OrdSuperl" ;
oper PConjConj : Conj -> PConj = notYet "PConjConj" ;
oper PPartNP : NP -> V2 -> NP = notYet "PPartNP" ; oper PPartNP : NP -> V2 -> NP = notYet "PPartNP" ;
oper PartNP : CN -> NP -> CN = notYet "PartNP" ; oper PartNP : CN -> NP -> CN = notYet "PartNP" ;
oper PositAdAAdj : A -> AdA = notYet "PositAdAAdj" ; oper PositAdAAdj : A -> AdA = notYet "PositAdAAdj" ;
@@ -92,18 +91,6 @@ oper UseA2 : A2 -> AP = notYet "UseA2" ;
oper UseComparA : A -> AP = notYet "UseComparA" ; oper UseComparA : A -> AP = notYet "UseComparA" ;
oper UseQCl : Temp -> Pol -> QCl -> QS = notYet "UseQCl" ; oper UseQCl : Temp -> Pol -> QCl -> QS = notYet "UseQCl" ;
oper UseSlash : Temp -> Pol -> ClSlash -> SSlash = notYet "UseSlash" ; oper UseSlash : Temp -> Pol -> ClSlash -> SSlash = notYet "UseSlash" ;
oper UttAP : AP -> Utt = notYet "UttAP" ;
oper UttAdv : Adv -> Utt = notYet "UttAdv" ;
oper UttCN : CN -> Utt = notYet "UttCN" ;
oper UttCard : Card -> Utt = notYet "UttCard" ;
oper UttIAdv : IAdv -> Utt = notYet "UttIAdv" ;
oper UttIP : IP -> Utt = notYet "UttIP" ;
oper UttImpPl : Pol -> Imp -> Utt = notYet "UttImpPl" ;
oper UttImpPol : Pol -> Imp -> Utt = notYet "UttImpPol" ;
oper UttImpSg : Pol -> Imp -> Utt = notYet "UttImpSg" ;
oper UttInterj : Interj -> Utt = notYet "UttInterj" ;
oper UttQS : QS -> Utt = notYet "UttQS" ;
oper UttVP : VP -> Utt = notYet "UttVP" ;
oper VPSlashPrep : VP -> Prep -> VPSlash = notYet "VPSlashPrep" ; oper VPSlashPrep : VP -> Prep -> VPSlash = notYet "VPSlashPrep" ;
oper VocNP : NP -> Voc = notYet "VocNP" ; oper VocNP : NP -> Voc = notYet "VocNP" ;
oper above_Prep : Prep = notYet "above_Prep" ; oper above_Prep : Prep = notYet "above_Prep" ;

View File

@@ -8,21 +8,19 @@ concrete PhraseMay of Phrase = CatMay ** open Prelude, ResMay in {
UttIAdv iadv = iadv ; UttIAdv iadv = iadv ;
UttNP np = {s = np.s ! Bare} ; UttNP np = {s = np.s ! Bare} ;
UttIP ip = {s = ip.sp ! NF Sg Bare} ; UttIP ip = {s = ip.sp ! NF Sg Bare} ;
UttImpSg pol imp = { s = pol.s ++ imp.s ! Sg ! pol.p } ; UttImpSg pol imp = {s = pol.s ++ imp.s ! Sg ! pol.p } ;
UttImpPol pol imp = {s = pol.s ++ imp.s ! Sg ! pol.p} ; UttImpPol pol imp = {s = pol.s ++ imp.s ! Sg ! pol.p} ;
UttImpPl pol imp = {s = pol.s ++ imp.s ! Pl ! pol.p} ;
UttVP vp = {s = linVP vp} ; UttVP vp = {s = linVP vp} ;
UttAP ap = { s = ap.s } ; UttAP ap = {s = ap.s} ;
{- UttAdv adv = adv ;
UttImpPl pol imp = UttCN n = {s = linCN n} ;
UttAdv adv = {s = } ; UttCard c = c ;
UttCN n = {s = } ;
UttCard n = {s = } ;
UttInterj i = i ; UttInterj i = i ;
-}
NoPConj = {s = []} ; NoPConj = {s = []} ;
-- PConjConj conj = {s = conj.s1 ++ conj.s2 ! …} ; PConjConj conj = {s = conj.s1 ++ conj.s2} ;
NoVoc = {s = []} ; NoVoc = {s = []} ;
-- VocNP np = { s = "," ++ np.s ! … } ; -} VocNP np = { s = "," ++ np.s ! Bare} ;
} }

View File

@@ -96,8 +96,8 @@ oper
-- Prep -- Prep
-- lin above_Prep = mkPrep "" -- lin above_Prep = mkPrep ""
-- lin after_Prep = mkPrep "" lin after_Prep = mkPrep "selepas" ;
-- lin before_Prep = mkPrep "" ; lin before_Prep = mkPrep "sebelum" ;
-- lin behind_Prep = mkPrep "" ; -- lin behind_Prep = mkPrep "" ;
-- lin between_Prep = = mkPrep "" ; -- lin between_Prep = = mkPrep "" ;
lin by8agent_Prep = mkPrep "oleh" ; -- for pronoun agent, see Mintz p. 170, 5.4.1 lin by8agent_Prep = mkPrep "oleh" ; -- for pronoun agent, see Mintz p. 170, 5.4.1