chelsy 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca69c9ae44f38d8c0857b220996ba0d61b317f9f
-  data.tar.gz: 8bf0eae470330703ad014bedf2b721a78147e643
+  metadata.gz: 4878521c7b523d8c46ebc91d752c23af91616475
+  data.tar.gz: e74c0550a0a40cc62d3956d2c6379d3c33ceed9c
 SHA512:
-  metadata.gz: 7f52743c6703285660c60b3f9da020d9a4e11ff57e6847142cbb3b91e5b041dce5fc4ee3ee19404a30667e987a0104afc78c2f8ef3f05270f51e0dc289b5e192
-  data.tar.gz: 0aa25da10d2d50d6b620c3236edb4c98ca8def623b333b04c588963fd6bdfbf14f87a49ef7a6e3abff45d9447079680671968fd2c0ee7debb77fac7eeaa716a7
+  metadata.gz: edc3882ef58112153fe6af6817b0caba5dcfc1221d0cb080e164c58873431cca39677ec1b32f6df97271684c5cff35c8e1869b0413cdbf58e7f9c3236d99f7fe
+  data.tar.gz: 87b5270bd4276f3ec3b5d9009dda2d34cf89c84efe28c2c3d8b17874884e39de0788a07b2828d6d0642b64a9e2f8c182f50ca5a861f543cc7f94b32a6ae7daf7

data/README.md

