rhcl 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f4fec10586c8cabcb7f667f0796e2000cd60bb1
-  data.tar.gz: 66103b7b1b76c3784a79d28864eb96c1aa091aa7
+  metadata.gz: 7912283f77ce4f133e772641e1b258bc77bddadd
+  data.tar.gz: 2747ad96ebb024b9534ecd3d54b23d669cb14df5
 SHA512:
-  metadata.gz: f3d97b092c6914e3c087825e7983b207e73014fc18c2e5b693d282fc80463a7ef46e76ea124db54284e68b023bf957b8e8b9fca2f0939c835670fe5d657aa5ae
-  data.tar.gz: b7b82103a49c43892ade824a5db41f3000276cebcc60a7148e04d2120551280bd423b3602b2e32d5b85c82837d624deb7a603984f868e2e5af0dde187ab0beb8
+  metadata.gz: 8f2567babef26dd87c6aed2335419cfccf7a75f4a7cab6e4d2a80e595e15fee51709ed49f0a5e5d7433fdeb0814481e37aaafe56004d405fd9de667adba22b9a
+  data.tar.gz: a8f8da9aa5a07a54e4609efbc3d2e68110535cb8c34dfbed488fb80af3d5ab5e25f5b0127415c79e2d66f2f063c6e3b27a430d81addb7cd65492fb9433a60b4b

data/lib/rhcl/parse.tab.rb

@@ -21,32 +21,44 @@ end
 
 def scan
   tok = nil
+  @prev_tokens = []
 
   until @ss.eos?
     if (tok = @ss.scan /\s+/)
       # nothing to do
     elsif (tok = @ss.scan(/#/))
-      @ss.scan_until(/\n/)
+      @prev_tokens << tok
+      @prev_tokens << @ss.scan_until(/\n/)
+      tok = ''
     elsif (tok = @ss.scan(%r|/|))
-      case @ss.getch
+      @prev_tokens << tok
+
+      case (tok = @ss.getch)
       when '/'
-        @ss.scan_until(/(\n|\z)/)
+        @prev_tokens << tok
+        @prev_tokens << @ss.scan_until(/(\n|\z)/)
       when '*'
+        @prev_tokens << tok
         nested = 1
 
         until nested.zero?
-          case @ss.scan_until(%r{(/\*|\*/|\z)})
+          case (tok = @ss.scan_until(%r{(/\*|\*/|\z)}))
           when %r|/\*\z|
+            @prev_tokens << tok
             nested += 1
           when %r|\*/\z|
+            @prev_tokens << tok
             nested -= 1
           else
+            @prev_tokens << tok
             break
           end
         end
       else
         raise "comment expected, got '#{tok}'"
       end
+
+      tok = ''
     elsif (tok = @ss.scan(/-?\d+\.\d+/))
       yield [:FLOAT, tok.to_f]
     elsif (tok = @ss.scan(/-?\d+/))
@@ -66,16 +78,18 @@ def scan
     elsif (tok = @ss.scan(/"/))
       yield [:STRING, (@ss.scan_until(/("|\z)/) || '').sub(/"\z/, '')]
     else
-      identifier = (@ss.scan_until(/(\s|\z)/) || '').sub(/\s\z/, '')
+      tok = (@ss.scan_until(/(\s|\z)/) || '').sub(/\s\z/, '')
       token_type = :IDENTIFIER
 
-      if ['true', 'false'].include?(identifier)
-        identifier = !!(identifier =~ /true/)
+      if ['true', 'false'].include?(tok)
+        tok = !!(tok =~ /true/)
         token_type = :BOOL
       end
 
-      yield [token_type, identifier]
+      yield [token_type, tok]
     end
+
+    @prev_tokens << tok
   end
 
   yield [false, '$end']
@@ -86,6 +100,36 @@ def parse
   yyparse self, :scan
 end
 
+def on_error(error_token_id, error_value, value_stack)
+  raise_error(error_value)
+end
+
+def raise_error(error_value)
+  header = "parse error on value: #{error_value}\n"
+  prev = (@prev_tokens || [])
+  prev = prev.empty? ? '' : prev.join + ' '
+  errmsg = prev + "__#{error_value}__"
+
+  if @ss and @ss.rest?
+    errmsg << ' ' + @ss.rest
+  end
+
+  lines = errmsg.lines
+  err_num = prev.count("\n")
+  from_num = err_num - 3
+  from_num = 0 if from_num < 0
+  to_num = err_num + 3
+  digit_num = lines.count.to_s.length
+
+  errmsg = lines.each_with_index.map {|line, i|
+    mark = (i == err_num) ? '*' : ' '
+    '%s %*d: %s' % [mark, digit_num, i + 1, line]
+  }.slice(from_num..to_num).join
+
+  raise Racc::ParseError, header + errmsg
+end
+private :raise_error
+
 def self.parse(obj)
   self.new(obj).parse
 end

data/lib/rhcl/parse.y

@@ -112,32 +112,44 @@ end
 
 def scan
   tok = nil
+  @prev_tokens = []
 
   until @ss.eos?
     if (tok = @ss.scan /\s+/)
       # nothing to do
     elsif (tok = @ss.scan(/#/))
-      @ss.scan_until(/\n/)
+      @prev_tokens << tok
+      @prev_tokens << @ss.scan_until(/\n/)
+      tok = ''
     elsif (tok = @ss.scan(%r|/|))
-      case @ss.getch
+      @prev_tokens << tok
+
+      case (tok = @ss.getch)
       when '/'
-        @ss.scan_until(/(\n|\z)/)
+        @prev_tokens << tok
+        @prev_tokens << @ss.scan_until(/(\n|\z)/)
       when '*'
+        @prev_tokens << tok
         nested = 1
 
         until nested.zero?
-          case @ss.scan_until(%r{(/\*|\*/|\z)})
+          case (tok = @ss.scan_until(%r{(/\*|\*/|\z)}))
           when %r|/\*\z|
+            @prev_tokens << tok
             nested += 1
           when %r|\*/\z|
+            @prev_tokens << tok
             nested -= 1
           else
+            @prev_tokens << tok
             break
           end
         end
       else
         raise "comment expected, got '#{tok}'"
       end
+
+      tok = ''
     elsif (tok = @ss.scan(/-?\d+\.\d+/))
       yield [:FLOAT, tok.to_f]
     elsif (tok = @ss.scan(/-?\d+/))
@@ -157,16 +169,18 @@ def scan
     elsif (tok = @ss.scan(/"/))
       yield [:STRING, (@ss.scan_until(/("|\z)/) || '').sub(/"\z/, '')]
     else
-      identifier = (@ss.scan_until(/(\s|\z)/) || '').sub(/\s\z/, '')
+      tok = (@ss.scan_until(/(\s|\z)/) || '').sub(/\s\z/, '')
       token_type = :IDENTIFIER
 
-      if ['true', 'false'].include?(identifier)
-        identifier = !!(identifier =~ /true/)
+      if ['true', 'false'].include?(tok)
+        tok = !!(tok =~ /true/)
         token_type = :BOOL
       end
 
-      yield [token_type, identifier]
+      yield [token_type, tok]
     end
+
+    @prev_tokens << tok
   end
 
   yield [false, '$end']
@@ -177,6 +191,36 @@ def parse
   yyparse self, :scan
 end
 
+def on_error(error_token_id, error_value, value_stack)
+  raise_error(error_value)
+end
+
+def raise_error(error_value)
+  header = "parse error on value: #{error_value}\n"
+  prev = (@prev_tokens || [])
+  prev = prev.empty? ? '' : prev.join + ' '
+  errmsg = prev + "__#{error_value}__"
+
+  if @ss and @ss.rest?
+    errmsg << ' ' + @ss.rest
+  end
+
+  lines = errmsg.lines
+  err_num = prev.count("\n")
+  from_num = err_num - 3
+  from_num = 0 if from_num < 0
+  to_num = err_num + 3
+  digit_num = lines.count.to_s.length
+
+  errmsg = lines.each_with_index.map {|line, i|
+    mark = (i == err_num) ? '*' : ' '
+    '%s %*d: %s' % [mark, digit_num, i + 1, line]
+  }.slice(from_num..to_num).join
+
+  raise Racc::ParseError, header + errmsg
+end
+private :raise_error
+
 def self.parse(obj)
   self.new(obj).parse
 end

data/lib/rhcl/version.rb

@@ -1,3 +1,3 @@
 module Rhcl
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhcl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge