diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile index 180e1bb34..0dc4c889a 100644 --- a/lib/resource-1.0/Makefile +++ b/lib/resource-1.0/Makefile @@ -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 diff --git a/lib/resource-1.0/finnish/ResFin.gf b/lib/resource-1.0/finnish/ResFin.gf index 03d92dbe7..aa5bf4a32 100644 --- a/lib/resource-1.0/finnish/ResFin.gf +++ b/lib/resource-1.0/finnish/ResFin.gf @@ -56,10 +56,13 @@ param NPForm = NPCase Case | NPAcc ; oper - npform2case : Number -> NPForm -> Case = \n,f -> case of { - => c ; - => Gen ;-- appCompl does the job - => Nom + npform2case : Number -> NPForm -> Case = \n,f -> + +-- type signature: workaround for gfc bug 9/11/2007 + case < : NPForm * Number> of { + => c ; + => Gen ;-- appCompl does the job + => Nom } ; n2nform : NForm -> NForm = \nf -> case nf of { diff --git a/src/GF/GFCC/Generate.hs b/src/GF/GFCC/Generate.hs index 8baaf12d7..64ef5d5cf 100644 --- a/src/GF/GFCC/Generate.hs +++ b/src/GF/GFCC/Generate.hs @@ -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