citrus 1.5.1 → 1.5.2

data/citrus.gemspec

@@ -1,6 +1,10 @@
+$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
+
+require 'citrus'
+
 Gem::Specification.new do |s|
   s.name = 'citrus'
-  s.version = '1.5.1'
+  s.version = Citrus.version
   s.date = '2010-08-17'
 
   s.summary = 'Parsing Expressions for Ruby'

data/lib/citrus.rb

@@ -4,7 +4,7 @@
 #
 # http://mjijackson.com/citrus
 module Citrus
-  VERSION = [1, 5, 1]
+  VERSION = [1, 5, 2]
 
   Infinity = 1.0 / 0
 
@@ -982,5 +982,7 @@ class Object
   def grammar(name, &block)
     obj = respond_to?(:const_set) ? self : Object
     obj.const_set(name, Citrus::Grammar.new(&block))
+  rescue NameError
+    raise ArgumentError, 'Invalid grammar name: %s' % name
   end
 end

data/lib/citrus/file.rb

@@ -10,45 +10,29 @@ module Citrus
 
     rule :file do
       all(:space, zero_or_more(any(:require, :grammar))) {
-        def requires
-          find(:require)
-        end
-
-        def grammars
-          find(:grammar)
-        end
-
         def value
-          requires.each {|r| require r.value }
-          grammars.map {|g| g.value }
+          find(:require).each {|r| require r.value }
+          find(:grammar).map {|g| g.value }
         end
       }
     end
 
     rule :grammar do
       all(:grammar_keyword, :module_name, :grammar_body, :end_keyword) {
-        def includes
-          find(:include)
-        end
-
         def modules
-          includes.map {|inc| eval(inc.value, TOPLEVEL_BINDING) }
+          find(:include).map {|inc| eval(inc.value, TOPLEVEL_BINDING) }
         end
 
         def root
           find(:root).last
         end
 
-        def rules
-          find(:rule)
-        end
-
         def value
           code = '%s = Citrus::Grammar.new' % module_name.value
           grammar = eval(code, TOPLEVEL_BINDING)
           modules.each {|mod| grammar.include(mod) }
           grammar.root(root.value) if root
-          rules.each {|rule| grammar.rule(rule.rule_name.value, rule.value) }
+          find(:rule).each {|r| grammar.rule(r.rule_name.value, r.value) }
           grammar
         end
       }

data/test/grammar_test.rb

@@ -131,4 +131,10 @@ class GrammarTest < Test::Unit::TestCase
     assert_equal(str.length, match.length)
   end
 
+  def test_global_grammar
+    assert_raise ArgumentError do
+      grammar(:abc)
+    end
+  end
+
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: citrus
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Michael Jackson
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -118,7 +115,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -127,7 +123,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"