Commit 10154e95861c4fc8da6c57cbec24194b9f605f5c - Fountain

`--fuel-factor` requires that `--convert-loops` has also been given. Chris Pressey 4 months ago

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

-0

HISTORY.md less more

32	32	of storage, this limits Fountain to simulating a Linear Bounded Automaton
33	33	(LBA), which is the known bounds for parsing Context-Sensitive Languages
34	34	(CSLs).
	35
	36	`--fuel-factor` may only be specified when `--convert-loops` is also
	37	specified.
35	38
36	39	Also moved project history to its own `HISTORY.md` file.
37	40

-2

src/Main.hs less more

60	60	args <- getArgs
61	61	let (flags, args') = parseFlags defaultFlags args
62	62	let output = if (suppressNewline flags) then putStr else putStrLn
	63	fuel <- case (convertLoops flags, fuelFactor flags) of
	64	(False, Just _) -> do
	65	putStrLn "Error: --fuel-factor cannot be specified without --convert-loops"
	66	usage
	67	(_, _) -> do
	68	return Fuel.FuelState{
	69	Fuel.currentFuel=(initialFuel flags),
	70	Fuel.fuelFactor=(fuelFactor flags)
	71	}
63	72	case args' of
64	73	["version"] -> do
65	74	putStrLn "fountain 0.7"

77	86	let grammar' = Preprocessor.preprocessGrammarForParsing grammar (convertLoops flags)
78	87	text <- loadText textFileName
79	88	let start = getStartSymbol grammar' flags
80		let fuel = Fuel.FuelState{ Fuel.currentFuel=(initialFuel flags), Fuel.fuelFactor=(fuelFactor flags) }
81	89	let initialState = Parser.constructState grammar' start text initialParams fuel
82	90	let finalState = Parser.parseFrom grammar' start initialState
83	91	output $ if (dumpState flags) then show finalState else formatParseResult $ Parser.obtainResult finalState

86	94	grammar <- loadSource grammarFileName
87	95	let grammar' = Preprocessor.preprocessGrammarForGeneration grammar (convertLoops flags)
88	96	let start = getStartSymbol grammar' flags
89		let fuel = Fuel.FuelState{ Fuel.currentFuel=(initialFuel flags), Fuel.fuelFactor=(fuelFactor flags) }
90	97	let initialState = Generator.constructState grammar' start (seed flags) initialParams fuel
91	98	let finalState = Generator.generateFrom grammar' start initialState
92	99	output $ if (dumpState flags) then show finalState else formatGenerateResult $ Generator.obtainResult finalState

-9

test.sh less more

23	23
24	24	# Fuel factor 0 won't ever be enough to sustain anything.
25	25
26		echo -n "((*))" \| $FOUNTAIN --dump-state --initial-fuel 0 --fuel-factor 0 parse eg/nested-parens.fountain -- n=2 \| \
	26	echo -n "((*))" \| $FOUNTAIN --dump-state --convert-loops --initial-fuel 0 --fuel-factor 0 parse eg/nested-parens.fountain -- n=2 \| \
27	27	expect 'Left "Out of fuel"'
28	28
29	29	# But if you have enough fuel initially, it doesn't have to be sustainable.
30	30
31		echo -n "((*))" \| $FOUNTAIN --dump-state --initial-fuel 4 --fuel-factor 0 parse eg/nested-parens.fountain -- n=2 \| \
	31	echo -n "((*))" \| $FOUNTAIN --dump-state --convert-loops --initial-fuel 4 --fuel-factor 0 parse eg/nested-parens.fountain -- n=2 \| \
32	32	expect 'Right (Parsing {input = "", store = fromList [(Var "a",2),(Var "n",2)], fuel = FuelState {currentFuel = 1, fuelFactor = Just 0}})'
33	33
34	34	# Fuel factor 1 is sufficient for this parsing problem.
35	35
36		echo -n "((*))" \| $FOUNTAIN --dump-state --initial-fuel 1 --fuel-factor 1 parse eg/nested-parens.fountain -- n=2 \| \
	36	echo -n "((*))" \| $FOUNTAIN --dump-state --convert-loops --initial-fuel 1 --fuel-factor 1 parse eg/nested-parens.fountain -- n=2 \| \
37	37	expect 'Right (Parsing {input = "", store = fromList [(Var "a",2),(Var "n",2)], fuel = FuelState {currentFuel = 3, fuelFactor = Just 1}})'
38	38
39	39	# If you can do something with fuel factor 1, you can do it with fuel factor 2 as well.
40	40
41		echo -n "((*))" \| $FOUNTAIN --dump-state --initial-fuel 1 --fuel-factor 2 parse eg/nested-parens.fountain -- n=2 \| \
	41	echo -n "((*))" \| $FOUNTAIN --dump-state --convert-loops --initial-fuel 1 --fuel-factor 2 parse eg/nested-parens.fountain -- n=2 \| \
42	42	expect 'Right (Parsing {input = "", store = fromList [(Var "a",2),(Var "n",2)], fuel = FuelState {currentFuel = 8, fuelFactor = Just 2}})'
43	43
44	44	### Fuel Consumption During Generation ###
45	45
46	46	# Given enough fuel, it does generate.
47	47
48		$FOUNTAIN --fuel-factor 1 --initial-fuel 4 generate eg/nested-parens.fountain n=3 \| \
	48	$FOUNTAIN --convert-loops --fuel-factor 1 --initial-fuel 4 generate eg/nested-parens.fountain n=3 \| \
49	49	expect '(((*)))'
50	50
51	51	# It does need some initial fuel.
52	52
53		$FOUNTAIN --fuel-factor 1 --initial-fuel 0 generate eg/nested-parens.fountain n=3 \| \
	53	$FOUNTAIN --convert-loops --fuel-factor 1 --initial-fuel 0 generate eg/nested-parens.fountain n=3 \| \
54	54	expect 'Failure'
55	55
56	56	# Fuel gain, and usage, is proportional to the given n in this case.
57	57
58		$FOUNTAIN --fuel-factor 1 --initial-fuel 4 generate eg/nested-parens.fountain n=10 \| \
	58	$FOUNTAIN --convert-loops --fuel-factor 1 --initial-fuel 4 generate eg/nested-parens.fountain n=10 \| \
59	59	expect '((((((((((*))))))))))'
60	60
61	61	# If fuel factor is 0 it is reliant on the initial fuel.
62	62
63		$FOUNTAIN --fuel-factor 0 --initial-fuel 4 generate eg/nested-parens.fountain n=10 \| \
	63	$FOUNTAIN --convert-loops --fuel-factor 0 --initial-fuel 4 generate eg/nested-parens.fountain n=10 \| \
64	64	expect 'Failure'
65	65
66		$FOUNTAIN --fuel-factor 0 --initial-fuel 15 generate eg/nested-parens.fountain n=10 \| \
	66	$FOUNTAIN --convert-loops --fuel-factor 0 --initial-fuel 15 generate eg/nested-parens.fountain n=10 \| \
67	67	expect '((((((((((*))))))))))'