diff --git a/lib/src/arabic/SymbolAra.gf b/lib/src/arabic/SymbolAra.gf index d8003eaf8..3d62fc851 100644 --- a/lib/src/arabic/SymbolAra.gf +++ b/lib/src/arabic/SymbolAra.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolAra of Symbol = CatAra ** open Prelude, ResAra in { diff --git a/lib/src/bulgarian/SymbolBul.gf b/lib/src/bulgarian/SymbolBul.gf index 5b962db14..343c6971c 100644 --- a/lib/src/bulgarian/SymbolBul.gf +++ b/lib/src/bulgarian/SymbolBul.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolBul of Symbol = CatBul ** open Prelude, ResBul in { diff --git a/lib/src/catalan/SymbolCat.gf b/lib/src/catalan/SymbolCat.gf index 55ebeeadc..03cf15c96 100644 --- a/lib/src/catalan/SymbolCat.gf +++ b/lib/src/catalan/SymbolCat.gf @@ -1,4 +1,4 @@ ---# -path=.:romance:abstract:common +--# -path=.:../romance:../abstract:../common concrete SymbolCat of Symbol = CatCat ** SymbolRomance with (ResRomance = ResCat) ; diff --git a/lib/src/danish/SymbolDan.gf b/lib/src/danish/SymbolDan.gf index 610f94306..0318eadbe 100644 --- a/lib/src/danish/SymbolDan.gf +++ b/lib/src/danish/SymbolDan.gf @@ -1,4 +1,4 @@ ---# -path=.:scandinavian:abstract:common +--# -path=.:../scandinavian:../abstract:../common concrete SymbolDan of Symbol = CatDan ** SymbolScand with (ResScand = ResDan) ; diff --git a/lib/src/english/SymbolEng.gf b/lib/src/english/SymbolEng.gf index 0b7405b93..f2b00bc4b 100644 --- a/lib/src/english/SymbolEng.gf +++ b/lib/src/english/SymbolEng.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolEng of Symbol = CatEng ** open Prelude, ResEng in { diff --git a/lib/src/finnish/SymbolFin.gf b/lib/src/finnish/SymbolFin.gf index 9ceac2105..fc7923a8a 100644 --- a/lib/src/finnish/SymbolFin.gf +++ b/lib/src/finnish/SymbolFin.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolFin of Symbol = CatFin ** open Prelude, NounFin, ResFin in { diff --git a/lib/src/french/SymbolFre.gf b/lib/src/french/SymbolFre.gf index 3e3202f73..f9b0ca934 100644 --- a/lib/src/french/SymbolFre.gf +++ b/lib/src/french/SymbolFre.gf @@ -1,4 +1,4 @@ ---# -path=.:romance:abstract:common +--# -path=.:../romance:../abstract:../common concrete SymbolFre of Symbol = CatFre ** SymbolRomance with (ResRomance = ResFre) ; diff --git a/lib/src/german/SymbolGer.gf b/lib/src/german/SymbolGer.gf index c2e6b2a1d..429869ffd 100644 --- a/lib/src/german/SymbolGer.gf +++ b/lib/src/german/SymbolGer.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolGer of Symbol = CatGer ** open Prelude, ResGer in { diff --git a/lib/src/hindi/SymbolHin.gf b/lib/src/hindi/SymbolHin.gf index f972c60a3..621c6d68b 100644 --- a/lib/src/hindi/SymbolHin.gf +++ b/lib/src/hindi/SymbolHin.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolHin of Symbol = CatHin ** open Prelude, ResHin in { diff --git a/lib/src/interlingua/SymbolIna.gf b/lib/src/interlingua/SymbolIna.gf index 1ea8b5841..4a3b6b2f2 100644 --- a/lib/src/interlingua/SymbolIna.gf +++ b/lib/src/interlingua/SymbolIna.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolIna of Symbol = CatIna ** open Prelude, ResIna in { diff --git a/lib/src/italian/SymbolIta.gf b/lib/src/italian/SymbolIta.gf index 527bb0afb..6555c5e9e 100644 --- a/lib/src/italian/SymbolIta.gf +++ b/lib/src/italian/SymbolIta.gf @@ -1,4 +1,4 @@ ---# -path=.:romance:abstract:common +--# -path=.:../romance:../abstract:../common concrete SymbolIta of Symbol = CatIta ** SymbolRomance with (ResRomance = ResIta) ; diff --git a/lib/src/latin/SymbolLat.gf b/lib/src/latin/SymbolLat.gf index 04946b738..3461339b2 100644 --- a/lib/src/latin/SymbolLat.gf +++ b/lib/src/latin/SymbolLat.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolLat of Symbol = CatLat ** open Prelude, ResLat in { -- diff --git a/lib/src/norwegian/SymbolNor.gf b/lib/src/norwegian/SymbolNor.gf index f7674df55..600f0e744 100644 --- a/lib/src/norwegian/SymbolNor.gf +++ b/lib/src/norwegian/SymbolNor.gf @@ -1,4 +1,4 @@ ---# -path=.:scandinavian:abstract:common +--# -path=.:../scandinavian:../abstract:../common concrete SymbolNor of Symbol = CatNor ** SymbolScand with (ResScand = ResNor) ; diff --git a/lib/src/romanian/ResRon.gf b/lib/src/romanian/ResRon.gf index cb76b8343..e1351c4d0 100644 --- a/lib/src/romanian/ResRon.gf +++ b/lib/src/romanian/ResRon.gf @@ -508,9 +508,9 @@ oper RCond => VCondit ; RPres => VPres m } ; - cmp = case of - { | => True ; - => True; + cmp = case < : RTense * Anteriority * Mood> of { + | => True ; --# notpresent + => True; --# notpresent _ => False } ; vp = useVP vpr ; diff --git a/lib/src/romanian/SymbolRon.gf b/lib/src/romanian/SymbolRon.gf index c8843d1a2..021e4a081 100644 --- a/lib/src/romanian/SymbolRon.gf +++ b/lib/src/romanian/SymbolRon.gf @@ -1,3 +1,5 @@ +--# -path=.:../abstract:../common + concrete SymbolRon of Symbol = CatRon ** open Prelude, ResRon in { diff --git a/lib/src/russian/SymbolRus.gf b/lib/src/russian/SymbolRus.gf index 54355374a..9eed7763f 100644 --- a/lib/src/russian/SymbolRus.gf +++ b/lib/src/russian/SymbolRus.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:common +--# -path=.:../abstract:../common concrete SymbolRus of Symbol = CatRus ** open Prelude, ResRus in { diff --git a/lib/src/spanish/SymbolSpa.gf b/lib/src/spanish/SymbolSpa.gf index bcc6323e7..e300021cb 100644 --- a/lib/src/spanish/SymbolSpa.gf +++ b/lib/src/spanish/SymbolSpa.gf @@ -1,4 +1,4 @@ ---# -path=.:romance:abstract:common +--# -path=.:../romance:../abstract:../common concrete SymbolSpa of Symbol = CatSpa ** SymbolRomance with (ResRomance = ResSpa) ; diff --git a/lib/src/swedish/SymbolSwe.gf b/lib/src/swedish/SymbolSwe.gf index 0c74baa93..331e4ba3e 100644 --- a/lib/src/swedish/SymbolSwe.gf +++ b/lib/src/swedish/SymbolSwe.gf @@ -1,4 +1,4 @@ ---# -path=.:scandinavian:abstract:common +--# -path=.:../scandinavian:../abstract:../common concrete SymbolSwe of Symbol = CatSwe ** SymbolScand with (ResScand = ResSwe) ; diff --git a/src/server/MorphoService.hs b/src/server/MorphoService.hs index 146ba2307..cd1aac8b0 100644 --- a/src/server/MorphoService.hs +++ b/src/server/MorphoService.hs @@ -3,7 +3,7 @@ import GF.Data.Operations import GF.Grammar.API import GF.Grammar.Parser import GF.Grammar.Grammar (Term) -import GF.Grammar.PrGrammar (prTermTabular) +--import GF.Grammar.PrGrammar (prTermTabular) import GF.Infra.Option import GF.Infra.UseIO import GF.Text.UTF8 @@ -60,7 +60,8 @@ doEval :: Grammar -> String -> Err JSValue doEval sgr t = liftM termToJSValue $ eval sgr t termToJSValue :: Term -> JSValue -termToJSValue t = showJSON [toJSObject [("name", name), ("value",value)] | (name,value) <- prTermTabular t] +termToJSValue t = error "prTermTabular undefined" +---- showJSON [toJSObject [("name", name), ("value",value)] | (name,value) <- prTermTabular t] eval :: Grammar -> String -> Err Term eval sgr t =