ascode 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c3acce51fa7eec449751f02bba7325fae7ef52c3bff31c6613ffb4850718d60
-  data.tar.gz: ff07ae63b600f20e2922e9241fb74dd4aafc041570227f6fbcb7a35e7d54d59d
+  metadata.gz: 213907cdd00229e60f474d6d67e4daf5b7a3b1ce67b0a7f9973cae5aa83854f2
+  data.tar.gz: 91bd1c91592074ee6688f37daa37e4e188ddd8b5b2b302740b7dcbd60ad60af4
 SHA512:
-  metadata.gz: b9f08680ca2a5c03067793421c2d22bb786a5bc38a600fa40495a9d28bdc9a8e228183b9f1af696bef11a286b8ae040ed121bb676354e2cf07c701c570181e11
-  data.tar.gz: bdbcfad01d5c039a6dade2c099ba460f1b8eaf698494c60703a43a400516ce607d6146250ffffaca7e0793bfb22b92012fa6e435270760ae0e43a70392c834a3
+  metadata.gz: 71fca1e21167ad4626dd16e703c046021b0c318a453bc80f59dcbfffe66356a6b245caed879692105ae1c6c6840dc951243e952dadd5ade870ff4609c4b2a7c9
+  data.tar.gz: 07f068c484bc3060aba51694c125819f08532669a5ff502465983d67bb76622c8af33a451762c2f7a8d0fc55e99160783381de10aa5f005dc72455483c174de1

data/README.md

@@ -29,9 +29,10 @@ irb(main):001:0> require "ascode"
 irb(main):002:0> Ascode.run '"Number: "Oe["Even":"Odd"]O'
 Number: 10
 Even
-irb(main):003:0> Ascode.run "1.1*"
-5
-5.5
+irb(main):003:0> Ascode.run '"A: "OI"B: "OIS>["A > B":"A <= B"]O'
+A: 10
+B: 5
+A > B
 ```
 
 ### Features

data/lib/ascode/interpreter/environment.rb

@@ -23,6 +23,13 @@ module Ascode
           @stack.pop
         end
       end
+
+      def swap
+        a = pop false
+        b = pop false
+        push a
+        push b
+      end
     end
   end
 end

data/lib/ascode/interpreter/math.rb

@@ -25,6 +25,24 @@ module Ascode
         env.push a * b
       end
 
+      def self.bigger_than(env)
+        a = env.pop
+        b = env.pop
+        env.push a > b ? 1 : 0
+      end
+
+      def self.less_than(env)
+        a = env.pop
+        b = env.pop
+        env.push a < b ? 1 : 0
+      end
+
+      def self.equal(env)
+        a = env.pop
+        b = env.pop
+        env.push a == b ? 1 : 0
+      end
+
       def self.even(env)
         env.push env.pop.even? ? 1 : 0
       end

data/lib/ascode/parser/function.rb

@@ -11,8 +11,9 @@ module Ascode
           read_csv file
         end
 
-        @csv_data.delete_at 0
-        @csv_data.delete_at 0
+        @csv_data.delete_if do |e|
+          e[:short].nil? || e[:short].to_s.length > 1
+        end
       end
 
       def parse(char)

data/lib/ascode/parser/functions.md

@@ -1,16 +1,37 @@
+#### IO
+
 Character|Type|Name|`pop`s|`push`es|Description
 ---|---|---|---|---|---
 `I`|`io`|`input`||`a`|`stdin` -> `a`
 `O`|`io`|`output`|`a`||`a` -> `stdout`
 `N`|`io`|`new_line`|||`\n` -> `stdout`
+
+#### Environment
+
+Character|Type|Name|`pop`s|`push`es|Description
+---|---|---|---|---|---
 `P`|`env`|`pop`|`a`||
-`[`|`condition`|`begin`|`a`|| If `a` = `0`, `nil` or `false`, then part after `:` is executed
+`S`|`env`|`swap`|`a`, `b`|`a`, `b`|Swaps first two elements in the stack
+
+#### Condition
+
+Character|Type|Name|`pop`s|`push`es|Description
+---|---|---|---|---|---
+`[`|`condition`|`begin`|`a`|| Condition is false if `a` = `0` or `false`
 `:`|`condition`|`else`|||
-`]`|`condition`|`end`||| 
+`]`|`condition`|`end`|||
+
+#### Math
+
+Character|Type|Name|`pop`s|`push`es|Description
+---|---|---|---|---|---
 `+`|`math`|`plus`|`a`, `b`|`c`|`c` = `a` + `b`
 `-`|`math`|`minus`|`a`, `b`|`c`|`c` = `a` - `b`
 `/`|`math`|`divide`|`a`, `b`|`c`|`c` = `a` / `b`
 `*`|`math`|`multiply`|`a`, `b`|`c`|`c` = `a` * `b`
+`>`|`math`|`bigger_than`|`a`, `b`|`c`|`c` = `1` if `a` > `b`, `0` otherwise
+`<`|`math`|`less_than`|`a`, `b`|`c`|`c` = `1` if `a` < `b`, `0` otherwise
+`=`|`math`|`equal`|`a`, `b`|`c`|`c` = `1` if `a` = `b`, `0` otherwise
 `e`|`math`|`even`|`a`|`b`|`b` = `1` if `a` is even, `0` otherwise
 `!`|`math`|`invert`|`a`|`b`|`b` = `1` if `a` = `0`, otherwise `0`
 `s`|`math`|`change_sign`|`a`|`b`|`b` = `-1` * `a`

metadata

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