nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-02-19 00:28:05 +01:00
parent 2922603cc4 4fdf62eb2a
commit d5358a749e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
generate-command-parser.pl
View File

@ -84,14 +84,14 @@ for my $line (@lines) {
# Cleanup the identifier (if any). # Cleanup the identifier (if any).
$identifier =~ s/^\s*(\S+)\s*=\s*$/$1/g; $identifier =~ s/^\s*(\S+)\s*=\s*$/$1/g;
# Cleanup the tokens (remove whitespace).
$tokens =~ s/\s*//g;
# The default action is to stay in the current state. # The default action is to stay in the current state.
$action = $current_state if length($action) == 0; $action = $current_state if length($action) == 0;
#say "identifier = *$identifier*, token = *$tokens*, action = *$action*"; #say "identifier = *$identifier*, token = *$tokens*, action = *$action*";
for my $token (split(',', $tokens)) { for my $token (split(',', $tokens)) {
# Cleanup trailing/leading whitespace.
$token =~ s/^\s*//g;
$token =~ s/\s*$//g;
my $store_token = { my $store_token = {
token => $token, token => $token,
identifier => $identifier, identifier => $identifier,

2
parser-specs/commands.spec
View File

@ -262,7 +262,7 @@ state MOVE_DIRECTION_PX:
-> call cmd_move_direction($direction, $pixels) -> call cmd_move_direction($direction, $pixels)
state MOVE_WORKSPACE: state MOVE_WORKSPACE:
'to' 'to '
-> MOVE_WORKSPACE_TO_OUTPUT -> MOVE_WORKSPACE_TO_OUTPUT
workspace = 'next_on_output', 'prev_on_output', 'next', 'prev', 'current' workspace = 'next_on_output', 'prev_on_output', 'next', 'prev', 'current'
-> call cmd_move_con_to_workspace($workspace) -> call cmd_move_con_to_workspace($workspace)

4
testcases/t/187-commands-parser.t
View File

@ -52,6 +52,8 @@ is(parser_calls(
'move window to workspace 3; ' . 'move window to workspace 3; ' .
'move container to workspace 3; ' . 'move container to workspace 3; ' .
'move workspace foobar; ' . 'move workspace foobar; ' .
'move workspace torrent; ' .
'move workspace to output LVDS1; ' .
'move workspace 3: foobar; ' . 'move workspace 3: foobar; ' .
'move workspace "3: foobar"; ' . 'move workspace "3: foobar"; ' .
'move workspace "3: foobar, baz"; '), 'move workspace "3: foobar, baz"; '),
@ -59,6 +61,8 @@ is(parser_calls(
"cmd_move_con_to_workspace_name(3)\n" . "cmd_move_con_to_workspace_name(3)\n" .
"cmd_move_con_to_workspace_name(3)\n" . "cmd_move_con_to_workspace_name(3)\n" .
"cmd_move_con_to_workspace_name(foobar)\n" . "cmd_move_con_to_workspace_name(foobar)\n" .
"cmd_move_con_to_workspace_name(torrent)\n" .
"cmd_move_workspace_to_output(LVDS1)\n" .
"cmd_move_con_to_workspace_name(3: foobar)\n" . "cmd_move_con_to_workspace_name(3: foobar)\n" .
"cmd_move_con_to_workspace_name(3: foobar)\n" . "cmd_move_con_to_workspace_name(3: foobar)\n" .
"cmd_move_con_to_workspace_name(3: foobar, baz)", "cmd_move_con_to_workspace_name(3: foobar, baz)",