chelsy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56cad98ddddf30558dd50bde2947f90b785fea1b
-  data.tar.gz: 52271a3c6e50b65b1961316cd11ce5d9160226d5
+  metadata.gz: ca69c9ae44f38d8c0857b220996ba0d61b317f9f
+  data.tar.gz: 8bf0eae470330703ad014bedf2b721a78147e643
 SHA512:
-  metadata.gz: fe0511b66fc3ba2ca8c0e7a04eec0ae9298bea40ffba516bc367bc5017b3ba29f2deef4bc553eb0fc91be520cec55b3f41894753f3eefed9778348c460f82aac
-  data.tar.gz: 6b9c4b85d08f88956c60735a9fd72d4c04d4dbe0415eb0fd1a179aa7af2a46cc9c59ed4770761fd9b1ecda766bdd0021e6e1508e8b677fcbcfe78fd2d4e74f26
+  metadata.gz: 7f52743c6703285660c60b3f9da020d9a4e11ff57e6847142cbb3b91e5b041dce5fc4ee3ee19404a30667e987a0104afc78c2f8ef3f05270f51e0dc289b5e192
+  data.tar.gz: 0aa25da10d2d50d6b620c3236edb4c98ca8def623b333b04c588963fd6bdfbf14f87a49ef7a6e3abff45d9447079680671968fd2c0ee7debb77fac7eeaa716a7

data/lib/chelsy/ast.rb

@@ -978,38 +978,67 @@ module Chelsy
   end
 
   # == 6.8.5 Iteration statements
-  class While < Stmt
+
+  # @abstract Subclass to implement a custom iteration class.
+  class Iteration < Stmt
     attr_reader :condition, :body
 
-    def initialize(condition_expr, body_stmt, **rest)
-      @condition = Syntax::Expr.ensure(condition_expr)
-      @body = Syntax::Stmt::ensure(body_stmt)
+    # Initialize iteration statement with its condition and iteration body statement.
+    # You can pass an optional code block which takes {Chelsy::Block} instance can be
+    # used to construct iteration body statements.
+    #
+    # @param condition_expr an expression which express condition
+    # @param body_stmt iteration body statement
+    # @yield [Chelsy::Block] If given, this method yields {Chelsy::Block} instance
+    # @raise [ArgumentError] Given neither `body_stmt` nor code block
+    def initialize(condition_expr=nil, body_stmt=nil, **rest)
+      @condition = Syntax::Expr.ensure(condition_expr) if condition_expr
+
+      if block_given?
+        @body = Block.new
+        yield @body
+      elsif body_stmt
+        @body = Syntax::Stmt.ensure(body_stmt)
+      else
+        raise ArgumentError, "missing body statement"
+      end
 
       super **rest
     end
   end
 
-  class DoWhile < Stmt
-    attr_reader :condition, :body
-
-    def initialize(condition_expr, body_stmt, **rest)
-      @condition = Syntax::Expr.ensure(condition_expr)
-      @body = Syntax::Stmt::ensure(body_stmt)
+  # This class represents `while` iteration statement.
+  class While < Iteration
+    # (see Chelsy::Iteration#initialize)
+    # @raise [ArgumentError] `condition_expr` is nil
+    def initialize(condition_expr, body_stmt=nil, **rest)
+      raise ArgumentError, "missing condition expr" unless condition_expr
+      super condition_expr, body_stmt, **rest
+    end
+  end
 
-      super **rest
+  # This class represents `do ... while (...)` iteration statement.
+  class DoWhile < Iteration
+    # (see Chelsy::Iteration#initialize)
+    # @raise [ArgumentError] `condition_expr` is nil
+    def initialize(condition_expr, body_stmt=nil, **rest)
+      raise ArgumentError, "missing condition expr" unless condition_expr
+      super condition_expr, body_stmt, **rest
     end
   end
 
-  class For < Stmt
-    attr_reader :init, :condition, :loop, :body
+  # This class represents `for` iteration statement.
+  class For < Iteration
+    attr_reader :init, :loop
 
-    def initialize(init_stmt=nil, condition_expr=nil, loop_expr=nil, body_stmt, **rest)
+    # (see Chelsy::Iteration#initialize)
+    # @param init_stmt initialization statement
+    # @param loop_expr loop expression is performed each iteration
+    def initialize(init_stmt=nil, condition_expr=nil, loop_expr=nil, body_stmt=nil, **rest)
       @init = Syntax::BlockItem::ensure(init_stmt) if init_stmt
-      @condition = Syntax::Expr.ensure(condition_expr) if condition_expr
       @loop = Syntax::Expr.ensure(loop_expr) if loop_expr
-      @body = Syntax::Stmt::ensure(body_stmt)
 
-      super **rest
+      super condition_expr, body_stmt, **rest
     end
   end
 

data/lib/chelsy/version.rb

@@ -1,3 +1,3 @@
 module Chelsy
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/sample/temperature.rb

@@ -23,16 +23,15 @@ doc << Function.new(:main,
   cond = Operator::LessThanOrEqual.new(:fahr, 'UPPER')
   step = Operator::AssignAdd.new(:fahr, 'STEP')
 
-  stmt = Block.new.tap do |b|
+  b << For.new(init, cond, step) do |body|
     celsius = Operator::Sub.new(:fahr, Constant::Int.new(32))
     celsius = Operator::Mul.new(Constant::Int.new(5), celsius)
     celsius = Operator::Div.new(celsius, Constant::Int.new(9))
 
-    b << Declaration.new(:celsius, Type::Int.new, celsius)
-    b << Operator::Call.new(:printf, [Constant::String.new("%d\t%d\n"), :fahr, :celsius])
+    body << Declaration.new(:celsius, Type::Int.new, celsius)
+    body << Operator::Call.new(:printf, [Constant::String.new("%d\t%d\n"), :fahr, :celsius])
   end
 
-  b << For.new(init, cond, step, stmt)
   b << Return.new(Constant::Int.new(0))
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chelsy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Takanori Ishikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler