tp_plus 0.0.74 → 0.0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 145a37ef7d63642c1a654a9e804c0dc8ce21f1b0
-  data.tar.gz: 3229bc8c6be259a54326b1d83ff5cc295a443b6c
+  metadata.gz: 715a2b6920c4a27cba58ad07cdef950bce8dc85b
+  data.tar.gz: 1d67bbde251dd3dc0c84f346b49cce19c07bcf45
 SHA512:
-  metadata.gz: 33068559319eff301cd865cef17e9db384ab30b50b7f59fa44659b4ba4ad87289a195ac500ce9105a7355a5561e9f483f6c9b22946c59e89458d5b85c395df9b
-  data.tar.gz: 0c4db71fa16f12d8fa0d244c0a1b59a25a492f9911049a3697c8fa33a5b46ee6387848928dcf0daaa8ce912b461d589e353c5214d4255f0ca2eec29f3a32a2cf
+  metadata.gz: 83cbd62b3807e17cc20bfb6d4f426197f6d8da570628bb9e89d6e5f95b135b190b2e08283c483d3afa9f26a6d21e2e762360fd0ec6b45f93f68dc1346f6b8713
+  data.tar.gz: 5514468372d3b436202ac3f4a80f86fe0f0c5365408e124db71c13d03139a3b4bc70abc120b89c37cbb595f482a96d88a9399e4fb8431d86a0eedefe0b004973

data/README.md

@@ -68,6 +68,16 @@ Usage
 
 See `tpp --help` for options.
 
+Development
+-----------
+
+1. Install Ruby
+2. Install git
+3. Install bundler `gem install bundler`
+4. Clone the repo `git clone https://github.com/onerobotics/tp_plus.git`
+5. Install dependencies with `bundle`
+6. Build the parser and run the tests with `rake`
+
 License
 -------
 

data/lib/tp_plus/parser.rb

@@ -31,9 +31,14 @@ module TPPlus
 
     do_parse
     @interpreter
-  rescue Racc::ParseError => e
-    raise "Parse error on line #{@interpreter.line_count+1}: #{e}"
   end
+
+  def on_error(t, val, vstack)
+    raise ParseError, sprintf("Parse error on line #{@scanner.tok_line} column #{@scanner.tok_col}: %s (%s)",
+                                val.inspect, token_to_str(t) || '?')
+  end
+
+  class ParseError < StandardError ; end
 ##### State transition tables begin ###
 
 racc_action_table = [

data/lib/tp_plus/scanner.rb

@@ -3,13 +3,20 @@ module TPPlus
     def initialize
     end
 
+    attr_reader :lineno, :col
+    attr_reader :tok_line, :tok_col
     def scan_setup(src)
       @src = src
       @lineno = 1
       @ch = " "
       @offset = 0
+      @col = 0
       @rdOffset = 0
       @prevDot = false # for groups
+
+      @tok_line = 0
+      @tok_col = 0
+
       self.next
     end
 
@@ -19,8 +26,10 @@ module TPPlus
         @ch = @src[@rdOffset]
         if @ch == "\n"
           @lineno += 1
+          @col = 0
         end
         @rdOffset += 1
+        @col += 1
       else
         @offset = @src.length
         @ch = -1
@@ -131,6 +140,9 @@ module TPPlus
     def next_token
       self.skipWhitespace
 
+      @tok_line = @lineno
+      @tok_col = @col
+
       tok = nil
       lit = ""
       ch = @ch

data/lib/tp_plus/version.rb

@@ -1,3 +1,3 @@
 module TPPlus
-  VERSION = '0.0.74'
+  VERSION = '0.0.75'
 end

data/test/tp_plus/test_interpreter.rb

@@ -698,7 +698,7 @@ Foo::Bar::baz = 2)
 
 
   def test_bad_environment
-    assert_raise(RuntimeError) do
+    assert_raise(TPPlus::Parser::ParseError) do
       @interpreter.load_environment("asdf")
     end
   end

data/test/tp_plus/test_parser.rb

@@ -493,4 +493,10 @@ end)
     assert_equal 3, l.args.length
   end
 
+  def test_parse_error_reporting
+    e = assert_raise(TPPlus::Parser::ParseError) do
+      parse("foo bar")
+    end
+    assert_equal "Parse error on line 1 column 5: \"bar\" (WORD)", e.message
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.74
+  version: 0.0.75
 platform: ruby
 authors:
 - Jay Strybis