razyk 0.0.1 → 0.1.0

data/lib/razyk/node.rb

@@ -54,15 +54,54 @@ module RazyK
       self.class.disconnect(self, a)
       self.class.connect(self, b)
     end
+
+    def integer?
+      @label.is_a?(Integer) or (/\A\d+\z/ =~ @label.to_s)
+    end
+
+    def integer
+      unless integer?
+        raise "#{self} is not a integer"
+      end
+      case @label
+      when Integer
+        @label
+      else
+        Integer(@label.to_s)
+      end
+    end
+
+    def as_json
+      {name: @label.to_s}
+    end
+
+    def self.list(*args, terminator: nil, memory: {})
+      cons = lambda{|x, y| Pair.cons(x, y, memory) }
+      term = (terminator || cons[:K, 256])
+      args.reverse.each do |i|
+        term = cons[cons[:S, cons[cons[:S, :I], cons[:K, i]]], cons[:K, term]]
+      end
+      term
+    end
   end
 
   class Combinator < Node
+    def self.get(comb, mem)
+      n = comb.to_s
+      mem[n] ||= self.new(comb)
+    end
+
     def initialize(comb)
       super(comb)
     end
 
     def to_s
-      @label.to_s
+      case l = @label.to_s
+      when "S", "K", "I"
+        l
+      else
+        "$" + l
+      end
     end
     def inspect
       to_s
@@ -73,6 +112,11 @@ module RazyK
   # Pair has only two child node (car and cdr).
   #  It represent term of combinators or terms.
   class Pair < Node
+    def self.cons(car, cdr, mem)
+      n = "(#{car} #{cdr})"
+      mem[n] ||= self.new(car, cdr)
+    end
+
     def initialize(car, cdr)
       car = Combinator.new(car) unless car.is_a?(Node)
       cdr = Combinator.new(cdr) unless cdr.is_a?(Node)
@@ -113,5 +157,9 @@ module RazyK
     def inspect
       to_s
     end
+
+    def as_json
+      {name: "", children: [@car.as_json, @cdr.as_json]}
+    end
   end
 end

data/lib/razyk/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.13
 # from Racc grammer file "".
 #
 
@@ -15,12 +15,7 @@ module RazyK
 module_eval(<<'...end parser.y/module_eval...', 'parser.y', 114)
 
 def str2list(str)
-  # (K 256) means End-of-stream. RazyK String adopt it as null terminator
-  head = Pair.new(:K, 256)
-  str.unpack("C*").reverse_each do |ch|
-    head = Pair.new(Pair.new(:CONS, ch), head)
-  end
-  head
+  Node.list(*str.unpack("C*"), memory: @memory)
 end
 
 def scan
@@ -121,6 +116,7 @@ end
 def parse(str, opt={})
   @buf = str
   @jot = []
+  @memory = opt[:memory] || {}
   yyparse self, :scan
 end
 
@@ -269,7 +265,7 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'parser.y', 16)
   def _reduce_1(val, _values, result)
-              result = val[0] || Combinator.new(:I)
+              result = val[0] || Combinator.get(:I, @memory)
         
     result
   end
@@ -288,7 +284,7 @@ module_eval(<<'.,.,', 'parser.y', 26)
               if val[0].nil?
             result = val[1]
           else
-            result = Pair.new(val[0], val[1])
+            result = Pair.cons(val[0], val[1], @memory)
           end
         
     result
@@ -297,7 +293,7 @@ module_eval(<<'.,.,', 'parser.y', 26)
 
 module_eval(<<'.,.,', 'parser.y', 36)
   def _reduce_4(val, _values, result)
-              result = Combinator.new(:I)
+              result = Combinator.get(:I, @memory)
         
     result
   end
@@ -307,7 +303,7 @@ module_eval(<<'.,.,', 'parser.y', 36)
 
 module_eval(<<'.,.,', 'parser.y', 43)
   def _reduce_6(val, _values, result)
-              result = Combinator.new(:IOTA)
+              result = Combinator.get(:IOTA, @memory)
         
     result
   end
@@ -317,7 +313,7 @@ module_eval(<<'.,.,', 'parser.y', 43)
 
 module_eval(<<'.,.,', 'parser.y', 50)
   def _reduce_8(val, _values, result)
-              result = Combinator.new(:I)
+              result = Combinator.get(:I, @memory)
         
     result
   end
@@ -325,7 +321,7 @@ module_eval(<<'.,.,', 'parser.y', 50)
 
 module_eval(<<'.,.,', 'parser.y', 54)
   def _reduce_9(val, _values, result)
-              result = Combinator.new(:K)
+              result = Combinator.get(:K, @memory)
         
     result
   end
@@ -333,7 +329,7 @@ module_eval(<<'.,.,', 'parser.y', 54)
 
 module_eval(<<'.,.,', 'parser.y', 58)
   def _reduce_10(val, _values, result)
-              result = Combinator.new(:S)
+              result = Combinator.get(:S, @memory)
         
     result
   end
@@ -341,13 +337,13 @@ module_eval(<<'.,.,', 'parser.y', 58)
 
 module_eval(<<'.,.,', 'parser.y', 62)
   def _reduce_11(val, _values, result)
-              comb = Combinator.new(:I)
+              comb = Combinator.get(:I, @memory)
           @jot.reverse_each do |i|
             case i
             when 0
-              comb = Pair.new(Pair.new(comb, :S), :K)
+              comb = Pair.cons(Pair.cons(comb, :S, @memory), :K, @memory)
             when 1
-              comb = Pair.new(:S, Pair.new(:K, comb))
+              comb = Pair.cons(:S, Pair.cons(:K, comb, @memory), @memory)
             end
           end
           @jot.clear
@@ -359,7 +355,7 @@ module_eval(<<'.,.,', 'parser.y', 62)
 
 module_eval(<<'.,.,', 'parser.y', 76)
   def _reduce_12(val, _values, result)
-              result = Pair.new(val[1], val[2])
+              result = Pair.cons(val[1], val[2], @memory)
         
     result
   end
@@ -367,7 +363,7 @@ module_eval(<<'.,.,', 'parser.y', 76)
 
 module_eval(<<'.,.,', 'parser.y', 80)
   def _reduce_13(val, _values, result)
-              result = Pair.new(val[1], val[2])
+              result = Pair.cons(val[1], val[2], @memory)
         
     result
   end
@@ -383,7 +379,7 @@ module_eval(<<'.,.,', 'parser.y', 84)
 
 module_eval(<<'.,.,', 'parser.y', 88)
   def _reduce_15(val, _values, result)
-              result = Combinator.new(val[0].to_sym)
+              result = Combinator.get(val[0].to_sym, @memory)
         
     result
   end

data/lib/razyk/parser.y

@@ -14,7 +14,7 @@ rule
 
 program :   ccexpr
         {
-          result = val[0] || Combinator.new(:I)
+          result = val[0] || Combinator.get(:I, @memory)
         }
         ;
 
@@ -27,46 +27,46 @@ ccexpr  :   /* epsilon */
           if val[0].nil?
             result = val[1]
           else
