fixed pre expressions, parsing {} patterns, and the path in resource Make.hs

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

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" } } ;
 
 }

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

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} ;

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 }