summaryrefslogtreecommitdiffstats
path: root/server/util_expr_parse.y
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2019-11-13 09:01:13 +0100
committerJoe Orton <jorton@apache.org>2019-11-13 09:01:13 +0100
commit11ec7b0061b1c31eaeab94b767b5d4af76a24444 (patch)
treeae9c4f796684857fbc77969daed88ef09740ed10 /server/util_expr_parse.y
parentMinor Travis doc updates and a todo list. [skip ci] (diff)
downloadapache2-11ec7b0061b1c31eaeab94b767b5d4af76a24444.tar.xz
apache2-11ec7b0061b1c31eaeab94b767b5d4af76a24444.zip
Non terminal cannot have string aliases (only tokens appear in error
messages). %token is used to define tokens, and %nterm non terminals. The hidden %type (which was only recently documented) is meant for both tokens and non terminals. Yet %type <foo> expr "expression" is actually more or less equivalent to %nterm <foo> expr %token <foo> "expression" which is clearly not the intention of the author here. * server/util_expr_parse.y: Remove useless string-literal only tokens. Prefer %nterm to %type to avoid this error. PR: #72 Submitted by: Akim Demaille <akim.demaille gmail.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869724 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/util_expr_parse.y')
-rw-r--r--server/util_expr_parse.y32
1 files changed, 16 insertions, 16 deletions
diff --git a/server/util_expr_parse.y b/server/util_expr_parse.y
index b6d586c614..e570cc0128 100644
--- a/server/util_expr_parse.y
+++ b/server/util_expr_parse.y
@@ -98,22 +98,22 @@
%right T_OP_NOT
%right T_OP_CONCAT
-%type <exVal> cond "condition"
-%type <exVal> comp "comparison"
-%type <exVal> strfunc "string function"
-%type <exVal> listfunc "list function"
-%type <exVal> list "list"
-%type <exVal> words "words"
-%type <exVal> word "word"
-%type <exVal> string "string"
-%type <exVal> substr "substring"
-%type <exVal> var "variable"
-%type <exVal> regex "match regex"
-%type <exVal> regsub "substitution regex"
-%type <exVal> regany "any regex"
-%type <exVal> split "split"
-%type <exVal> join "join"
-%type <exVal> sub "sub"
+%nterm <exVal> cond
+%nterm <exVal> comp
+%nterm <exVal> strfunc
+%nterm <exVal> listfunc
+%nterm <exVal> list
+%nterm <exVal> words
+%nterm <exVal> word
+%nterm <exVal> string
+%nterm <exVal> substr
+%nterm <exVal> var
+%nterm <exVal> regex
+%nterm <exVal> regsub
+%nterm <exVal> regany
+%nterm <exVal> split
+%nterm <exVal> join
+%nterm <exVal> sub
%{
#include "util_expr_private.h"