posxml_parser 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f79b2e53edf5b30845ed0b52dd45d6a68130c1
-  data.tar.gz: c2aabe64c1d84a47b02a23ae5de401704a4ca432
+  metadata.gz: 75698368d9027886e4f0eb814f9dad2f189a9c4a
+  data.tar.gz: 7058de9d31f7e90186c69bf9c92595cdd0edf4bc
 SHA512:
-  metadata.gz: fe118e0b98a77595bbf4f65c71562d17704589ca360d7350a59b36c0d4032a6e41a7785a7e5cf92ebe088aacf3a0da8fb73888a9142912ac2c6c1753e5ecd289
-  data.tar.gz: 9835dc9a42b38bc3f6d90c46bf084a631e32f2e31bf5b1b13074e28e28700e265f88478f15ca2872ee824c76b147e2744234bbe14ecd1a3fb73ce51f02032a9f
+  metadata.gz: 413314bda102faa426cef8426a7f7b4f10626ac405dfcafe00895ef8a877b7d632c77146a2fc4769ee10314ade4c075bb8c3c57bbf25f4f86c9683178bd1749e
+  data.tar.gz: 1adfcd2f7c148a9dc765acf2f8b46c5958b1f77b1d714b365ab5f0caa21cabedbceec860fdc82f3cd1d350ca134c65afcb007271066f734b7dc82c8cd5f82144

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    posxml_parser (2.8.0)
+    posxml_parser (2.8.1)
       funky-emv (~> 0.3)
 
 GEM

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # Posxml Parser
 
+### 2.8.1 - 2018-09-03
+
+- Fix ambiguous argument on instruction tests.
+- Fix multiple reference supporting no variable value.
+
 ### 2.8.0 - 2018-08-24
 
 - Support float variable compilation.

data/lib/posxml_compiler/variable.rb

@@ -85,6 +85,7 @@ module PosxmlCompiler
     # Return:
     #   {:original => "functionbla", :value => "functionbla", :type => :string}
     #   {:original => "$(sKeyTouchScreen)", :value => "$(1)", :type => :string}
+    #   {:original => "$(!sBufRecv[2])", :value => "$(2.&2)", :type => :string}
     #   {:original => "$(!sBufRecv[$(iFound)])", :value => "$(2.$&3)", :type => :string}
     #   {:original => "$(sBufRecv[$(iFound)])", :value => "$(2.$3)", :type => :string}
     #   {:original => "equalto", :value => "equalto", :type => :string}
@@ -184,7 +185,7 @@ module PosxmlCompiler
     def parse_index_variable(value, reference)
       #if reference && value.include?("[")
       if self.multiple_reference?(value, reference)
-        index = "$(#{value.match(/\[\$\((.+)\)\]/)[1]})"
+        index = "#{value.match(/\[(.+)\]/)[1]}"
         str = "$(#{value.split("[")[0]})"
 
         if str[2] == "!"
@@ -201,9 +202,13 @@ module PosxmlCompiler
     def format_multiple_reference(range_index, variable1, variable2)
       str1 = variable1.sub(VARIABLE_REFERENCE, "").sub(")", "") # Format value to be like "123"
       str2 = variable2.sub("(", "").sub(")", "") # format value to be "$123")
-      # At the end "$(123.$&456)"
+      # At the end "$(123.$&456)" or "$(123.&456)" (no reference)
       if range_index
-        format = "#{VARIABLE_REFERENCE}#{str1}.#{str2.insert(1, "&")})"
+        if str2.include?("$") # no reference
+          format = "#{VARIABLE_REFERENCE}#{str1}.#{str2.insert(1, "&")})"
+        else
+          format = "#{VARIABLE_REFERENCE}#{str1}.#{str2.insert(0, "&")})"
+        end
       else
         format = "#{VARIABLE_REFERENCE}#{str1}.#{str2})"
       end

data/lib/posxml_parser/version.rb

@@ -1,5 +1,5 @@
 
 module PosxmlParser
-  VERSION = "2.8.0"
+  VERSION = "2.8.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: posxml_parser
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - CloudWalk Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler