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

debugging gfcc bug; resulted in some type annotations to work around problems

Browse Source
This commit is contained in:
aarne
2007-11-09 14:02:11 +00:00
parent 3cbaf00c3c
commit ce975919c9
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/resource-1.0/Makefile
View File

@@ -29,7 +29,8 @@ GFCCP=$(GFCC) -preproc=./mkPresent
new: new:
export GF='../../bin/gf -s' ; make -e all export GF='../../bin/gf -s' ; make -e all
all: chmod show-path prelude present alltenses mathematical api langs compiled all: langs compiled
#all: chmod show-path prelude present alltenses mathematical api langs compiled
chmod: chmod:
chmod a+x mkPresent chmod a+x mkPresent

2
lib/resource-1.0/danish/DiffDan.gf
View File

@@ -10,7 +10,7 @@ instance DiffDan of DiffScand = open CommonScand, Prelude in {
neutrum = Neutr ; neutrum = Neutr ;
gennum : Gender -> Number -> GenNum = \g,n -> gennum : Gender -> Number -> GenNum = \g,n ->
case <g,n> of { case <<g,n> : Gender * Number> of {
<Utr, Sg> => SgUtr ; <Utr, Sg> => SgUtr ;
<Neutr,Sg> => SgNeutr ; <Neutr,Sg> => SgNeutr ;
_ => Plg _ => Plg

2
lib/resource-1.0/norwegian/DiffNor.gf
View File

@@ -11,7 +11,7 @@ instance DiffNor of DiffScand = open CommonScand, Prelude in {
neutrum = Neutr ; neutrum = Neutr ;
gennum : Gender -> Number -> GenNum = \g,n -> gennum : Gender -> Number -> GenNum = \g,n ->
case <g,n> of { case <<g,n> : Gender * Number> of {
<Utr _,Sg> => SgUtr ; <Utr _,Sg> => SgUtr ;
<Neutr,Sg> => SgNeutr ; <Neutr,Sg> => SgNeutr ;
_ => Plg _ => Plg

10
lib/resource-1.0/scandinavian/CommonScand.gf
View File

@@ -81,10 +81,12 @@ oper
-- Used in $Noun.AdjCN$. -- Used in $Noun.AdjCN$.
agrAdj : GenNum -> DetSpecies -> AFormPos = \gn,d -> case <gn,d> of { ----- agrAdj : GenNum -> DetSpecies -> AFormPos = \gn,d -> Strong gn ; --- debug
<_, DIndef> => Strong gn ; agrAdj : GenNum -> DetSpecies -> AFormPos = \gn,d ->
<Plg,DDef _> => Weak Pl ; case <<gn,d> : GenNum * DetSpecies> of {
_ => Weak Sg <_, DIndef> => Strong gn ;
<Plg,DDef _> => Weak Pl ;
_ => Weak Sg
} ; } ;
-- Used in $DiffScand.predV$. -- Used in $DiffScand.predV$.

13
lib/resource-1.0/swedish/DiffSwe.gf
View File

@@ -9,8 +9,19 @@ instance DiffSwe of DiffScand = open CommonScand, Prelude in {
utrum = Utr ; utrum = Utr ;
neutrum = Neutr ; neutrum = Neutr ;
gennumN : Gender -> Number -> GenNum = \g,n -> Plg ; -----
gennum : Gender -> Number -> GenNum = \g,n -> gennum : Gender -> Number -> GenNum = \g,n ->
case <g,n> of { {-
--- debugging Compute 9/11/2007
case n of {
Sg => case g of {
Utr => SgUtr ;
Neutr => SgNeutr
} ;
_ => Plg
} ;
-}
case <<g,n> : Gender * Number> of {
<Utr,Sg> => SgUtr ; <Utr,Sg> => SgUtr ;
<Neutr,Sg> => SgNeutr ; <Neutr,Sg> => SgNeutr ;
_ => Plg _ => Plg

4
src/GF/Grammar/Compute.hs
View File

@@ -179,6 +179,7 @@ computeTermOpt rec gr = comp where
vs <- allParamValues gr ptyp vs <- allParamValues gr ptyp
case lookup v' (zip vs [0 .. length vs - 1]) of case lookup v' (zip vs [0 .. length vs - 1]) of
Just i -> comp g $ ts !! i Just i -> comp g $ ts !! i
----- _ -> prtBad "selection" $ S t' v' -- debug
_ -> return $ S t' v' -- if v' is not canonical _ -> return $ S t' v' -- if v' is not canonical
T (TComp _) cs -> do T (TComp _) cs -> do
@@ -196,8 +197,7 @@ computeTermOpt rec gr = comp where
Alias _ _ d -> comp g (S d v') Alias _ _ d -> comp g (S d v')
S (T i cs) e -> prawitz g i (flip S v') cs e S (T i cs) e -> prawitz g i (flip S v') cs e
_ -> returnC $ S t' v'
_ -> returnC $ S t' v'
-- normalize away empty tokens -- normalize away empty tokens
K "" -> return Empty K "" -> return Empty