citrus 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2caf741a96f7499506f5bf450998aad817dbe9d4
-  data.tar.gz: 955838c4b13b2ae7c25be7b7d8e440a594105be8
+  metadata.gz: 8d8b5389cb9cd24e66e80cccf3919854caa40f2a
+  data.tar.gz: fb65be9111329304a3c6e14d469799ae5fcd939a
 SHA512:
-  metadata.gz: 3b02bb8198f6190575e3e4960be9d81adcca08d638919e32a6b1b1dc164e953007ce60b6ed86e0988a51a3c81b2ad490f40863e9ed61f06a58e50193a055e03f
-  data.tar.gz: 3a5b292f74e1849e01ebe3349c402a4ad3d7f9c1f0a024b21f830c3f10700063f9551ebd601155070992f9d636cca4e6609dd00e4e72faa8400c098d622510ad
+  metadata.gz: d3ea3ad5c127c4496350c36545abeeadd632ef61c070733e7fc2878767681e54c69434aa71e3f7cf2f5725d0ca0261288d1bb9aaed7ffa41ffccb7d8d253511a
+  data.tar.gz: 0ba669d11e232d8060cad7a1e6c1d116e41eef1bcfac3a98707bdbdea2ced9fb5c386a21f5aaeb3e0b28f1d0fae39188a6c27a106aae3dde8af654cac85aa18d

data/README.md

