ascode 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f4408a0db6f51c967a99742111084fa89aac0c41237313ccbfed61e9d64fe6
-  data.tar.gz: b1ff0ca8a235111caaa549b768f0d4444480e3d15910c8585e6029b71f44f0bf
+  metadata.gz: 56d53aec79abb0959c5e34c61b0f537013168b6ad79bde7a2480472f5259b7a1
+  data.tar.gz: b574b6f1f4ff79a222a11a482dead059dd1a1f8f78b3f5eef6d0c5130584286e
 SHA512:
-  metadata.gz: fae634110d25627412c71d7d30f6c87cea3f37764db75149f937387f82b03250306d6822cb9482f8e99ce8415fd0fc2eab80366fca99a00e1b945f83d1a94b31
-  data.tar.gz: af4ffcf2b5779e69583d54e935dbfcc7ffa0aad67d76d2b3694e00b743566aee3ede7c0f748a7908867e85ee93d6cc4996bd87ed10cde69a593a402a27106bbe
+  metadata.gz: 16b9ce147aa1a3cdfa24f46884ba9a0d6a16e0c4650a55dab82f30d90360a877aabfc996ad11bd022c37adc9b62ec4779a16c45df197651f2d2658ddd5309a12
+  data.tar.gz: dd356e67eba3f008bba0a8e1838f0b45171be8ce2c08e8b7a972e2b44f92cea402fff096df928b1d90e6e74ee075adbcbc385a84d2416826189726f1e6e667a0

data/lib/ascode/parser/condition_block.rb

@@ -1,3 +1,5 @@
+require_relative "literal"
+
 module Ascode
   module Parser
     class ConditionBlock
@@ -26,12 +28,21 @@ module Ascode
       end
 
       def find(what)
-        # TODO: Ignore '[', ':', ']' when in string
         level = 0
+        skip = 0
         @block.split("").to_enum.each_with_index do |char, index|
-          return index if char == what && level.zero?
-          level += 1 if char == "["
-          level -= 1 if char == "]"
+          if skip > 0
+            skip -= 1
+            next
+          elsif char == "\""
+            literal = Literal.new @block, index
+            literal.parse
+            skip = literal.length
+          else
+            return index if char == what && level.zero?
+            level += 1 if char == "["
+            level -= 1 if char == "]"
+          end
         end
 
         -1

data/lib/ascode/parser/literal.rb

@@ -3,7 +3,7 @@ require_relative "../converter"
 module Ascode
   module Parser
     class Literal
-      attr_reader :literal
+      attr_reader :length
 
       def initialize(code, literal_begin)
         @code = code
@@ -19,6 +19,7 @@ module Ascode
         @literal = @literal[0..(@end - 1)]
 
         @literal = Converter.convert @literal
+        @length = @literal.to_s.length + (@quoted ? 1 : -1)
         ast
       end
 

data/lib/ascode/parser/main.rb

@@ -32,10 +32,8 @@ module Ascode
       end
 
       def character(char, index)
-        if char == "\""
-          literal(index, false)
-        elsif char =~ /[0-9.]/
-          literal(index, true)
+        if char == "\"" || char =~ /[0-9.]/
+          literal index
         elsif char == "["
           block index
         else
@@ -43,12 +41,10 @@ module Ascode
         end
       end
 
-      def literal(index, num)
-        add = num ? -1 : 1
-
+      def literal(index)
         literal = Literal.new @code, index
         @ast.push literal.parse
-        @skip_chars = literal.literal.to_s.length + add
+        @skip_chars = literal.length
       end
 
       def block(index)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ascode
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Artem Varaksa