diff --git "a/class-regex\\Generic.php" "b/class-regex\\Generic.php" index 0c9ed76..46dca7c 100644 --- "a/class-regex\\Generic.php" +++ "b/class-regex\\Generic.php" @@ -1,65 +1,69 @@ . namespace regex; class Generic { public static function firstCaseInsensitive( $s, $group_name = null ) { list( $fc, $rest ) = self::splitFirstCase( $s ); return self::groupNamed( self::insensitiveChar( $fc ), $group_name ) . $rest; } public function groupNamed( $group, $group_name = null ) { if( null === $group_name ) { return $group; } - return "(?P<$group_name>...)"; + return "(?P<$group_name>$group)"; + } + + public function groupName( $group_name ) { + return '${' . $name . '}'; } public static function spaceBurger( $s ) { return self::burger( $s, '[_ ]*' ); } public static function tabBurger( $s ) { return self::burger( $s, '[ \t]*' ); } public static function newlineBurger( $s ) { return self::burger( $s, '[ \t\n]*' ); } private static function insensitiveChar( $c ) { $u = strtoupper( $c ); $l = strtolower( $c ); if( $u === $l ) { return $c; } return "[$u$l]"; } private static function splitFirstCase( $s ) { return [ substr( $s, 0, 1 ), substr( $s, 1 ) ]; } private function burger( $s, $bread ) { return $bread . $s . $bread; } }