From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: relayd: improve token ordering and readability
To: tech@openbsd.org
Date: Sun, 2 Aug 2026 13:37:02 +0200

This pattern from httpd makes a lot more sense than before.

OK?


diff --git a/parse.y b/parse.y
index e89d40e..8245ee6 100644
--- a/parse.y
+++ b/parse.y
@@ -172,18 +172,30 @@ typedef struct {
 
 %}
 
-%token	AGENTX APPEND BACKLOG BACKUP BINARY BUFFER CA CACHE SET CHECK CIPHERS
-%token	CODE COOKIE DEMOTE DIGEST DISABLE ERROR EXPECT PASS BLOCK EXTERNAL
-%token	FILENAME FORWARD FROM HASH HEADER HEADERLEN HOST HTTP ICMP INCLUDE INET
-%token	INET6 INTERFACE INTERVAL IP KEYPAIR LABEL LISTEN VALUE LOADBALANCE LOG
-%token	LOOKUP METHOD MODE NAT NO DESTINATION NODELAY NOTHING OCSP ON PARENT
-%token	PATH PFTAG PORT PREFORK PRIORITY PROTO QUERYSTR REAL REDIRECT RELAY
-%token	REMOVE REQUEST RESPONSE RETRY QUICK RETURN ROUNDROBIN ROUTE SACK SCRIPT
-%token	SEND SESSION SOCKET SPLICE STICKYADDR STRIP STYLE TABLE TAG TAGGED TCP
-%token	TIMEOUT TLS TO ROUTER RTLABEL TRANSPARENT URL WITH TTL RTABLE
-%token	MATCH PARAMS RANDOM LEASTSTATES SRCHASH KEY CERTIFICATE PASSWORD ECDHE
-%token	EDH TICKETS CONNECTION CONNECTIONS CONTEXT ERRORS STATE CHANGES CHECKS
-%token	WEBSOCKETS PFLOG CLIENT PROXYPROTO V1 V2
+%token	AGENTX APPEND
+%token	BACKLOG BACKUP BINARY BLOCK BUFFER
+%token	CA CACHE CERTIFICATE CHANGES CHECK CHECKS CIPHERS CLIENT CODE CONNECTION
+%token	CONNECTIONS CONTEXT COOKIE
+%token	DEMOTE DESTINATION DIGEST DISABLE
+%token	ECDHE EDH ERROR ERRORS EXPECT EXTERNAL
+%token	FILENAME FORWARD FROM
+%token	HASH HEADER HEADERLEN HOST HTTP
+%token	ICMP INCLUDE INET INET6 INTERFACE INTERVAL IP
+%token	KEY KEYPAIR
+%token	LABEL LEASTSTATES LISTEN LOADBALANCE LOG LOOKUP
+%token	MATCH METHOD MODE NAT NO NODELAY NOTHING
+%token	OCSP ON
+%token	PARAMS PARENT PASS PASSWORD PATH PFLOG PFTAG PORT PREFORK PRIORITY
+%token	PROTO PROXYPROTO
+%token	QUERYSTR QUICK
+%token	RANDOM REAL REDIRECT RELAY REMOVE REQUEST RESPONSE RETRY RETURN
+%token	ROUNDROBIN ROUTE ROUTER RTABLE RTLABEL
+%token	SACK SCRIPT SEND SESSION SET SOCKET SPLICE SRCHASH STATE STICKYADDR
+%token	STRIP STYLE
+%token	TABLE TAG TAGGED TCP TICKETS TIMEOUT TLS TO TRANSPARENT TTL
+%token	URL
+%token	V1 V2 VALUE
+%token	WEBSOCKETS WITH
 %token	<v.string>	STRING
 %token  <v.number>	NUMBER
 %type	<v.string>	context hostname interface table value path