@@ -4,10 +4,12 @@
 [![Build Status](https://travis-ci.org/ishikawa/chelsy.svg?branch=master)](https://travis-ci.org/ishikawa/chelsy)
 [![Gem](https://img.shields.io/gem/v/chelsy.svg)](https://rubygems.org/gems/chelsy)
 
-> C code generator written in Ruby
+> C code generator library written in Ruby
 
 **Chelsy** is C code generator library written in Ruby. You can construct AST objects and then transform it to C code.
 
+**This library heavily under development. Anything may change at any time. The public API should not be considered stable.**
+
 ## Table of Contents
 
 - [Installation](#installation)

data/chelsy.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.email         = ['takanori.ishikawa@gmail.com']
 
   spec.homepage      = 'https://github.com/ishikawa/chelsy'
-  spec.summary       = 'C code generator written in Ruby'
-  spec.description   = 'C code generator written in Ruby'
+  spec.summary       = 'C code generator library written in Ruby'
+  spec.description   = 'C code generator library written in Ruby'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

data/lib/chelsy/ast.rb

@@ -6,6 +6,21 @@ module Chelsy
   class Node
     def initialize(**opts)
     end
+
+    protected
+
+    # 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
   end
 
   # The class must provide a method validate_node`
@@ -107,6 +122,25 @@ module Chelsy
     end
   end
 
+  # This node represents arbitrary C code snippet. It can be an decsendant of any node.
+  # However it is used mainly in macro definition.
+  class Raw < Element
+    # @!attribute [r] code
+    #   @return [String] C code snippet
+    attr_reader :code
+
+    # Initialize instance.
+    # @param [#to_s] code C code snippet
+    def initialize(code, **rest)
+      @code = immutable_stringify(code)
+      super **rest
+    end
+
+    def to_s
+      @code
+    end
+  end
+
   class Declarative < Element
     attr_reader :storage
 
@@ -922,16 +956,6 @@ module Chelsy
   class EmptyStmt < Stmt
   end
 
-  class ExprStmt < Stmt
-    attr_reader :expr
-
-    def initialize(expr, **rest)
-      @expr = Syntax::Expr.ensure(expr)
-
-      super(**rest)
-    end
-  end
-
   # == 6.8.2 Compound statement
 
   class Block < Stmt
@@ -1130,7 +1154,7 @@ module Chelsy
       attr_reader :location
 
       def initialize(location, system: false, **rest)
-        @location = location.to_s.dup
+        @location = immutable_stringify(location)
         @system = !!system
 
         super **rest
@@ -1151,7 +1175,7 @@ module Chelsy
       def initialize(name, params=nil, replacement, **rest)
         @name = Syntax::Ident.ensure(name)
         @params = IdentList.new(params) if params
-        @replacement = Syntax::Raw.ensure(replacement)
+        @replacement = Syntax::MacroDefinition.ensure(replacement)
 
         super **rest
       end
@@ -1204,7 +1228,7 @@ module Chelsy
 
       def initialize(lineno, filename=nil, **rest)
         @lineno = Syntax::Int.ensure(lineno)
-        @filename = Syntax::Raw.ensure(filename) if filename
+        @filename = immutable_stringify(filename) if filename
 
         super **rest
       end
@@ -1215,7 +1239,7 @@ module Chelsy
       attr_reader :pragma
 
       def initialize(pragma, **rest)
-        @pragma = Syntax::Raw.ensure(pragma)
+        @pragma = immutable_stringify(pragma)
         super **rest
       end
     end
@@ -1244,7 +1268,6 @@ module Chelsy
   module Syntax
     TopLevel = Any.new('TopLevel', [Declarative])
     Type = Any.new('TypeSpecifier', [Chelsy::Type::Base, :void])
-    Raw = Any.new('Raw', [String])
     Int = Any.new('Int', [::Integer])
     Ident = Any.new('Identifier', [Symbol])
     Expr = Any.new('Expression', [Chelsy::Expr, Syntax::Ident])
@@ -1259,7 +1282,7 @@ module Chelsy
     EnumMember = Any.new('EnumMember', [Chelsy::EnumMember, Symbol])
     Initializer = Any.new('Initializer', [Syntax::Expr, Chelsy::Initializer, Chelsy::InitializerList])
     Stmt = Any.new('Statement', [
-                    Syntax::Expr, # Treats Expr as ExprStmt
+                    Syntax::Expr, # Treats Expr as Expression Statement
                     Chelsy::Stmt])
     BlockItem   = Any.new('BlockItem', [
                     Syntax::Stmt,
@@ -1267,5 +1290,8 @@ module Chelsy
     Declaration = Any.new('Declaration', [Chelsy::Declaration])
     StdcPragma = Any.new('STDC Pragma', [:FP_CONTRACT, :FENV_ACCESS, :CX_LIMITED_RANGE])
     StdcPragmaState = Any.new('STDC Pragma State', [:ON, :OFF, :DEFAULT])
+    MacroDefinition = Any.new('Raw', [
+                        Chelsy::Raw,
+                        Syntax::BlockItem])
   end
 end

data/lib/chelsy/syntax.rb

@@ -34,9 +34,9 @@ module Chelsy; module Syntax
     end
 
     def accept?(node)
-      # Most C program uses C preprocessor, so we accept any raw string representation.
+      # Most C program uses C preprocessor, so we must accept any C code snippet.
       case node
-      when String
+      when Chelsy::Raw
         true
       else
         @constraints.any? do |constraint|

data/lib/chelsy/translator.rb

@@ -70,6 +70,9 @@ module Chelsy
 
     def translate_element(node)
       case node
+      when Raw
+        node.code
+
       # Document
       when Document
         translate_document(node)
@@ -93,8 +96,6 @@ module Chelsy
       # Statements
       when EmptyStmt
         translate_empty_stmt(node)
-      when ExprStmt
-        translate_expr_stmt(node)
       when If
         translate_if(node)
       when Switch
@@ -588,9 +589,10 @@ module Chelsy
           src << ')'
         end
 
-        unless node.replacement.empty?
+        replacement = translate(node.replacement)
+        unless replacement.empty?
           src << ' '
-          src << node.replacement.to_s
+          src << replacement
         end
       end
     end
@@ -613,12 +615,12 @@ module Chelsy
 
     def translate_line_directive(node)
       "#line #{node.lineno}".tap do |src|
-        src << " \"#{node.filename}\"" if node.filename
+        src << " \"#{translate node.filename}\"" if node.filename
       end
     end
 
     def translate_pragma_directive(node)
-      "#pragma #{node.pragma}"
+      "#pragma #{translate node.pragma}"
     end
 
     private

data/lib/chelsy/version.rb

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

data/sample/temperature.rb

@@ -10,18 +10,18 @@ doc.fragments << Comment::Multi.new([
   "Print Fahrenheit to Celsius table",
   "(fahr = 0, 20, ..., 300)"
 ])
-doc.fragments << Directive::Define.new(:LOWER, '0')
-doc.fragments << Directive::Define.new(:UPPER, '300')
-doc.fragments << Directive::Define.new(:STEP,  '20')
+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 << Function.new(:main,
                     Type::Int.new, [
                       Param.new(:argc, Type::Int.new),
                       Param.new(:argv, Type::Pointer.new(Type::Pointer.new(Type::Char.new(const: true)))),
                     ]) do |b|
-  init = Declaration.new(:fahr, Type::Int.new, 'LOWER')
-  cond = Operator::LessThanOrEqual.new(:fahr, 'UPPER')
-  step = Operator::AssignAdd.new(:fahr, 'STEP')
+  init = Declaration.new(:fahr, Type::Int.new, :LOWER)
+  cond = Operator::LessThanOrEqual.new(:fahr, :UPPER)
+  step = Operator::AssignAdd.new(:fahr, :STEP)
 
   b << For.new(init, cond, step) do |body|
     celsius = Operator::Sub.new(:fahr, Constant::Int.new(32))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chelsy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Takanori Ishikawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.5
-description: C code generator written in Ruby
+description: C code generator library written in Ruby
 email:
 - takanori.ishikawa@gmail.com
 executables: []
@@ -129,5 +129,5 @@ rubyforge_project:
 rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
-summary: C code generator written in Ruby
+summary: C code generator library written in Ruby
 test_files: []