lua-literal 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f66fc9b4403eb46e870cf8c10f2e5276ccc91cfeb1a97c107143942875d34e
-  data.tar.gz: 5d844615dd7ab5dc9c217a60376875a2311111cc505612de16e2adc77e0dd0dd
+  metadata.gz: e5df06fe05cd5b78ae6c72d85127073b0b5d15d114ba6075274c4be7dd68a539
+  data.tar.gz: 49736a59edd2c6e17d2ffdb19f4c820f9ac285e24c60aab0ec34273c62b239b0
 SHA512:
-  metadata.gz: 023a3ed726e61843bc68a7d21df59cfed1162c9942ba884cc66b2fc9467327294702e09a6725edb3f6ba24f20fa08cf9d0e5c046e3eeaccdb3a642e29e467e7f
-  data.tar.gz: 597cf6e0a42df7a3ac9695abd8218a73052119988ec624b68667a71cfa130c0e0902d0b57278e1d294779d6011951d3fad08f8337f7e3c960e3926101b1f5e2a
+  metadata.gz: e3c317cd3e3a2e5d8dd5d6fd276548ed37fb53f69934e13f06e8773f2f77891045323546fdadca52b29c0f8ea58bdfaabf8d43f1b12c588a3a3dc87d9537ce33
+  data.tar.gz: 745b110958417e590c5ff4942654d271d44c11b3b5edcfb38312401504c06a665730d8098ec7999ff4de003d70bf59609b71b797216adb633b7607303538d215

data/.rubocop.yml

@@ -14,6 +14,9 @@ AllCops:
   TargetRubyVersion: 2.7
   UseCache: true
 
+Layout/EmptyLineAfterGuardClause:
+  Enabled: true
+
 Layout/EmptyLineAfterMagicComment:
   Enabled: true
 
@@ -95,6 +98,7 @@ Style/MethodCallWithArgsParentheses:
   Enabled: true
   IgnoredMethods:
     # language core
+    - raise
     - require
     - require_relative
     # gem/bundler

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# ChangeLog
+
+## 0.2.0
+
+- Support string concatenation
+
+## 0.1.0
+
+- Initial release

data/README.md

@@ -60,6 +60,10 @@ Lua's tables are converted to Ruby's `Hash`.
 
 Short comments are recognized and removed.
 
+### String concatenation
+
+This is not strictly a literal expression but supported for convenience.
+
 ## Unsupported literals
 
 * Hexadecimal numerals.

data/lib/lua/literal.rb

@@ -8,5 +8,6 @@ require 'lua/literal/transform'
 module Lua
   module Literal
     class Error < StandardError; end
+    class ParseError < Error; end
   end
 end

data/lib/lua/literal/parser.rb

@@ -10,12 +10,12 @@ module Lua
 
       # table_constructor ::= '{' [fieldlist] '}'
       rule(:table_constructor) {
-        (str('{') >> space? >> fieldlist.maybe >> space? >> str('}')).as(:table)
+        (str('{') >> space? >> fieldlist.maybe.as(:table) >> space? >> str('}'))
       }
 
       # fieldlist ::= field {fieldsep field} [fieldsep]
       rule(:fieldlist) {
-        (field >> space? >> (fieldsep >> space? >> field).repeat).as(:fields) >> space? >> fieldsep.maybe
+        field >> space? >> (fieldsep >> space? >> field).repeat >> space? >> fieldsep.maybe
       }
 
       # field ::= '[' exp ']' '=' exp | Name '=' exp | exp
@@ -44,14 +44,19 @@ module Lua
         space? >>
         (
           table_constructor |
-          literal_nil |
-          literal_false |
-          literal_true |
-          numeral |
-          literal_string
+          string_concatenation |
+          scalar
         ) >> space?
       }
 
+      rule(:scalar) {
+        literal_nil |
+        literal_false |
+        literal_true |
+        numeral |
+        literal_string
+      }
+
       rule(:literal_nil) {
         str('nil')
       }
@@ -157,6 +162,10 @@ module Lua
         match('[0-9]')
       }
 
+      rule(:string_concatenation) {
+        (scalar.as(:lhs) >> space? >> str('..') >> space? >> scalar.as(:rhs)).as(:string_concatenation)
+      }
+
       rule(:name) {
         (match('[A-Za-z_]') >> match('[A-Za-z_0-9]').repeat).as(:name)
       }
@@ -177,6 +186,18 @@ module Lua
       rule(:space?) {
         (space | comment).repeat
       }
+
+      # Parses the given argument as a Lua literal expression
+      #
+      # See {file:README.md} for supported syntax.
+      # @param [String, Parslet::Source] lua_literal Lua literal expression
+      # @return [Hash, Array, Parslet::Slice] PORO (Plain old Ruby object) result tree
+      # @see {::Parslet::Parser#parse}
+      def parse(lua_literal)
+        super(lua_literal)
+      rescue Parslet::ParseFailed
+        raise Lua::Literal::ParseError
+      end
     end
   end
 end

data/lib/lua/literal/transform.rb

@@ -57,6 +57,10 @@ module Lua
         vs.join
       }
 
+      rule(string_concatenation: subtree(:v)) {
+        [v[:lhs], v[:rhs]].join
+      }
+
       rule('nil') {
         nil
       }
@@ -69,7 +73,9 @@ module Lua
         false
       }
 
-      rule(table: {fields: subtree(:fields)}) {
+      rule(table: subtree(:fields)) {
+        next {} if fields.nil?
+
         pairs = (fields.is_a?(Hash) ? [fields] : fields)
         indexed, kvs = pairs.partition {|pair| pair.key?(:indexed) }
         hash = kvs.inject({}) {|acc, pair| acc.merge(pair) }
@@ -77,10 +83,6 @@ module Lua
         hash
       }
 
-      rule(table: '{}') {
-        Hash[]
-      }
-
       rule(key: subtree(:key), value: subtree(:value)) {
         {key => value}
       }

data/lib/lua/literal/version.rb

@@ -2,7 +2,7 @@
 
 module Lua
   module Literal
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
     public_constant :VERSION
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lua-literal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - OZAWA Sakuro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -136,6 +136,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md