antelope 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16bfd59509232d2d3ac2ae7a2fd3be25254836da
-  data.tar.gz: 28f7a1a19695c03a3f22e0d4b4bcf3ddea518fd4
+  metadata.gz: 589dbe0a0efbde62a5437b07ade45e68dc624d13
+  data.tar.gz: 2b3e774c00a75aa76bb37288621c5d6e094dc9ea
 SHA512:
-  metadata.gz: c89393e3efb8f38b932aefd49a5b7800879ca7d9a4bcbdc4a23f075f6bae1f5eb758904b6c602856834bb281ebf910ad0ffeb4af4fc2f6212c9813af121253e0
-  data.tar.gz: 62bebf9be801f6408ed4603e401aab55d7e38224dd428073874255ba20e3b1892b9f79e5abb56a4a5bd9de8bbb55501f0c6854a2261ea99526e6b79f420eac67
+  metadata.gz: e0ab4508a37e1d0d32ec8a3c715d8ba3117e8a94b3aa370e16ec8a22d2183c86f4ad2c290d89c18736e3f10d120412922e0eb0466aec79c36dabcaf2aac354c3
+  data.tar.gz: 95c5614a000b96260bc277cc8cfff24505fb8d5ae6d7780ededb1178f92c3bce97525961004ee63f54ea319901add91f6a63abf68a0fd9c559680aedd014de56

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
+  - 2.1.2
   - 2.1.0
   - 2.0.0
   - 1.9.3
   - jruby-19mode
 script: bundle exec rspec -f d spec
+sudo: false

data/lib/antelope/generation/recognizer.rb

@@ -118,7 +118,7 @@ module Antelope
           rules = state.rules.
             select { |r| r.active == active && r.succ? }.
             map(&:succ).to_set
-          s = states.find { |st| rules <= st.rules } || begin
+          s = states.find { |st| rules.subset? st.rules } || begin
             s = State.new << rules
             compute_closure(s)
             states << s

data/lib/antelope/template/scanner.rb

@@ -21,7 +21,7 @@ module Antelope
           @line   = 1
           @scanner.pos = 0
           until @scanner.eos?
-            scan_tag || scan_until_tag || error!
+            scan_tag || scan_until_tag || scan_until_end
           end
 
           @tokens
@@ -30,7 +30,7 @@ module Antelope
       rescue SyntaxError => e
         start = [@scanner.pos - 8, 0].max
         stop  = [@scanner.pos + 8, @scanner.string.length].min
-        snip  = @scanner.string[start..stop].strip.inspect
+        snip  = @scanner.string[start..stop].inspect
         char  = @scanner.string[@scanner.pos]
         char = if char
           char.inspect
@@ -38,8 +38,8 @@ module Antelope
           "EOF"
         end
 
-        new_line = "#{@source}:#{@line}: unexpected #{char} " \
-          "(near #{snip})"
+        new_line = "#{@source}:#{@line}:#{@scanner.pos}: "\
+          "unexpected #{char} (near #{snip})"
 
         raise e, e.message, [new_line, *e.backtrace]
       end
@@ -47,41 +47,36 @@ module Antelope
       private
 
       def scan_until_tag
-        if value = @scanner.scan_until(/(\n|\%|\{|\}|\\)/)
+        case
+        when value = @scanner.scan_until(/(\%|\{|\}|\\)/)
           @scanner.pos -= 1
           tokens << [:text, value[0..-2]]
         end
       end
 
+      def scan_until_end
+        tokens << [:text, @scanner.scan(/.+/m)]
+      end
+
       def scan_tag
         case
         when @scanner.scan(/\\(\{\{|\}\}|\%)/)
           tokens << [:text, @scanner[1]]
-        when @scanner.scan(/\n?\%\{/)
-          update_line
-          tokens << [:newline] if @scanner[0][0] == "\n"
+        when @scanner.scan(/\%\{/)
           scan_tag_start(:output_tag, :_, /\}/)
-        when @scanner.scan(/\n\%/)
-          update_line
-          error! unless value = @scanner.scan_until(/\n/)
-          @scanner.pos -= 1
+        when @scanner.scan(/\%/)
           tokens << [:tag, value]
-        when @scanner.scan(/\n?\{\{=/)
+        when @scanner.scan(/\{\{=/)
           update_line
           scan_tag_start(:output_tag)
-        when @scanner.scan(/\n?\{\{!/)
+        when @scanner.scan(/\{\{!/)
           update_line
           scan_tag_start(:comment_tag)
-        when @scanner.scan(/\n?\{\{/)
-          update_line
+        when @scanner.scan(/\{\{/)
           scan_tag_start(:tag)
-        when @scanner.scan(/\n?\}\}/)
-          update_line
+        when @scanner.scan(/\}\}/)
           @scanner.pos -= 2
           error!
-        when @scanner.scan(/\n/)
-          update_line
-          tokens << [:newline]
         when @scanner.scan(/\{|\}|\%|\\/)
           tokens << [:text, @scanner[0]]
         else

data/lib/antelope/version.rb

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

data/spec/antelope/ace/compiler_spec.rb

@@ -6,7 +6,7 @@ describe Ace::Compiler do
     %}
 
     %require "#{VERSION}"
-    %type "ruby"
+    %language "ruby"
 
     %terminal NUMBER
     %terminal SEMICOLON ";"

data/spec/antelope/ace/scanner_spec.rb

@@ -4,8 +4,8 @@ describe Ace::Scanner do
     expect(scan("%test \"a\" hi\n%%\nt: d { { } }\n%%\nhi\n")).to eq [
       [:directive, "test", ["a", "hi"]],
       [:second],
-      [:label, "t"],
-      [:part, "d"],
+      [:label, "t", nil],
+      [:part, "d", nil],
       [:block, "{ { } }"],
       [:third],
       [:copy, "\nhi\n"]

data/spec/antelope/constructor_spec.rb

@@ -1,7 +1,7 @@
 describe Generation::Constructor do
   let(:grammar)  { double("grammar") }
   let(:terminal) { token(:TERMINAL)  }
-  let(:epsilon)  { token(nil, nil, :epsilon) }
+  let(:epsilon)  { token(:epsilon) }
 
   subject { described_class.new(grammar) }
 
@@ -73,7 +73,7 @@ describe Generation::Constructor do
     end
 
     context "when given an array" do
-      let(:terminal2) { token(:TERMINAL2) }
+      let(:terminal2) { token(:terminal, :TERMINAL2) }
 
       it "generates a set" do
         expect(subject.first([epsilon, terminal])).
@@ -85,11 +85,14 @@ describe Generation::Constructor do
 
     context "when given a nonterminal" do
       let(:grammar) { with_recognizer }
-      let(:nonterminal) { token(:e, nil, :nonterminal) }
+      let(:nonterminal) { token(:nonterminal, :e) }
 
+      before do
+        p grammar.terminals
+      end
       it "generates a set" do
         expect(subject.first(nonterminal)).
-          to eq [token(:IDENT), token(:STAR, "*")].to_set
+          to eq [token(:terminal, :IDENT), token(:terminal, :STAR, "*")].to_set
       end
     end
 
@@ -109,7 +112,7 @@ describe Generation::Constructor do
 
     context "when given a nonterminal" do
       let(:grammar) { with_recognizer }
-      let(:nonterminal) { token(:l, nil, :nonterminal) }
+      let(:nonterminal) { token(:nonterminal, :l) }
 
       before do
         subject.productions.merge grammar.productions.values.flatten
@@ -117,15 +120,17 @@ describe Generation::Constructor do
 
       it "generates a set" do
         expect(subject.follow(nonterminal)).to eq [
-          token(:EQUALS, "="),
-          token(:"$")
+          token(:terminal, :EQUALS, "="),
+          token(:terminal, :"$end")
         ].to_set
       end
     end
   end
 
-  def token(name = nil, value = nil, type = :terminal)
+
+
+  def token(type, name = nil, value = nil, ttype = nil, id = nil)
     type = Ace::Token.const_get(type.to_s.capitalize)
-    type.new(name, value)
+    type.new(name, ttype, id, value)
   end
 end

data/spec/antelope/template_spec.rb

@@ -29,9 +29,9 @@ _out << "hello\\n"
 _out << begin
   something
 end.to_s
-_out << "world\\n\\n"
+_out << "\\nworld\\n\\n"
 thing
-_out << "a\\n\\n"
+_out << "\\na\\n\\n"
 _out
 TEST
     end

data/spec/fixtures/simple.ace

@@ -1,4 +1,4 @@
-%type "ruby"
+%language <ruby>
 
 %terminal IDENT
 %terminal STAR "*"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antelope
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie