fly/fgdata
1
0
Fork 0
Code Activity

minus can't be delimiter in a [] range

Browse source
This commit is contained in:
mfranz 2007-06-22 20:41:00 +00:00
parent cfd9c1b48f
commit 43d6e707bb
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Nasal/string.nas
View file

@ -65,10 +65,10 @@ var imatch = func(a, b) match(lc(a), lc(b));
# ? stands for any single character
# * stands for any number (including zero) of arbitrary characters
# \ escapes the next character and makes it stand for itself; that is:
# \? stands for a question mark (not "any single character" placeholder)
# \? stands for a question mark (not the "any single character" placeholder)
# [] stands for a group of characters:
# [abc] stands for letters a or b or c
# [^abc] stands for any character but any of a, b, and c
# [abc] stands for letters a, b or c
# [^abc] stands for any character but a, b, and c
# [1-4] stands for digits 1 to 4 (1, 2, 3, 4)
# [1-4-] stands for digits 1 to 4, and the minus
# [-1-4] same as above
@ -77,6 +77,8 @@ var imatch = func(a, b) match(lc(a), lc(b));
# [][] stands for the closing and the opening bracket (']' must be first!)
# [^^] stands for all characters but the caret symbol
#
# Note that a minus can't be a range delimiter, as in [a--b]
#
# Example:
# string.match(name, "*[0-9].xml"); ... true if 'name' ends with digit followed by ".xml"
#
@ -117,7 +119,8 @@ var match = func(str, patt) {
x[patt[p]] = 1;
i += 1;
if (p + 2 < patt[p] and patt[p + 1] == `-` and patt[p + 2] != `]`) {
if (p + 2 < patt[p] and patt[p] != `-` and patt[p + 1] == `-`
and patt[p + 2] != `]` and patt[p + 2] != `-`) {
var from = patt[p];
var to = patt[p += 2];
for (var c = from; c <= to; c += 1)