Blame

Date:
Message:
plumb/basic: avoid wrap around in file:1:2 (#158) Fixes #122, #140. As reported in #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 #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.
Actions:
History | Blob | Raw File
  1 e70f3050 2003-11-23 devnull # these are generally in order from most specific to least,

  2 e70f3050 2003-11-23 devnull # since first rule that fires wins.

  3 e70f3050 2003-11-23 devnull 

  4 e70f3050 2003-11-23 devnull include fileaddr

  5 e70f3050 2003-11-23 devnull 

  6 e70f3050 2003-11-23 devnull # declarations of ports without rules

  7 e70f3050 2003-11-23 devnull plumb to seemail

  8 e70f3050 2003-11-23 devnull plumb to showmail

  9 e70f3050 2003-11-23 devnull 

 10 dee84543 2004-08-11 devnull # relative files as file: urls get made into absolute paths

 11 dee84543 2004-08-11 devnull type is text

 12 dee84543 2004-08-11 devnull data matches 'file:([.a-zA-Z¡-￿0-9_\-]([.a-zA-Z¡-￿0-9_/\-]*[a-zA-Z¡-￿0-9_/\-]))?'

 13 dee84543 2004-08-11 devnull arg isfile	$1

 14 dee84543 2004-08-11 devnull data set	file://$file

 15 dee84543 2004-08-11 devnull plumb to web

 16 dee84543 2004-08-11 devnull plumb start web $data

 17 dee84543 2004-08-11 devnull 

 18 3040f289 2004-06-09 devnull # urls go to web browser

 19 e70f3050 2003-11-23 devnull type is text

 20 41deef57 2007-04-03 devnull data matches '(https?|ftp|file|gopher|mailto|news|nntp|telnet|wais|prospero)://[a-zA-Z0-9_@\-]+([.:][a-zA-Z0-9_@\-]+)*/?[a-zA-Z0-9_?,%#~&/\-+=]+([:.][a-zA-Z0-9_?,%#~&/\-+=]+)*'

 21 dee84543 2004-08-11 devnull plumb to web

 22 3040f289 2004-06-09 devnull plumb start web $0

 23 e70f3050 2003-11-23 devnull 

 24 e70f3050 2003-11-23 devnull # doc and rtf files go to wdoc2txt

 25 e70f3050 2003-11-23 devnull type is text

 26 e70f3050 2003-11-23 devnull data matches '[a-zA-Z¡-￿0-9_\-./]+'

 27 e70f3050 2003-11-23 devnull data matches '([a-zA-Z¡-￿0-9_\-./]+)\.(doc|rtf)'

 28 e70f3050 2003-11-23 devnull arg isfile	$0

 29 e70f3050 2003-11-23 devnull plumb to msword

 30 e70f3050 2003-11-23 devnull plumb start wdoc2txt $file

 31 e70f3050 2003-11-23 devnull 

 32 e70f3050 2003-11-23 devnull # start rule for microsoft word documents without .doc suffix

 33 e70f3050 2003-11-23 devnull type is text

 34 e70f3050 2003-11-23 devnull dst is msword

 35 e70f3050 2003-11-23 devnull plumb to msword

 36 e70f3050 2003-11-23 devnull plumb start wdoc2txt $file

 37 e70f3050 2003-11-23 devnull 

 38 e70f3050 2003-11-23 devnull # image files go to page

 39 e70f3050 2003-11-23 devnull type is text

 40 82abcd6f 2018-11-12 rsc data matches '[a-zA-Z¡-￿0-9_\-./@]+'

 41 82abcd6f 2018-11-12 rsc data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.(jpe?g|JPE?G|gif|GIF|tiff?|TIFF?|ppm|bit|png|PNG)'

 42 e70f3050 2003-11-23 devnull arg isfile	$0

 43 e70f3050 2003-11-23 devnull plumb to image

 44 8b0728d3 2006-06-06 devnull plumb start 9 page $file

 45 e70f3050 2003-11-23 devnull 

 46 e70f3050 2003-11-23 devnull # postscript/pdf/dvi go to page but not over the a plumb port

 47 e70f3050 2003-11-23 devnull # the port is here for reference but is unused

 48 e70f3050 2003-11-23 devnull type is text

 49 82abcd6f 2018-11-12 rsc data matches '[a-zA-Z¡-￿0-9_\-./@]+'

 50 82abcd6f 2018-11-12 rsc data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.(ps|PS|eps|EPS|pdf|PDF|dvi|DVI)'

 51 e70f3050 2003-11-23 devnull arg isfile	$0

 52 e70f3050 2003-11-23 devnull plumb to postscript

 53 8b0728d3 2006-06-06 devnull plumb start 9 page $file

 54 e70f3050 2003-11-23 devnull 

 55 dee84543 2004-08-11 devnull # open office - s[xt][cdigmw], doc, xls, ppt

 56 82abcd6f 2018-11-12 rsc data matches '[a-zA-Z¡-￿0-9_\-./@]+'

 57 82abcd6f 2018-11-12 rsc data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.([Ss][XxTt][CcDdIiGgMmWw]|[Dd][Oo][Cc]|[Xx][Ll][Ss]|[Pp][Pp][Tt])'

 58 dee84543 2004-08-11 devnull arg isfile	$0

 59 dee84543 2004-08-11 devnull plumb to openoffice

 60 dee84543 2004-08-11 devnull plumb start openoffice $file

 61 dee84543 2004-08-11 devnull 

 62 5a69e405 2013-10-22 robpike # existing files tagged by line number:columnumber or linenumber.columnumber, twice, go to editor

 63 c84e737c 2010-10-28 rsc type is text

 64 82abcd6f 2018-11-12 rsc data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr,$twocolonaddr

 65 c84e737c 2010-10-28 rsc arg isfile     $1

 66 c84e737c 2010-10-28 rsc data set       $file

 67 73ea3656 2018-11-14 rsc attr add       addr=$2-#0+#$3-#1,$4-#0+#$5-#1

 68 5a69e405 2013-10-22 robpike plumb to edit

 69 5a69e405 2013-10-22 robpike plumb client $editor

 70 5a69e405 2013-10-22 robpike 

 71 5a69e405 2013-10-22 robpike # existing files tagged by line number:columnumber or linenumber.columnumber, twice, go to editor

 72 5a69e405 2013-10-22 robpike type is text

 73 82abcd6f 2018-11-12 rsc data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr

 74 5a69e405 2013-10-22 robpike arg isfile     $1

 75 5a69e405 2013-10-22 robpike data set       $file

 76 73ea3656 2018-11-14 rsc attr add       addr=$2-#0+#$3-#1

 77 c84e737c 2010-10-28 rsc plumb to edit

 78 c84e737c 2010-10-28 rsc plumb client $editor

 79 c84e737c 2010-10-28 rsc 

 80 e70f3050 2003-11-23 devnull # existing files, possibly tagged by line number, go to editor

 81 e70f3050 2003-11-23 devnull type is text

 82 82abcd6f 2018-11-12 rsc data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])('$addr')?'

 83 e70f3050 2003-11-23 devnull arg isfile	$1

 84 e70f3050 2003-11-23 devnull data set	$file

 85 e70f3050 2003-11-23 devnull attr add	addr=$3

 86 e70f3050 2003-11-23 devnull plumb to edit

 87 32f69c36 2003-12-11 devnull plumb client $editor

 88 e70f3050 2003-11-23 devnull 

 89 ccee548f 2003-12-04 devnull # .h files are looked up in /usr/include and passed to edit

 90 e70f3050 2003-11-23 devnull type is text

 91 e50b313e 2006-07-05 devnull data matches '([a-zA-Z¡-￿0-9/_\-]+\.h)('$addr')?'

 92 ccee548f 2003-12-04 devnull arg isfile	/usr/include/$1

 93 e70f3050 2003-11-23 devnull data set	$file

 94 e70f3050 2003-11-23 devnull attr add	addr=$3

 95 e70f3050 2003-11-23 devnull plumb to edit

 96 32f69c36 2003-12-11 devnull plumb client $editor

 97 e70f3050 2003-11-23 devnull 

 98 ccee548f 2003-12-04 devnull # .h files are looked up in /usr/local/include and passed to edit

 99 ccee548f 2003-12-04 devnull type is text

