update parser to use 2.6
was choking on &. syntax improved error reporting slightly
This commit is contained in:
parent
fb89c01681
commit
8d4eab72bf
@ -8,7 +8,7 @@ PATH
|
|||||||
remote: .
|
remote: .
|
||||||
specs:
|
specs:
|
||||||
rubyx (0.6.0)
|
rubyx (0.6.0)
|
||||||
parser (~> 2.4.0)
|
parser (~> 2.6.0)
|
||||||
rx-file (~> 0.3)
|
rx-file (~> 0.3)
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
@ -60,8 +60,8 @@ GEM
|
|||||||
notiffany (0.1.1)
|
notiffany (0.1.1)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
shellany (~> 0.0)
|
shellany (~> 0.0)
|
||||||
parser (2.4.0.2)
|
parser (2.6.0.0)
|
||||||
ast (~> 2.3)
|
ast (~> 2.4.0)
|
||||||
pry (0.11.3)
|
pry (0.11.3)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.9.0)
|
method_source (~> 0.9.0)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
require "parser/ruby22"
|
require "parser/current"
|
||||||
require "ast"
|
require "ast"
|
||||||
|
|
||||||
AST::Node.class_eval do
|
AST::Node.class_eval do
|
||||||
|
@ -29,8 +29,17 @@ module Ruby
|
|||||||
include AST::Sexp
|
include AST::Sexp
|
||||||
|
|
||||||
def self.compile(input)
|
def self.compile(input)
|
||||||
ast = Parser::Ruby22.parse( input )
|
begin
|
||||||
self.new.process(ast)
|
ast = Parser::CurrentRuby.parse( input )
|
||||||
|
rescue => e
|
||||||
|
puts "Error parsing #{input}"
|
||||||
|
end
|
||||||
|
begin
|
||||||
|
self.new.process(ast)
|
||||||
|
rescue => e
|
||||||
|
puts "Error processing #{ast}"
|
||||||
|
raise e
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# raise a ProcessError. This means ruby-x doesn't know how to handle it.
|
# raise a ProcessError. This means ruby-x doesn't know how to handle it.
|
||||||
|
@ -13,6 +13,6 @@ Gem::Specification.new do |s|
|
|||||||
s.require_paths = ['lib']
|
s.require_paths = ['lib']
|
||||||
s.summary = 'RubyX is a native object vm without any c, one day possibly a ruby vm'
|
s.summary = 'RubyX is a native object vm without any c, one day possibly a ruby vm'
|
||||||
|
|
||||||
s.add_dependency "parser" , "~> 2.4.0"
|
s.add_dependency "parser" , "~> 2.6.0"
|
||||||
s.add_dependency "rx-file" , "~> 0.3"
|
s.add_dependency "rx-file" , "~> 0.3"
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user