forked from GitHub/gf-rgl
record extension typs checking fixed
This commit is contained in:
@@ -113,9 +113,7 @@ instance SyntaxDan of SyntaxScand = TypesDan **
|
|||||||
progressiveClause : NounPhrase -> VerbPhrase -> Clause = \np,vp ->
|
progressiveClause : NounPhrase -> VerbPhrase -> Clause = \np,vp ->
|
||||||
predVerbGroupClause np
|
predVerbGroupClause np
|
||||||
(complVerbVerb
|
(complVerbVerb
|
||||||
(verbVara **
|
{s = verbVara.s ; s1 = "ved" ; isAux = False}
|
||||||
{isAux = False} ----- {s3 = ["ved at"]}
|
|
||||||
)
|
|
||||||
vp) ;
|
vp) ;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -68,6 +68,7 @@ lincat
|
|||||||
V2S = TransVerb ;
|
V2S = TransVerb ;
|
||||||
V2Q = TransVerb ;
|
V2Q = TransVerb ;
|
||||||
V2V = TransVerb ** {s4 : Str} ;
|
V2V = TransVerb ** {s4 : Str} ;
|
||||||
|
----V2V = {s : VForm => Str ; s1 : Particle ; s3, s4 : Str} ;
|
||||||
V2A = TransVerb ;
|
V2A = TransVerb ;
|
||||||
V0 = Verb ;
|
V0 = Verb ;
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ lin
|
|||||||
|
|
||||||
AdjPart = adjPastPart ;
|
AdjPart = adjPastPart ;
|
||||||
|
|
||||||
UseV2V x = x ** {isAux = False} ;
|
UseV2V x = verb2aux x ** {isAux = False} ;
|
||||||
UseV2S x = x ;
|
UseV2S x = x ;
|
||||||
UseV2Q x = x ;
|
UseV2Q x = x ;
|
||||||
UseA2S x = x ;
|
UseA2S x = x ;
|
||||||
|
|||||||
@@ -329,7 +329,7 @@ oper
|
|||||||
mkV0 v = v ** {lock_V0 = <>} ;
|
mkV0 v = v ** {lock_V0 = <>} ;
|
||||||
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
|
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
|
||||||
mkV2S v p = mkV2 v p ** {mn,mp = Ind ; lock_V2S = <>} ;
|
mkV2S v p = mkV2 v p ** {mn,mp = Ind ; lock_V2S = <>} ;
|
||||||
mkVV v = v ** {c = accusative ; lock_VV = <>} ;
|
mkVV v = v ** {c = accusative.p1 ; lock_VV = <>} ;
|
||||||
deVV v = v ** {c = genitive.p1 ; lock_VV = <>} ;
|
deVV v = v ** {c = genitive.p1 ; lock_VV = <>} ;
|
||||||
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
|
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
|
||||||
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
|
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
|
||||||
|
|||||||
@@ -347,7 +347,7 @@ oper
|
|||||||
mkV0 v = v ** {lock_V0 = <>} ;
|
mkV0 v = v ** {lock_V0 = <>} ;
|
||||||
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
|
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
|
||||||
mkV2S v p = mkV2 v p ** {mn,mp = Ind ; lock_V2S = <>} ;
|
mkV2S v p = mkV2 v p ** {mn,mp = Ind ; lock_V2S = <>} ;
|
||||||
mkVV v = v ** {c = accusative ; lock_VV = <>} ;
|
mkVV v = v ** {c = accusative.p1 ; lock_VV = <>} ;
|
||||||
deVV v = v ** {c = genitive.p1 ; lock_VV = <>} ;
|
deVV v = v ** {c = genitive.p1 ; lock_VV = <>} ;
|
||||||
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
|
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
|
||||||
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
|
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
|
||||||
|
|||||||
@@ -114,8 +114,6 @@ instance SyntaxNor of SyntaxScand = TypesNor **
|
|||||||
progressiveClause : NounPhrase -> VerbPhrase -> Clause = \np,vp ->
|
progressiveClause : NounPhrase -> VerbPhrase -> Clause = \np,vp ->
|
||||||
predVerbGroupClause np
|
predVerbGroupClause np
|
||||||
(complVerbVerb
|
(complVerbVerb
|
||||||
(verbVara **
|
({s = verbVara.s ; s1 = "ved" ; isAux = False})
|
||||||
{isAux = False} ----- {s3 = ["ved at"]}
|
|
||||||
)
|
|
||||||
vp) ;
|
vp) ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -637,7 +637,7 @@ oper
|
|||||||
|
|
||||||
mkVerbGroupCopula : (Gender => Number => Person => Str) -> VerbGroup =
|
mkVerbGroupCopula : (Gender => Number => Person => Str) -> VerbGroup =
|
||||||
\obj ->
|
\obj ->
|
||||||
mkVerbGroupObject (verbVara ** {s1 = []}) obj ;
|
mkVerbGroupObject verbVara obj ;
|
||||||
|
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
@@ -688,7 +688,7 @@ oper
|
|||||||
-- on semantic grounds.
|
-- on semantic grounds.
|
||||||
|
|
||||||
vara : (Gender => Number => Person => Str) -> VerbGroup =
|
vara : (Gender => Number => Person => Str) -> VerbGroup =
|
||||||
useVerb (verbVara ** {s1 = []}) ;
|
useVerb verbVara ;
|
||||||
|
|
||||||
predAdjective : Adjective -> VerbGroup = \arg ->
|
predAdjective : Adjective -> VerbGroup = \arg ->
|
||||||
vara (\\g,n,_ => arg.s ! predFormAdj g n ! Nom) ;
|
vara (\\g,n,_ => arg.s ! predFormAdj g n ! Nom) ;
|
||||||
@@ -1016,7 +1016,7 @@ oper
|
|||||||
insertObject (mkSats subj verb) obj ;
|
insertObject (mkSats subj verb) obj ;
|
||||||
|
|
||||||
mkSatsCopula : NounPhrase -> Str -> Sats = \subj,obj ->
|
mkSatsCopula : NounPhrase -> Str -> Sats = \subj,obj ->
|
||||||
mkSatsObject subj (verbVara ** {s1 = []}) obj ;
|
mkSatsObject subj verbVara obj ;
|
||||||
|
|
||||||
|
|
||||||
--3 Sentence-complement verbs
|
--3 Sentence-complement verbs
|
||||||
|
|||||||
@@ -338,7 +338,7 @@ oper
|
|||||||
mkV0 v = v ** {lock_V0 = <>} ;
|
mkV0 v = v ** {lock_V0 = <>} ;
|
||||||
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
|
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
|
||||||
mkV2S v p = mkV2 v p ** {mn,mp = Ind ; lock_V2S = <>} ;
|
mkV2S v p = mkV2 v p ** {mn,mp = Ind ; lock_V2S = <>} ;
|
||||||
mkVV v = v ** {c = accusative ; lock_VV = <>} ;
|
mkVV v = v ** {c = accusative.p1 ; lock_VV = <>} ;
|
||||||
deVV v = v ** {c = genitive.p1 ; lock_VV = <>} ;
|
deVV v = v ** {c = genitive.p1 ; lock_VV = <>} ;
|
||||||
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
|
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
|
||||||
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
|
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;
|
||||||
|
|||||||
Reference in New Issue
Block a user