ascode 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bb261a46eb4fafcf1993ea9424ecd61e1b0563bb7442b19f0bc36dbc3aeac00
-  data.tar.gz: 57ce7e23f1fcb9846dc1e081a67b0904e7b5f45adf9ad4e31775ec46e133c273
+  metadata.gz: d5f4408a0db6f51c967a99742111084fa89aac0c41237313ccbfed61e9d64fe6
+  data.tar.gz: b1ff0ca8a235111caaa549b768f0d4444480e3d15910c8585e6029b71f44f0bf
 SHA512:
-  metadata.gz: 60f714e57e55ef148f53ceb7491157bf939271cf39748ec6e0025ccfce42c6247b0c7233a125c0779075faf921a6e26e492679d09f4db28c679cd3ca8e944249
-  data.tar.gz: 5266a0121fe8e7c11db83a78dc9d35565b02736e9ad58081b8e741a49a6a5207885eb541016170d0b452909fc39f51dea5ad886e6b81246742a8c00a5a905c94
+  metadata.gz: fae634110d25627412c71d7d30f6c87cea3f37764db75149f937387f82b03250306d6822cb9482f8e99ce8415fd0fc2eab80366fca99a00e1b945f83d1a94b31
+  data.tar.gz: af4ffcf2b5779e69583d54e935dbfcc7ffa0aad67d76d2b3694e00b743566aee3ede7c0f748a7908867e85ee93d6cc4996bd87ed10cde69a593a402a27106bbe

data/lib/ascode/interpreter/condition.rb

@@ -0,0 +1,14 @@
+module Ascode
+  module Interpreter
+    class Condition
+      def self.begin(env, true_ast, false_ast)
+        condition = env.pop
+        ast = condition.nil? || !condition || condition.zero? ? false_ast : true_ast
+
+        (Main.new ast, env).run
+      end
+
+      def self.end(_); end
+    end
+  end
+end

data/lib/ascode/interpreter/environment.rb

@@ -0,0 +1,28 @@
+require_relative "io"
+
+module Ascode
+  module Interpreter
+    class Environment
+      attr_accessor :ast, :stack
+
+      def initialize(ast = "")
+        @ast = ast
+        @stack = []
+      end
+
+      def push(what)
+        @stack.push what
+      end
+
+      def pop(ask = true)
+        value = @stack.pop
+        if value
+          value
+        elsif ask
+          IO.input itself
+          @stack.pop
+        end
+      end
+    end
+  end
+end

data/lib/ascode/interpreter/io.rb

@@ -0,0 +1,15 @@
+require_relative "../converter"
+
+module Ascode
+  module Interpreter
+    class IO
+      def self.input(env)
+        env.push Converter.convert gets
+      end
+
+      def self.output(env)
+        puts env.pop(false)
+      end
+    end
+  end
+end

data/lib/ascode/interpreter/main.rb

@@ -0,0 +1,43 @@
+require_relative "environment"
+require_relative "condition"
+require_relative "math"
+require_relative "io"
+
+module Ascode
+  module Interpreter
+    class Main
+      def initialize(ast, env = Environment.new)
+        @env = env
+        @env.ast = ast
+
+        @map = {
+          "io" => IO,
+          "math" => Math,
+          "condition" => Condition
+        }
+      end
+
+      def run
+        @env.ast.each do |action|
+          name = action[:action]
+
+          if name == "push"
+            @env.push(action[:what])
+          elsif name == "condition"
+            Condition.begin @env, action[:true_block], action[:false_block]
+          else
+            call action[:type], name
+          end
+        end
+      end
+
+      def call(type, name)
+        if type == "env"
+          @env.send name
+        else
+          @map[type].send name, @env
+        end
+      end
+    end
+  end
+end

data/lib/ascode/interpreter/math.rb

@@ -0,0 +1,46 @@
+module Ascode
+  module Interpreter
+    class Math
+      def self.plus(env)
+        a = env.pop
+        b = env.pop
+        env.push a + b
+      end
+
+      def self.minus(env)
+        a = env.pop
+        b = env.pop
+        env.push a - b
+      end
+
+      def self.divide(env)
+        a = env.pop
+        b = env.pop
+        env.push a / b
+      end
+
+      def self.multiply(env)
+        a = env.pop
+        b = env.pop
+        env.push a * b
+      end
+
+      def self.even(env)
+        env.push env.pop.even? ? 1 : 0
+      end
+
+      def self.invert(env)
+        a = env.pop
+        if a.zero?
+          env.push 1
+        else
+          env.push 0
+        end
+      end
+
+      def self.change_sign(env)
+        env.push(-1 * env.pop)
+      end
+    end
+  end
+end

data/lib/ascode/parser/function.rb

@@ -20,9 +20,10 @@ module Ascode
           value[:short] == char
         end
 
-        raise "Unexpected function: '#{char}'" unless function
+        return unless function
 
         {
+          type: function[:type],
           action: function[:long]
         }
       end
