From ccac96eaa0a735612bc2dc4bc8a040c6b354eb54 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 28 Mar 2010 20:32:03 +0000 Subject: [PATCH] catching initial bind symbol in PGFServer --- examples/phrasebook/WordsIta.gf | 2 +- examples/phrasebook/WordsRon.gf | 4 ++-- src/server/PGFService.hs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/phrasebook/WordsIta.gf b/examples/phrasebook/WordsIta.gf index a8caf0d58..6f7a4cb1e 100644 --- a/examples/phrasebook/WordsIta.gf +++ b/examples/phrasebook/WordsIta.gf @@ -12,7 +12,7 @@ Wine = mkCN (mkN "vino") ; Beer = mkCN (mkN "birra") ; Water = mkCN (mkN "acqua") ; Coffee = mkCN (mkN "caff�") ; - Tea = mkCN (mkN "t�") ; ---- +-- Tea = mkCN (mkN "t�") ; ---- Cheese = mkCN (mkN "formaggio") ; Fish = mkCN (mkN "pesce") ; diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf index 8fb0aad5d..6f117fae7 100644 --- a/examples/phrasebook/WordsRon.gf +++ b/examples/phrasebook/WordsRon.gf @@ -40,10 +40,10 @@ Boring = mkAPA "plictisitor" "plictisitoare" "plictisitori" "plictisitoare" ; ASpeak p lang = mkCl p (dirV2 (mkV "vorbi")) lang ; ALove p q = mkCl p (dirV2 (mkV "iubi")) q ; - English = SyntaxRon.mkNP (mkPN "anglais") ; ---- ? + English = SyntaxRon.mkNP (mkPN "engleză") ; ---- ? -- Finnish = mkNP (mkPN "finnois") ; -- French = mkNP (mkPN "français") ; - Romanian = SyntaxRon.mkNP (mkPN "engleză") ; ---- ? + Romanian = SyntaxRon.mkNP (mkPN "română") ; ---- ? -- Swedish = mkNP (mkPN "suédois") ; oper diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs index b8c8f7aff..510aa8bd5 100644 --- a/src/server/PGFService.hs +++ b/src/server/PGFService.hs @@ -147,6 +147,7 @@ doTranslateGroup pgf input mcat mfrom mto = _ -> s bind ws = case ws of w : "&+" : u : ws2 -> bind ((w ++ u) : ws2) + "&+":ws2 -> bind ws2 w : ws2 -> w : bind ws2 _ -> ws langOnly = reverse . take 3 . reverse