From d7b210d63a26f2158ac8b2091e08b2b2c8be3708 Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Sun, 6 Mar 2016 10:48:14 +0200
Subject: [PATCH] update parser

---
 Gemfile       |  4 ++--
 Gemfile.lock  | 11 ++++-------
 lib/salama.rb |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index b7c5e54b..59aab373 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,8 +6,8 @@ gem "ast" , :github => "whitequark/ast"
 gem "rake"
 gem "rye"
 
-gem "salama-reader" , :github => "salama/salama-reader"
-#gem "salama-reader" , :path => "../salama-reader"
+gem "soml-parser" , :github => "salama/soml-parser"
+#gem "soml-parser" , :path => "../soml-parser"
 gem "salama-object-file" , :github => "salama/salama-object-file"
 #gem "salama-object-file" , :path => "../salama-object-file"
 gem "salama-arm" , :github => "salama/salama-arm"
diff --git a/Gemfile.lock b/Gemfile.lock
index 246ace93..95fe7ba5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,10 +11,10 @@ GIT
     salama-object-file (0.3.0)
 
 GIT
-  remote: git://github.com/salama/salama-reader.git
-  revision: 6ae4b624b07bb86ceb24acb27ad0ac83be2ecc1e
+  remote: git://github.com/salama/soml-parser.git
+  revision: 4a9b492dd9fb1d7cbc6f114aee226ff227753568
   specs:
-    salama-reader (0.4.0)
+    soml-parser (0.5.0)
       ast (~> 2.1.0)
       parslet (~> 1.7.1)
 
@@ -105,9 +105,6 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    soml-parser (0.5.0)
-      ast (~> 2.1.0)
-      parslet (~> 1.7.1)
     storable (0.8.9)
     sysinfo (0.8.1)
       drydock
@@ -130,7 +127,7 @@ DEPENDENCIES
   salama!
   salama-arm!
   salama-object-file!
-  salama-reader!
+  soml-parser!
 
 BUNDLED WITH
    1.11.2
diff --git a/lib/salama.rb b/lib/salama.rb
index 65859dfe..90a48ef6 100644
--- a/lib/salama.rb
+++ b/lib/salama.rb
@@ -2,7 +2,7 @@ require 'parslet'
 
 require "logging"
 require "elf/object_writer"
-require 'salama-reader'
+require 'soml-parser'
 AST::Node.class_eval do
   def first
     children.first