100 e50b313e 2006-07-05 devnull data matches '([a-zA-Z¡-￿0-9/_\-]+\.h)('$addr')?'

101 ccee548f 2003-12-04 devnull arg isfile	/usr/local/include/$1

102 ccee548f 2003-12-04 devnull data set	$file

103 ccee548f 2003-12-04 devnull attr add	addr=$3

104 ccee548f 2003-12-04 devnull plumb to edit

105 32f69c36 2003-12-11 devnull plumb client $editor

106 ccee548f 2003-12-04 devnull 

107 4de03b54 2005-01-11 devnull # .h files are looked up in $plan9/include and passed to edit

108 ccee548f 2003-12-04 devnull type is text

109 e50b313e 2006-07-05 devnull data matches '([a-zA-Z¡-￿0-9/_\-]+\.h)('$addr')?'

110 4de03b54 2005-01-11 devnull arg isfile	$plan9/include/$1

111 ccee548f 2003-12-04 devnull data set	$file

112 ccee548f 2003-12-04 devnull attr add	addr=$3

113 ccee548f 2003-12-04 devnull plumb to edit

114 32f69c36 2003-12-11 devnull plumb client $editor

115 ccee548f 2003-12-04 devnull 

116 9a0e0048 2009-05-17 rsc # .m files are looked up in /usr/inferno/module and passed to edit

117 e70f3050 2003-11-23 devnull type is text

118 e50b313e 2006-07-05 devnull data matches '([a-zA-Z¡-￿0-9/_\-]+\.m)('$addr')?'

119 9a0e0048 2009-05-17 rsc arg isfile	/usr/inferno/module/$1

120 e70f3050 2003-11-23 devnull data set	$file

121 e70f3050 2003-11-23 devnull attr add	addr=$3

122 e70f3050 2003-11-23 devnull plumb to edit

123 32f69c36 2003-12-11 devnull plumb client window $editor

124 e70f3050 2003-11-23 devnull 

125 e70f3050 2003-11-23 devnull # faces -> new mail window for message

126 e70f3050 2003-11-23 devnull type	is	text

127 e70f3050 2003-11-23 devnull data	matches	'[a-zA-Z¡-￿0-9_\-./]+'

128 e70f3050 2003-11-23 devnull data	matches	'/mail/fs/[a-zA-Z¡-￿0-9/]+/[0-9]+'

129 e70f3050 2003-11-23 devnull plumb	to	showmail

130 e70f3050 2003-11-23 devnull plumb	start	window -r 4 120 750 600 upas/nedmail -s $0

131 e70f3050 2003-11-23 devnull 

132 64851eee 2008-04-17 rsc # email addresses get a new mail window

133 64851eee 2008-04-17 rsc type is text

134 64851eee 2008-04-17 rsc data matches '[a-zA-Z0-9_+.\-]+@[a-zA-Z0-9_+.\-]*'

135 64851eee 2008-04-17 rsc plumb to sendmail

136 64851eee 2008-04-17 rsc plumb start wmail $0

137 64851eee 2008-04-17 rsc # plumb start window rc -c '''echo % mail '''$0'; mail '$0

138 64851eee 2008-04-17 rsc 

139 e70f3050 2003-11-23 devnull # man index entries are synthesized

140 e70f3050 2003-11-23 devnull type is text

141 e70f3050 2003-11-23 devnull data matches '([a-zA-Z¡-￿0-9_\-./]+)\(([1-8])\)'

142 6b53e2a4 2004-04-19 devnull plumb start rc -c 'man '$2' '$1' >[2=1] | nobs | plumb -i -d edit -a ''action=showdata filename=/man/'$1'('$2')'''

143 e70f3050 2003-11-23 devnull 

144 e70f3050 2003-11-23 devnull # start rule for images without known suffixes

145 e70f3050 2003-11-23 devnull dst is image

146 32f69c36 2003-12-11 devnull arg isfile $data

147 e70f3050 2003-11-23 devnull plumb to image

148 8b0728d3 2006-06-06 devnull plumb start 9 page $data

149 e70f3050 2003-11-23 devnull 

150 e70f3050 2003-11-23 devnull # start rule for postscript without known suffixes

151 e70f3050 2003-11-23 devnull dst is postscript

152 e70f3050 2003-11-23 devnull arg isfile $data

153 8b0728d3 2006-06-06 devnull plumb start 9 page $data