koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config parser: recover after invalid input

Browse Source 
This is done by ignoring the rest of the current line and jumping to the
nearest <error> token.

fixes #879
This commit is contained in:
Michael Stapelberg
2012-11-20 17:09:03 +01:00
parent 6148136e7c
commit 3cb909fa62
5 changed files with 100 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
testcases/t/201-config-parser.t
View File

@ -362,6 +362,47 @@ is(parser_calls($config),
$expected,
'colors ok');
################################################################################
# Verify that errors don’t harm subsequent valid statements
################################################################################
$config = <<'EOT';
hide_edge_border both
client.focused #4c7899 #285577 #ffffff #2e9ef4
EOT
$expected = <<'EOT';
ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'bindsym', 'bindcode', 'bind', 'bar', 'font', 'mode', 'floating_minimum_size', 'floating_maximum_size', 'floating_modifier', 'default_orientation', 'workspace_layout', 'new_window', 'new_float', 'hide_edge_borders', 'for_window', 'assign', 'focus_follows_mouse', 'force_focus_wrapping', 'force_xinerama', 'force-xinerama', 'workspace_auto_back_and_forth', 'fake_outputs', 'fake-outputs', 'force_display_urgency_hint', 'workspace', 'ipc_socket', 'ipc-socket', 'restart_state', 'popup_during_fullscreen', 'exec_always', 'exec', 'client.background', 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent'
ERROR: CONFIG: (in file <stdin>)
ERROR: CONFIG: Line 1: hide_edge_border both
ERROR: CONFIG: ^^^^^^^^^^^^^^^^^^^^^
ERROR: CONFIG: Line 2: client.focused #4c7899 #285577 #ffffff #2e9ef4
cfg_color(client.focused, #4c7899, #285577, #ffffff, #2e9ef4)
EOT
is(parser_calls($config),
$expected,
'errors dont harm subsequent statements');
$config = <<'EOT';
hide_edge_borders FOOBAR
client.focused #4c7899 #285577 #ffffff #2e9ef4
EOT
$expected = <<'EOT';
ERROR: CONFIG: Expected one of these tokens: 'none', 'vertical', 'horizontal', 'both', '1', 'yes', 'true', 'on', 'enable', 'active'
ERROR: CONFIG: (in file <stdin>)
ERROR: CONFIG: Line 1: hide_edge_borders FOOBAR
ERROR: CONFIG: ^^^^^^
ERROR: CONFIG: Line 2: client.focused #4c7899 #285577 #ffffff #2e9ef4
cfg_color(client.focused, #4c7899, #285577, #ffffff, #2e9ef4)
EOT
is(parser_calls($config),
$expected,
'errors dont harm subsequent statements');
################################################################################
# Error message with 2+2 lines of context
################################################################################
@ -524,6 +565,7 @@ ERROR: CONFIG: Line 2: output LVDS-1
ERROR: CONFIG: Line 3: unknown qux
ERROR: CONFIG: ^^^^^^^^^^^
ERROR: CONFIG: Line 4: }
cfg_bar_finish()
EOT
is(parser_calls($config),