diff options
| -rw-r--r-- | appl/cmd/sed.b | 26 | ||||
| -rw-r--r-- | dis/sed.dis | bin | 13134 -> 13142 bytes |
2 files changed, 13 insertions, 13 deletions
diff --git a/appl/cmd/sed.b b/appl/cmd/sed.b index 59c7c7b7..2dda0e27 100644 --- a/appl/cmd/sed.b +++ b/appl/cmd/sed.b @@ -28,12 +28,12 @@ bool: type int; Addr: adt { pick { - None => - Dollar => - Line => - line: int; - Regex => - re: Re; + None => + Dollar => + Line => + line: int; + Regex => + re: Re; } }; @@ -776,10 +776,7 @@ arout() match(re: Re, s: string) : bool { - if (re != nil && regex->execute(re, s) != nil) - return true; - else - return false; + return re != nil && regex->execute(re, s) != nil; } substitute(c: ref Sedcom.S, s: string) : (bool, string) @@ -797,9 +794,12 @@ substitute(c: ref Sedcom.S, s: string) : (bool, string) (l, r) := m[0]; rep := ""; for (i := 0; i < len c.rhs; i++){ - if (c.rhs[i] != '\\' ) - rep[len rep] = c.rhs[i]; - else { + if (c.rhs[i] != '\\' || i+1 == len c.rhs){ + if (c.rhs[i] == '&') + rep += s[l: r]; + else + rep[len rep] = c.rhs[i]; + }else { i++; case c.rhs[i] { '0' to '9' => diff --git a/dis/sed.dis b/dis/sed.dis Binary files differindex 6e42daba..f45aca2f 100644 --- a/dis/sed.dis +++ b/dis/sed.dis |