regexp_parser 0.1.1 → 0.1.5

data/lib/regexp_parser/syntax.rb

@@ -50,6 +50,13 @@ module Regexp::Syntax
       # alias for the latest 1.9 implementation
       when 'ruby/1.9';    syntax = Regexp::Syntax::Ruby::V19.new
 
+      when 'ruby/2.0.0';  syntax = Regexp::Syntax::Ruby::V20.new
+      when 'ruby/2.1.0';  syntax = Regexp::Syntax::Ruby::V21.new
+
+      # aliases for the latest 2.x implementations
+      when 'ruby/2.0';    syntax = Regexp::Syntax::Ruby::V20.new
+      when 'ruby/2.1';    syntax = Regexp::Syntax::Ruby::V21.new
+
       else
         raise UnknownSyntaxError.new(name)
     end

data/lib/regexp_parser/syntax/ruby/1.8.6.rb

@@ -8,10 +8,10 @@ module Regexp::Syntax
         super
 
         implements :anchor, Anchor::All
-        implements :assertion, Group::Assertion::Lookahead
+        implements :assertion, Assertion::Lookahead
         implements :backref, [:number]
 
-        implements :escape, 
+        implements :escape,
           Escape::Basic + Escape::Backreference +
           Escape::ASCII + Escape::Meta + Escape::Control
 
@@ -19,13 +19,13 @@ module Regexp::Syntax
 
         implements :meta, Meta::Extended
 
-        implements :quantifier, 
+        implements :quantifier,
           Quantifier::Greedy + Quantifier::Reluctant +
           Quantifier::Interval + Quantifier::IntervalReluctant
 
         implements :set, CharacterSet::OpenClose +
           CharacterSet::Extended + CharacterSet::Types +
-          CharacterSet::POSIX::Standard 
+          CharacterSet::POSIX::Standard
 
         implements :type,
           CharacterType::Extended

data/lib/regexp_parser/syntax/ruby/1.9.1.rb

@@ -9,24 +9,24 @@ module Regexp::Syntax
       def initialize
         super
 
-        implements :assertion, Group::Assertion::Lookbehind +
-          Group::SubexpressionCall::All
+        implements :assertion, Assertion::Lookbehind +
+          SubexpressionCall::All
 
-        implements :backref, Group::Backreference::All +
-          Group::SubexpressionCall::All
+        implements :backref, Backreference::All +
+          SubexpressionCall::All
 
         implements :escape, CharacterType::Hex
 
-        implements :property, 
+        implements :property,
           UnicodeProperty::All
 
-        implements :nonproperty, 
+        implements :nonproperty,
           UnicodeProperty::All
 
-        implements :quantifier, 
+        implements :quantifier,
           Quantifier::Possessive + Quantifier::IntervalPossessive
 
-        implements :set, 
+        implements :set,
           CharacterSet::POSIX::StandardNegative +
           CharacterSet::POSIX::Extensions +
           CharacterSet::POSIX::ExtensionsNegative +
@@ -34,7 +34,7 @@ module Regexp::Syntax
 
         implements :subset, CharacterSet::OpenClose +
           CharacterSet::Extended + CharacterSet::Types +
-          CharacterSet::POSIX::Standard 
+          CharacterSet::POSIX::Standard
       end
 
     end

data/lib/regexp_parser/syntax/ruby/2.0.0.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../1.9.3', __FILE__)
+
+module Regexp::Syntax
+  module Ruby
+
+    # use the last 1.9 release as the base
+    class V20 < Regexp::Syntax::Ruby::V193
+      def initialize
+        super
+
+        #implements :escape, CharacterType::Hex
+      end
+    end
+
+  end
+end

data/lib/regexp_parser/syntax/ruby/2.1.0.rb

@@ -0,0 +1,13 @@
+require File.expand_path('../2.0.0', __FILE__)
+
+module Regexp::Syntax
+  module Ruby
+
+    class V21 < Regexp::Syntax::Ruby::V20
+      def initialize
+        super
+      end
+    end
+
+  end
+end

data/lib/regexp_parser/syntax/tokens.rb

@@ -1,334 +1,35 @@
+# Define the base module and the simplest of tokens.
 module Regexp::Syntax
-
   module Token
+    Map = {}
 
