diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-01-03 17:11:32 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-01-03 17:11:32 +0000 |
| commit | 3323ccb7506f7076808031065c113950e4fbd88c (patch) | |
| tree | e30f6b487a38f1a0e0a4d1e37c463d29d23ccf8d /examples | |
| parent | c17d8cfd501419a812881a51545f0751b0ada882 (diff) | |
fixed Swadesh for new resource version
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bronzeage/BronzeageI.gf | 2 | ||||
| -rw-r--r-- | examples/bronzeage/SwadeshI.gf | 7 | ||||
| -rw-r--r-- | examples/uusisuomi/Makefile | 3 | ||||
| -rw-r--r-- | examples/uusisuomi/correct-NSSK.txt (renamed from examples/uusisuomi/correct-NSK.txt) | 0 |
4 files changed, 7 insertions, 5 deletions
diff --git a/examples/bronzeage/BronzeageI.gf b/examples/bronzeage/BronzeageI.gf index 86def573a..23693dc6f 100644 --- a/examples/bronzeage/BronzeageI.gf +++ b/examples/bronzeage/BronzeageI.gf @@ -30,7 +30,7 @@ incomplete concrete BronzeageI of Bronzeage = open Lang in { UsePron p = Lang.UsePron p ; DetCN d n = Lang.DetCN d n ; - NumCN k cn = Lang.DetCN (DetPl (PlQuant IndefArt) k NoOrd) cn ; + NumCN k cn = Lang.DetCN (DetPl (IndefArt) k NoOrd) cn ; UseN n = Lang.UseN n ; ModCN a cn = AdjCN (PositA a) cn ; diff --git a/examples/bronzeage/SwadeshI.gf b/examples/bronzeage/SwadeshI.gf index a622bed2b..0cd3fcd32 100644 --- a/examples/bronzeage/SwadeshI.gf +++ b/examples/bronzeage/SwadeshI.gf @@ -20,8 +20,8 @@ incomplete concrete SwadeshI of Swadesh = open Lang in { -- Determiners - this_Det = DetSg (SgQuant this_Quant) NoOrd ; - that_Det = DetSg (SgQuant that_Quant) NoOrd ; + this_Det = DetSg (this_Quant) NoOrd ; + that_Det = DetSg (that_Quant) NoOrd ; many_Det = Lang.many_Det ; some_Det = someSg_Det ; ---- few_Det = few_Det ; @@ -42,7 +42,8 @@ incomplete concrete SwadeshI of Swadesh = open Lang in { in_Prep = Lang.in_Prep ; with_Prep = Lang.with_Prep ; -- Numerals - one_Det = Lang.DetSg one_Quant NoOrd ; + one_Det = Lang.DetPl IndefArt + (Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01))))) NoOrd ; two_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ; three_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ; four_Num = Lang.NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ; diff --git a/examples/uusisuomi/Makefile b/examples/uusisuomi/Makefile index f5023537b..76fb3b684 100644 --- a/examples/uusisuomi/Makefile +++ b/examples/uusisuomi/Makefile @@ -1,6 +1,7 @@ #LEX=Duodecim #LEX=Aino -LEX=Omat +#LEX=Omat +LEX=NSSK all: tests diff --git a/examples/uusisuomi/correct-NSK.txt b/examples/uusisuomi/correct-NSSK.txt index 32c3eb79e..32c3eb79e 100644 --- a/examples/uusisuomi/correct-NSK.txt +++ b/examples/uusisuomi/correct-NSSK.txt |