From fa9807102b95c4b744f63439c51dbb9a9eb0f8c8 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Wed, 28 Dec 2016 20:38:12 +0200 Subject: [PATCH] upgrade parser to avoid conflicts with opal --- Gemfile.lock | 10 +++++----- salama.gemspec | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index da0e44a3..f9678e93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,16 +6,16 @@ GIT GIT remote: git://github.com/whitequark/ast.git - revision: 3814fb102af82a30bf334005ebe17332744f9dad + revision: 93c43433ec4d4344485eb4ea6f8948925f092af1 branch: master specs: - ast (2.1.0) + ast (2.3.0) PATH remote: . specs: salama (0.5.0) - parser (~> 2.2.0) + parser (~> 2.3.0) salama-object-file (~> 0.3) GEM @@ -60,8 +60,8 @@ GEM notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - parser (2.2.3.0) - ast (>= 1.1, < 3.0) + parser (2.3.3.1) + ast (~> 2.2) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) diff --git a/salama.gemspec b/salama.gemspec index 849e01ff..c0b8c244 100644 --- a/salama.gemspec +++ b/salama.gemspec @@ -13,6 +13,6 @@ Gem::Specification.new do |s| s.require_paths = ['lib'] s.summary = 'Salama is a native object vm without any c, one day possibly a ruby vm' - s.add_dependency "parser" , "~> 2.2.0" + s.add_dependency "parser" , "~> 2.3.0" s.add_dependency "salama-object-file" , "~> 0.3" end