-    # -------------------------------------------------------------------------
-    module Anchor
-      Basic       = [:beginning_of_line, :end_of_line]
-      Extended    = Basic + [:word_boundary, :nonword_boundary]
-      String      = [:bos, :eos, :eos_ob_eol]
-      MatchStart  = [:match_start]
-
-      All = Extended + String + MatchStart
-    end
-
-
-    # -------------------------------------------------------------------------
-    module CharacterSet
-      OpenClose = [:open, :close]
-
-      Basic     = [:negate, :member, :range]
-      Extended  = Basic + [:escape, :intersection, :range_hex, :backspace]
-
-      Types     = [:type_digit, :type_nondigit, :type_hex, :type_nonhex,
-                   :type_space, :type_nonspace, :type_word, :type_nonword]
-
-      module POSIX
-        Standard  = [:class_alnum, :class_alpha, :class_blank, :class_cntrl,
-                     :class_digit, :class_graph, :class_lower, :class_print,
-                     :class_punct, :class_space, :class_upper, :class_xdigit]
-
-        StandardNegative = [
-                     :class_nonalnum, :class_nonalpha, :class_nonblank,
-                     :class_noncntrl, :class_nondigit, :class_nongraph,
-                     :class_nonlower, :class_nonprint, :class_nonpunct,
-                     :class_nonspace, :class_nonupper, :class_nonxdigit]
-
-        Extensions = [:class_ascii, :class_word]
-        ExtensionsNegative = [:class_nonascii, :class_nonword]
-
-        All         = Standard + StandardNegative +
-                      Extensions + ExtensionsNegative
-      end
-
-      All = Basic + Extended + Types + POSIX::All
-
-      module SubSet
-        OpenClose = [:open, :close]
-        All       = CharacterSet::All
-      end
-    end
-
-
-    # -------------------------------------------------------------------------
-    module CharacterType
-      Basic     = []
-      Extended  = [:digit, :nondigit, :space, :nonspace, :word, :nonword]
-      Hex       = [:hex, :nonhex]
-
-      All = Basic + Extended + Hex
-    end
-
-
-    # -------------------------------------------------------------------------
-    module Escape
-      Basic     = [:backslash, :literal]
-
-      Backreference = [:digit]
-
-      Control = [:control, :meta_sequence]
-
-      ASCII = [:bell, :backspace, :escape, :form_feed, :newline, :carriage,
-               :space, :tab, :vertical_tab]
-
-      Meta  = [:dot, :alternation, :zero_or_one, :zero_or_more, :one_or_more,
-               :beginning_of_line, :end_of_line, :group_open, :group_close,
-               :interval_open, :interval_close, :set_open, :set_close, :baclslash]
-
-      All   = Basic + Backreference + ASCII + Meta
-    end
-
-
-    # -------------------------------------------------------------------------
-    module Group
-      Basic     = [:capture, :close]
-      Extended  = Basic + [:options]
-
-      Named     = [:named]
-      Atomic    = [:atomic]
-      Passive   = [:passive]
-      Comment   = [:comment]
-
-      module Assertion
-        Lookahead = [:lookahead, :nlookahead]
-        Lookbehind = [:lookbehind, :nlookbehind]
-
-        All = Lookahead + Lookbehind
-      end
-
-      module Backreference
-        Name      = [:name_ref]
-        Number    = [:number_ref, :number_rel_ref]
-
-        NestLevel = [:name_nest_ref, :number_nest_ref]
-
-        All = Name + Number + NestLevel
-      end
-
-      module SubexpressionCall
-        Name      = [:name_call]
-        Number    = [:number_call, :number_rel_call]
-
-        All = Name + Number
-      end
-
-      All = Group::Extended + Group::Named + Group::Atomic +
-            Group::Passive + Group::Comment
+    module Literal
+      All = [:literal]
+      Type = :literal
     end
 
+    Map[Literal::Type] = Literal::All
+  end
+end
 
-    # -------------------------------------------------------------------------
-    module Meta
-      Basic     = [:dot]
-      Extended  = Basic + [:alternation]
-    end
 
+# Load all the token files, they will populate the Map constant.
+Dir[File.dirname(__FILE__) + '/tokens/*.rb'].each {|f| require f }
 
-    # -------------------------------------------------------------------------
-    module Quantifier
-      Greedy      = [:zero_or_one, :zero_or_more, :one_or_more]
-      Reluctant   = [:zero_or_one_reluctant, :zero_or_more_reluctant, :one_or_more_reluctant]
-      Possessive  = [:zero_or_one_possessive, :zero_or_more_possessive, :one_or_more_possessive]
 
-      Interval             = [:interval]
-      IntervalReluctant    = [:interval_reluctant]
-      IntervalPossessive   = [:interval_possessive]
+# After loading all the tokens the map is full. Extract all tokens and types
+# into the All and Types constants.
+module Regexp::Syntax
+  module Token
+    if RUBY_VERSION >= '1.9'
+      All = Map.map {|k,v| v}.flatten.uniq.sort
+    else
+      All = Map.map {|k,v| v}.flatten.uniq
     end
 
+    Types = Map.keys
 
