citrus 1.2.0 → 1.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/citrus.gemspec +1 -1
- data/extras/citrus.vim +2 -2
- data/lib/citrus.rb +4 -4
- data/lib/citrus/file.rb +1 -1
- metadata +2 -2
data/citrus.gemspec
CHANGED
data/extras/citrus.vim
CHANGED
@@ -16,7 +16,7 @@ syn case match
|
|
16
16
|
syn match ctDoubleColon "::" contained
|
17
17
|
syn match ctConstant "\u\w*" contained
|
18
18
|
syn match ctModule "\(\(::\)\?\u\w*\)\+" contains=ctDoubleColon,ctConstant contained
|
19
|
-
syn match ctVariable "
|
19
|
+
syn match ctVariable "[a-zA-Z_-]\+" contained
|
20
20
|
|
21
21
|
" Comments
|
22
22
|
syn match ctComment "#.*" contains=@Spell
|
@@ -41,7 +41,7 @@ syn match ctQuantifier "\d*\*\d*" contained display
|
|
41
41
|
|
42
42
|
" Operators
|
43
43
|
syn match ctOperator "|" contained
|
44
|
-
syn match ctOperator "\
|
44
|
+
syn match ctOperator "\w\+:"me=e-1 contained
|
45
45
|
|
46
46
|
" Extensions
|
47
47
|
syn region ctRubyBlock start="{"ms=e+1 end="}"me=s-1 contains=@rubyTop contained
|
data/lib/citrus.rb
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
#
|
5
5
|
# http://github.com/mjijackson/citrus
|
6
6
|
module Citrus
|
7
|
-
VERSION = [1, 2,
|
7
|
+
VERSION = [1, 2, 1]
|
8
8
|
|
9
9
|
Infinity = 1.0 / 0
|
10
10
|
|
@@ -625,7 +625,7 @@ module Citrus
|
|
625
625
|
|
626
626
|
# An AndPredicate is a Predicate that contains a rule that must match. Upon
|
627
627
|
# success an empty match is returned and no input is consumed. The Citrus
|
628
|
-
# notation is any expression
|
628
|
+
# notation is any expression preceded by an ampersand, e.g.:
|
629
629
|
#
|
630
630
|
# &expr
|
631
631
|
#
|
@@ -646,7 +646,7 @@ module Citrus
|
|
646
646
|
|
647
647
|
# A NotPredicate is a Predicate that contains a rule that must not match. Upon
|
648
648
|
# success an empty match is returned and no input is consumed. The Citrus
|
649
|
-
# notation is any expression
|
649
|
+
# notation is any expression preceded by an exclamation mark, e.g.:
|
650
650
|
#
|
651
651
|
# !expr
|
652
652
|
#
|
@@ -708,7 +708,7 @@ module Citrus
|
|
708
708
|
#
|
709
709
|
# expr N*M
|
710
710
|
#
|
711
|
-
# In this notation +N+ specifies the minimum number of times the
|
711
|
+
# In this notation +N+ specifies the minimum number of times the preceding
|
712
712
|
# expression must match and +M+ specifies the maximum. If +N+ is ommitted,
|
713
713
|
# it is assumed to be 0. Likewise, if +M+ is omitted, it is assumed to be
|
714
714
|
# infinity (no maximum). Thus, an expression followed by only an asterisk may
|
data/lib/citrus/file.rb
CHANGED