ascode 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15e393eaf5cfaef02c4bf415e82300e47d1210106ff2c30cdb38f39a3e0c931c
-  data.tar.gz: 03f293c11dee276ec902a35ff51fd31ff7bee3057eb8cdff79de8b53ea576c32
+  metadata.gz: d7d02a2015c6ea648b76aedd3144765b8f130376016b865026aaae8f15a1fb38
+  data.tar.gz: fbc32bb909699a1ed819612b0f7e190d1d1c794bffffe7f5b653bffd1083fd23
 SHA512:
-  metadata.gz: 3d8ebacbec4a7289af7ee40ec2cf15dd95cf4d052b43d3d88fa56594e6e52ff0698b5a0e4b0cd68f1ab5bacec5b1d5821d9d89d30b3e62e8c17456d49127d39e
-  data.tar.gz: e79edd415b548b685571241ddab7b93f9976c560759381f84d1e94c99876707a219f085d46ca02ec55f5cb4d212320fb7bae42dee654dc4aa623a4fe4791c399
+  metadata.gz: 34f50589e7fb8dbee4c2c766611fc5ebd91c19fc7fd6c6eb82e80de0b5034d449fb50a6bb08efb4422d2b8bf707a03a0f46b173574bc35f5fca50fa10bdd79ad
+  data.tar.gz: b68e5200f7f82852ac04d74d85ed59a5ab40b0feadeec83048f6c411c406ae8062c8df2f2044717a2d3ffec1bd759786e421b19a3ec1a0796288594dee71da3a

data/README.md

