wader/fq
1
1
Fork 0
mirror of https://github.com/wader/fq.git synced 2024-12-24 13:52:02 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #53 from wader/interp-match-no-buffer-smartness

Browse Source 
interp: Remove buffer smartness for regexp match functions
This commit is contained in:
Mattias Wadman 2022-01-05 21:17:17 +01:00 committed by GitHub
commit 293d8cfc1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/interp/buffer.go
View File

@ -21,7 +21,6 @@ func init() {
functionRegisterFns = append(functionRegisterFns, func(i *Interp) []Function {
return []Function{
{"_tobitsrange", 0, 2, i._toBitsRange, nil},
{"_is_buffer", 0, 0, i._isBuffer, nil},
{"open", 0, 0, i._open, nil},
}
})
@ -108,11 +107,6 @@ func toBuffer(v interface{}) (Buffer, error) {
}
}
func (i *Interp) _isBuffer(c interface{}, a []interface{}) interface{} {
_, ok := c.(ToBuffer)
return ok
}
// note is used to implement tobytes*/0 also
func (i *Interp) _toBitsRange(c interface{}, a []interface{}) interface{} {
var unit int

2
pkg/interp/match.jq
View File

@ -6,7 +6,7 @@ def _buffer_fn(f):
def _buffer_try_orig(bfn; fn):
( . as $c
| if type == "string" and (_is_buffer | not) then fn
| if type == "string" then fn
else
( $c
| tobytesrange

4
pkg/interp/testdata/match.fqtest vendored
View File

@ -1,12 +1,12 @@
$ fq -i -d mp3 . /test.mp3
mp3> .frames[1].data | match("3\u0085"; "b")
mp3> .frames[1].data | tobytes | match("3\u0085"; "b")
{
"captures": [],
"length": 2,
"offset": 4,
"string": "3\ufffd"
}
mp3> .frames[1].data | match([0x33, 0x85]), first(scan([0x33, 0x85]) | hex), first(splits([0x33, 0x85]) | hex), first(scan_toend([0x33, 0x85]) | hex)
mp3> .frames[1].data | tobytes | match([0x33, 0x85]), first(scan([0x33, 0x85]) | hex), first(splits([0x33, 0x85]) | hex), first(scan_toend([0x33, 0x85]) | hex)
{
"captures": [],
"length": 2,