ascode 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be5ffda76c2c8c88b0a89678a05730f7497fc8752208b3a41dc2523d81e62e46
-  data.tar.gz: a510b069ecb83cf610dd696c3d3b55abf761062f4296329b1ef012a67cfa21af
+  metadata.gz: c5d1f71ff0d30c17ef55b8f2d4c91554b4f7363d812d29db1d113e8c88aa3d63
+  data.tar.gz: f3af4b019e3f8c03844a195424de19c54058e45b0375a4ea4a3079094952e982
 SHA512:
-  metadata.gz: f18a849a4413d3182427a88f98da6736712443915a199e320ac857b79e2bb436807b977920a21cad5d527673382d8f79dc3f99df789955017a25d38e59b87214
-  data.tar.gz: 6a10e1ef202258ebb4414e922e4a97e69d286b8524c7c46cc34000650ecb78d4a7e611079aa09ae6c7224e38fdb8d34fd0ba0b67b786a53314adf1a1b78e7e72
+  metadata.gz: 45d409bd132f0cfb0e28f441bf36464379289711a7688e2d627a9de310c36904c2806ffaa3329ece4ce0da561d7cf7f7f1a6f0ed98b1cd05313acc933f901278
+  data.tar.gz: 031ab75e57bbf8202a8a6f87605d4e08248333f10f7c8c60a152104123a23545a3ce892d510fc6ae810f46e18cb113f182139f07689656bc0377159259863063

data/README.md

@@ -27,7 +27,8 @@ At this moment, the only way to play with `ascode` is `irb`.
 $ irb
 irb(main):001:0> require 'ascode'
 => true
-irb(main):002:0> Ascode.run '5*ê[Even~Odd]'
+irb(main):002:0> Ascode.run 'Number:>ê[Even~Odd]>'
+Number:
 10
 Even
 ```

data/lib/ascode/functions.md

@@ -3,7 +3,7 @@ Character|Name|`pop`s|`push`es|Description
 `>`|`output`|`a`||`a` -> `stdout`
 `<`|`input`||`a`|`stdin` -> `a`
 `^`|`pop`|`a`||
-`[`|`condition_begin`|`a`|| If `a` = `0`, `nil` or `false`, jump to `~`, or to `]` if `~` is not present
+`[`|`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`

data/lib/ascode/interpreter.rb

@@ -2,23 +2,23 @@ require_relative 'converter'
 
 module Ascode
   class Interpreter
-    def initialize(ast)
+    def initialize(ast, stack = [])
       @ast = ast
-      @conditions = []
-      @cond_positions = []
 
-      @stack = []
+      @stack = stack
     end
 
     def run
       @ast.each do |action|
         name = action[:action]
 
-        if !@conditions.empty? && !%w[condition_else condition_end].include?(name)
-          next if @conditions[0] != @cond_positions[0]
+        if name == 'push'
+          push(action[:what])
+        elsif name == 'condition'
+          condition_begin action[:true_block], action[:false_block]
+        else
+          send(name)
         end
-
-        name == 'push' ? push(action[:what]) : send(name)
       end
     end
 
@@ -44,19 +44,16 @@ module Ascode
       puts pop(false)
     end
 
-    def condition_begin
+    def condition_begin(true_ast, false_ast)
       condition = pop
-      @conditions.push(!(condition.nil? || !condition || condition.zero?))
-      @cond_positions.push true
-    end
+      ast = condition.nil? || !condition || condition.zero? ? false_ast : true_ast
 
-    def condition_else
-      @cond_positions[0] = false
+      (Interpreter.new ast, @stack).run
     end
 
-    def condition_end
-      @conditions.pop
-    end
+    def condition_else; end
+
+    def condition_end; end
 
     def plus
       a = pop

data/lib/ascode/parser.rb

@@ -3,18 +3,26 @@ require_relative 'converter'
 
 module Ascode
   class Parser
-    def initialize(code)
+    def initialize(code, impl_o = true)
       @fun = Functions.new
       @code = code
+
+      @do_implicit_output = impl_o
     end
 
     def parse
       @ast = []
       @push_buffer = false
-      @implicit_output = true
+      @skip_chars = 0
+      @implicit_output = @do_implicit_output
 
-      @code.split('').to_enum.each do |char|
-        parse_character char
+      @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
 
@@ -23,8 +31,62 @@ module Ascode
       @ast
     end
 
-    def parse_character(char)
-      if char =~ /[\w.,:;!?]/
+    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 = ''
+      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 == '['
+        end_index = parse_condition_block index
+        @skip_chars = end_index - index
+      elsif char =~ /[\w.,:;!?]/
         buffer_push char
       elsif char == ' '
         ast_add_buffer
@@ -39,7 +101,7 @@ module Ascode
         value[:short] == char
       end
 
-      puts '[Error] Unexpected identifier: \'' + char + '\'' unless function
+      raise "Unexpected identifier: '#{char}'" unless function
       ast_add_action function[:long]
     end
 

metadata

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