-            result = Pair.new(val[0], val[1])
+            result = Pair.cons(val[0], val[1], @memory)
           end
         }
         ;
 
 expr    :   SMALL_I
         {
-          result = Combinator.new(:I)
+          result = Combinator.get(:I, @memory)
         }
         |   expr2
         ;
 
 iotaexpr:   SMALL_I
         {
-          result = Combinator.new(:IOTA)
+          result = Combinator.get(:IOTA, @memory)
         }
         |   expr2
         ;
 
 expr2   :   I
         {
-          result = Combinator.new(:I)
+          result = Combinator.get(:I, @memory)
         }
         |   K
         {
-          result = Combinator.new(:K)
+          result = Combinator.get(:K, @memory)
         }
         |   S
         {
-          result = Combinator.new(:S)
+          result = Combinator.get(:S, @memory)
         }
         |   no_empty_jot_expr
         {
-          comb = Combinator.new(:I)
+          comb = Combinator.get(:I, @memory)
           @jot.reverse_each do |i|
             case i
             when 0
-              comb = Pair.new(Pair.new(comb, :S), :K)
+              comb = Pair.cons(Pair.cons(comb, :S, @memory), :K, @memory)
             when 1
-              comb = Pair.new(:S, Pair.new(:K, comb))
+              comb = Pair.cons(:S, Pair.cons(:K, comb, @memory), @memory)
             end
           end
           @jot.clear
@@ -74,11 +74,11 @@ expr2   :   I
         }
         |   BACKSLASH expr expr
         {
-          result = Pair.new(val[1], val[2])
+          result = Pair.cons(val[1], val[2], @memory)
         }
         |   ASTAR iotaexpr iotaexpr
         {
-          result = Pair.new(val[1], val[2])
+          result = Pair.cons(val[1], val[2], @memory)
         }
         |   LPAR ccexpr RPAR
         {
@@ -86,7 +86,7 @@ expr2   :   I
         }
         |   LITERAL
         {
-          result = Combinator.new(val[0].to_sym)
+          result = Combinator.get(val[0].to_sym, @memory)
         }
         | STRING
         {
@@ -113,12 +113,7 @@ require "razyk/node"
 ---- inner
 
 def str2list(str)
-  # (K 256) means End-of-stream. RazyK String adopt it as null terminator
-  head = Pair.new(:K, 256)
-  str.unpack("C*").reverse_each do |ch|
-    head = Pair.new(Pair.new(:CONS, ch), head)
-  end
-  head
+  Node.list(*str.unpack("C*"), memory: @memory)
 end
 
 def scan
@@ -219,6 +214,7 @@ end
 def parse(str, opt={})
   @buf = str
   @jot = []
+  @memory = opt[:memory] || {}
   yyparse self, :scan
 end
 

data/lib/razyk/version.rb

@@ -0,0 +1,3 @@
+module RazyK
+  VERSION = "0.1.0"
+end

data/lib/razyk/vm.rb

@@ -12,12 +12,13 @@ module RazyK
   class VM
     class StackUnderflow < StandardError; end
 
-    def initialize(tree, input=$stdin, output=$stdout, recursive=false)
+    def initialize(tree, input=$stdin, output=$stdout, recursive: false, statistics: nil)
       @root = Node.new(:root, [], [tree])
       @generator = nil
       @input = input
       @output = output
       @recursive = recursive
+      @statistics = statistics
     end
 
     def tree
@@ -54,21 +55,22 @@ module RazyK
       stack.push(new_root)
     end
 
-    def evaluate(root, gen=nil)
+    def evaluate(root, &blk)
       stack = [root]
-      until step(stack, gen).nil?
-        if gen
-          gen.yield(self)
+      until step(stack, &blk).nil?
+        if blk
+          blk.call(self)
         end
       end
       if @recursive and stack.last.is_a?(Pair)
-        evaluate(stack.last.cdr, gen)
+        evaluate(stack.last.cdr, &blk)
       end
       nil
     end
 
-    def step(stack, gen=nil)
+    def step(stack, &blk)
       return nil if stack.empty?
+      @statistics[:count] += 1 if @statistics
       while stack.last.is_a?(Pair)
         stack.push(stack.last.car)
       end
@@ -92,40 +94,19 @@ module RazyK
         root, x = pop_pairs(stack, 1)
         new_root = Pair.new(Pair.new(x, :S), :K)
         replace_root(stack, root, new_root)
-      when Integer
-        # (<N> f x) -> x               (N == 0)
-        #           -> (f (<N-1> f x)) (N > 0)
-        root, f, x = pop_pairs(stack, 2)
-        num = comb.label
-        if num == 0
-          replace_root(stack, root, x)
-        else
-          # shortcut
-          if f.label == :INC and x.label.is_a?(Integer)
-            replace_root(stack, root, Combinator.new(num + x.label))
-          else
-            dec_pair = Pair.new(Combinator.new(num-1), f)
-            new_root = Pair.new(f, Pair.new(dec_pair, x))
-            replace_root(stack, root, new_root)
-          end
-        end
       when :CONS
         # (CONS a d f) -> (f a d)
         root, a, d, f = pop_pairs(stack, 3)
         new_root = Pair.new(Pair.new(f, a), d)
         replace_root(stack, root, new_root)
       when :IN
-        # (IN f) -> (CONS <CH> IN f) where <CH> is a byte from stdin
-        ch = @input.read(1)
+        # (IN f) -> (S (S I (K <CH>)) (K IN)) where <CH> is a byte from stdin
+        ch = @input.getbyte
         if ch.nil?
           ch = 256
-        else
-          ch = ch.unpack("C")[0]
         end
-        new_root = Pair.new(Pair.new(:CONS, Combinator.new(ch)),
-                            :DUMMY) # reuse :IN combinator
+        new_root = Node.list(Combinator.new(ch), terminator: Combinator.new(:IN))
         comb.replace(new_root)
-        new_root.cdr = comb
         stack.push(new_root)
       when :CAR
         # (CAR x) -> (x K)       (CAR = (Lx.x TRUE), TRUE = (Lxy.x) = K)
@@ -142,16 +123,16 @@ module RazyK
         root, f = pop_pairs(stack, 1)
         new_root = Pair.new(
                      Pair.new(:PUTC,
-                       Pair.new(Pair.new(Pair.new(:CAR, f), :INC), 0)),
+                       Pair.new(Pair.new(Pair.new(f, :K), :INC), 0)),
                      Pair.new(comb, # reuse :OUT combinator
-                              Pair.new(:CDR, f)))
+                              Pair.new(f, Pair.new(:S, :K))))
         replace_root(stack, root, new_root)
       when :INC
         # (INC n) -> n+1 : increment church number
         raise StackUnderflow if stack.empty?
