Blob

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 | Blame | Raw File
1 # these are generally in order from most specific to least,

2 # since first rule that fires wins.

4 include fileaddr

6 # declarations of ports without rules

7 plumb to seemail

8 plumb to showmail

10 # relative files as file: urls get made into absolute paths

11 type is text

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

13 arg isfile	$1

14 data set	file://$file

15 plumb to web

16 plumb start web $data

18 # urls go to web browser

19 type is text

20 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 plumb to web

22 plumb start web $0

24 # doc and rtf files go to wdoc2txt

25 type is text

26 data matches '[a-zA-Z¡-￿0-9_\-./]+'

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

28 arg isfile	$0

29 plumb to msword

30 plumb start wdoc2txt $file

32 # start rule for microsoft word documents without .doc suffix

33 type is text

34 dst is msword

35 plumb to msword

36 plumb start wdoc2txt $file

38 # image files go to page

39 type is text

40 data matches '[a-zA-Z¡-￿0-9_\-./@]+'

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

42 arg isfile	$0

43 plumb to image

44 plumb start 9 page $file

46 # postscript/pdf/dvi go to page but not over the a plumb port

47 # the port is here for reference but is unused

48 type is text

49 data matches '[a-zA-Z¡-￿0-9_\-./@]+'

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

51 arg isfile	$0

52 plumb to postscript

53 plumb start 9 page $file

55 # open office - s[xt][cdigmw], doc, xls, ppt

56 data matches '[a-zA-Z¡-￿0-9_\-./@]+'

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

58 arg isfile	$0

59 plumb to openoffice

60 plumb start openoffice $file

62 # existing files tagged by line number:columnumber or linenumber.columnumber, twice, go to editor

63 type is text

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

65 arg isfile     $1

66 data set       $file

67 attr add       addr=$2-#0+#$3-#1,$4-#0+#$5-#1

68 plumb to edit

69 plumb client $editor

71 # existing files tagged by line number:columnumber or linenumber.columnumber, twice, go to editor

72 type is text

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

74 arg isfile     $1

75 data set       $file

76 attr add       addr=$2-#0+#$3-#1

77 plumb to edit

78 plumb client $editor

80 # existing files, possibly tagged by line number, go to editor

81 type is text

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

83 arg isfile	$1

84 data set	$file

85 attr add	addr=$3

86 plumb to edit

87 plumb client $editor

89 # .h files are looked up in /usr/include and passed to edit

90 type is text

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

92 arg isfile	/usr/include/$1

93 data set	$file

94 attr add	addr=$3

95 plumb to edit

96 plumb client $editor

98 # .h files are looked up in /usr/local/include and passed to edit

99 type is text

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

101 arg isfile	/usr/local/include/$1

102 data set	$file

103 attr add	addr=$3

104 plumb to edit

105 plumb client $editor

107 # .h files are looked up in $plan9/include and passed to edit

108 type is text

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

110 arg isfile	$plan9/include/$1

111 data set	$file

112 attr add	addr=$3

113 plumb to edit

114 plumb client $editor

116 # .m files are looked up in /usr/inferno/module and passed to edit

117 type is text

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

119 arg isfile	/usr/inferno/module/$1

120 data set	$file

121 attr add	addr=$3

122 plumb to edit

123 plumb client window $editor

125 # faces -> new mail window for message

126 type	is	text

127 data	matches	'[a-zA-Z¡-￿0-9_\-./]+'

128 data	matches	'/mail/fs/[a-zA-Z¡-￿0-9/]+/[0-9]+'

129 plumb	to	showmail

130 plumb	start	window -r 4 120 750 600 upas/nedmail -s $0

132 # email addresses get a new mail window

133 type is text

134 data matches '[a-zA-Z0-9_+.\-]+@[a-zA-Z0-9_+.\-]*'

135 plumb to sendmail

136 plumb start wmail $0

137 # plumb start window rc -c '''echo % mail '''$0'; mail '$0

139 # man index entries are synthesized

140 type is text

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

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

144 # start rule for images without known suffixes

145 dst is image

146 arg isfile $data

147 plumb to image

148 plumb start 9 page $data

150 # start rule for postscript without known suffixes

151 dst is postscript

152 arg isfile $data

153 plumb start 9 page $data