ascode 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aece182feab64b111905b9b6e7726bd9740bf2ec70b73a3db768c648d84d828
-  data.tar.gz: 51e28b6149fec7fd287ca800c125be7a5756b92c445687a0fa901fe00c4539a6
+  metadata.gz: 8673a2b92556eee81f6f27f3cdf04715439084468ab40a30df31c3aff7f8e355
+  data.tar.gz: 804972be81f40132cb5c8625aec8fcf974937a5c3b4bdef0bd91f1b5265b6524
 SHA512:
-  metadata.gz: 10b757893cac2833915eb3a70cc79c47917a2dcbe676fca054c473b5e2dde3e36d8082827399b6a6bc6d16242ff816b55b38d2d841d1bcfcf5a8b35a9f27a1eb
-  data.tar.gz: 9f84e46035edb327d7e00da64fb08a28078a54282610308b9032a7f46c782cce084adce6d8039b4a886a2de575df5a80338723c46c6d6f4ffed1bf9f7d8109cd
+  metadata.gz: '08979b039e095c115dc5e7a62c0faef24d79e2df1716c32f4c2068eeb3f45bd98d069badd5760991db715abc2656e057b6cba346f74feb386059610b47d25c98'
+  data.tar.gz: 6a2202d1f503b9a32347aaf5c844101880a0aa9ff793718296ae38526e08ad1909b664fe3717a75f60c5ae85487544115464d01f974641a754477c194d4974cd

data/lib/ascode/functions.md

@@ -1,8 +1,11 @@
-Short|Long|`pop`s|`push`es|Description
+Character|Name|`pop`s|`push`es|Description
 ---|---|---|---|---
-`➤`|`output`|`a`||Prints `a` to stdout
+`>`|`output`|`a`||Prints `a` to stdout
 `^`|`pop`|`a`||
 `+`|`plus`|`a`, `b`|`c`|`c` = `a` + `b`
 `-`|`minus`|`a`, `b`|`c`|`c` = `a` - `b`
 `/`|`divide`|`a`, `b`|`c`|`c` = `a` / `b`
 `*`|`multiply`|`a`, `b`|`c`|`c` = `a` * `b`
+`ê`|`even`|`a`|`b`|`b` = `1` if `a` is even, `0` otherwise
+`↺`|`invert`|`a`|`b`|`b` = `1` if `a` = `0`, otherwise `0`
+`±`|`change_sign`|`a`|`b`|`b` = `-1` * `a`

data/lib/ascode/interpreter.rb

@@ -38,21 +38,38 @@ module Ascode
     end
 
     def minus
-      a = pop.to_f
-      b = pop.to_f
+      a = pop
+      b = pop
       push a - b
     end
 
     def divide
-      a = pop.to_f
-      b = pop.to_f
+      a = pop
+      b = pop
       push a / b
     end
 
     def multiply
-      a = pop.to_f
-      b = pop.to_f
+      a = pop
+      b = pop
       push a * b
     end
+
+    def even
+      push pop.even? ? 1 : 0
+    end
+
+    def invert
+      a = pop
+      if a.zero?
+        push 1
+      else
+        push 0
+      end
+    end
+
+    def change_sign
+      push(-1 * pop)
+    end
   end
 end

data/lib/ascode/parser.rb

@@ -10,27 +10,39 @@ module Ascode
     def parse
       @ast = []
       @push_buffer = false
+      @implicit_output = true
 
       @code.split('').to_enum.each do |char|
         parse_character char
       end
-      add_push_buffer
+      ast_add_buffer
+
+      ast_add_action 'output' if @implicit_output
 
       @ast
     end
 
     def parse_character(char)
       if char =~ /[\w.,:;!?]/
-        parse_push char
+        buffer_push char
       elsif char == ' '
-        add_push_buffer
+        ast_add_buffer
       else
-        add_push_buffer
+        ast_add_buffer
         parse_function char
       end
     end
 
-    def parse_push(char)
+    def parse_function(char)
+      function = @fun.csv_data.to_enum.find do |value|
+        value[:short] == char
+      end
+
+      puts '[Error] Unexpected identifier: \'' + char + '\'' unless function
+      ast_add_action function[:long]
+    end
+
+    def buffer_push(char)
       if @push_buffer
         @push_buffer += char
       else
@@ -38,23 +50,22 @@ module Ascode
       end
     end
 
-    def add_push_buffer
-      if @push_buffer
-        add_action 'push', @push_buffer
-        @push_buffer = false
-      end
-    end
+    def ast_add_buffer
+      return unless @push_buffer
 
-    def parse_function(char)
-      function = @fun.csv_data.to_enum.find do |value|
-        value[:short] == char
+      if @push_buffer =~ /^[0-9]+$/
+        @push_buffer = @push_buffer.to_i
+      elsif @push_buffer =~ /^[0-9.]+$/
+        @push_buffer = @push_buffer.to_f
       end
 
-      puts '[Error] Unexpected identifier: \'' + char + '\'' unless function
-      add_action function[:long]
+      ast_add_action 'push', @push_buffer
+      @push_buffer = false
     end
 
-    def add_action(name, what = nil)
+    def ast_add_action(name, what = nil)
+      @implicit_output = false if name == 'output'
+
       data = { action: name }
       data[:what] = what if what
       @ast.push data

data/lib/ascode.rb

@@ -12,4 +12,4 @@ module Ascode
 end
 
 # Test
-Ascode.run('st Te+➤ 5 5*➤')
+Ascode.run('5 5*ê↺5*±')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascode
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Artem Varaksa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-01-14 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: