Commit 7dd76df0d139c5f2069ce0f2914a6bdcb914e560 - Fountain

Even stronger ignore Chris Pressey 11 months ago

1 changed file(s) with 11 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all

+11

-4

src/Language/Fountain/Generator.hs less more

37	37	both x Identity = x
38	38	both x y = Both x y
39	39
	40	containsLookahead (Lookahead _) = True
	41	containsLookahead (Both c1 c2) = containsLookahead c1 \|\| containsLookahead c2
	42	containsLookahead (Not c) = containsLookahead c
	43	containsLookahead _ = False
	44
40	45	genTerminal :: Char -> GenState -> GenState
41	46	genTerminal c state@Generating{ text=text } = state{ text=(c:text) }
42	47

45	50	--
46	51	getPreCondition :: Expr -> Constraint Value
47	52	getPreCondition (Seq exprs) = getPreConditionPrefix Identity exprs
48		getPreCondition (Constraint (Lookahead _)) = Identity
49		getPreCondition (Constraint c) = c
	53	getPreCondition (Constraint c) = if containsLookahead c then Identity else c
50	54	getPreCondition _ = Identity
51	55
52	56	getPreConditionPrefix c [] = c
53	57	getPreConditionPrefix c (Seq subseq:exprs) = getPreConditionPrefix c (subseq ++ exprs)
54		getPreConditionPrefix c (Constraint (Lookahead _):exprs) = getPreConditionPrefix c exprs
55		getPreConditionPrefix c (Constraint c':exprs) = getPreConditionPrefix (both c c') exprs
	58	getPreConditionPrefix c (Constraint c':exprs) =
	59	let
	60	c'' = if containsLookahead c' then c else (both c c')
	61	in
	62	getPreConditionPrefix c'' exprs
56	63	getPreConditionPrefix c _ = c
57	64
58	65	getApplicableChoices state choices =