whittle 0.0.5 → 0.0.6

data/lib/whittle/non_terminal.rb

@@ -0,0 +1,12 @@
+# Whittle: A little LALR(1) parser in pure ruby, without a generator.
+#
+# Copyright (c) Chris Corbyn, 2011
+
+module Whittle
+  # Represents an nonterminal Rule, which refers to other Rules.
+  class NonTerminal < Rule
+    def terminal?
+      false
+    end
+  end
+end

data/lib/whittle/parser.rb

@@ -76,7 +76,7 @@ module Whittle
           raise ArgumentError,
             "Parser#rule does not accept both a Hash and a block" if name.kind_of?(Hash)
 
-          rules[name] = RuleSet.new(name)
+          rules[name] = RuleSet.new(name, false)
           rules[name].tap { |r| yield r }
         else
           key, value = if name.kind_of?(Hash)
@@ -88,7 +88,7 @@ module Whittle
             [name, name]
           end
 
-          rules[key] = RuleSet.new(key)
+          rules[key] = RuleSet.new(key, true)
           rules[key][value].as(:value)
         end
       end

data/lib/whittle/rule.rb

@@ -28,7 +28,6 @@ module Whittle
       @components = components
       @action     = DUMP_ACTION
       @name       = name
-      @terminal   = components.length == 1 && !components.first.kind_of?(Symbol)
       @assoc      = :right
       @prec       = 0
 
@@ -40,7 +39,7 @@ module Whittle
 
       pattern = @components.first
 
-      if @terminal
+      if terminal?
         @pattern = if pattern.kind_of?(Regexp)
           Regexp.new("\\G#{pattern}")
         else
@@ -57,7 +56,7 @@ module Whittle
     # @return [Boolean]
     #   true if this rule represents a terminal symbol
     def terminal?
-      @terminal
+      raise "Must be implemented by subclass"
     end
 
     # Walks all possible branches from the given rule, building a parse table.
@@ -83,7 +82,7 @@ module Whittle
       end || [self, new_offset].hash
 
       if sym.nil?
-        assert_reducable!(state, sym)
+        assert_reducible!(state, sym)
 
         state[sym] = {
           :action => :reduce,
@@ -231,7 +230,7 @@ module Whittle
     #
     # Returns nil if nothing is matched.
     def scan(source, offset, line)
-      return nil unless @terminal
+      return nil unless terminal?
 
       if match = source.match(@pattern, offset)
         {
@@ -255,7 +254,7 @@ module Whittle
       end
     end
 
-    def assert_reducable!(instructions, sym)
+    def assert_reducible!(instructions, sym)
       if instructions.key?(sym) && !instructions[sym][:rule].equal?(self)
         message = <<-END.gsub(/(^|$)\s+/m, " ")
           Unresolvable conflict found between rules

data/lib/whittle/rule_set.rb

@@ -15,9 +15,13 @@ module Whittle
     #
     # @param [Symbol, String] name
     #   the name of the rule in the grammar
-    def initialize(name)
-      @name  = name
-      @rules = []
+    #
+    # @param [Boolean] terminal
+    #   the class the use to add new rules
+    def initialize(name, terminal = false)
+      @name       = name
+      @rules      = []
+      @terminal   = terminal
     end
 
     # Enumerate all Rules in the set.
@@ -30,7 +34,8 @@ module Whittle
     # @param [Object...] components...
     #   a variable list of components (Symbols, Strings, or Regexps)
     def [](*components)
-      Rule.new(@name, *components).tap do |rule|
+      klass = terminal? ? Terminal : NonTerminal
+      klass.new(@name, *components).tap do |rule|
         @rules << rule
       end
     end
@@ -88,7 +93,7 @@ module Whittle
     # @return [Boolean]
     #   true if this rule is a terminal symbol
     def terminal?
-      @rules.length == 1 && @rules.first.terminal?
+      @terminal
     end
 
     # Predicate test for whether or not this RuleSet references a nonterminal Symbol.

data/lib/whittle/terminal.rb

@@ -0,0 +1,12 @@
+# Whittle: A little LALR(1) parser in pure ruby, without a generator.
+#
+# Copyright (c) Chris Corbyn, 2011
+
+module Whittle
+  # Represents an terminal Rule, matching a pattern in the input String
+  class Terminal < Rule
+    def terminal?
+      true
+    end
+  end
+end

data/lib/whittle/version.rb

@@ -3,5 +3,5 @@
 # Copyright (c) Chris Corbyn, 2011
 
 module Whittle
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/whittle.rb

@@ -8,5 +8,7 @@ require "whittle/errors/unconsumed_input_error"
 require "whittle/errors/parse_error"
 require "whittle/errors/grammar_error"
 require "whittle/rule"
+require "whittle/terminal"
+require "whittle/non_terminal"
 require "whittle/rule_set"
 require "whittle/parser"

data/spec/unit/parser/non_terminal_ambiguity_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe "a parser with a nonterminal rule looking like a terminal" do
+  let(:parser) do
+    Class.new(Whittle::Parser) do
+      rule("+")
+
+      rule(:prog) do |r|
+        r["+"]
+      end
+
+      start(:prog)
+    end
+  end
+
+  it "recognises the correct terminal" do
+    parser.new.parse("+").should == "+"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whittle
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70134349797920 !ruby/object:Gem::Requirement
+  requirement: &70361567853620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70134349797920
+  version_requirements: *70361567853620
 description: ! "Write powerful parsers by defining a series of very simple rules\n
   \                    and operations to perform as those rules are matched.  Whittle\n
   \                    parsers are written in pure ruby and as such are extremely
@@ -46,9 +46,11 @@ files:
 - lib/whittle/errors/grammar_error.rb
 - lib/whittle/errors/parse_error.rb
 - lib/whittle/errors/unconsumed_input_error.rb
+- lib/whittle/non_terminal.rb
 - lib/whittle/parser.rb
 - lib/whittle/rule.rb
 - lib/whittle/rule_set.rb
+- lib/whittle/terminal.rb
 - lib/whittle/version.rb
 - spec/spec_helper.rb
 - spec/unit/parser/empty_rule_spec.rb
@@ -56,6 +58,7 @@ files:
 - spec/unit/parser/error_reporting_spec.rb
 - spec/unit/parser/grouped_expr_spec.rb
 - spec/unit/parser/multiple_precedence_spec.rb
+- spec/unit/parser/non_terminal_ambiguity_spec.rb
 - spec/unit/parser/noop_spec.rb
 - spec/unit/parser/pass_through_parser_spec.rb
 - spec/unit/parser/precedence_spec.rb
@@ -98,6 +101,7 @@ test_files:
 - spec/unit/parser/error_reporting_spec.rb
 - spec/unit/parser/grouped_expr_spec.rb
 - spec/unit/parser/multiple_precedence_spec.rb
+- spec/unit/parser/non_terminal_ambiguity_spec.rb
 - spec/unit/parser/noop_spec.rb
 - spec/unit/parser/pass_through_parser_spec.rb
 - spec/unit/parser/precedence_spec.rb