mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Fix gsub, add gsub/3 (fix #782)

Browse Source
This commit is contained in:
Nicolas Williams
2015-05-18 23:02:11 -05:00
parent cf1306f469
commit cbdaeb4062
3 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
builtin.c
View File

@@ -1354,24 +1354,33 @@ static const char* const jq_builtins[] = {
" | $in[0:$r.offset] + s + $in[$r.offset+$r.length:]" " | $in[0:$r.offset] + s + $in[$r.offset+$r.length:]"
" end ;", " end ;",
// //
// If s contains capture variables, then create a capture object and pipe it to s
"def sub($re; s; flags):"
" def subg: explode | select(. != 103) | implode;"
// # "fla" should be flags with all occurrences of g removed; gs should be non-nil if flags has a g
" def sub1(fla; gs):"
" def mysub:"
" . as $in"
" | [match($re; fla)]"
" | if length == 0 then $in"
" else .[0] as $edit"
" | ($edit | .offset + .length) as $len"
// # create the "capture" object:
" | reduce ( $edit | .captures | .[] | select(.name != null) | { (.name) : .string } ) as $pair"
" ({}; . + $pair)"
" | $in[0:$edit.offset]"
" + s"
" + ($in[$len:] | if gs then mysub else . end)"
" end ;"
" mysub ;"
" (flags | index(\"g\")) as $gs"
" | (flags | if $gs then subg else . end) as $fla"
" | sub1($fla; $gs);",
//
"def sub($re; s): sub($re; s; \"\");",
// repeated substitution of re (which may contain named captures) // repeated substitution of re (which may contain named captures)
"def gsub($re; s; flags):" "def gsub($re; s; flags): sub($re; s; flags + \"g\");",
// # _stredit(edits;s) - s is the \"to\" string, which might contain capture variables, "def gsub($re; s): sub($re; s; \"g\");",
// # so if an edit contains captures, then create the capture object and pipe it to s
" def _stredit(edits; s):"
" if (edits|length) == 0 then ."
" else . as $in"
" | (edits|length -1) as $l"
" | (edits[$l]) as $edit"
// # create the \"capture\" object:
" | ($edit | reduce ( $edit | .captures | .[] | select(.name != null) | { (.name) : .string } ) as $pair"
" ({}; . + $pair) )"
" | if . == {} then $in | .[0:$edit.offset]+s+.[$edit.offset+$edit.length:] | _stredit(edits[0:$l]; s)"
" else (if $l == 0 then \"\" else ($in | _stredit(edits[0:$l]; s)) end) + (. | s)"
" end"
" end ;"
" [match($re; flags + \"g\")] as $edits | _stredit($edits; s) ;",
"def gsub($re; s): gsub($re; s; \"\");",
//####################################################################### //#######################################################################
// range/3, with a `by` expression argument // range/3, with a `by` expression argument

2
docs/content/3.manual/manual.yml
View File

@@ -2045,7 +2045,7 @@ sections:
output: '"ZabcZabc"' output: '"ZabcZabc"'
- title: "`gsub(regex; string)`" - title: "`gsub(regex; string)`, `gsub(regex; string; flags)`"
body: | body: |
`gsub` is like `sub` but all the non-overlapping occurrences of the regex are `gsub` is like `sub` but all the non-overlapping occurrences of the regex are

4
tests/all.test
View File

@@ -892,6 +892,10 @@ sub("^(?<head>.)"; "Head=\(.head) Tail=")
["a,b, c, d, e,f",", a,b, c, d, e,f, "] ["a,b, c, d, e,f",", a,b, c, d, e,f, "]
["a,b:c:d:e,f",":a,b:c:d:e,f:"] ["a,b:c:d:e,f",":a,b:c:d:e,f:"]
gsub("(?<d>\\d)"; ":\(.d);")
"a1b2"
"a:1;b:2;"
[.[] | scan(", ")] [.[] | scan(", ")]
["a,b, c, d, e,f",", a,b, c, d, e,f, "] ["a,b, c, d, e,f",", a,b, c, d, e,f, "]
[", ",", ",", ",", ",", ",", ",", ",", "] [", ",", ",", ",", ",", ",", ",", ",", "]