-    # -------------------------------------------------------------------------
-    module UnicodeProperty
-      Type    = [:alnum, :alpha, :ascii, :blank, :cntrl, :digit, :graph, :lower,
-                 :print, :punct, :space, :upper, :word, :xdigit]
-
-      POSIX  = [:any, :assigned, :newline]
-
-      module Category
-        Letter        = [:letter_any, :letter_uppercase, :letter_lowercase,
-                         :letter_titlecase, :letter_modifier, :letter_other]
-
-        Mark          = [:mark_any, :mark_nonspacing, :mark_spacing,
-                         :mark_enclosing]
-
-        Number        = [:number_any, :number_decimal, :number_letter,
-                         :number_other]
-
-        Punctuation   = [:punct_any, :punct_connector, :punct_dash,
-                         :punct_open, :punct_close, :punct_initial,
-                         :punct_final, :punct_other]
-
-        Symbol        = [:symbol_any, :symbol_math, :symbol_currency,
-                         :symbol_modifier, :symbol_other]
-
-        Separator     = [:separator_any, :separator_space, :separator_line,
-                         :separator_para]
-
-        Codepoint     = [:other, :control, :format,
-                         :surrogate, :private_use, :unassigned]
-
-        All = Letter + Mark + Number + Punctuation +
-              Symbol + Separator + Codepoint
-      end
-
-      Age = [:age_1_1, :age_2_0, :age_2_1, :age_3_0, :age_3_1,
-             :age_3_2, :age_4_0, :age_4_1, :age_5_0, :age_5_1,
-             :age_5_2, :age_6_0]
-
-      Derived = [
-        :ascii_hex,
-        :alphabetic,
-        :cased,
-        :changes_when_casefolded,
-        :changes_when_casemapped,
-        :changes_when_lowercased,
-        :changes_when_titlecased,
-        :changes_when_uppercased,
-        :case_ignorable,
-        :bidi_control,
-        :dash,
-        :deprecated,
-        :default_ignorable_cp,
-        :diacritic,
-        :extender,
-        :grapheme_base,
-        :grapheme_extend,
-        :grapheme_link,
-        :hex_digit,
-        :hyphen,
-        :id_continue,
-        :ideographic,
-        :id_start,
-        :ids_binary_op,
-        :ids_trinary_op,
-        :join_control,
-        :logical_order_exception,
-        :lowercase,
-        :math,
-        :non_character_cp,
-        :other_alphabetic,
-        :other_default_ignorable_cp,
-        :other_grapheme_extended,
-        :other_id_continue,
-        :other_id_start,
-        :other_lowercase,
-        :other_math,
-        :other_uppercase,
-        :pattern_syntax,
-        :pattern_whitespace,
-        :quotation_mark,
-        :radical,
-        :soft_dotted,
-        :sentence_terminal,
-        :terminal_punctuation,
-        :unified_ideograph,
-        :uppercase,
-        :variation_selector,
-        :whitespace,
-        :xid_start,
-        :xid_continue,
-      ]
-
-      Script =[
-        :script_arabic,
-        :script_imperial_aramaic,
-        :script_armenian,
-        :script_avestan,
-        :script_balinese,
-        :script_bamum,
-        :script_bengali,
-        :script_bopomofo,
-        :script_braille,
-        :script_buginese,
-        :script_buhid,
-        :script_canadian_aboriginal,
-        :script_carian,
-        :script_cham,
-        :script_cherokee,
-        :script_coptic,
-        :script_cypriot,
-        :script_cyrillic,
-        :script_devanagari,
-        :script_deseret,
-        :script_egyptian_hieroglyphs,
-        :script_ethiopic,
-        :script_georgian,
-        :script_glagolitic,
-        :script_gothic,
-        :script_greek,
-        :script_gujarati,
-        :script_gurmukhi,
-        :script_hangul,
-        :script_han,
-        :script_hanunoo,
-        :script_hebrew,
-        :script_hiragana,
-        :script_katakana_or_hiragana,
-        :script_old_italic,
-        :script_javanese,
-        :script_kayah_li,
-        :script_katakana,
-        :script_kharoshthi,
-        :script_khmer,
-        :script_kannada,
-        :script_kaithi,
-        :script_tai_tham,
-        :script_lao,
-        :script_latin,
-        :script_lepcha,
-        :script_limbu,
-        :script_linear_b,
-        :script_lisu,
-        :script_lycian,
-        :script_lydian,
-        :script_malayalam,
-        :script_mongolian,
-        :script_meetei_mayek,
-        :script_myanmar,
-        :script_nko,
-        :script_ogham,
-        :script_ol_chiki,
-        :script_old_turkic,
-        :script_oriya,
-        :script_osmanya,
-        :script_phags_pa,
-        :script_inscriptional_pahlavi,
-        :script_phoenician,
-        :script_inscriptional_parthian,
-        :script_rejang,
-        :script_runic,
-        :script_samaritan,
-        :script_old_south_arabian,
-        :script_saurashtra,
-        :script_shavian,
-        :script_sinhala,
-        :script_sundanese,
-        :script_syloti_nagri,
-        :script_syriac,
-        :script_tagbanwa,
-        :script_tai_le,
-        :script_new_tai_lue,
-        :script_tamil,
-        :script_tai_viet,
-        :script_telugu,
-        :script_tifinagh,
-        :script_tagalog,
-        :script_thaana,
-        :script_thai,
-        :script_tibetan,
-        :script_ugaritic,
-        :script_vai,
-        :script_old_persian,
-        :script_cuneiform,
-        :script_yi,
-        :script_inherited,
-        :script_common,
-        :script_unknown
-      ]
-
-      Script_6_0 = [:script_brahmi, :script_batak, :script_mandaic]
-
-      All = Type + POSIX + Category::All + Age + Derived + Script
-    end
+    All.freeze
+    Types.freeze
   end
-
 end