weskit 0.1.0 → 0.2.0

data/lib/weskit/wml/parser.rb

@@ -1,6 +1,3 @@
-require 'polyglot'
-require 'treetop'
-
 require 'open-uri'
 require 'stringio'
 require 'zlib'
@@ -18,7 +15,7 @@ module Weskit::WML
         begin
           str = open(uri).read
         rescue
-          raise Errrors::ReadError, "Coldn't open URI"
+          raise Errrors::ReadError, "Couldn't open URI"
         ensure
           str = Zlib::GzipReader.new(StringIO.new str).read rescue str
         end
@@ -29,19 +26,15 @@ module Weskit::WML
       private
 
       def parse data
-        parsed = parser.parse data.strip, :consume_all_input => false
+        parser = KPEGParser.new "#{data}\n"
 
-        unless parsed
-          msg = parser.failure_reason or 'Invalid data'
+        unless parser.parse
+          msg = "#{parser.failure_character} #{parser.failure_info}"
           raise Errors::ParseError, msg
         end
 
-        parsed.wml
-      end
-
-      def parser
-        @parser ||= WesnothMarkupLanguageParser.new
+        parser.result
       end
     end
   end
-end
+end

data/spec/wml/parser_spec.rb

@@ -1,5 +1,4 @@
 require 'wml_spec_helper'
-require 'awesome_print'
 
 describe Weskit::WML::Parser do
   include WMLHelpers
@@ -21,12 +20,28 @@ describe Weskit::WML::Parser do
         parsed[:a].should match_value_of(:b)
       end
 
+      specify 'concated' do
+        parsed = Weskit::WML::Parser.string ' a= _ "a" + 1 '
+        parsed[:a].attribute.should be_translatable
+        parsed[:a].should match_value_of(:a1)
+      end
+
       specify 'multiline' do
         parsed = Weskit::WML::Parser.string %Q{a= "b \n c"}
         parsed[:a].attribute.should be_multiline
         parsed[:a].should match_value_of("b \n c")
       end
 
+      specify 'multiple' do
+        parsed = Weskit::WML::Parser.string %Q{ a, b = _"a", <<b>> }
+
+        parsed[:a].attribute.should be_translatable
+        parsed[:a].should match_value_of(:a)
+
+        parsed[:b].attribute.should be_code
+        parsed[:b].should match_value_of(:b)
+      end
+
       specify 'escape sequence' do
         parsed = Weskit::WML::Parser.string %Q{ a= "b "" c" }
         parsed[:a].should match_value_of('b " c')
@@ -40,12 +55,6 @@ describe Weskit::WML::Parser do
     end
 
     context 'element' do
-      specify 'tags' do
-        expect {
-          Weskit::WML::Parser.string "[foo]\n[/bar]"
-        }.to raise_error Weskit::WML::Errors::ParseError
-      end
-
       specify 'default' do
         parsed = Weskit::WML::Parser.string "[foo]\n[/foo]"
         parsed[0].should have_identifier_of(:foo)

data/weskit.gemspec

@@ -18,10 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename f }
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'awesome_print'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_runtime_dependency 'polyglot'
-  s.add_runtime_dependency 'term-ansicolor'
-  s.add_runtime_dependency 'treetop'
+  s.add_development_dependency 'kpeg', '~>0.10.0'
+  s.add_development_dependency 'rake', '>=0.9.2.2'
+  s.add_development_dependency 'rspec', '~>2.11.0'
+  s.add_runtime_dependency 'term-ansicolor', '>=1.0.7'
 end

metadata

@@ -1,119 +1,97 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: weskit
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - f6p
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+
+date: 2012-10-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: kpeg
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: polyglot
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 11
+        - 0
+        version: 2.11.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: term-ansicolor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: treetop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 0
+        - 7
+        version: 1.0.7
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id004
 description: Tools for interacting with Wesnoth Markup Language, MP Server and such.
-email:
+email: 
 - filip.pyda@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -150,16 +128,16 @@ files:
 - lib/weskit/wml/formatters/attribute.rb
 - lib/weskit/wml/formatters/element.rb
 - lib/weskit/wml/formatters/item_formatter.rb
-- lib/weskit/wml/grammars/wml.treetop
+- lib/weskit/wml/grammars/wml.kpeg
 - lib/weskit/wml/item.rb
 - lib/weskit/wml/items.rb
+- lib/weskit/wml/kpeg_parser.rb
 - lib/weskit/wml/mixins/container.rb
 - lib/weskit/wml/mixins/grammar.rb
 - lib/weskit/wml/mixins/searchable.rb
 - lib/weskit/wml/mixins/validator.rb
 - lib/weskit/wml/parser.rb
 - lib/weskit/wml/root.rb
