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

ResFin workaround; type annot for ghc 6.8.1

Browse Source
This commit is contained in:
aarne
2007-11-09 15:51:12 +00:00
parent bfb04e5eb0
commit 70bb329c8e
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/resource-1.0/Makefile
View File

@@ -165,10 +165,10 @@ gf3:
$(GFNew) finnish/Finnish.gf
$(GFNew) french/French.gf
$(GFNew) german/German.gf
$(GFNew) italian/Italian.gf
$(GFNew) italian/Italian.gf $(RTSS)
$(GFNew) norwegian/Norwegian.gf
$(GFNew) russian/Russian.gf
$(GFNew) spanish/Spanish.gf
$(GFNew) spanish/Spanish.gf $(RTSS)
$(GFNew) swedish/Swedish.gf
$(GFNew) common/ConstructX.gf
cp -p */*.gfo ../alltenses

11
lib/resource-1.0/finnish/ResFin.gf
View File

@@ -56,10 +56,13 @@ param
NPForm = NPCase Case | NPAcc ;
oper
npform2case : Number -> NPForm -> Case = \n,f -> case <f,n> of {
<NPCase c,_> => c ;
<NPAcc,Sg> => Gen ;-- appCompl does the job
<NPAcc,Pl> => Nom
npform2case : Number -> NPForm -> Case = \n,f ->
-- type signature: workaround for gfc bug 9/11/2007
case <<f,n> : NPForm * Number> of {
<NPCase c,_> => c ;
<NPAcc,Sg> => Gen ;-- appCompl does the job
<NPAcc,Pl> => Nom
} ;
n2nform : NForm -> NForm = \nf -> case nf of {

2
src/GF/GFCC/Generate.hs
View File

@@ -25,7 +25,7 @@ generate gfcc cat = concatMap (\i -> gener i cat) [0..]
-- generate an infinite list of trees randomly
genRandom :: StdGen -> GFCC -> CId -> [Exp]
genRandom gen gfcc cat = genTrees (randomRs (0.0, 1.0) gen) cat where
genRandom gen gfcc cat = genTrees (randomRs (0.0, 1.0 :: Double) gen) cat where
timeout = 47 -- give up