@@ -1,8 +1,7 @@
 # ascode 
 [![RubyGem Version](https://img.shields.io/gem/v/ascode.svg?style=flat-square)](https://rubygems.org/gems/ascode) [![RubyGem Downloads](https://img.shields.io/gem/dt/ascode.svg?style=flat-square)](https://rubygems.org/gems/ascode)     
 
-> Esoteric golfing language
-
+> **Esoteric golfing language**  
 > In active development, so behavior may be changed without prior notice.
 
 - [Getting Started](#getting-started)
@@ -18,8 +17,8 @@ gem install ascode
 
 ###### Run
 
-Function documentation is available in [`lib/ascode/functions.md
-`](https://github.com/sudoio/ascode/blob/master/lib/ascode/functions.md).
+Function reference is available in [`lib/ascode/parser/functions.md
+`](https://github.com/sudoio/ascode/blob/master/lib/ascode/parser/functions.md).
 
 At this moment, the only way to play with `ascode` is `irb`.
 
@@ -37,5 +36,5 @@ irb(main):003:0> Ascode.run "1.1*"
 
 ### Features
 - Implicit input/output
-    - If you did not output anything, `>` (`output` function) will be called at the end of the program.
-    - During `pop`, if the value is not in the stack, it will be grabbed via `<` (`input` function).
+    - If you did not output anything, `O` (`output` function) will be called at the end of the program.
+    - During `pop`, if the value is not in the stack, it will be grabbed via `I` (`input` function).

data/lib/ascode/parser/condition_block.rb

@@ -0,0 +1,67 @@
+module Ascode
+  module Parser
+    class ConditionBlock
+      attr_reader :block
+
+      def initialize(code, block_begin)
+        @code = code
+        @begin = block_begin + 1
+
+        @true = ""
+        @false = ""
+      end
+
+      def parse
+        @block = @code[@begin..-1]
+
+        @end = find "]"
+        raise "Unmatched '[' detected." if @end == -1
+
+        @block = @block[0..(@end - 1)]
+
+        @split_pos = find ":"
+        split
+
+        ast_action
+      end
+
+      def find(what)
+        # TODO: Ignore '[', ':', ']' when in string
+        level = 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 == "]"
+        end
+
+        -1
+      end
+
+      def split
+        if @split_pos == -1
+          @true = @block
+        elsif @split_pos.zero?
+          @false = @block
+        else
+          @true = @block[0..(@split_pos - 1)]
+          @false = @block[(@split_pos + 1)..-1]
+        end
+
+        @true = parse_part(@true)
+        @false = parse_part(@false)
+      end
+
+      def parse_part(part)
+        (Main.new part, false).parse
+      end
+
+      def ast_action
+        @ast = {
+          action: "condition",
+          true_block: @true,
+          false_block: @false
+        }
+      end
+    end
+  end
+end

data/lib/ascode/parser/function.rb

@@ -0,0 +1,47 @@
+module Ascode
+  module Parser
+    class Function
+      attr_reader :csv_data
+
+      def initialize
+        @csv_data = []
+
+        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
+      end
+
+      def parse(char)
+        function = @csv_data.to_enum.find do |value|
+          value[:short] == char
+        end
+
+        raise "Unexpected function: '#{char}'" unless function
+
+        {
+          action: function[:long]
+        }
+      end
+
+      def read_csv(file)
+        until (line = file.gets).nil?
+          src = line.strip.split("|")
+
+          @csv_data.push(
+            short: clear_quotes(src[0]),
+            long: clear_quotes(src[1])
+          )
+        end
+      end
+
+      def clear_quotes(str)
+        return str unless str
+        str.delete("`")
+      end
+    end
+  end
+end

data/lib/ascode/{functions.md → parser/functions.md}

@@ -4,7 +4,7 @@ Character|Name|`pop`s|`push`es|Description
 `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_else`|||
 `]`|`condition_end`||| 
 `+`|`plus`|`a`, `b`|`c`|`c` = `a` + `b`
 `-`|`minus`|`a`, `b`|`c`|`c` = `a` - `b`

data/lib/ascode/parser/literal.rb

@@ -0,0 +1,46 @@
+require_relative "../converter"
+
+module Ascode
+  module Parser
+    class Literal
+      attr_reader :literal
+
+      def initialize(code, literal_begin)
+        @code = code
+        @begin = literal_begin
+      end
+
+      def parse
+        @quoted = @code[@begin] == '"'
+        @begin += 1 if @quoted
+        @literal = @code[@begin..-1]
+
+        @end = find_end
+        @literal = @literal[0..(@end - 1)]
+
+        @literal = Converter.convert @literal
+        ast
+      end
+
+      def find_end
+        escape = false
+        @literal.split("").each_with_index do |char, index|
+          if @quoted
+            return index if char == '"' && !escape
+            escape = char == "\\"
+          else
+            return index unless char =~ /[0-9.]/
+          end
+        end
+        -1
+      end
+
+      def ast
+        @ast = {
+          action: "push",
+          what: @literal
+        }
+      end
+    end
+  end
+end

data/lib/ascode/parser/main.rb

@@ -0,0 +1,67 @@
+require_relative "condition_block"
+require_relative "function"
+require_relative "literal"
+
+module Ascode
+  module Parser
+    class Main
+      def initialize(code, impl_o = true)
+        @function = Function.new
+        @code = code
+
+        @do_implicit_output = impl_o
+      end
+
+      def parse
+        @ast = []
+        @skip_chars = 0
+        @implicit_output = @do_implicit_output
+
+        @code.split("").to_enum.each_with_index do |char, index|
+          if @skip_chars > 0
+            @skip_chars -= 1
+            next
+          end
+
+          character char, index
+        end
+
+        @ast.push(action: "output") if @implicit_output
+
+        @ast
+      end
+
+      def character(char, index)
+        if char == "\""
+          literal(index, false)
+        elsif char =~ /[0-9.]/
+          literal(index, true)
+        elsif char == "["
+          block index
+        else
+          function char
+        end
+      end
+
+      def literal(index, num)
+        add = num ? 0 : 1
+
+        literal = Literal.new @code, index
+        @ast.push literal.parse
+        @skip_chars = literal.literal.to_s.length + add
+      end
+
+      def block(index)
+        block = ConditionBlock.new @code, index
+        @ast.push block.parse
+        @skip_chars = block.block.length
+      end
+
+      def function(char)
+        function = @function.parse char
+        @implicit_output = false if function[:action] == "output"
+        @ast.push function
+      end
+    end
+  end
+end

data/lib/ascode.rb

@@ -1,9 +1,9 @@
 require_relative "ascode/interpreter"
-require_relative "ascode/parser"
+require_relative "ascode/parser/main"
 
 module Ascode
   def self.run(code)
-    parser = Parser.new code
+    parser = Parser::Main.new code
     ast = parser.parse
 
     interpreter = Interpreter.new ast

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascode
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Artem Varaksa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies: []
 description: Esoteric golfing language. In active development, so behavior may be
   changed without prior notice.
@@ -21,10 +21,12 @@ files:
 - README.md
 - lib/ascode.rb
 - lib/ascode/converter.rb
-- lib/ascode/functions.md
-- lib/ascode/functions.rb
 - lib/ascode/interpreter.rb
-- lib/ascode/parser.rb
+- lib/ascode/parser/condition_block.rb
+- lib/ascode/parser/function.rb
+- lib/ascode/parser/functions.md
+- lib/ascode/parser/literal.rb
+- lib/ascode/parser/main.rb
 homepage: https://github.com/sudoio/ascode
 licenses:
 - MIT

data/lib/ascode/functions.rb

@@ -1,33 +0,0 @@
-module Ascode
-  class Functions
-    attr_reader :csv_data
-
-    def initialize
-      @csv_data = []
-
-      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
-    end
-
-    def read_csv(file)
-      until (line = file.gets).nil?
-        src = line.strip.split("|")
-
-        @csv_data.push(
-          short: clear_quotes(src[0]),
-          long: clear_quotes(src[1])
-        )
-      end
-    end
-
-    def clear_quotes(str)
-      return str unless str
-      str.delete("`")
-    end
-  end
-end

data/lib/ascode/parser.rb

@@ -1,148 +0,0 @@
-require_relative "functions"
-require_relative "converter"
-
-module Ascode
-  class Parser
-    def initialize(code, impl_o = true)
-      @fun = Functions.new
-      @code = code
-
-      @do_implicit_output = impl_o
-    end
-
-    def parse
-      @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|
-        if @skip_chars > 0
-          @skip_chars -= 1
-          next
-        else
-          parse_character char, index
-        end
-      end
-      ast_add_buffer
-
-      ast_add_action "output" if @implicit_output
-
-      @ast
-    end
-
-    def parse_condition_block(begin_index)
-      block_code = @code[(begin_index + 1)..-1]
-
-      end_index = (find_block_end block_code) + begin_index
-      raise "Unmatched '[' at position #{begin_index}" if end_index == -1
-
-      block_code = @code[(begin_index + 1)..(end_index + 1)]
-
-      split_pos = find_block_split(block_code)
-
-      if split_pos == -1
-        true_block_ast = (Parser.new block_code).parse
-        false_block_ast = []
-      elsif split_pos.zero?
-        true_block_ast = []
-        false_block_ast = (Parser.new block_code[1..-1]).parse
-      else
-        true_block_ast = (Parser.new block_code[0..(split_pos - 1)], false).parse
-        false_block_ast = (Parser.new block_code[(split_pos + 1)..-1], false).parse
-      end
-
-      @ast.push(action: "condition", true_block: true_block_ast, false_block: false_block_ast )
-
-      end_index + 2
-    end
-
-    def find_block_end(block)
-      end_index = -1
-      block.split("").to_enum.with_index.reverse_each do |char, index|
-        if char == "]"
-          end_index = index
-          break
-        end
-      end
-
-      end_index - 1
-    end
-
-    def find_block_split(block)
-      level = 0
-      split_pos = -1
-      block.split("").to_enum.each_with_index do |char, index|
-        if char == "["
-          level += 1
-        elsif char == "]"
-          level -= 1
-        elsif char == "~" && level.zero?
-          split_pos = index
-        end
-      end
-
-      split_pos
-    end
-
-    def parse_character(char, index)
-      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 == " "
-        ast_add_buffer
-      else
-        ast_add_buffer
-        parse_function char
-      end
-
-      @escape = false
-    end
-
-    def parse_function(char)
-      function = @fun.csv_data.to_enum.find do |value|
-        value[:short] == char
-      end
-
-      raise "Unexpected identifier: '#{char}'" unless function
-      ast_add_action function[:long]
-    end
-
-    def buffer_push(char)
-      if @push_buffer
-        @push_buffer += char
-      else
-        @push_buffer = char
-      end
-    end
-
-    def ast_add_buffer
-      return unless @push_buffer
-
-      @push_buffer = Converter.convert @push_buffer
-
-      ast_add_action "push", @push_buffer
-      @push_buffer = false
-    end
-
-    def ast_add_action(name, what = nil)
-      @implicit_output = false if name == "output"
-
-      data = { action: name }
-      data[:what] = what if what
-      @ast.push data
-    end
-  end
-end