diff options
| author | aarne <aarne@chalmers.se> | 2009-05-25 12:19:32 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2009-05-25 12:19:32 +0000 |
| commit | a71aed81fd2abe142aa71ba75f59bb21a3afbd1e (patch) | |
| tree | e5e8ed34cea3f395faad5dd41396035ec1e27070 | |
| parent | 3efb7a671bb9f40ac0b442aa94e1714ddd8c9c53 (diff) | |
fixed pre expressions, parsing {} patterns, and the path in resource Make.hs
| -rw-r--r-- | next-lib/src/Make.hs | 3 | ||||
| -rw-r--r-- | next-lib/src/catalan/PhonoCat.gf | 12 | ||||
| -rw-r--r-- | next-lib/src/french/MorphoFre.gf | 5 | ||||
| -rw-r--r-- | next-lib/src/russian/ResRus.gf | 4 | ||||
| -rw-r--r-- | src/GF/Grammar/Parser.y | 1 |
5 files changed, 19 insertions, 6 deletions
diff --git a/next-lib/src/Make.hs b/next-lib/src/Make.hs index 63f50afc2..e3af0110e 100644 --- a/next-lib/src/Make.hs +++ b/next-lib/src/Make.hs @@ -198,7 +198,8 @@ unlexer abstr ls = -- | Runs the gf executable in compile mode with the given arguments. run_gfc :: [String] -> IO () run_gfc args = - do let args' = ["-batch","-gf-lib-path=."] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"] + do let args' = ["-batch"] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"] +--- do let args' = ["-batch","-gf-lib-path=."] ++ filter (not . null) args ++ ["+RTS"] ++ rts_flags ++ ["-RTS"] --- why path? AR putStrLn $ "Running: " ++ default_gf ++ " " ++ unwords (map showArg args') e <- rawSystem default_gf args' case e of diff --git a/next-lib/src/catalan/PhonoCat.gf b/next-lib/src/catalan/PhonoCat.gf index f750aeb01..61420cc45 100644 --- a/next-lib/src/catalan/PhonoCat.gf +++ b/next-lib/src/catalan/PhonoCat.gf @@ -34,8 +34,16 @@ elisEl = pre { "el" ; "l'" / vocal } ; elisLa = pre { "la" ; "l'" / vocalForta } ; elisEm = pre { "em" ; "m'" / vocal } ; elisEt = pre { "et" ; "t'" / vocal } ; + +-- AR after pre syntax change 25/5/2009 elisEs = pre { - pre { "es" ; "s'" / vocal} ; - "se" / strs { "s" } } ; + vocal => "s'" ; + "s" => "se" ; + _ => "es" + } ; + +--elisEs = pre { +-- pre { "es" ; "s'" / vocal} ; +-- "se" / strs { "s" } } ; } diff --git a/next-lib/src/french/MorphoFre.gf b/next-lib/src/french/MorphoFre.gf index 05ecbc925..00dd88536 100644 --- a/next-lib/src/french/MorphoFre.gf +++ b/next-lib/src/french/MorphoFre.gf @@ -182,7 +182,10 @@ oper } ; elisPoss : Str -> Str = \s -> - pre {s + "a" ; s + "on" / voyelle} ; + pre { + voyelle => s + "on" ; + _ => s + "a" + } ; --2 Determiners diff --git a/next-lib/src/russian/ResRus.gf b/next-lib/src/russian/ResRus.gf index 8f298bca6..477c96cc8 100644 --- a/next-lib/src/russian/ResRus.gf +++ b/next-lib/src/russian/ResRus.gf @@ -375,8 +375,8 @@ param Place = attr | indep ; param Size = nom | sgg | plg ; --param Gend = masc | fem | neut ; oper mille : Size => Str = table { - {nom} => "тысяча" ; - {sgg} => "тысячи" ; + nom => "тысяча" ; + sgg => "тысячи" ; _ => "тысяч"} ; oper gg : Str -> Gender => Str = \s -> table {_ => s} ; diff --git a/src/GF/Grammar/Parser.y b/src/GF/Grammar/Parser.y index 1a9723c28..e07ec8684 100644 --- a/src/GF/Grammar/Parser.y +++ b/src/GF/Grammar/Parser.y @@ -483,6 +483,7 @@ Patt2 | '#' Ident '.' Ident { PM $2 $4 } | '_' { PW } | Ident { PV $1 } + | '{' Ident '}' { PC $2 [] } | Ident '.' Ident { PP $1 $3 [] } | Integer { PInt $1 } | Double { PFloat $1 } |