Skip to content

Commit

Permalink
plumb/basic: avoid wrap around in file:1:2 (9fans#158)
Browse files Browse the repository at this point in the history
Fixes 9fans#122, 9fans#140.

As reported in 9fans#122, `file:1:1` moves to the end of the file,
and `file:1:2` fails with “address out of range”.

I’ll use file:2:3 as an example so we can tell the line and column number apart.

What’s happening is this:
plumb/basic matches `2:3` using twocolonaddr (from plumb/fileaddr),
then sets addr to `2-#1+#3`
(the 1 is constant and was introduced because column numbers are 1-based).
Acme interprets this in three steps:

1. find the range (q0, q1) that contains line 2
2. create the range (q2, q2) where q2 = q0 - 1
3. create the range (q3, q3) where q3 = q2 + 3

The second step has a branch where if q0 == 0 and 1 > 0
(remember that 1 is constant and comes form plumb/basic),
q0 is set to the end of the file.
This makes addressing things at the end of the file easier.

The problem then is that if we select line 1,
which starts at the beginning of the file,
q0 is always 0 and the branch in step 2) will always be used.
`1:1` is interpreted as `1-#1+#1` which starts at 0, wraps around to the end of the file, then moves 1 character backwards and then forwards again, ending at the end of the file.
`1:2` is interpretes as `1-#1+#2` which starts at 0, wraps around to the end od the file, then moves 1 character backwards and tries moving 2 characters forwards beyond the end of the file, resulting in the out of range error.

In 9fans#140 @rsc proposed transforming `:X:Y` into `:X-#0+#Y-#1` instead since that
avoids wrapping around by not moving backwards at first.
This change modifies `plumb/basic` to do that.
  • Loading branch information
mkhl authored and rsc committed Nov 14, 2018
1 parent a9e66ff commit 73ea365
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plumb/basic
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ type is text
data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr,$twocolonaddr
arg isfile $1
data set $file
attr add addr=$2-#1+#$3,$4-#1+#$5
attr add addr=$2-#0+#$3-#1,$4-#0+#$5-#1
plumb to edit
plumb client $editor

Expand All @@ -73,7 +73,7 @@ type is text
data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr
arg isfile $1
data set $file
attr add addr=$2-#1+#$3
attr add addr=$2-#0+#$3-#1
plumb to edit
plumb client $editor

Expand Down

0 comments on commit 73ea365

Please sign in to comment.