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

took back smart type of Int ; Digits type in resource and some adjustments of Det syntax (not yet for romance and russian)

Browse Source
This commit is contained in:
aarne
2007-12-17 18:12:46 +00:00
parent eb10ccbe7c
commit 2d5f98dc05
31 changed files with 560 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/resource/abstract/Cat.gf
View File

@@ -78,9 +78,7 @@ abstract Cat = Common ** {
Pron ; -- personal pronoun e.g. "she"
Det ; -- determiner phrase e.g. "those seven"
Predet ; -- predeterminer (prefixed Quant) e.g. "all"
QuantSg ;-- quantifier ('nucleus' of sing. Det) e.g. "every"
QuantPl ;-- quantifier ('nucleus' of plur. Det) e.g. "many"
Quant ; -- quantifier with both sg and pl e.g. "this/these"
Quant ; -- quantifier ('nucleus' of Det) e.g. "this/these"
Num ; -- cardinal number (used with QuantPl) e.g. "seven"
Ord ; -- ordinal number (used in Det) e.g. "seventh"
@@ -88,7 +86,8 @@ abstract Cat = Common ** {
-- Constructed in [Numeral Numeral.html].
Numeral;-- cardinal or ordinal, e.g. "five/fifth"
Numeral ; -- cardinal or ordinal, e.g. "five/fifth"
Digits ; -- cardinal or ordinal, e.g. "1,000/1,000th"
--2 Structural words
@@ -121,4 +120,8 @@ abstract Cat = Common ** {
N3 ; -- three-place relational noun e.g. "connection"
PN ; -- proper name e.g. "Paris"
-- DEPRECATED: QuantSg, QuantPl
--- QuantSg ;-- quantifier ('nucleus' of sing. Det) e.g. "every"
--- QuantPl ;-- quantifier ('nucleus' of plur. Det) e.g. "many"
}

20
lib/resource/abstract/Noun.gf
View File

@@ -35,13 +35,17 @@ abstract Noun = Cat ** {
-- (This is modified from CLE by further dividing their $Num$ into
-- cardinal and ordinal.)
DetSg : QuantSg -> Ord -> Det ; -- this best man
DetPl : QuantPl -> Num -> Ord -> Det ; -- these five best men
DetSg : Quant -> Ord -> Det ; -- this best man
DetPl : Quant -> Num -> Ord -> Det ; -- these five best men
-- Notice that $DetPl$ can still result in a singular determiner, because
-- "one" is a numeral: "this one man".
-- Quantifiers that have both forms can be used in both ways.
SgQuant : Quant -> QuantSg ; -- this
PlQuant : Quant -> QuantPl ; -- these
--- DEPRECATED: no longer needed
--- SgQuant : Quant -> QuantSg ; -- this
--- PlQuant : Quant -> QuantPl ; -- these
-- Pronouns have possessive forms. Genitives of other kinds
-- of noun phrases are not given here, since they are not possible
@@ -58,7 +62,8 @@ abstract Noun = Cat ** {
-- $Num$ consists of either digits or numeral words.
NumInt : Int -> Num ; -- 51
NumInt : Int -> Num ; -- 51 (DEPRECATED)
NumDigits : Digits -> Num ; -- 51
NumNumeral : Numeral -> Num ; -- fifty-one
-- The construction of numerals is defined in [Numeral Numeral.html].
@@ -69,7 +74,8 @@ abstract Noun = Cat ** {
-- $Ord$ consists of either digits or numeral words.
OrdInt : Int -> Ord ; -- 51st
OrdInt : Int -> Ord ; -- 51st (DEPRECATED)
OrdDigits : Digits -> Ord ; -- 51st
OrdNumeral : Numeral -> Ord ; -- fifty-first
-- Superlative forms of adjectives behave syntactically in the same way as
@@ -88,7 +94,7 @@ abstract Noun = Cat ** {
-- not distinguish mass nouns from other common nouns, which can result
-- in semantically odd expressions.
MassDet : QuantSg ; -- (beer)
MassDet : Quant ; -- (beer)
-- Other determiners are defined in [Structural Structural.html].

11
lib/resource/abstract/Numeral.gf
View File

@@ -46,4 +46,15 @@ fun
pot3 : Sub1000 -> Sub1000000 ; -- m * 1000
pot3plus : Sub1000 -> Sub1000 -> Sub1000000 ; -- m * 1000 + n
-- Numerals as sequences of digits have a separate, simpler grammar
cat
Dig ;
fun
IDig : Dig -> Digits ;
IIDig : Dig -> Digits -> Digits ;
D_0, D_1, D_2, D_3, D_4, D_5, D_6, D_7, D_8, D_9 : Dig ;
}

4
lib/resource/abstract/Structural.gf
View File

@@ -36,7 +36,7 @@ abstract Structural = Cat ** {
everybody_NP : NP ;
everything_NP : NP ;
everywhere_Adv : Adv ;
first_Ord : Ord ;
--- first_Ord : Ord ; DEPRECATED
few_Det : Det ;
for_Prep : Prep ;
from_Prep : Prep ;
@@ -59,7 +59,7 @@ abstract Structural = Cat ** {
must_VV : VV ;
no_Phr : Phr ;
on_Prep : Prep ;
one_Quant : QuantSg ;
--- one_Quant : QuantSg ; DEPRECATED
only_Predet : Predet ;
or_Conj : Conj ;
otherwise_PConj : PConj ;