@@ -33,7 +34,8 @@ module Ascode
 
           @csv_data.push(
             short: clear_quotes(src[0]),
-            long: clear_quotes(src[1])
+            type: clear_quotes(src[1]),
+            long: clear_quotes(src[2])
           )
         end
       end

data/lib/ascode/parser/functions.md

@@ -1,15 +1,15 @@
-Character|Name|`pop`s|`push`es|Description
----|---|---|---|---
-`I`|`input`||`a`|`stdin` -> `a`
-`O`|`output`|`a`||`a` -> `stdout`
-`P`|`pop`|`a`||
-`[`|`condition_begin`|`a`|| If `a` = `0`, `nil` or `false`, then part after `:` is executed
-`:`|`condition_else`|||
-`]`|`condition_end`||| 
-`+`|`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`
-`e`|`even`|`a`|`b`|`b` = `1` if `a` is even, `0` otherwise
-`!`|`invert`|`a`|`b`|`b` = `1` if `a` = `0`, otherwise `0`
-`s`|`change_sign`|`a`|`b`|`b` = `-1` * `a`
+Character|Type|Name|`pop`s|`push`es|Description
+---|---|---|---|---|---
+`I`|`io`|`input`||`a`|`stdin` -> `a`
+`O`|`io`|`output`|`a`||`a` -> `stdout`
+`P`|`env`|`pop`|`a`||
+`[`|`condition`|`begin`|`a`|| If `a` = `0`, `nil` or `false`, then part after `:` is executed
+`:`|`condition`|`else`|||
+`]`|`condition`|`end`||| 
+`+`|`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`
+`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`

data/lib/ascode/parser/main.rb

@@ -26,7 +26,7 @@ module Ascode
           character char, index
         end
 
-        @ast.push(action: "output") if @implicit_output
+        @ast.push(type: "io", action: "output") if @implicit_output
 
         @ast
       end
@@ -44,7 +44,7 @@ module Ascode
       end
 
       def literal(index, num)
-        add = num ? 0 : 1
+        add = num ? -1 : 1
 
         literal = Literal.new @code, index
         @ast.push literal.parse
@@ -59,6 +59,7 @@ module Ascode
 
       def function(char)
         function = @function.parse char
+        return unless function
         @implicit_output = false if function[:action] == "output"
         @ast.push function
       end

data/lib/ascode.rb

@@ -1,4 +1,4 @@
-require_relative "ascode/interpreter"
+require_relative "ascode/interpreter/main"
 require_relative "ascode/parser/main"
 
 module Ascode
@@ -6,7 +6,7 @@ module Ascode
     parser = Parser::Main.new code
     ast = parser.parse
 
-    interpreter = Interpreter.new ast
+    interpreter = Interpreter::Main.new ast
     interpreter.run
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascode
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Artem Varaksa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies: []
 description: Esoteric golfing language. In active development, so behavior may be
   changed without prior notice.
@@ -21,7 +21,11 @@ files:
 - README.md
 - lib/ascode.rb
 - lib/ascode/converter.rb
-- lib/ascode/interpreter.rb
+- lib/ascode/interpreter/condition.rb
+- lib/ascode/interpreter/environment.rb
+- lib/ascode/interpreter/io.rb
+- lib/ascode/interpreter/main.rb
+- lib/ascode/interpreter/math.rb
 - lib/ascode/parser/condition_block.rb
 - lib/ascode/parser/function.rb
 - lib/ascode/parser/functions.md

data/lib/ascode/interpreter.rb

@@ -1,99 +0,0 @@
-require_relative "converter"
-
-module Ascode
-  class Interpreter
-    def initialize(ast, stack = [])
-      @ast = ast
-
-      @stack = stack
-    end
-
-    def run
-      @ast.each do |action|
-        name = action[:action]
-
-        if name == "push"
-          push(action[:what])
-        elsif name == "condition"
-          condition_begin action[:true_block], action[:false_block]
-        else
-          send(name)
-        end
-      end
-    end
-
-    def push(what)
-      @stack.push what
-    end
-
-    def pop(ask = true)
-      value = @stack.pop
-      if value
-        value
-      elsif ask
-        input
-        @stack.pop
-      end
-    end
-
-    def input
-      push Converter.convert gets
-    end
-
-    def output
-      puts pop(false)
-    end
-
-    def condition_begin(true_ast, false_ast)
-      condition = pop
-      ast = condition.nil? || !condition || condition.zero? ? false_ast : true_ast
-
-      (Interpreter.new ast, @stack).run
-    end
-
-    def condition_else; end
-
-    def condition_end; end
-
-    def plus
-      a = pop
-      b = pop
-      push a + b
-    end
-
-    def minus
-      a = pop
-      b = pop
-      push a - b
-    end
-
-    def divide
-      a = pop
-      b = pop
-      push a / b
-    end
-
-    def multiply
-      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