Merge pull request #2 from FROGGS/master

cntrl is not a method on the Cursor anymore
masak · Mar 2, 2014 · d9374dc · d9374dc
2 parents e2674b9 + c48dc5b
commit d9374dc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/STATUS b/STATUS
@@ -55,7 +55,7 @@ Perl 6 rule features implemented
 * non-capturing subrules  (<.expr>)
 * negated subrules (<!expr>)
 * built-in rules: <alpha>, <digit>, <alnum>, <upper>, <lower>,
-    <xdigit>, <space>, <cntrl>, <punct>
+    <xdigit>, <space>, <punct>
 * backreferences ($0, $1, $<foo>)
 * scalar subrule and subpattern aliases ($<foo>:=(...), $0:=(...))
 * composed character classes (<+alpha-[aeiou]>)

diff --git a/lib/GGE/Match.pm b/lib/GGE/Match.pm
@@ -211,7 +211,6 @@ class GGE::Match {
     method xdigit() { self.cclass: /<xdigit>/ }
     method space()  { self.cclass: /<space>/  }
     method blank()  { self.cclass: /<blank>/  }
-    method cntrl()  { self.cclass: /<cntrl>/  }
     method punct()  { self.cclass: /<punct>/  }
     method alnum()  { self.cclass: /<alnum>/  }
 

diff --git a/t/perl6regex/rx_subrules b/t/perl6regex/rx_subrules
@@ -40,9 +40,6 @@ a<!wb>			abc\ndef\n-==\nghi	y	\w\w nonword boundary
 <blank>		\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob<blank>: <\t @ 0>/		<blank>
 <+blank>	\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob: <\t @ 0>/			<+blank>
 <+blank>+	\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob: <\t @ 0>/			<+blank>+
-<cntrl>		\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob<cntrl>: <\t @ 0>/		<cntrl>
-<+cntrl>	\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob: <\t @ 0>/			<+cntrl>
-<+cntrl>+	\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob: <\t\n\r @ 0>/		<+cntrl>+
 <punct>		\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob<punct>: <! @ 4>/		<punct>
 <+punct>	\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob: <! @ 4>/			<+punct>
 <+punct>+	\t\n\r !"#$%&'()*+,-./:;<=>?@[\]^`_{|}0123456789ABCDEFGHIJabcdefghij	/mob: <!"#$%&/		<+punct>+