antelope 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b92cf3cc4e8746993ec89f21f9eb97646787cbf1
-  data.tar.gz: 2739de2a0326fa116232b6f6be22e1b771d87225
+  metadata.gz: 60074794e65864ae5447727e4984cde3a504f0a2
+  data.tar.gz: 30f5789883e6d9ed457f39cfbe9bb2e403e73e94
 SHA512:
-  metadata.gz: 1bca5d306f74efc0f25f4823e288221e3b5c708a2f6a15e870254df602c617bfac7482c5871b6241a17c2fd81cad4bb83a132c7c04a44c2c035e14604faf85cd
-  data.tar.gz: 22b68475fe03066f181006e21763707dd01102143998634b8938597d771a9bca7a776f5980702a55db87db6ad923b63434c14dd12be925a2d1c0cf40ccdf9653
+  metadata.gz: 6a0f05690c5a8cf167e2eac1dade2394b5d0e74c23b457c5aed225ad8416c9fd5aec77bb3ec60e9b6ac6c1d9bfcf62604accff5f1ed8d94f06b5cc746d10ca14
+  data.tar.gz: 8773be8140d656cbada7cd82dcf601577a3bbc0ec335d9bb07a0200ca2cafc538b19609c2c83ca98ae1b51e8945b04cb49616f9dc1a9f09fb409c224088fa852

data/bin/antelope

@@ -4,4 +4,4 @@ $: << File.expand_path("../../lib", __FILE__)
 require "antelope"
 require "antelope/cli"
 
-Antelope::CLI.start(ARGV)
+Antelope::CLI.start

data/lib/antelope/ace/grammar/productions.rb

@@ -99,7 +99,7 @@ module Antelope
           left  = Token::Nonterminal.new(rule[:label])
           items = rule[:set].map { |_| find_token(_[0]) }
           prec  = if rule[:prec].empty?
-            items.select(&:terminal?).last
+            items.select(&:terminal?).first
           else
             rule[:prec].intern
           end

data/lib/antelope/ace/scanner/first.rb

@@ -22,7 +22,7 @@ module Antelope
         def scan_first_part
           until @scanner.check(CONTENT_BOUNDRY)
             scan_first_copy || scan_first_directive ||
-            scan_whitespace || error!
+            scan_whitespace || scan_comment || error!
           end
         end
 

data/lib/antelope/ace/scanner/second.rb

@@ -32,7 +32,8 @@ module Antelope
           tokens << [:second]
 
           until @scanner.check(CONTENT_BOUNDRY)
-            scan_second_rule || scan_whitespace || error!
+            scan_second_rule || scan_whitespace || scan_comment ||
+            error!
           end
         end
 
@@ -77,7 +78,7 @@ module Antelope
           while body
             scan_second_rule_prec || scan_second_rule_part ||
             scan_second_rule_or ||  scan_second_rule_block ||
-            scan_whitespace || (body = false)
+            scan_whitespace || scan_comment || (body = false)
           end
           @scanner.scan(/;/)
         end

data/lib/antelope/ace/scanner.rb

@@ -120,6 +120,16 @@ module Antelope
         end
       end
 
