Commit f26d5626e7da9f7813bd1348ad95082f41fc1508 - Decoy

Refactor parser. Toplevels are seperate. Chris Pressey 1 year, 4 months ago

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

-2

eg/fold.scm less more

0		(import-from "stdenv" (+))
	0	(import-from "stdenv" (+ list))
1	1	(import-from "list" (fold))
2		(fold (lambda (x acc) (+ x acc)) 0 (quote (4 16 1)))
	2	(fold (lambda (x acc) (+ x acc)) 0 (list 4 16 1))

+42

-25

src/decoy_parser.lua less more

10	10
11	11	local Parser = {}
12	12
13		function Parser:parse_exprs()
	13	function Parser:parse_sexps()
14	14	local es = {}
15	15	local e
16		while not self.scanner:is_eof() and self.scanner:get_token_text() ~= ")" do
17		e = self:parse_expr()
	16	while (not self.scanner:is_eof()) and self.scanner:get_token_text() ~= ")" do
	17	e = self:parse_sexp()
18	18	table.insert(es, e)
19	19	end
20	20	return es
21	21	end
22	22
23		function Parser:parse_expr()
	23	function Parser:parse_sexp()
24	24	local e
25	25	local scanner = self.scanner
26	26	if scanner:consume("(") then
27		if self.parse_special_forms then
28		if scanner:consume("define") then
29		assert(scanner:get_token_type() == "symbol")
30		local name = scanner:get_token_text()
31		scanner:consume_type("symbol")
32		local defn = self:parse_expr()
33		scanner:expect(")")
34		e = ast.new_Define(name, defn)
35		--elseif scanner:consume("import-from") then
36		-- error("You said *import-from")
37		-- scanner:expect(")")
38		else
39		local es = self:parse_exprs()
40		scanner:expect(")")
41		e = Cons.table_to_list(es)
42		end
43		else
44		local es = self:parse_exprs()
45		scanner:expect(")")
46		e = Cons.table_to_list(es)
47		end
	27	local es = self:parse_sexps()
	28	scanner:expect(")")
	29	e = Cons.table_to_list(es)
48	30	elseif scanner:get_token_type() == "symbol" then
49	31	e = Symbol.new(scanner:get_token_text())
50	32	scanner:scan()

55	37	local value = tonumber(scanner:get_token_text())
56	38	e = Number.new(value)
57	39	scanner:scan()
	40	else
	41	error("what is this I don't even: " .. scanner:get_token_text())
	42	end
	43	return e
	44	end
	45
	46	function Parser:parse_toplevels()
	47	local es = {}
	48	local e
	49	while not self.scanner:is_eof() do
	50	e = self:parse_toplevel()
	51	table.insert(es, e)
	52	end
	53	return es
	54	end
	55
	56	function Parser:parse_toplevel()
	57	local e
	58	local scanner = self.scanner
	59	if scanner:consume("(") then
	60	if scanner:consume("define") then
	61	assert(scanner:get_token_type() == "symbol")
	62	local name = scanner:get_token_text()
	63	scanner:consume_type("symbol")
	64	local defn = self:parse_sexp()
	65	scanner:expect(")")
	66	e = ast.new_Define(name, defn)
	67	--elseif scanner:consume("import-from") then
	68	-- error("You said *import-from")
	69	-- scanner:expect(")")
	70	else
	71	local es = self:parse_sexps()
	72	scanner:expect(")")
	73	e = Cons.table_to_list(es)
	74	end
58	75	else
59	76	error("what is this I don't even: " .. scanner:get_token_text())
60	77	end

-1

src/decoy_registry.lua less more

86	86	local env = self.preload_env
87	87
88	88	local parser = Parser.new(program_text)
89		local exprs = parser:parse_exprs()
	89	-- local exprs = parser:parse_toplevels()
	90	local exprs = parser:parse_sexps()
90	91	for j, expr in ipairs(exprs) do
91	92	env = process_toplevel(self, expr, env, module, expr_processor)
92	93	end

-8

src/test_decoy.lua less more

16	16
17	17	local Parser = require "decoy_parser"
18	18
19		local p, j, expr
	19	local p, j, sexp
20	20
21	21	p = Parser.new("(meow woof)")
22		expr = p:parse_expr()
23		print(depict(expr))
	22	sexp = p:parse_sexp()
	23	print(depict(sexp))
24	24
25	25	p = Parser.new("(a ())")
26		expr = p:parse_expr()
27		print(depict(expr))
28		print(render(expr))
	26	sexp = p:parse_sexp()
	27	print(depict(sexp))
	28	print(render(sexp))
29	29	print(Cons.table_to_list({}))
30	30
31	31	p = Parser.new([[

49	49	(define update (lambda (key fn map)
50	50	(set key (fn (get key map)) map)))
51	51	]])
52		local result = p:parse_exprs()
	52	local result = p:parse_sexps()
53	53	for j, expr in ipairs(result) do
54	54	print(depict(expr))
55	55	end

60	60
61	61	function run(s)
62	62	local p = Parser.new(s)
63		local expr = p:parse_expr()
	63	local expr = p:parse_sexp()
64	64	print("???", depict(expr))
65	65	local desugarer = Desugarer.new()
66	66	expr = desugarer:desugar_expr(expr)