citrus 2.1.1 → 2.1.2

data/citrus.gemspec

@@ -5,7 +5,7 @@ require 'citrus'
 Gem::Specification.new do |s|
   s.name = 'citrus'
   s.version = Citrus.version
-  s.date = '2010-08-17'
+  s.date = Time.now.strftime('%Y-%m-%d')
 
   s.summary = 'Parsing Expressions for Ruby'
   s.description = 'Parsing Expressions for Ruby'

data/lib/citrus.rb

@@ -8,7 +8,7 @@ require 'strscan'
 module Citrus
   autoload :File, 'citrus/file'
 
-  VERSION = [2, 1, 1]
+  VERSION = [2, 1, 2]
 
   # Returns the current version of Citrus as a string.
   def self.version
@@ -116,6 +116,13 @@ module Citrus
     # The number of times the cache was hit. Only present if memoing is enabled.
     attr_reader :cache_hits
 
+    # Resets all internal variables so that this object may be used in
+    # another parse.
+    def reset
+      super
+      @max_offset = 0
+    end
+
     # Returns the length of this input.
     def length
       string.length
@@ -212,11 +219,8 @@ module Citrus
           end
         end
 
-        # Resets all internal variables so that this object may be used in
-        # another parse.
-        def reset
+        def reset # :nodoc:
           super
-          @max_offset = 0
           @cache = {}
           @cache_hits = 0
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Michael Jackson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -07:00
+date: 2010-10-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,6 @@ files:
 - examples/calc.rb
 - examples/ip.citrus
 - examples/ip.rb
-- extras/citrus.vim
 - lib/citrus/debug.rb
 - lib/citrus/file.rb
 - lib/citrus.rb

data/extras/citrus.vim

@@ -1,92 +0,0 @@
-" Vim syntax file for Citrus grammars.
-"
-" Language: Citrus
-" Author: Michael Jackson
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-syn include @rubyTop syntax/ruby.vim
-
-syn case match
-
-syn match ctDoubleColon "::" contained
-syn match ctConstant "\u\w*" contained
-syn match ctModule "\(\(::\)\?\u\w*\)\+" contains=ctDoubleColon,ctConstant contained
-syn match ctVariable "\a[a-zA-Z0-9_-]*" contained
-
-" Comments
-syn match ctComment "#.*" contains=@Spell
-
-" Keywords
-syn match ctKeyword "\<super\>" contained
-
-" Terminals
-syn region ctString matchgroup=ctStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" contains=@ctStringSpecial
-syn region ctString matchgroup=ctStringDelimiter start="'" end="'" skip="\\\\\|\\'"
-syn region ctRegexp matchgroup=ctRegexpDelimiter start="/" end="/[iomxneus]*" skip="\\\\\|\\/" contains=@ctRegexpSpecial contained display
-syn region ctCharClass matchgroup=ctRegexpDelimiter start="\[" end="\]" skip="\\\\\|\\\[" contains=@ctRegexpSpecial contained display
-syn match ctAnything "\." contained display
-
-syn cluster ctStringSpecial contains=rubyStringEscape
-syn cluster ctRegexpSpecial contains=rubyStringEscape,rubyRegexpSpecial,rubyRegexpEscape,rubyRegexpBrackets,rubyRegexpCharClass,rubyRegexpDot,rubyRegexpQuantifier,rubyRegexpAnchor,rubyRegexpParens,rubyRegexpComment
-
-" Quantifiers
-syn match ctQuantifier "+" contained display
-syn match ctQuantifier "?" contained display
-syn match ctQuantifier "\d*\*\d*" contained display
-
-" Operators
-syn match ctOperator "|" contained
-syn match ctOperator "\w\+:"me=e-1 contained
-
-" Extensions
-syn region ctRubyBlock start="{"ms=e+1 end="}"me=s-1 contains=@rubyTop contained
-syn match ctTag "<\s*\(\(::\)\?\u\w*\)\+\s*>" contains=ctModule contained
-
-" Declarations
-syn match ctRequire "\<require\>" nextgroup=ctString skipwhite skipnl
-syn match ctGrammar "\<grammar\>" nextgroup=ctModule skipwhite skipnl
-syn match ctInclude "\<include\>" nextgroup=ctModule skipwhite skipnl contained
-syn match ctRoot    "\<root\>"    nextgroup=ctVariable skipwhite skipnl contained
-syn match ctRule    "\<rule\>"    nextgroup=ctVariable skipwhite skipnl contained
-
-" Blocks
-syn region ctGrammarBlock start="\<grammar\>" matchgroup=ctGrammar end="\<end\>" contains=ctComment,ctGrammar,ctInclude,ctRoot,ctRuleBlock fold
-syn region ctRuleBlock start="\<rule\>" matchgroup=ctRule end="\<end\>" contains=ALLBUT,ctRequire,ctGrammar,ctInclude,ctRoot,ctConstant fold
-
-" Groups
-hi def link ctComment       Comment
-
-hi def link ctRequire       Include
-hi def link ctInclude       Include
-hi def link ctGrammar       ctDefine
-hi def link ctRoot          ctDefine
-hi def link ctRule          ctDefine
-hi def link ctDefine        Define
-
-hi def link ctConstant      Type
-hi def link ctVariable      Function
-hi def link ctKeyword       Keyword
-
-hi def link ctString        ctTerminal
-hi def link ctRegexp        ctTerminal
-hi def link ctCharClass     ctTerminal
-hi def link ctAnything      ctTerminal
-hi def link ctTerminal      String
-
-hi def link ctRegexpDelimiter ctStringDelimiter
-hi def link ctStringDelimiter Delimiter
-
-hi def link ctRegexpSpecial  ctStringSpecial
-hi def link ctStringSpecial  Special
-
-hi def link ctQuantifier    Number
-hi def link ctOperator      Operator
-
-let b:current_syntax = "citrus"
-
-" vim: nowrap: