GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-18 09:19:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

record extension typs checking fixed

Browse Source
This commit is contained in:
aarne
2005-04-25 17:19:32 +00:00
parent 6c9c095c9a
commit e601bc4e43
9 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/resource/danish/SyntaxDan.gf
View File

@@ -113,9 +113,7 @@ instance SyntaxDan of SyntaxScand = TypesDan **
progressiveClause : NounPhrase -> VerbPhrase -> Clause = \np,vp ->
predVerbGroupClause np
(complVerbVerb
(verbVara **
{isAux = False} ----- {s3 = ["ved at"]}
)
{s = verbVara.s ; s1 = "ved" ; isAux = False}
vp) ;
}

1
lib/resource/english/CategoriesEng.gf
View File

@@ -68,6 +68,7 @@ lincat
V2S = TransVerb ;
V2Q = TransVerb ;
V2V = TransVerb ** {s4 : Str} ;
----V2V = {s : VForm => Str ; s1 : Particle ; s3, s4 : Str} ;
V2A = TransVerb ;
V0 = Verb ;

2
lib/resource/english/RulesEng.gf
View File

@@ -86,7 +86,7 @@ lin
AdjPart = adjPastPart ;
UseV2V x = x ** {isAux = False} ;
UseV2V x = verb2aux x ** {isAux = False} ;
UseV2S x = x ;
UseV2Q x = x ;
UseA2S x = x ;

2
lib/resource/french/ParadigmsFre.gf
View File

@@ -329,7 +329,7 @@ oper
mkV0 v = v ** {lock_V0 = <>} ;
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
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 = <>} ;
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;

2
lib/resource/italian/ParadigmsIta.gf
View File

@@ -347,7 +347,7 @@ oper
mkV0 v = v ** {lock_V0 = <>} ;
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
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 = <>} ;
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;

4
lib/resource/norwegian/SyntaxNor.gf
View File

@@ -114,8 +114,6 @@ instance SyntaxNor of SyntaxScand = TypesNor **
progressiveClause : NounPhrase -> VerbPhrase -> Clause = \np,vp ->
predVerbGroupClause np
(complVerbVerb
(verbVara **
{isAux = False} ----- {s3 = ["ved at"]}
)
({s = verbVara.s ; s1 = "ved" ; isAux = False})
vp) ;
}

6
lib/resource/scandinavian/SyntaxScand.gf
View File

@@ -637,7 +637,7 @@ oper
mkVerbGroupCopula : (Gender => Number => Person => Str) -> VerbGroup =
\obj ->
mkVerbGroupObject (verbVara ** {s1 = []}) obj ;
mkVerbGroupObject verbVara obj ;
-----------------------
@@ -688,7 +688,7 @@ oper
-- on semantic grounds.
vara : (Gender => Number => Person => Str) -> VerbGroup =
useVerb (verbVara ** {s1 = []}) ;
useVerb verbVara ;
predAdjective : Adjective -> VerbGroup = \arg ->
vara (\\g,n,_ => arg.s ! predFormAdj g n ! Nom) ;
@@ -1016,7 +1016,7 @@ oper
insertObject (mkSats subj verb) obj ;
mkSatsCopula : NounPhrase -> Str -> Sats = \subj,obj ->
mkSatsObject subj (verbVara ** {s1 = []}) obj ;
mkSatsObject subj verbVara obj ;
--3 Sentence-complement verbs

2
lib/resource/spanish/ParadigmsSpa.gf
View File

@@ -338,7 +338,7 @@ oper
mkV0 v = v ** {lock_V0 = <>} ;
mkVS v = v ** {mn,mp = Ind ; lock_VS = <>} ; ---- more moods
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 = <>} ;
aVV v = v ** {c = dative.p1 ; lock_VV = <>} ;
mkV2V v p t = mkV2 v p ** {c3 = t.p1 ; s3 = p.p2 ; lock_V2V = <>} ;