chelsy 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4878521c7b523d8c46ebc91d752c23af91616475
-  data.tar.gz: e74c0550a0a40cc62d3956d2c6379d3c33ceed9c
+  metadata.gz: 129bcae8df6bfcf4cfd02feda9b21434f0e14995
+  data.tar.gz: 5cffbdf5d8eb95b8818f8787cb57e9600cae90ce
 SHA512:
-  metadata.gz: edc3882ef58112153fe6af6817b0caba5dcfc1221d0cb080e164c58873431cca39677ec1b32f6df97271684c5cff35c8e1869b0413cdbf58e7f9c3236d99f7fe
-  data.tar.gz: 87b5270bd4276f3ec3b5d9009dda2d34cf89c84efe28c2c3d8b17874884e39de0788a07b2828d6d0642b64a9e2f8c182f50ca5a861f543cc7f94b32a6ae7daf7
+  metadata.gz: 96b462cba28e4e094d5b7013a6f9ecda4076c25d00a6a4dded2b11e74d365923c50d14f9dd74f477406c709ca08408808f74e1c01539ffe4078eb3f18d9eb172
+  data.tar.gz: a2f7ed0df99110425279350a7c7771dd35ad7e77d409019f50877d59f2da95eadc44f9fb7bce76d80aa934de2854358fb9d2b35b47fbd92eccc0287518ede8f2

data/README.md

@@ -44,8 +44,8 @@ doc = Document.new
 doc.fragments << Directive::Include.new("stdio.h", system: true)
 
 doc << Function.new(:main, Type::Int.new, [:void]) do |b|
-  b << Operator::Call.new(:printf, [Constant::String.new("Hello, Chelsy!\n")])
-  b << Return.new(Constant::Int.new(0))
+  b << Operator::Call.new(:printf, ["Hello, Chelsy!\n"])
+  b << Return.new(0)
 end
 
 puts Translator.new.translate(doc)

data/lib/chelsy/ast.rb

@@ -523,7 +523,7 @@ module Chelsy
       attr_reader :value
 
       def initialize(str, wide: false, **rest)
-        @value = str.dup.freeze
+        @value = immutable_stringify(str)
         @wide = !!wide
 
         super(**rest)
@@ -1145,6 +1145,27 @@ module Chelsy
     end
   end
 
+  # AST node represents a macro invocation with or without arguments.
+  class Macro < Expr
+    attr_reader :name, :args
+
+    # @!attribute [r] name
+    #   @return [Symbol] Macro name
+    # @!attribute [r] args
+    #   @return [Enumerable] Arguments
+
+    # initialize instance.
+    #
+    # @param [Symbol] name Macro name
+    # @param [Enumerable] args Arguments. `nil` if no arguments supplied.
+    def initialize(name, args=nil, **rest)
+      @name = Syntax::Ident.ensure(name)
+      @args = args.map {|a| Syntax::Expr.ensure(a) } if args
+
+      super **rest
+    end
+  end
+
   # = 6.10 Preprocessing directives
   module Directive
     class Base < Fragment
@@ -1227,7 +1248,7 @@ module Chelsy
       attr_reader :lineno, :filename
 
       def initialize(lineno, filename=nil, **rest)
-        @lineno = Syntax::Int.ensure(lineno)
+        @lineno = Syntax::Constant::Int.ensure(lineno)
         @filename = immutable_stringify(filename) if filename
 
         super **rest
@@ -1266,18 +1287,36 @@ end
 
 module Chelsy
   module Syntax
+
+    module Constant
+      Int = Coercer.new(Chelsy::Constant::Int) do |value|
+        Chelsy::Constant::Int.new(value) if ::Integer === value
+      end
+
+      String = Coercer.new(Chelsy::Constant::String) do |value|
+        Chelsy::Constant::String.new(value) if ::String === value
+      end
+    end
+
     TopLevel = Any.new('TopLevel', [Declarative])
     Type = Any.new('TypeSpecifier', [Chelsy::Type::Base, :void])
-    Int = Any.new('Int', [::Integer])
     Ident = Any.new('Identifier', [Symbol])
-    Expr = Any.new('Expression', [Chelsy::Expr, Syntax::Ident])
+    Expr = Any.new('Expression', [
+      Chelsy::Expr,
+      Syntax::Ident,
+      Syntax::Constant::Int,
+      Syntax::Constant::String,
+    ])
     ExprOrType = Any.new('Expression-Or-Type', [Syntax::Expr, Syntax::Type])
     Fragment = Any.new('Fragment', [Fragment, String])
     Storage = Any.new('Storage-class specifiers', [:typedef, :extern, :static])
     Param = Any.new('Parameter', [Chelsy::Param, :void, :"..."])
     ProtoParam = Any.new('Prototype Parameter', [Syntax::Param, Symbol, Chelsy::Type::Base])
     ArraySize = Any.new('ArraySize', [Syntax::Expr])
-    BitField = Any.new('BitField', [Chelsy::Constant::Integral])
+    BitField = Any.new('BitField', [
+      Chelsy::Constant::Integral,
+      Syntax::Constant::Int,
+    ])
     StructOrUnionMember = Any.new('StructOrUnionMember', [Chelsy::Declaration, Chelsy::BitField])
     EnumMember = Any.new('EnumMember', [Chelsy::EnumMember, Symbol])
     Initializer = Any.new('Initializer', [Syntax::Expr, Chelsy::Initializer, Chelsy::InitializerList])

data/lib/chelsy/syntax.rb

@@ -15,36 +15,82 @@ module Chelsy; module Syntax
     end
 
     def accept?(node)
-      false
+      # Most C program uses C preprocessor, so we must accept any C code snippet.
+      case node
+      when Chelsy::Raw
+        true
+      else
+        false
+      end
+    end
+
+    # Try to coerce `obj` to acceptable node.
+    #
+    # @param obj Any object to coerce
+    # @return [Node] A node or `nil` if it can't be coerced.
+    def coerce(obj)
+      nil
     end
 
     def ensure(node)
       if accept?(node)
         node
       else
-        raise ArgumentError, "#{node.class.name} is not one of #{@name}"
+        coerce(node).tap do |coerced|
+          raise ArgumentError, "#{node.class.name} is not one of #{@name}" unless coerced
+        end
       end
     end
   end
 
+  # This constraint accepts an instance of specific type of node, or
+  # can coerce some other type of objects to such a node.
+  class Coercer < Constraint
+    # Initialize an instance.
+    #
+    # @param [Class] klass type of acceptable node.
+    # @yieldparam value the value will be coerced.
+    # @yieldreturn [Node, nil] the coerced value of `nil`
+    def initialize(klass, &block)
+      @class = klass
+      @coercer_block = block
+
+      super klass.name
+    end
+
+    def accept?(node)
+      @class === node || super(node)
+    end
+
+    def coerce(node)
+      @coercer_block.call(node)
+    end
+  end
+
+  # This constraint instance is composed of multiple constraints.
   class Any < Constraint
+
+    # Initialize an instance with constraints.
+    #
+    # @param [String] name the name of this constraint
+    # @param [Array<Constraint>] constraints constraints
     def initialize(name, constraints)
       @constraints = constraints.dup
       super name
     end
 
-    def accept?(node)
-      # Most C program uses C preprocessor, so we must accept any C code snippet.
-      case node
-      when Chelsy::Raw
-        true
-      else
-        @constraints.any? do |constraint|
-          constraint === node
-        end
-      end
+    def coerce(node)
+      @constraints
+      .lazy
+      .find_all {|c| c.respond_to?(:coerce) }
+      .map {|c| c.coerce(node) }
+      .reject(&:nil?)
+      .first
     end
 
+    def accept?(node)
+      @constraints.any? {|constraint| constraint === node} || super(node)
+    end
   end
 
 end; end

data/lib/chelsy/translator.rb

@@ -92,6 +92,8 @@ module Chelsy
         translate_binary_operator(node)
       when Operator::Conditional
         translate_ternary_conditional(node)
+      when Macro
+        translate_macro(node)
 
       # Statements
       when EmptyStmt
@@ -406,6 +408,18 @@ module Chelsy
       "#{condition_expr} ? #{then_expr} : #{else_expr}"
     end
 
+    def translate_macro(node)
+      if node.args.nil?
+        node.name.to_s
+      else
+        node.name.to_s.tap do |src|
+          src << '('
+          src << node.args.map(&method(:translate)).join(', ')
+          src << ')'
+        end
+      end
+    end
+
     # = Statements
 
     def translate_empty_stmt(node)
@@ -614,7 +628,7 @@ module Chelsy
     def translate_endif_directive(node); "#endif" end
 
     def translate_line_directive(node)
-      "#line #{node.lineno}".tap do |src|
+      "#line #{translate node.lineno}".tap do |src|
         src << " \"#{translate node.filename}\"" if node.filename
       end
     end

data/lib/chelsy/version.rb

@@ -1,3 +1,3 @@
 module Chelsy
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/sample/hello_chelsy.rb

@@ -7,8 +7,8 @@ doc = Document.new
 doc.fragments << Directive::Include.new("stdio.h", system: true)
 
 doc << Function.new(:main, Type::Int.new, [:void]) do |b|
-  b << Operator::Call.new(:printf, [Constant::String.new("Hello, Chelsy!\n")])
-  b << Return.new(Constant::Int.new(0))
+  b << Operator::Call.new(:printf, ["Hello, Chelsy!\n"])
+  b << Return.new(0)
 end
 
 puts Translator.new.translate(doc)

data/sample/temperature.rb

@@ -10,9 +10,9 @@ doc.fragments << Comment::Multi.new([
   "Print Fahrenheit to Celsius table",
   "(fahr = 0, 20, ..., 300)"
 ])
-doc.fragments << Directive::Define.new(:LOWER, Constant::Int.new(0))
-doc.fragments << Directive::Define.new(:UPPER, Constant::Int.new(300))
-doc.fragments << Directive::Define.new(:STEP,  Constant::Int.new(20))
+doc.fragments << Directive::Define.new(:LOWER, 0)
+doc.fragments << Directive::Define.new(:UPPER, 300)
+doc.fragments << Directive::Define.new(:STEP,  20)
 
 doc << Function.new(:main,
                     Type::Int.new, [
@@ -24,15 +24,15 @@ doc << Function.new(:main,
   step = Operator::AssignAdd.new(:fahr, :STEP)
 
   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))
+    celsius = Operator::Sub.new(:fahr, 32)
+    celsius = Operator::Mul.new(5, celsius)
+    celsius = Operator::Div.new(celsius, 9)
 
     body << Declaration.new(:celsius, Type::Int.new, celsius)
-    body << Operator::Call.new(:printf, [Constant::String.new("%d\t%d\n"), :fahr, :celsius])
+    body << Operator::Call.new(:printf, ["%d\t%d\n", :fahr, :celsius])
   end
 
-  b << Return.new(Constant::Int.new(0))
+  b << Return.new(0)
 end
 
 puts Translator.new(indent_string: '  ').translate(doc)

metadata

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