enable matching of ++ strings with regular patterns

This commit is contained in:
aarne
2008-09-09 06:36:36 +00:00
parent 5fde12f8f4
commit 56173a9fdb
3 changed files with 31 additions and 4 deletions

View File

@@ -85,6 +85,9 @@ make xx = do
ifx "lang" $ do
mapM_ (gfc pres [] . lang) (optl langsLang)
copy "*/*.gfo" dir
ifx "compat" $ do
mapM_ (gfc pres [] . compat) (optl langsLang)
copy "*/*.gfo" dir
ifx "api" $ do
mapM_ (gfc pres presApiPath . try) (optl langsAPI)
copy "*/*.gfo" dir
@@ -132,6 +135,7 @@ demos abstr ls = "gr -number=100 | l -treebank " ++ unlexer abstr ls ++
" | ps -to_html | wf -file=resdemo.html"
lang (lla,la) = lla ++ "/All" ++ la ++ ".gf"
compat (lla,la) = lla ++ "/Compatibility" ++ la ++ ".gf"
try (lla,la) = "api/Try" ++ la ++ ".gf"
math (lla,la) = "mathematical/Mathematical" ++ la ++ ".gf"
symbolic (lla,la) = "mathematical/Symbolic" ++ la ++ ".gf"

View File

@@ -312,9 +312,16 @@ oper
mkN : (apa : Str) -> N = regN ;
mkN : Str -> Gender -> N = regGenN ;
mkN : (nyckel, nycklar : Str) -> N = mk2N ;
mkN : (museum,museet,museer,museerna : Str) -> N = mk4N
mkN : (museum,museet,museer,museerna : Str) -> N = mk4N ;
mkN : Str -> N -> N = compoundN ;
} ;
compoundN : Str -> N -> N = \s,no -> {
s = \\n,d,c => s ++ no.s ! n ! d ! c ;
g = no.g ;
lock_N = <>
} ;
mk4N : (museum,museet,museer,museerna : Str) -> N = \apa,apan,apor,aporna -> {
s = nounForms apa apan apor aporna ;
g = case last apan of {