posxml_parser 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d60bf50fa7ab91550cbf08f242e3bc99de1bf0f6
-  data.tar.gz: db6e74583f24eea84485164847143ef8bcae67f8
+  metadata.gz: e0f79b2e53edf5b30845ed0b52dd45d6a68130c1
+  data.tar.gz: c2aabe64c1d84a47b02a23ae5de401704a4ca432
 SHA512:
-  metadata.gz: f8bb0e307d4ed7b3463fcc279131905ad42b00be15ca298400c9065def91713c20e5605d4713c9905582cde1b4b48b2d2910880c89a6179f2c98f06c9346b58f
-  data.tar.gz: 2d0b84facc1030f1dec6cb2f8c38148ab011705761b273a7d88715071ca29a427bf482cef741191e0476a989bc896690d366e30b2521fd4863a76a2e6c626700
+  metadata.gz: fe118e0b98a77595bbf4f65c71562d17704589ca360d7350a59b36c0d4032a6e41a7785a7e5cf92ebe088aacf3a0da8fb73888a9142912ac2c6c1753e5ecd289
+  data.tar.gz: 9835dc9a42b38bc3f6d90c46bf084a631e32f2e31bf5b1b13074e28e28700e265f88478f15ca2872ee824c76b147e2744234bbe14ecd1a3fb73ce51f02032a9f

data/Gemfile.lock

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

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # Posxml Parser
 
+### 2.8.0 - 2018-08-24
+
+- Support float variable compilation.
+- Add file line number to compilation error.
+
 ### 2.7.1 - 2018-08-20
 
 - Fix incompatible character encodings on compilation.

data/lib/posxml_compiler/jump.rb

@@ -56,7 +56,7 @@ module PosxmlCompiler
           stack_while << [index, instruction[:point]]
         when INSTRUCTION_BREAK
           reference, point = stack_while.last
-          raise PosxmlCompilerError.new("While not found for <break") unless reference
+          raise PosxmlCompilerError.new("#{instruction[:line_number]}:While not found for <break") unless reference
           @jumps << JumpPoint.new(self, INSTRUCTION_BREAK, index, reference, point)
         when INSTRUCTION_WHILE
           reference, point = stack_while.pop
@@ -86,8 +86,9 @@ module PosxmlCompiler
 
     def check_function_tree(tree, instruction)
       function_name    = instruction[:parameters]["name"][:original]
+      line_number      = instruction[:line_number]
       unless function  = tree[function_name]
-        raise PosxmlCompilerError.new("Function #{function_name} not found") unless reference
+        raise PosxmlCompilerError.new("#{line_number}:Function #{function_name} not found") unless reference
       end
       function_indexed = tree[function_name][0]
       [function_indexed[1], function_indexed[0][:point]]

data/lib/posxml_compiler/parser.rb

@@ -25,6 +25,8 @@ module PosxmlCompiler
         puts "Application size limit(#{self.limit}) exceed"
       end
       txt
+    rescue => e
+      raise e.class.new("#{number}:#{e.message}")
     end
 
     private
@@ -54,25 +56,35 @@ module PosxmlCompiler
     def split_instructions(txt)
       txt_new = ""
       ignore = false
-      txt.split("\n").compact.each do |str|
+      txt.split("\n").compact.each_with_index do |str, number|
         line = str.strip
         if line[0..3] == "<!--" || ignore # Check comentaries
           ignore = true
           ignore = false if line.include?("-->")
         elsif line.include?("<!--") # Check end of comentaries
           line_without_comment = line.split("<!--")[0].strip
-          txt_new << instruction_check_close(line_without_comment)
+          txt_new << add_line_number(number, instruction_check_close(line_without_comment))
         elsif line.include?("<") || line.include?(">")
-          txt_new << instruction_check_close(line)
+          txt_new << add_line_number(number, instruction_check_close(line))
         else !ignore # For middle of instruction between lines
           # Avoid this <pinpad.getpindukptmessage="$(sDisplayMsg)"type="3"pan="$(sPAN)"maxlen="12"variablereturnpin="$(sPIN)"variablereturnksn="$(sKSN)"variablereturn="$(iRet)"
           txt_new << " " if txt_new[-1] != " "
-          txt_new << instruction_check_close(line)
+          txt_new << add_line_number(number, instruction_check_close(line))
         end
       end
+      #p txt_new
       txt_new.split("\n")
     end
 
+    def add_line_number(line, string)
+      # necessary check to avoid add line on commands devide in two lines
+      if string[0] == "<"
+        "#{line+1}\x00#{string}"
+      else
+        string
+      end
+    end
+
     def instruction_check_close(str)
       if str[-1] == ">"
         "#{str[0..-2]}\n"
@@ -83,9 +95,15 @@ module PosxmlCompiler
 
     def parse(txt)
       point = 0
+      number = 0
       # Split in lines and remove nil's
       split_instructions(sanitize(txt)).inject([]) do |array, str|
-        value = str.strip
+        if str.include?("\x00")
+          number, value = str.split("\x00", 2)
+        else
+          value = str
+        end
+        value = value.strip
         next(array) if value.empty?
         # => "if", {"variable" => "$(sKeyTouchScreen)", "operator" => "equalto", "value" => "KEY_CLEAR"}
         name, parameters = parse_line(value)
@@ -96,11 +114,13 @@ module PosxmlCompiler
         line = parse_instruction(name, parameters)
         size = line.size
         array << {
-          :name => name, :parameters => parameters, :line => line, :size => size, :point => point
+          :name => name, :parameters => parameters, :line => line, :size => size, :point => point, :line_number => number
         }
         point += size
         array
       end
+    rescue => e
+      raise e.class.new("#{number}:#{e.message}")
     end
 
     # Receive:

data/lib/posxml_compiler/xsd_parser.rb

@@ -157,7 +157,7 @@ module PosxmlCompiler
     end
 
     def type_string_or_integer?(str)
-      str.match(/(string ou inteiro|string or integer)/)
+      str.match(/(string ou inteiro|string or integer|float)/)
     end
 
     #def type_string?(str)

data/lib/posxml_parser/version.rb

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

metadata

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