-- lib/weskit/wml/wml.rb
 - spec/spec_helper.rb
 - spec/wml/attribute_spec.rb
 - spec/wml/attributes_spec.rb
@@ -178,35 +156,38 @@ files:
 - weskit.gemspec
 homepage: https://github.com/f6p/weskit
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -4565766782065065646
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -4565766782065065646
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby utilies for BfW
-test_files:
+test_files: 
 - spec/spec_helper.rb
 - spec/wml/attribute_spec.rb
 - spec/wml/attributes_spec.rb
@@ -222,3 +203,4 @@ test_files:
 - spec/wml_matchers.rb
 - spec/wml_shared_examples.rb
 - spec/wml_spec_helper.rb
+has_rdoc: 

data/lib/weskit/wml/grammars/wml.treetop

@@ -1,195 +0,0 @@
-require 'treetop'
-require 'weskit/wml'
-
-grammar WesnothMarkupLanguage
-  rule document
-    contents {
-      def wml
-        ::Weskit::WML::Root.new.push *::Weskit::WML::Mixins::Grammar.reject_non_wml(elements)
-      end
-    }
-  end
-
-  # parts -------------------------------------------------------------------------------
-
-  rule identifier
-    [a-z] [a-z_]* {
-      def name
-        text_value
-      end
-    }
-  end
-
-  rule raw_string
-    (!eol .)* {
-      def data
-        text_value
-      end
-    }
-  end
-
-  rule code_content
-    (!'>>' content)* {
-      def contents
-        text_value
-      end
-    }
-  end
-
-  rule code_string
-    '<<' string:code_content '>>' {
-      def data
-        string.contents
-      end
-    }
-  end
-
-  rule multiline_content
-    (!quote content)* {
-      def contents
-        text_value
-      end
-    }
-  end
-
-  rule multiline_string
-    (quote string:multiline_content quote)* {
-      def data
-        elements.collect(&:string).collect(&:contents).join '"'
-      end
-    }
-  end
-
-  rule translatable_string
-    '_' lws string:multiline_string {
-      def data
-        string.contents
-      end
-    }
-  end
-
-  rule opening_tag
-    lws '[' tag:identifier ']' fws {
-      def name
-        tag.name
-      end
-    }
-  end
-
-  rule amending_tag
-    lws '[+' tag:identifier ']' fws {
-      def name
-        tag.name
-      end
-    }
-  end
-
-  rule closing_tag
-    lws '[/' tag:identifier ']' fws {
-      def name
-        tag.name
-      end
-    }
-  end
-
-  rule blank_line
-    ws* "\n"
-  end
-
-  rule item
-    code_attribute / multiline_attribute / translatable_attribute / attribute / amending_element / element
-  end
-
-  rule contents
-    (blank_line / item)* {
-      def items
-        ::Weskit::WML::Mixins::Grammar.reject_non_wml elements
-      end
-    }
-  end
-
-  # items -------------------------------------------------------------------------------
-
-  rule attribute
-    lws id:identifier lws equals value:raw_string eol {
-      def item
-        ::Weskit::WML::Attribute.new id.name, value.data
-      end
-    }
-  end
-
-  rule code_attribute
-    lws id:identifier lws equals lws value:code_string fws {
-      def item
-        ::Weskit::WML::Attribute.new id.name, value.data, :code => true
-      end
-    }
-  end
-
-  rule multiline_attribute
-    lws id:identifier lws equals lws value:multiline_string fws {
-      def item
-        ::Weskit::WML::Attribute.new id.name, value.data
-      end
-    }
-  end
-
-  rule translatable_attribute
-    lws id:identifier lws equals lws '_' lws value:multiline_string fws {
-      def item
-        ::Weskit::WML::Attribute.new id.name, value.data, :translatable => true
-      end
-    }
-  end
-
-  rule element
-    open:opening_tag nested:contents close:closing_tag {
-      def item
-        ::Weskit::WML::Mixins::Grammar.raise_on_mismatching open, close
-        ::Weskit::WML::Element.new(open.name).push *nested.items
-      end
-    }
-  end
-
-  rule amending_element
-    open:amending_tag nested:contents close:closing_tag {
-      def item
-        ::Weskit::WML::Mixins::Grammar.raise_on_mismatching open, close
-        ::Weskit::WML::Element.new(open.name, :amendment => true).push *nested.items
-      end
-    }
-  end
-
-  # helpers -----------------------------------------------------------------------------
-
-  rule content
-    "\n" / .
-  end
-
-  rule eol
-    "\n" / !.
-  end
-
-  rule equals
-    '='
-  end
-
-  rule quote
-    '"'
-  end
-
-  # whitespace
-  rule ws
-    "\s" / "\t"
-  end
-
-  # leading whitespaces
-  rule lws
-    ws*
-  end
-
-  # following whitespaces
-  rule fws
-    ws* eol
-  end
-end