-        evaluate(stack.last.cdr, gen)
+        evaluate(stack.last.cdr, &blk)
         root, n = pop_pairs(stack, 1)
-        unless n.label.is_a?(Integer)
+        unless n.integer?
           begin
             msg = "argument of INC combinator is not a church number but #{n.inspect}"
           rescue
@@ -159,13 +140,13 @@ module RazyK
           end
           raise msg
         end
-        replace_root(stack, root, Combinator.new(n.label + 1))
+        replace_root(stack, root, Combinator.new(n.integer + 1))
       when :PUTC
         # (PUTC x y) -> y : evaluate x and putchar it
         raise StackUnderflow if stack.size < 2
         x = stack.pop
-        evaluate(x.cdr, gen)
-        unless x.cdr.label.is_a?(Integer)
+        evaluate(x.cdr, &blk)
+        unless x.cdr.integer?
           begin
             msg = "output is not church number but #{x.cdr.inspect}"
           rescue
@@ -173,16 +154,38 @@ module RazyK
           end
           raise msg
         end
-        num = x.cdr.label
+        num = x.cdr.integer
         if num >= 256
+          if @output != $stdout and @output != STDOUT
+            @output.close_write
+          end
           return nil
         end
         @output.write([num].pack("C"))
         root = stack.pop
         y = root.cut_cdr
         replace_root(stack, root, y)
-      else # unknown combinator... treat as combinator without enough arguments
-        raise StackUnderflow
+      else
+        if comb.integer?
+          # (<N> f x) -> x               (N == 0)
+          #           -> (f (<N-1> f x)) (N > 0)
+          root, f, x = pop_pairs(stack, 2)
+          num = comb.integer
+          if num == 0
+            replace_root(stack, root, x)
+          else
+            # shortcut
+            if f.label == :INC and x.integer?
+              replace_root(stack, root, Combinator.new(num + x.integer))
+            else
+              dec_pair = Pair.new(Combinator.new(num-1), f)
+              new_root = Pair.new(f, Pair.new(dec_pair, x))
+              replace_root(stack, root, new_root)
+            end
+          end
+        else # unknown combinator... treat as combinator without enough arguments
+          raise StackUnderflow
+        end
       end
       true
     rescue StackUnderflow
@@ -190,22 +193,17 @@ module RazyK
     end
 
     def reduce
-      @generator ||= Enumerator.new{|e| evaluate(self.tree, e) }
-      begin
-        @generator.next
-        self
-      rescue StopIteration
-        nil
-      end
+      evaluate(self.tree) {|vm| return vm }
+      nil
     end
 
     def run(&blk)
-      if blk
-        while reduce
-          blk.call(self)
-        end
-      else
-        evaluate(self.tree, nil)
+      if @statistics
+        @statistics[:started_at] = Time.now
+      end
+      evaluate(self.tree, &blk)
+      if @statistics
+        @statistics[:finished_at] = Time.now
       end
     end
   end