rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: rdelaage:ebe2e54900ad3bc7a3f577b4640db08b9d997044
Branches Tags
rdelaage:master
rdelaage:nix
rdelaage:imsg-test
rdelaage:1.8
rdelaage:2.0.2
rdelaage:2.0.1
rdelaage:2.0
rdelaage:1.8.6
rdelaage:1.8.5
rdelaage:1.8.4
rdelaage:1.8.3
rdelaage:1.8.2
rdelaage:1.8.1
rdelaage:1.8
rdelaage:1.7.5
rdelaage:1.7.4
rdelaage:1.7.3
rdelaage:1.7.2
rdelaage:1.7.1
rdelaage:1.7
rdelaage:1.6.2
rdelaage:v1.6.1
rdelaage:v1.6
rdelaage:v1.5
rdelaage:1.4.1
rdelaage:1.4
rdelaage:1.3.2
rdelaage:1.3.1
rdelaage:1.3
rdelaage:1.2
rdelaage:1.1
rdelaage:1.0
...
compare: rdelaage:acf244c5167f041bb2ef5ab92d30801c887ad60c
Branches Tags
rdelaage:master
rdelaage:nix
rdelaage:imsg-test
rdelaage:1.8
rdelaage:2.0.2
rdelaage:2.0.1
rdelaage:2.0
rdelaage:1.8.6
rdelaage:1.8.5
rdelaage:1.8.4
rdelaage:1.8.3
rdelaage:1.8.2
rdelaage:1.8.1
rdelaage:1.8
rdelaage:1.7.5
rdelaage:1.7.4
rdelaage:1.7.3
rdelaage:1.7.2
rdelaage:1.7.1
rdelaage:1.7
rdelaage:1.6.2
rdelaage:v1.6.1
rdelaage:v1.6
rdelaage:v1.5
rdelaage:1.4.1
rdelaage:1.4
rdelaage:1.3.2
rdelaage:1.3.1
rdelaage:1.3
rdelaage:1.2
rdelaage:1.1
rdelaage:1.0

5 Commits
ebe2e54900 ... acf244c516

Author SHA1 Message Date
Omar Polo acf244c516 sync changelog 2024-01-30 09:39:07 +00:00
Anna “CyberTailor” 53ad458e22 contrib/vim: fix indent 2024-01-30 09:35:37 +00:00
Omar Polo bb5a25d287 rename the @common_opt macro back to @common 
now common is no longer a reserved keyword
 2024-01-30 09:31:09 +00:00
Omar Polo f862d389ff turn log styles into strings from yacc point of view 
having styles as reserved keywords means that variables / macros can't
be called `common', `condensed', etc...  which is not great and not
obvious either.

Instead, let's keep the log styles as strings and match on them.  This
also allows to have a slightly better error message in case of a typo.

See: https://codeberg.org/op/gmid/issues/1
 2024-01-30 09:30:50 +00:00
Omar Polo 574f71f7a3 remove stray space 2024-01-30 09:28:54 +00:00
4 changed files with 34 additions and 21 deletions
Show Stats Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2024-01-30 Anna “CyberTailor”
* contrib/vim/indent/gmid.vim: fix indent
2024-01-30 Omar Polo <op@omarpolo.com>
* parse.y: don't make log styles reserved keywords. Unbreaks the
example in the manpage with `common = ...'.
2024-01-26 Omar Polo <op@omarpolo.com>
* parse.y: rework grammar to allow the semicolon after
variables/macros definition and top-level options
2024-01-24 Omar Polo <op@omarpolo.com>
* configure (VERSION): release 2.0.1

2
contrib/vim/indent/gmid.vim
View File

@ -9,3 +9,5 @@ setlocal indentexpr=
setlocal cindent
" Just make sure that the comments are not reset as defs would be.
setlocal cinkeys-=0#
" And indentation works correctly without semicolons.
setlocal cinoptions=+0

35
parse.y
View File

@ -1,7 +1,7 @@
%{
/*
* Copyright (c) 2021, 2022, 2023 Omar Polo <op@omarpolo.com>
* Copyright (c) 2021-2024 Omar Polo <op@omarpolo.com>
* Copyright (c) 2018 Florian Obser <florian@openbsd.org>
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
* Copyright (c) 2004 Ryan McBride <mcbride@openbsd.org>
@ -46,7 +46,7 @@ static struct file {
TAILQ_ENTRY(file) entry;
FILE *stream;
char *name;
size_t ungetpos;
size_t ungetpos;
size_t ungetsize;
u_char *ungetbuf;
int eof_reached;
@ -125,12 +125,12 @@ typedef struct {
%token ACCESS ALIAS AUTO
%token BLOCK
%token CA CERT CHROOT CLIENT COMBINED COMMON CONDENSED
%token CA CERT CHROOT CLIENT
%token DEFAULT
%token FACILITY FASTCGI FOR_HOST
%token INCLUDE INDEX IPV6
%token KEY
%token LANG LEGACY LISTEN LOCATION LOG
%token LANG LISTEN LOCATION LOG
%token OCSP OFF ON
%token PARAM PORT PREFORK PROTO PROTOCOLS PROXY
%token RELAY_TO REQUIRE RETURN ROOT
@ -264,17 +264,18 @@ logopt : ACCESS string {
free(conf->log_access);
conf->log_access = $2;
}
| STYLE COMMON {
conf->log_format = LOG_FORMAT_COMMON;
}
| STYLE COMBINED {
conf->log_format = LOG_FORMAT_COMBINED;
}
| STYLE CONDENSED {
conf->log_format = LOG_FORMAT_CONDENSED;
}
| STYLE LEGACY {
conf->log_format = LOG_FORMAT_LEGACY;
| STYLE string {
if (!strcmp("combined", $2))
conf->log_format = LOG_FORMAT_COMBINED;
else if (!strcmp("common", $2))
conf->log_format = LOG_FORMAT_COMMON;
else if (!strcmp("condensed", $2))
conf->log_format = LOG_FORMAT_CONDENSED;
else if (!strcmp("legacy", $2))
conf->log_format = LOG_FORMAT_LEGACY;
else
yyerror("unknown log style: %s", $2);
free($2);
}
| SYSLOG FACILITY string {
const char *str = $3;
@ -654,9 +655,6 @@ static const struct keyword {
{"cert", CERT},
{"chroot", CHROOT},
{"client", CLIENT},
{"combined", COMBINED},
{"common", COMMON},
{"condensed", CONDENSED},
{"default", DEFAULT},
{"facility", FACILITY},
{"fastcgi", FASTCGI},
@ -666,7 +664,6 @@ static const struct keyword {
{"ipv6", IPV6},
{"key", KEY},
{"lang", LANG},
{"legacy", LEGACY},
{"listen", LISTEN},
{"location", LOCATION},
{"log", LOG},

4
regress/tests.sh
View File

@ -287,7 +287,7 @@ test_fastcgi_deprecated_syntax() {
test_macro_expansion() {
cat <<EOF > reg.conf
pwd = "$PWD"
common_opts = "lang it; auto index on"
common = "lang it; auto index on"
server "localhost" {
# the quoting of \$ is for sh
@ -295,7 +295,7 @@ server "localhost" {
key \$pwd "/localhost.key"
root \$pwd "/testdata"
listen on $REGRESS_HOST port $port
@common_opts
@common
}
EOF