GF.Data.Str: change matchPrefix to agree with the GF book and the run-time system

The matchPrefix function is used in str2strings and the partial evaluator to
compute pre{...} tokens. But unlike the description in the GF book and
the implementation in the run-time system, matchPrefix looked at
the concatenation(!) of all following tokens and not just the next token
when deciding how to compute a pre{...} token.

This is a backwards incompatible change, but it is subtle and probably won't
cause any problems. In particular, the example grammars are unaffected.
This commit is contained in:
hallgren
2015-12-01 15:14:27 +00:00
parent 6d51e7f790
commit d5d4f11684

View File

@@ -44,8 +44,8 @@ type Ss = [String]
-- matching functions in both ways
matchPrefix :: Ss -> [(Ss,[String])] -> [String] -> Ss
matchPrefix s vs t =
head $ [u | let t' = concat (unmarkup t),
matchPrefix s vs t =
head $ [u | t':_ <- [unmarkup t],
(u,as) <- vs,
any (`isPrefixOf` t') as]
++ [s]