summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/Makefile
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2019-05-23 11:13:31 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2019-05-23 11:13:31 +0000
commit2a2a83c81e87824ba8fdfa6901f5c019f8c32f40 (patch)
tree9caaf05285ba4094c738d4f1f606ac856aa87627 /usr.bin/tmux/Makefile
parent02d7cdabeada967676d838229434389f5dbec087 (diff)
Replace the split parser code (cfg.c and cmd-string.c) with a single
parser using yacc(1). This is a major change but is clearer and simpler and allows some edge cases to be made more consistent, as well as tidying up how aliases are handled. It will also allow some further improvements later. Entirely the same parser is now used for parsing the configuration file and for string commands. This means that constructs previously only available in .tmux.conf, such as %if, can now be used in string commands (for example, those given to if-shell - not commands invoked from the shell, they are still parsed by the shell itself). The only syntax change I am aware of is that #{} outside quotes or a comment is now considered a format and not a comment, so #{ is now a syntax error (notably, if it is at the start of a line). This also adds two new sections to the man page documenting the syntax and outlining how parsing and command execution works. Thanks to everyone who sent me test configs (they still all parse without errors - but this doesn't mean they still work as intended!). Thanks to Avi Halachmi for testing and man page improvements, also to jmc@ for reviewing the man page changes.
Diffstat (limited to 'usr.bin/tmux/Makefile')
-rw-r--r--usr.bin/tmux/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/Makefile b/usr.bin/tmux/Makefile
index 4f93457924e..136c10e6a89 100644
--- a/usr.bin/tmux/Makefile
+++ b/usr.bin/tmux/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.96 2019/05/10 18:04:06 nicm Exp $
+# $OpenBSD: Makefile,v 1.97 2019/05/23 11:13:30 nicm Exp $
PROG= tmux
SRCS= alerts.c \
@@ -38,6 +38,7 @@ SRCS= alerts.c \
cmd-move-window.c \
cmd-new-session.c \
cmd-new-window.c \
+ cmd-parse.y \
cmd-paste-buffer.c \
cmd-pipe-pane.c \
cmd-queue.c \
@@ -63,7 +64,6 @@ SRCS= alerts.c \
cmd-show-options.c \
cmd-source-file.c \
cmd-split-window.c \
- cmd-string.c \
cmd-swap-pane.c \
cmd-swap-window.c \
cmd-switch-client.c \