ascode 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e23bc6e653965a74e847c726fd2475c9d80787d36eef439b68a8d4f9ad7f6f
-  data.tar.gz: 2e99a66181a565e217e3820fb18da9a44710dea2e91fb84b6e6dc838b880003d
+  metadata.gz: 5cd39a387db21b65e74bf8617268f265998de21ad229e34bd39c035ac340fcbc
+  data.tar.gz: 92a4c0f8331707b07e71956960c706a34d64f4ba08cb055b5038d5378bd07f45
 SHA512:
-  metadata.gz: 1c8680657e8d13ac141d4f7499f79f522a8b496b86dc28a62f9bc4594f6e3811b493be98a7cadf87f0a5694bb7e5bf02c22f445cd30ed89c990567a84593fa25
-  data.tar.gz: 00fb2ca59f0e7b23d3070b503be1472b338acf6a5cd8be40a6de6d1b9e95c6e673e3112cf488a358094ceb7e7ed49cd3b5290c8f3d43f54a93e5d14241cea51c
+  metadata.gz: 14a8a972f71267ff6f38d01903d79f3848f49dea8434dd6af168e72645a2e17fbc09e72da1d3662e6df1350f869b4f2552b2ef7d44181166071fe950a7e0ae86
+  data.tar.gz: 75adb189e94e30df9459dbacc96f537659658a7ab30e9831eddab6d6f8a6b957951c8cdb12d99eaa9fc315da3de5c33ddd553cdf113a180cb45d17e340dc941c

data/README.md

@@ -25,12 +25,14 @@ At this moment, the only way to play with `ascode` is `irb`.
 
 ```bash
 $ irb
-irb(main):001:0> require 'ascode'
+irb(main):001:0> require "ascode"
 => true
-irb(main):002:0> Ascode.run 'Number:>ê[Even~Odd]>'
-Number:
+irb(main):002:0> Ascode.run 'ê["Even"~"Odd"]"It is "+'
 10
-Even
+It is Even
+irb(main):003:0> Ascode.run "1.1*"
+5
+5.5
 ```
 
 ### Features

data/lib/ascode/functions.rb

@@ -5,9 +5,10 @@ module Ascode
     def initialize
       @csv_data = []
 
-      file = File.open(File.join(File.dirname(__FILE__), "functions.md"), "r")
-      read_csv file
-      file.close
+      filename = File.join(File.dirname(__FILE__), "functions.md")
+      File.open(filename, "r") do |file|
+        read_csv file
+      end
 
       @csv_data.delete_at 0
       @csv_data.delete_at 0
@@ -19,10 +20,7 @@ module Ascode
 
         @csv_data.push(
           short: clear_quotes(src[0]),
-          long: clear_quotes(src[1]),
-          pop: clear_quotes(src[2]),
-          push: clear_quotes(src[3]),
-          desc: clear_quotes(src[4])
+          long: clear_quotes(src[1])
         )
       end
     end

data/lib/ascode/parser.rb

@@ -14,6 +14,8 @@ module Ascode
       @ast = []
       @push_buffer = false
       @skip_chars = 0
+      @is_quoted = false
+      @escape = false
       @implicit_output = @do_implicit_output
 
       @code.split("").to_enum.each_with_index do |char, index|
@@ -86,17 +88,27 @@ module Ascode
     end
 
     def parse_character(char, index)
-      if char == "["
+      if char == "\\"
+        @escape = true
+        return
+      end
+
+      if char == "\"" && !@escape
+        ast_add_buffer if @is_quoted
+        @is_quoted = !@is_quoted
+      elsif @is_quoted || char =~ /[0-9.]/
+        buffer_push char
+      elsif char == "["
         end_index = parse_condition_block index
         @skip_chars = end_index - index
-      elsif char =~ /[\w.,:;!?]/
-        buffer_push char
       elsif char == " "
         ast_add_buffer
       else
         ast_add_buffer
         parse_function char
       end
+
+      @escape = false
     end
 
     def parse_function(char)

metadata

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