chelsy 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12890aa7a65ea8ba2ae82a58ccde7c00b6f48dcc
-  data.tar.gz: 925692aeeb8a6afefddad2120c937e572ec37881
+  metadata.gz: f6c2c39422a4c60d65a9808f55dec47e9401d50d
+  data.tar.gz: 1e2159913cb694fdaa99d326b5ea7a466a047d6b
 SHA512:
-  metadata.gz: 002b987b8be634228cdb3d23399211df5aa311727359749f7e646623e938fd5442841ccf5915b1b9ce2ae1559a10ec515b30ad940248442aaa031ab97ed795ea
-  data.tar.gz: ae9080c3b6b5fe7b77ad4241cf1a237b604f91d0b4a449a35233f9523d3f2840cec32020135cb9d3b54e6c1e68b2be357726f2d0f4e6546440f5495ffad3d5db
+  metadata.gz: 4dba34f4c4f6abd2d6778bb498375263841b37a803dca37e3305f4acd06e8e53e9d0547379ebf27c0269b7576a06d136731bf063f47797b10ddd9dc084baeb72
+  data.tar.gz: 02c82c641dcbe31e7a754fcd37a50d348016774d3e3946a3b00de84f2a7414616eed037b4eda8d93a1a10adeeea910533b8a020890eee7c77e0f7e0fbe2e0c8c

data/lib/chelsy/ast.rb

@@ -3,23 +3,23 @@ require "forwardable"
 
 module Chelsy
 
-  class Node
-    def initialize(**opts)
+  # Returns an object as an immutable string.
+  #
+  # @param [Object] obj an Object
+  # @return [String] The string representation of `obj`. It's frozen (unmodifiable).
+  def immutable_stringify(obj)
+    str = obj.to_s
+    if str.frozen?
+      str
+    else
+      str.dup.freeze
     end
+  end
 
-    protected
+  module_function :immutable_stringify
 
-    # Returns an object as an immutable string.
-    #
-    # @param [Object] obj an Object
-    # @return [String] The string representation of `obj`. It's frozen (unmodifiable).
-    def immutable_stringify(obj)
-      str = obj.to_s
-      if str.frozen?
-        str
-      else
-        str.dup.freeze
-      end
+  class Node
+    def initialize(**opts)
     end
   end
 
@@ -97,9 +97,6 @@ module Chelsy
 
   end
 
-  module Syntax
-  end
-
   class FragmentList < Node
     include NodeList
 
@@ -132,7 +129,7 @@ module Chelsy
     # Initialize instance.
     # @param [#to_s] code C code snippet
     def initialize(code, **rest)
-      @code = immutable_stringify(code)
+      @code = Chelsy.immutable_stringify(code)
       super **rest
     end
 
@@ -523,7 +520,7 @@ module Chelsy
       attr_reader :value
 
       def initialize(str, wide: false, **rest)
-        @value = immutable_stringify(str)
+        @value = Chelsy.immutable_stringify(str)
         @wide = !!wide
 
         super(**rest)
@@ -985,9 +982,18 @@ module Chelsy
   class Switch < Stmt
     attr_reader :expr, :stmt
 
-    def initialize(expr, stmt, **rest)
+    def initialize(expr, stmt=nil, **rest, &block)
       @expr = Syntax::Expr.ensure(expr)
-      @stmt = Syntax::Stmt.ensure(stmt)
+
+      if stmt
+        @stmt = Syntax::Stmt.ensure(stmt)
+      elsif block
+        @stmt = Block.new
+        block.call(@stmt)
+      else
+        raise ArgumentError, "missing body statement"
+      end
+
       super **rest
     end
   end
@@ -1175,7 +1181,7 @@ module Chelsy
       attr_reader :location
 
       def initialize(location, system: false, **rest)
-        @location = immutable_stringify(location)
+        @location = Chelsy.immutable_stringify(location)
         @system = !!system
 
         super **rest
@@ -1249,7 +1255,7 @@ module Chelsy
 
       def initialize(lineno, filename=nil, **rest)
         @lineno = Syntax::Coercers::Int.ensure(lineno)
-        @filename = immutable_stringify(filename) if filename
+        @filename = Chelsy.immutable_stringify(filename) if filename
 
         super **rest
       end
@@ -1260,7 +1266,7 @@ module Chelsy
       attr_reader :pragma
 
       def initialize(pragma, **rest)
-        @pragma = immutable_stringify(pragma)
+        @pragma = Chelsy.immutable_stringify(pragma)
         super **rest
       end
     end
@@ -1300,6 +1306,10 @@ module Chelsy
       Param = Coercer.new(Chelsy::Param) do |value|
         Chelsy::Param.new(*value) if ::Array === value
       end
+
+      Block = Coercer.new(Chelsy::Block) do |value|
+        Chelsy::Block.new(value) if ::Array === value
+      end
     end
 
     TopLevel = Any.new('TopLevel', [Declarative])
@@ -1326,7 +1336,8 @@ module Chelsy
     Initializer = Any.new('Initializer', [Syntax::Expr, Chelsy::Initializer, Chelsy::InitializerList])
     Stmt = Any.new('Statement', [
                     Syntax::Expr, # Treats Expr as Expression Statement
-                    Chelsy::Stmt])
+                    Chelsy::Stmt,
+                    Coercers::Block])
     BlockItem   = Any.new('BlockItem', [
                     Syntax::Stmt,
                     Chelsy::Declarative])

data/lib/chelsy/version.rb

@@ -1,3 +1,3 @@
 module Chelsy
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chelsy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Takanori Ishikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler