forked from GitHub/gf-rgl
some var parser bug fixes
This commit is contained in:
@@ -39,8 +39,8 @@ concrete StructuralEng of Structural =
|
|||||||
|
|
||||||
ThisNP = nameNounPhrase (nameReg "this") ;
|
ThisNP = nameNounPhrase (nameReg "this") ;
|
||||||
ThatNP = nameNounPhrase (nameReg "that") ;
|
ThatNP = nameNounPhrase (nameReg "that") ;
|
||||||
TheseNumNP n = nameNounPhrase {s = \\c => "these" ++ n.s ! c} ; --- Pl; Gen!
|
TheseNumNP n = nameNounPhrasePl {s = \\c => "these" ++ n.s ! c} ;
|
||||||
ThoseNumNP n = nameNounPhrase {s = \\c => "those" ++ n.s ! c} ; --- Pl; Gen!
|
ThoseNumNP n = nameNounPhrasePl {s = \\c => "those" ++ n.s ! c} ;
|
||||||
|
|
||||||
EverybodyNP = nameNounPhrase (nameReg "everybody") ;
|
EverybodyNP = nameNounPhrase (nameReg "everybody") ;
|
||||||
SomebodyNP = nameNounPhrase (nameReg "somebody") ;
|
SomebodyNP = nameNounPhrase (nameReg "somebody") ;
|
||||||
|
|||||||
@@ -47,6 +47,9 @@ oper
|
|||||||
nameNounPhrase : ProperName -> NounPhrase = \john ->
|
nameNounPhrase : ProperName -> NounPhrase = \john ->
|
||||||
{s = \\c => john.s ! toCase c ; n = Sg ; p = P3} ;
|
{s = \\c => john.s ! toCase c ; n = Sg ; p = P3} ;
|
||||||
|
|
||||||
|
nameNounPhrasePl : ProperName -> NounPhrase = \john ->
|
||||||
|
{s = \\c => john.s ! toCase c ; n = Pl ; p = P3} ;
|
||||||
|
|
||||||
-- The following construction has to be refined for genitive forms:
|
-- The following construction has to be refined for genitive forms:
|
||||||
-- "we two", "us two" are OK, but "our two" is not.
|
-- "we two", "us two" are OK, but "our two" is not.
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ abstract Shallow = {
|
|||||||
Verb ;
|
Verb ;
|
||||||
TV ;
|
TV ;
|
||||||
Adj ;
|
Adj ;
|
||||||
|
AdjDeg ; ----
|
||||||
|
Adj2 ; ----
|
||||||
|
V3 ; ----
|
||||||
N ;
|
N ;
|
||||||
Noun ;
|
Noun ;
|
||||||
CN ;
|
CN ;
|
||||||
|
|||||||
@@ -18,6 +18,9 @@ incomplete concrete ShallowI of Shallow = open (Resource = Resource) in {
|
|||||||
Det = Resource.Det ;
|
Det = Resource.Det ;
|
||||||
Prep = Resource.Prep ;
|
Prep = Resource.Prep ;
|
||||||
Num = Resource.Num ;
|
Num = Resource.Num ;
|
||||||
|
AdjDeg = Resource.AdjDeg ;
|
||||||
|
Adj2 = Resource.Adj2 ;
|
||||||
|
V3 = Resource.V3 ;
|
||||||
|
|
||||||
lin
|
lin
|
||||||
PhrS = Resource.IndicPhrase ;
|
PhrS = Resource.IndicPhrase ;
|
||||||
|
|||||||
Reference in New Issue
Block a user