Skip to content

Repeat - Fix multiple patterns with one name #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Repeat - Fix multiple patterns with one name #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3029,12 +3029,12 @@ chkNoDupeDotInParserDefs(ln_ctx ctx, struct json_object *parsers)
if(json_object_get_type(parsers) == json_type_array) {
const int maxparsers = json_object_array_length(parsers);
for(int i = 0 ; i < maxparsers ; ++i) {
++nParsers;
struct json_object *const parser
= json_object_array_get_idx(parsers, i);
struct json_object *fname;
json_object_object_get_ex(parser, "name", &fname);
if(fname != NULL) {
++nParsers;
if(!strcmp(json_object_get_string(fname), "."))
++nDots;
}
Expand Down
23 changes: 23 additions & 0 deletions tests/repeat_name_dot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash
# added 2023-02-14 by Kevin Guillemot
# This file is part of the liblognorm project, released under ASL 2.0

. $srcdir/exec.sh

test_def $0 "Repeat with one parser named dot"
add_rule 'version=2'
add_rule 'rule=:a %{"name":"numbers", "type":"repeat",
"parser":[
{"type":"number"},
{"type":"literal", "text":":"},
{"name":".", "type":"number"}
],
"while":[
{"type":"literal", "text":", "}
]
}% b %w:word%
'
execute 'a 1:2, 3:4, 5:6, 7:8 b test'
assert_output_json_eq '{ "w": "test", "numbers": [ "2", "4", "6", "8" ] }'

cleanup_tmp_files