Commit 851331804a86902188538064156b5c15f7a040c1 - Fountain

+1

-1

README.md less more

87	87
88	88	So our "space" production looks something like:
89	89
90		Space ::= <. local n = 0 .> { " " <. n += 1 .> } <. n > 0 .>
	90	Space ::= local n: <. n = 0 .> { " " <. n += 1 .> } <. n > 0 .>
91	91
92	92	### Implementation
93	93

+1

-1

doc/Definition-of-Fountain.md less more

15	15	grammar describe the concrete structure of tokens.
16	16
17	17	Grammar ::= {Production}.
18		Production ::= NonTerminal "::=" {Expr0}.
	18	Production ::= NonTerminal "::=" {"local" Variable ":"} {Expr0}.
19	19	Expr0 ::= Expr1 {"\|" Expr1}.
20	20	Expr1 ::= Term {Term}.
21	21	Term ::= "{" Expr0 "}"

+9

-9

doc/Tests-for-fountain.md less more

17	17	Sequence.
18	18
19	19	Goal ::= "f" "o" "o";
20		===> Grammar [("Goal",Alt [Seq [Terminal 'f',Terminal 'o',Terminal 'o']])]
	20	===> Grammar [("Goal",[],Alt [Seq [Terminal 'f',Terminal 'o',Terminal 'o']])]
21	21
22	22	Multi-character terminal.
23	23
24	24	Goal ::= "foo";
25		===> Grammar [("Goal",Alt [Seq [Seq [Terminal 'f',Terminal 'o',Terminal 'o']]])]
	25	===> Grammar [("Goal",[],Alt [Seq [Seq [Terminal 'f',Terminal 'o',Terminal 'o']]])]
26	26
27	27	Alternation and recursion.
28	28
29	29	Goal ::= "(" Goal ")" \| "0";
30		===> Grammar [("Goal",Alt [Seq [Terminal '(',NonTerminal "Goal",Terminal ')'],Seq [Terminal '0']])]
	30	===> Grammar [("Goal",[],Alt [Seq [Terminal '(',NonTerminal "Goal",Terminal ')'],Seq [Terminal '0']])]
31	31
32	32	Repetition.
33	33
34	34	Goal ::= "(" {"0"} ")";
35		===> Grammar [("Goal",Alt [Seq [Terminal '(',Loop (Alt [Seq [Terminal '0']]) [],Terminal ')']])]
	35	===> Grammar [("Goal",[],Alt [Seq [Terminal '(',Loop (Alt [Seq [Terminal '0']]) [],Terminal ')']])]
36	36
37	37	Constraints.
38	38

41	41	<. b = 0 .> { "b" <. b += 1 .> } <. b = n .>
42	42	<. c = 0 .> { "c" <. c += 1 .> } <. c = n .>
43	43	;
44		===> Grammar [("Goal",Alt [Seq [Constraint (Arb (Var "n")),Constraint (UnifyConst (Var "a") 0),Loop (Alt [Seq [Terminal 'a',Constraint (Inc (Var "a") 1)]]) [],Constraint (UnifyVar (Var "a") (Var "n")),Constraint (UnifyConst (Var "b") 0),Loop (Alt [Seq [Terminal 'b',Constraint (Inc (Var "b") 1)]]) [],Constraint (UnifyVar (Var "b") (Var "n")),Constraint (UnifyConst (Var "c") 0),Loop (Alt [Seq [Terminal 'c',Constraint (Inc (Var "c") 1)]]) [],Constraint (UnifyVar (Var "c") (Var "n"))]])]
	44	===> Grammar [("Goal",[],Alt [Seq [Constraint (Arb (Var "n")),Constraint (UnifyConst (Var "a") 0),Loop (Alt [Seq [Terminal 'a',Constraint (Inc (Var "a") 1)]]) [],Constraint (UnifyVar (Var "a") (Var "n")),Constraint (UnifyConst (Var "b") 0),Loop (Alt [Seq [Terminal 'b',Constraint (Inc (Var "b") 1)]]) [],Constraint (UnifyVar (Var "b") (Var "n")),Constraint (UnifyConst (Var "c") 0),Loop (Alt [Seq [Terminal 'c',Constraint (Inc (Var "c") 1)]]) [],Constraint (UnifyVar (Var "c") (Var "n"))]])]
45	45
46	46	### Preprocessing
47	47

