bug fix for sub/2

[pkoppstein]

There's a bug in builtin.c:sub -- a length check is missing. The corrected code is below. A relevant test case is:

"abc" | sub("^ +"; "X")

# If s contains capture variables, then create a capture object and pipe it to s
def sub(re; s):
  . as $in
  | [match(re)]
  | if length == 0 then $in
    else .[0]
    | . as $r
    # create the "capture" object:
    | reduce ( $r | .captures | .[] | select(.name != null) | { (.name) : .string } ) as $pair
        ({}; . + $pair) 
    | if . == {} then $in | .[0:$r.offset]+s+.[$r.offset+$r.length:]
      else (. | s)
      end
    end ;

[pkoppstein]

@nicowilliams - Now that you're back, could you please install the update?

#576 also requires your attention, somewhat urgently in my opinion, as "split" is often essential. Thanks.

[nicowilliams]

@pkoppstein This sub/2 fails to compile.

[pkoppstein]

@nicowilliams - It loads fine here, and the following builtin.c variant (with $re) compiles here as well. Perhaps you have a "$" or ";" or some-such out of place? In any case, the only needed change is the "length" check, so you may find it simplest to roll your own.

  // If s contains capture variables, then create a capture object and pipe it to s
  "def sub($re; s):"
  "  . as $in"
  "  | [match($re)]"
  "  | .[0]"
  "  | . as $r"
     //  # create the \"capture\" object:
  "  | reduce ( $r | .captures | .[] | select(.name != null) | { (.name) : .string } ) as $pair"
  "      ({}; . + $pair)"
  "  | if . == {} then $in | .[0:$r.offset]+s+.[$r.offset+$r.length:]"
  "    else (. | s)"
  "    end ;",

[pkoppstein]

#594 installs this fix, and makes trivial modifications to add gsub/3. The resultant jq has been tested.

[nicowilliams]

Thanks! That's much more convenient. I'm at an airport, so connectivity
spotty, but i'll get to this by tomorrow night unless @wtlangford gets to
it sooner.

[wtlangford]

I'll snag it tonight.
On Oct 6, 2014 3:54 PM, "Nico Williams" notifications@github.com wrote:

Thanks! That's much more convenient. I'm at an airport, so connectivity
spotty, but i'll get to this by tomorrow night unless @wtlangford gets to
it sooner.

—
Reply to this email directly or view it on GitHub
#586 (comment).

[wtlangford]

Closed with 85f0e30 (Why does this only auto-close half of the time?)