@@ -15,7 +15,7 @@ Via [RubyGems](http://rubygems.org/):
 
 From a local copy:
 
-    $ git clone git://github.com/mjijackson/citrus.git
+    $ git clone git://github.com/mjackson/citrus.git
     $ cd citrus
     $ rake package install
 
@@ -47,7 +47,7 @@ In Citrus, there are three main types of objects: rules, grammars, and matches.
 
 ## Rules
 
-A [Rule](http://mjijackson.com/citrus/api/classes/Citrus/Rule.html) is an object
+A [Rule](http://mjackson.github.io/citrus/api/classes/Citrus/Rule.html) is an object
 that specifies some matching behavior on a string. There are two types of rules:
 terminals and non-terminals. Terminals can be either Ruby strings or regular
 expressions that specify some input to match. For example, a terminal created
@@ -65,7 +65,7 @@ of Ruby modules. Rules use these modules to extend the matches they create.
 
 ## Grammars
 
-A [Grammar](http://mjijackson.com/citrus/api/classes/Citrus/Grammar.html) is a
+A [Grammar](http://mjackson.github.io/citrus/api/classes/Citrus/Grammar.html) is a
 container for rules. Usually the rules in a grammar collectively form a complete
 specification for some language, or a well-defined subset thereof.
 
@@ -79,7 +79,7 @@ Ruby's `super` keyword.
 
 ## Matches
 
-A [Match](http://mjijackson.com/citrus/api/classes/Citrus/Match.html) object
+A [Match](http://mjackson.github.io/citrus/api/classes/Citrus/Match.html) object
 represents a successful recognition of some piece of the input. Matches are
 created by rule objects during a parse.
 
@@ -128,8 +128,8 @@ match in a case-insensitive manner.
 Besides case sensitivity, case-insensitive strings have the same behavior as
 double quoted strings.
 
-See [Terminal](http://mjijackson.com/citrus/api/classes/Citrus/Terminal.html) and
-[StringTerminal](http://mjijackson.com/citrus/api/classes/Citrus/StringTerminal.html)
+See [Terminal](http://mjackson.github.io/citrus/api/classes/Citrus/Terminal.html) and
+[StringTerminal](http://mjackson.github.io/citrus/api/classes/Citrus/StringTerminal.html)
 for more information.
 
 ## Repetition
@@ -153,7 +153,7 @@ The `+` and `?` operators are supported as well for the common cases of `1*` and
     'abc'+        # match "abc" one or more times
     'abc'?        # match "abc" zero or one time
 
-See [Repeat](http://mjijackson.com/citrus/api/classes/Citrus/Repeat.html) for
+See [Repeat](http://mjackson.github.io/citrus/api/classes/Citrus/Repeat.html) for
 more information.
 
 ## Lookahead
@@ -175,9 +175,9 @@ that does not match a given expression.
 When using this operator (the tilde), at least one character must be consumed
 for the rule to succeed.
 
-See [AndPredicate](http://mjijackson.com/citrus/api/classes/Citrus/AndPredicate.html),
-[NotPredicate](http://mjijackson.com/citrus/api/classes/Citrus/NotPredicate.html),
-and [ButPredicate](http://mjijackson.com/citrus/api/classes/Citrus/ButPredicate.html)
+See [AndPredicate](http://mjackson.github.io/citrus/api/classes/Citrus/AndPredicate.html),
+[NotPredicate](http://mjackson.github.io/citrus/api/classes/Citrus/NotPredicate.html),
+and [ButPredicate](http://mjackson.github.io/citrus/api/classes/Citrus/ButPredicate.html)
 for more information.
 
 ## Sequences
@@ -188,7 +188,7 @@ should match in that order.
     'a' 'b' 'c'   # match "a", then "b", then "c"
     'a' [0-9]     # match "a", then a numeric digit
 
-See [Sequence](http://mjijackson.com/citrus/api/classes/Citrus/Sequence.html)
+See [Sequence](http://mjackson.github.io/citrus/api/classes/Citrus/Sequence.html)
 for more information.
 
 ## Choices
@@ -204,7 +204,7 @@ It is important to note when using ordered choice that any operator binds more
 tightly than the vertical bar. A full chart of operators and their respective
 levels of precedence is below.
 
-See [Choice](http://mjijackson.com/citrus/api/classes/Citrus/Choice.html) for
+See [Choice](http://mjackson.github.io/citrus/api/classes/Citrus/Choice.html) for
 more information.
 
 ## Labels
@@ -263,7 +263,7 @@ In the example above, the `FloatingPoint` grammar includes `Number`. Both have a
 rule named `number`, so `FloatingPoint#number` has access to `Number#number` by
 means of using `super`.
 
-See [Super](http://mjijackson.com/citrus/api/classes/Citrus/Super.html) for more
+See [Super](http://mjackson.github.io/citrus/api/classes/Citrus/Super.html) for more
 information.
 
 ## Precedence
@@ -343,7 +343,7 @@ and "1 + 2+3", but it does not have enough semantic information to be able to
 actually interpret these expressions.
 
 At this point, when the grammar parses a string it generates a tree of
-[Match](http://mjijackson.com/citrus/api/classes/Citrus/Match.html) objects.
+[Match](http://mjackson.github.io/citrus/api/classes/Citrus/Match.html) objects.
 Each match is created by a rule and may itself be comprised of any number of
 submatches.
 
@@ -420,14 +420,14 @@ commands in a terminal.
 Congratulations! You just ran your first piece of Citrus code.
 
 One interesting thing to notice about the above sequence of commands is the
-return value of [Citrus#load](http://mjijackson.com/citrus/api/classes/Citrus.html#M000003).
+return value of [Citrus#load](http://mjackson.github.io/citrus/api/classes/Citrus.html#M000003).
 When you use `Citrus.load` to load a grammar file (and likewise
-[Citrus#eval](http://mjijackson.com/citrus/api/classes/Citrus.html#M000004) to
+[Citrus#eval](http://mjackson.github.io/citrus/api/classes/Citrus.html#M000004) to
 evaluate a raw string of grammar code), the return value is an array of all the
 grammars present in that file.
 
 Take a look at
-[calc.citrus](http://github.com/mjijackson/citrus/blob/master/lib/citrus/grammars/calc.citrus)
+[calc.citrus](http://github.com/mjackson/citrus/blob/master/lib/citrus/grammars/calc.citrus)
 for an example of a calculator that is able to parse and evaluate more complex
 mathematical expressions.
 
@@ -535,7 +535,7 @@ made to test equality of match objects with string values.
 
 ## Debugging
 
-When a parse fails, a [ParseError](http://mjijackson.com/citrus/api/classes/Citrus/ParseError.html)
+When a parse fails, a [ParseError](http://mjackson.github.io/citrus/api/classes/Citrus/ParseError.html)
 object is generated which provides a wealth of information about exactly where
 the parse failed including the offset, line number, line text, and line offset.
 Using this object, you could possibly provide some useful feedback to the user

data/citrus.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = %w< --line-numbers --inline-source --title Citrus --main Citrus >
   s.extra_rdoc_files = %w< README.md CHANGES >
 
-  s.homepage = 'http://mjijackson.com/citrus'
+  s.homepage = 'http://mjackson.github.io/citrus'
 end

data/doc/example.markdown

@@ -120,7 +120,7 @@ grammar code), the return value is an array of all the grammars present in that
 file.
 
 Take a look at
-[examples/calc.citrus](http://github.com/mjijackson/citrus/blob/master/examples/calc.citrus)
+[examples/calc.citrus](http://github.com/mjackson/citrus/blob/master/examples/calc.citrus)
 for an example of a calculator that is able to parse and evaluate more complex
 mathematical expressions.
 

data/doc/index.markdown

@@ -13,6 +13,6 @@ Via [RubyGems](http://rubygems.org/):
 
 From a local copy:
 
-    $ git clone git://github.com/mjijackson/citrus.git
+    $ git clone git://github.com/mjackson/citrus.git
     $ cd citrus
     $ rake package install

data/lib/citrus.rb

@@ -8,7 +8,7 @@ require 'citrus/version'
 # elegance and expressiveness of the language with the simplicity and power of
 # parsing expressions.
 #
-# http://mjijackson.com/citrus
+# http://mjackson.github.io/citrus
 module Citrus
   autoload :File, 'citrus/file'
 
@@ -199,7 +199,7 @@ module Citrus
 
     # Returns the 0-based offset of the given +pos+ in the input on the line
     # on which it is found. +pos+ defaults to the current pointer position.
-    def line_offset(pos=pos)
+    def line_offset(pos=pos())
       p = 0
       string.each_line do |line|
         len = line.length
@@ -211,7 +211,7 @@ module Citrus
 
     # Returns the 0-based number of the line that contains the character at the
     # given +pos+. +pos+ defaults to the current pointer position.
-    def line_index(pos=pos)
+    def line_index(pos=pos())
       p = n = 0
       string.each_line do |line|
         p += line.length
@@ -223,7 +223,7 @@ module Citrus
 
     # Returns the 1-based number of the line that contains the character at the
     # given +pos+. +pos+ defaults to the current pointer position.
-    def line_number(pos=pos)
+    def line_number(pos=pos())
       line_index(pos) + 1
     end
 
@@ -231,7 +231,7 @@ module Citrus
 
     # Returns the text of the line that contains the character at the given
     # +pos+. +pos+ defaults to the current pointer position.
-    def line(pos=pos)
+    def line(pos=pos())
       lines[line_index(pos)]
     end
 

data/lib/citrus/version.rb

@@ -1,6 +1,6 @@
 module Citrus
   # The current version of Citrus as [major, minor, patch].
-  VERSION = [3, 0, 1]
+  VERSION = [3, 0, 2]
 
   # Returns the current version of Citrus as a string.
   def self.version

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: citrus
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Michael Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Parsing Expressions for Ruby
@@ -32,9 +32,13 @@ extra_rdoc_files:
 - README.md
 - CHANGES
 files:
+- CHANGES
+- README.md
+- Rakefile
 - benchmark/seqpar.citrus
 - benchmark/seqpar.gnuplot
 - benchmark/seqpar.rb
+- citrus.gemspec
 - doc/background.markdown
 - doc/example.markdown
 - doc/extras.markdown
@@ -43,11 +47,11 @@ files:
 - doc/links.markdown
 - doc/syntax.markdown
 - doc/testing.markdown
+- lib/citrus.rb
 - lib/citrus/core_ext.rb
 - lib/citrus/file.rb
 - lib/citrus/grammars.rb
 - lib/citrus/version.rb
-- lib/citrus.rb
 - test/_files/alias.citrus
 - test/_files/file1.citrus
 - test/_files/file2.citrus
@@ -88,36 +92,32 @@ files:
 - test/string_terminal_test.rb
 - test/super_test.rb
 - test/terminal_test.rb
-- citrus.gemspec
-- Rakefile
-- README.md
-- CHANGES
-homepage: http://mjijackson.com/citrus
+homepage: http://mjackson.github.io/citrus
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Citrus
-- --main
+- "--main"
 - Citrus
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Parsing Expressions for Ruby