50	50	Sequence.
51	51
52	52	Goal ::= "f" "o" "o";
53		===> Grammar [("Goal",Alt [Seq [Terminal 'f',Terminal 'o',Terminal 'o']])]
	53	===> Grammar [("Goal",[],Alt [Seq [Terminal 'f',Terminal 'o',Terminal 'o']])]
54	54
55	55	Alternation and recursion.
56	56
57	57	Goal ::= "(" Goal ")" \| "0";
58		===> Grammar [("Goal",Alt [Seq [Terminal '(',NonTerminal "Goal",Terminal ')'],Seq [Terminal '0']])]
	58	===> Grammar [("Goal",[],Alt [Seq [Terminal '(',NonTerminal "Goal",Terminal ')'],Seq [Terminal '0']])]
59	59
60	60	Repetition.
61	61
62	62	Goal ::= "(" {"0"} ")";
63		===> Grammar [("Goal",Alt [Seq [Terminal '(',Loop (Alt [Seq [Terminal '0']]) [],Terminal ')']])]
	63	===> Grammar [("Goal",[],Alt [Seq [Terminal '(',Loop (Alt [Seq [Terminal '0']]) [],Terminal ')']])]
64	64
65	65	Goal ::= <. arb n .>
66	66	<. a = 0 .> { "a" <. a += 1 .> } <. a = n .>
67	67	<. b = 0 .> { "b" <. b += 1 .> } <. b = n .>
68	68	<. c = 0 .> { "c" <. c += 1 .> } <. c = n .>
69	69	;
70		===> Grammar [("Goal",Alt [Seq [Constraint (Arb (Var "n")),Constraint (UnifyConst (Var "a") 0),Loop (Alt [Seq [Terminal 'a',Constraint (Inc (Var "a") 1)]]) [UnifyVar (Var "a") (Var "n"),UnifyConst (Var "b") 0],Loop (Alt [Seq [Terminal 'b',Constraint (Inc (Var "b") 1)]]) [UnifyVar (Var "b") (Var "n"),UnifyConst (Var "c") 0],Loop (Alt [Seq [Terminal 'c',Constraint (Inc (Var "c") 1)]]) [UnifyVar (Var "c") (Var "n")]]])]
	70	===> Grammar [("Goal",[],Alt [Seq [Constraint (Arb (Var "n")),Constraint (UnifyConst (Var "a") 0),Loop (Alt [Seq [Terminal 'a',Constraint (Inc (Var "a") 1)]]) [UnifyVar (Var "a") (Var "n"),UnifyConst (Var "b") 0],Loop (Alt [Seq [Terminal 'b',Constraint (Inc (Var "b") 1)]]) [UnifyVar (Var "b") (Var "n"),UnifyConst (Var "c") 0],Loop (Alt [Seq [Terminal 'c',Constraint (Inc (Var "c") 1)]]) [UnifyVar (Var "c") (Var "n")]]])]

+3

-3

src/Language/Fountain/Grammar.hs less more

18	18	deriving (Show, Ord, Eq)
19	19
20	20
21		data Grammar = Grammar [(NTName, Expr)]
	21	data Grammar = Grammar [(NTName, [Variable], Expr)]
22	22	deriving (Show, Ord, Eq)
23	23
24		startSymbol (Grammar ((term, _) : _)) = term
	24	startSymbol (Grammar ((term, _, _) : _)) = term
25	25
26		production nt (Grammar ((term, expr) : rest)) =
	26	production nt (Grammar ((term, locals, expr) : rest)) =
27	27	if term == nt then expr else production nt (Grammar rest)

+8

-1

src/Language/Fountain/Loader.hs less more

13	13	prod = do
14	14	nt <- capWord
15	15	keyword "::="
	16	l <- many local
16	17	e <- expr0
17	18	keyword ";"
18		return (nt, e)
	19	return (nt, l, e)
	20
	21	local = do
	22	keyword "local"
	23	v <- variable
	24	keyword ":"
	25	return v
19	26
20	27	expr0 = do
21	28	es <- sepBy (expr1) (keyword "\|")

+1

-1

src/Language/Fountain/Preprocessor.hs less more

8	8	preprocessGrammar :: Grammar -> Grammar
9	9	preprocessGrammar (Grammar productions) =
10	10	let
11		productions' = map (\(term, expr) -> (term, preprocessExpr expr)) productions
	11	productions' = map (\(term, locals, expr) -> (term, locals, preprocessExpr expr)) productions
12	12	in
13	13	Grammar productions'
14	14