Implement a new parser for commands. (+test)

[i3/i3] / src / cmdparse.l

diff --git a/src/cmdparse.l b/src/cmdparse.l
index cbce18d4b772e44833521cf3bb61819da3cc42f3..47a4f4e0f7a6fc01bc8b2346464aa3760348a8dd 100644 (file)
--- a/src/cmdparse.l
+++ b/src/cmdparse.l
@@ -96,6 +96,7 @@ back_and_forth                  { BEGIN(INITIAL); return TOK_BACK_AND_FORTH; }
 <MOVE>container                 { /* eat this token */ }
 <MOVE>workspace                 { yy_pop_state(); yy_push_state(MOVE_WS); yy_push_state(EAT_WHITESPACE); return TOK_WORKSPACE; }
 <MOVE>scratchpad                { yy_pop_state(); return TOK_SCRATCHPAD; }
+<MOVE>output                    { yy_pop_state(); return TOK_OUTPUT; }
 <MOVE>up                        { yy_pop_state(); return TOK_UP; }
 <MOVE>down                      { yy_pop_state(); return TOK_DOWN; }
 <MOVE>left                      { yy_pop_state(); return TOK_LEFT; }
@@ -107,7 +108,7 @@ back_and_forth                  { BEGIN(INITIAL); return TOK_BACK_AND_FORTH; }
      * 'move to workspace') while we also need to support
      * 'move workspace to output <output>'. */
 <MOVE_WS>to                     { yy_pop_state(); return TOK_TO; }
-<MOVE_WS>[^to]                  { yy_pop_state(); yy_push_state(WANT_STRING); yyless(0); }
+<MOVE_WS>[^t]                   { yy_pop_state(); yy_push_state(WANT_STRING); yyless(0); }
 
 <WANT_STRING>\"[^\"]+\"         {
                                   BEGIN(INITIAL);