modl 0.3.27 → 0.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19413632838d38b40c5079a2b4c4551681ba94fc67c03a9b5aba98ef3bab522b
-  data.tar.gz: 74648b6833fdd3a9562bfde9ce8ddbaeea71439b751d19cd4487d5c586f918e1
+  metadata.gz: f38dca1aa60310b7fab61c2903d9f5a8aef61b16b3e75fc2820e9c4bcd874680
+  data.tar.gz: 3f139db340886f4ecaff8633178bee2f81de07d628e4b660ba3c9a81570681d7
 SHA512:
-  metadata.gz: a2e31d1efa2d9668c94f503f1b0d5cdc19c9ea484dd85314e6697a6647ef44bed2213515ad3031839e38bf459a7e68497434b195f2f9cf5e54ce81203bfd03e0
-  data.tar.gz: c9dec885b8ea5acc8799c405379f3848dbac48f5dc919ae27f34d2d2d2bc8dda1fdee18620477f3867e747e00ba0baf2b940b1f62d29c7fa71055bb857cedc5f
+  metadata.gz: 22aa26fe242cbef6c107a0d11108a1b55eb1db8a3846f846de336102be16c85c7e658614a218dc5dba5c10b087e3937d769f634590a0a1c5f413fa6e0825ea63
+  data.tar.gz: 470a65dee83b3f12673b5ba0e3bf5eb050339b183e01ab26cdc82cb7a110278b1ec32c8564deb24163e2a5c0f8c375638990f90b8937d76fb351337a25efe89e

data/lib/modl/parser/parser.rb

@@ -46,7 +46,9 @@ module MODL
         result = parse_structures(tokens)
         return MODL::Model::Modl.new result[0] if result.length == 1
 
-        MODL::Model::Modl.new ModlArray.new(result)
+        return MODL::Model::Modl.new MODL::Model::ModlMap.new(result) if all_pairs?(result)
+
+        MODL::Model::Modl.new MODL::Model::ModlArray.new(result)
       end
     end
 
@@ -59,7 +61,7 @@ module MODL
       until tokens.empty?
         result.push parse_modl_value(tokens)
         expect_separator = tokens.shift
-        if !expect_separator.nil? && expect_separator.type == :struct_sep
+        if !expect_separator.nil? && expect_separator.type != :struct_sep
           raise ParserError, "Expected ';' near #{tokens}"
         end
       end
@@ -281,5 +283,11 @@ module MODL
       end
       result
     end
+
+    def self.all_pairs?(arr)
+      result = true
+      arr.each { |i| result = false unless i.instance_of? MODL::Model::ModlPair }
+      result
+    end
   end
 end

data/lib/modl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MODL
-  VERSION = '0.3.27'
+  VERSION = '0.3.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modl
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.3.28
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: A Ruby inretpreter for the MODL data serialisation language.