Commit 204075b785104126fbc8093c6bed46085debfe00 - Fountain

+3

-3

doc/Tests-for-fountain.md less more

22	22	Multi-character terminals.
23	23
24	24	Goal ::= "foo" "bar";
25		===> Grammar [("Goal",[],Alt [Seq [Seq [Terminal 'f',Terminal 'o',Terminal 'o'],Seq [Terminal 'b',Terminal 'a',Terminal 'r']]])]
	25	===> Grammar [("Goal",[],Alt [Seq [Terminal 'f',Terminal 'o',Terminal 'o',Terminal 'b',Terminal 'a',Terminal 'r']])]
26	26
27	27	Alternation and recursion.
28	28

47	47
48	48	Goal ::= "Hi" Sp<a> "there" Sp<b> "world" "!";
49	49	Sp<n> ::= <. n = 0 .> { " " <. n += 1 .> } <. n > 0 .>;
50		===> Grammar [("Goal",[],Alt [Seq [Seq [Terminal 'H',Terminal 'i'],NonTerminal "Sp" [Var "a"],Seq [Terminal 't',Terminal 'h',Terminal 'e',Terminal 'r',Terminal 'e'],NonTerminal "Sp" [Var "b"],Seq [Terminal 'w',Terminal 'o',Terminal 'r',Terminal 'l',Terminal 'd'],Terminal '!']]),("Sp",[Var "n"],Alt [Seq [Constraint (UnifyConst (Var "n") 0),Loop (Alt [Seq [Terminal ' ',Constraint (Inc (Var "n") (CInt 1))]]) [],Constraint (GreaterThan (Var "n") (CInt 0))]])]
	50	===> Grammar [("Goal",[],Alt [Seq [Terminal 'H',Terminal 'i',NonTerminal "Sp" [Var "a"],Terminal 't',Terminal 'h',Terminal 'e',Terminal 'r',Terminal 'e',NonTerminal "Sp" [Var "b"],Terminal 'w',Terminal 'o',Terminal 'r',Terminal 'l',Terminal 'd',Terminal '!']]),("Sp",[Var "n"],Alt [Seq [Constraint (UnifyConst (Var "n") 0),Loop (Alt [Seq [Terminal ' ',Constraint (Inc (Var "n") (CInt 1))]]) [],Constraint (GreaterThan (Var "n") (CInt 0))]])]
51	51
52	52	Comments.
53	53

61	61	//
62	62	// There are many ways to place comments.
63	63	"//";
64		===> Grammar [("Goal",[],Alt [Seq [Seq [Terminal 'f',Terminal 'o',Terminal 'o']]]),("A",[],Alt [Seq [Terminal 'f',Terminal 'o',Seq [Terminal '/',Terminal '/']]])]
	64	===> Grammar [("Goal",[],Alt [Seq [Terminal 'f',Terminal 'o',Terminal 'o']]),("A",[],Alt [Seq [Terminal 'f',Terminal 'o',Terminal '/',Terminal '/']])]
65	65
66	66	Misplaced semicolon is a syntax error.
67	67

+9

-1

src/Language/Fountain/Loader.hs less more

34	34
35	35	expr1 = do
36	36	es <- many1 term
37		return $ Seq es
	37	return $ Seq $ flattenseq es
	38
	39	flattenseq [] = []
	40	flattenseq (s:ss) = case s of
	41	-- Not just flatten Seq but also remove 1-element Alt's.
	42	-- Note that xs will always be flat already
	43	Seq xs -> xs ++ (flattenseq ss)
	44	Alt [x] -> (flattenseq [x]) ++ (flattenseq ss)
	45	_ -> (s:flattenseq ss)
38	46
39	47	term = (try parenExpr) <\|> (try loopExpr) <\|> (try constraintExpr) <\|> (try terminal) <\|> nonterminal
40	48

+1

-1

src/Language/Fountain/Preprocessor.hs less more

23	23	(Loop expr' constraints):(preprocessSeq rest')
24	24	preprocessSeq (expr:rest) =
25	25	(preprocessExpr expr):(preprocessSeq rest)
26		preprocessExpr (Alt [expr]) = Seq [preprocessExpr expr]
	26	preprocessExpr (Alt [expr]) = Seq [preprocessExpr expr] -- FIXME: flatten Alts in a more thorough way
27	27	preprocessExpr (Alt exprs) = Alt (map preprocessExpr exprs)
28	28	preprocessExpr (Loop expr _) = error "Cannot preprocess Loop that is not in Seq"
29	29	preprocessExpr other = other