+      # Scans for a comment.  If the next token is a number sign (#),
+      # it will consume all characters until the next newline.
+      #
+      # @return [Boolean] if a comment was matched.
+      def scan_comment
+        if @scanner.scan(/\#(.*)\n/)
+          @line += 1
+        end
+      end
+
       private
 
       # Raises an error.

data/lib/antelope/ace/token.rb

@@ -176,10 +176,6 @@ module Antelope
         end
       end
 
-      def ==(other)
-        hash == other.hash if other.respond_to?(:hash)
-      end
-
       alias_method :eql?, :==
 
       # Compares this class and another object, fuzzily.  If the other

data/lib/antelope/cli.rb

@@ -29,6 +29,11 @@ module Antelope
       end
     end
 
+    desc "version", "Displays the running version of antelope"
+    def version
+      puts "Antelope version #{Antelope::VERSION}"
+    end
+
     private
 
     # Compiles the given file, and then generates.  If an error

data/lib/antelope/generation/constructor/follow.rb

@@ -68,29 +68,31 @@ module Antelope
         # @see Nullable#nullable?
         def generate_follow_set(token)
           # Set it to the empty set so we don't end up recursing.
-          set = @follows[token] = Set.new
+          @follows[token] = Set.new
+          set = Set.new
 
           productions.each do |rule|
             items = rule.items
+            i = 0
 
             # Find all of the positions within the rule that our token
             # occurs, and then increment that position by one.
-            positions = items.each_with_index.
-              find_all { |t, _| t == token }.
-              map(&:last).map(&:succ)
+            while i < items.size
+              next i += 1 unless items[i] == token
+              position = i.succ
 
-            # Find the FIRST set of every item after our token, and
-            # put that in our set.
-            positions.map { |pos| first(items[pos..-1]) }.
-              inject(set, :merge)
+              # Find the FIRST set of every item after our token, and
+              # put that in our set.
+              set.merge first(items[position..-1])
 
-            positions.each do |pos|
               # If we're at the end of the rule...
-              if pos == items.size || nullable?(items[pos..-1])
+              if position == items.size || nullable?(items[position..-1])
                 # Then add the FOLLOW set of the left-hand side to our
                 # set.
                 set.merge follow(rule.label)
               end
+
+              i += 1
             end
           end
 

data/lib/antelope/generation/constructor.rb

@@ -97,7 +97,8 @@ module Antelope
       # @return [void]
       # @see Follow#follow
       def augment_rules(state)
-        state.rules.select { |x| x.position.zero? }.each do |rule|
+        state.rules.each do |rule|
+          next unless rule.position.zero?
           current_state = state
 
           label = rule.left.dup

data/lib/antelope/generation/tableizer.rb

@@ -95,7 +95,10 @@ module Antelope
               next
             end
 
-            terminal = grammar.precedence_for(on)
+            terminal = if states[state].transitions.key?(on)
+              states[state].rules.
+                detect { |rule| rule.active.name == on }.precedence
+            end
             rule_part, other_part = data.sort_by { |(t, _)| t }
 
             conflict = proc do |result|
@@ -118,8 +121,6 @@ module Antelope
                     detect { |rule| rule.active.name == on }
                 })
 
-              #conflicts[state][on] = [result, rule_part, other_part,
-              #  terminal, @rules[rule_part[1]].prec]
               conflicts[state][on] = hash
             end
 

data/lib/antelope/generator/templates/error.ant

@@ -1,17 +1,16 @@
 Productions:
 %len = grammar.all_productions.size.to_s.size
-%productions = grammar.all_productions.
-%  map { |x| ["#{x.label} → #{x.items.join(' ')}", x.block] }
-%body = productions.map { |_| _.first.size }.max
-%productions.each_with_index do |prod, i|
-  {{= sprintf("%#{len}s", i)}} {{= sprintf("%-#{body}s", prod[0])}} %{prod[1]}
+%productions = recognizer.states.map(&:rules).inject(:merge).
+%  select(&:final?).map { |x| [x.to_s(false), x.production.block] }
+%body = productions.map { |_| _[0].size }.max
+%productions.each do |prod|
+  {{= sprintf("%-#{body}s", prod[0]) }} %{prod[1]}
 %end
 
-%if table.any? { |_, i| tableizer.conflicts[i].any? }
-No errors :)
-%else
+% if table.each_with_index.any? { |_, i| tableizer.conflicts[i].each.
+%   select { |(_, v)| v[:result] == 0 || directives.output.verbose }.any? }
 Error:
-%  table.each_with_index do |v, i|
+%  table.each_with_index do |_, i|
 %    conflicts = tableizer.conflicts[i].each.
 %      select { |(_, v)| v[:result] == 0 || directives.output.verbose }
 %    next unless conflicts.any?
@@ -30,4 +29,6 @@ Error:
 %     end
 %    end
 %  end
+%else
+No errors :)
 %end

data/lib/antelope/generator/templates/info.ant

@@ -1,10 +1,10 @@
 Productions:
 %len = grammar.all_productions.size.to_s.size
-%productions = grammar.all_productions.
-%  map { |x| ["#{x.label} → #{x.items.join(' ')}", x.block] }
-%body = productions.map { |_| _.first.size }.max
-%productions.each_with_index do |prod, i|
-  {{= sprintf("%#{len}s", i)}} {{= sprintf("%-#{body}s", prod[0])}} %{prod[1]}
+%productions = recognizer.states.map(&:rules).inject(:merge).
+%  select(&:final?).map { |x| [x.to_s(false), x.production.block] }
+%body = productions.map { |_| _[0].size }.max
+%productions.each do |prod|
+  {{= sprintf("%-#{body}s", prod[0]) }} %{prod[1]}
 %end
 
 %if unused_symbols.any?

data/lib/antelope/template.rb

@@ -23,7 +23,6 @@ module Antelope
     end
 
     def result(binding = TOPLEVEL_BINDING.dup)
-      # sue me.
       eval(parse, binding, fake_name, 0)
     end
 

data/lib/antelope/version.rb

@@ -2,5 +2,5 @@
 
 module Antelope
   # The current running version of antelope.
-  VERSION = "0.2.2".freeze
+  VERSION = "0.2.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antelope
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie