babel_bridge 0.5.0 → 0.5.1

data/lib/nodes/node.rb

@@ -44,6 +44,9 @@ class Node
     @column
   end
 
+  def source_file; parser.source_file; end
+  def relative_source_file; parser.relative_source_file; end
+
   def to_s
     text
   end

data/lib/parser.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module BabelBridge
 # primary object used by the client
 # Used to generate the grammer with .rule methods
@@ -166,11 +168,18 @@ class Parser
   # parser active at a time
   attr_accessor :failure_index
   attr_accessor :expecting_list
-  attr_accessor :src
+  attr_accessor :src, :source_file
   attr_accessor :parse_cache
   attr_accessor :failed_parse # gets set if the entire input was not matched
 
-  def initialize
+  def relative_source_file
+    source_file && @relative_source_file ||= Pathname.new(File.expand_path(source_file)).relative_path_from(Pathname.getwd)
+  end
+
+  # options:
+  #     :source_file => string
+  def initialize(options={})
+    @source_file = options[:source_file]
     reset_parser_tracking
   end
 
@@ -314,7 +323,7 @@ Parse path at failure:
 Expecting#{expecting_list.length>1 ? ' one of' : ''}:
 #{Tools.uniform_tabs(Tools.indent(expecting_list.values.collect do |a|
     list=node_list_string(nodes_interesting_parse_path(a[:node]),common_root,options)
-    "#{a[:pattern].inspect}\t#{list}"
+    "#{a[:pattern].inspect}\t #{list}"
   end.sort.join("\n"),"  "))}
 ENDTXT
   end

data/lib/tools.rb

@@ -11,12 +11,12 @@ class Tools
       max_fields = lines.collect {|line| line.length}.max
       max_fields.times do |field|
         max_field_length = lines.collect {|line| (line[field]||"").length}.max
-        formatter = "%-#{max_field_length}s "
+        formatter = "%-#{max_field_length}s"
         lines.each_with_index do |line,i|
           lines[i][field] = formatter%line[field] if line[field]
         end
       end
-      lines.collect {|line|line.join}.join("\n")
+      lines.collect {|line|line.join.rstrip}.join("\n")
     end
 
     # return the line and column of a given offset into this string

data/lib/version.rb

@@ -1,4 +1,4 @@
 module BabelBridge
   # last release: 0.4.1
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/tools_spec.rb

@@ -4,18 +4,18 @@ describe "Tools::" do
   include TestParserGenerator
 
 
-  it "line_col" do
-    "".           line_col(0).should == [1,1]
-    " ".          line_col(0).should == [1,1]
-    "a\nbb\nccc". line_col(0).should == [1,1]
-    "a\nbb\nccc". line_col(1).should == [1,2]
-    "a\nbb\nccc". line_col(2).should == [2,1]
-    "a\nbb\nccc". line_col(3).should == [2,2]
-    "a\nbb\nccc". line_col(4).should == [2,3]
-    "a\nbb\nccc". line_col(5).should == [3,1]
-    "a\nbb\nccc". line_col(6).should == [3,2]
-    "a\nbb\nccc". line_col(7).should == [3,3]
-    "a\nbb\nccc". line_col(8).should == [3,4]
-    "a\nbb\nccc". line_col(9).should == [3,4]
+  it "line_column" do
+    BabelBridge::Tools.line_column("",           0).should == [1,1]
+    BabelBridge::Tools.line_column(" ",          0).should == [1,1]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 0).should == [1,1]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 1).should == [1,2]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 2).should == [2,1]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 3).should == [2,2]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 4).should == [2,3]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 5).should == [3,1]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 6).should == [3,2]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 7).should == [3,3]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 8).should == [3,4]
+    BabelBridge::Tools.line_column("a\nbb\nccc", 9).should == [3,4]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babel_bridge
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -130,4 +130,3 @@ signing_key:
 specification_version: 3
 summary: A Ruby-based parser-generator based on Parsing Expression Grammars.
 test_files: []
-has_rdoc: false