fort 1.1.0 → 2.0.0

data/{rakefile → Rakefile}

@@ -3,5 +3,5 @@ require 'rake/testtask'
 
 ::Rake::TestTask.new do |t|
   t.libs = ['lib', 'test'].map{|dir| File.join(__DIR__, dir)}
-  t.pattern = "test/**/test_*.rb"
+  t.pattern = "test/**/*_test.rb"
 end

data/fort.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.name = gem_name
   s.summary = "Library for Fortran 90 and newer."
   s.version = ::Fort::VERSION
-  s.add_runtime_dependency 'ruby_patch', '~> 1.1'
+  s.add_runtime_dependency 'ruby_patch', '>= 1.1.0'
   s.add_development_dependency 'pry', '~> 0.9'
   s.author = 'kshramt'
   s.description = "Ruby library for Fortran 90 and newer."

data/lib/fort/type.rb

@@ -1,43 +1,147 @@
-module Fort
-  class Type
-    require 'ruby_patch'
-    extend ::RubyPatch::AutoLoad
+module ::Fort::Type
+  USE_ISO_FORTRAN_ENV = "use, intrinsic:: iso_fortran_env, only: INT8, INT16, INT32, INT64, REAL32, REAL64, REAL128"
+  DIM_RANGE = (0..7)
 
-    USE_ISO_FORTRAN_ENV = "use, intrinsic:: iso_fortran_env, only: INT8, INT16, INT32, INT64, REAL32, REAL64, REAL128"
+  module Providable
+    ID_GENERATOR = lambda{
+      id_number = '0'
+      lambda{'T' + id_number.next!}}.call
 
-    attr_reader :dim, :stem
+    def provide(params = {})
+      @params_default ||= {}
+      @memo ||= {}
+      params_for_new = @params_default.merge(params)
+      @memo[params_for_new] ||= new(::Fort::Type::Providable::ID_GENERATOR.call, params_for_new)
+    end
 
-    def initialize(dim = 0)
-      @dim = dim
-      @stem = self.class.to_s.split('::').last.sub(/Type\z/, '')
+    # @param [Hash<Array>] params
+    def multi_provide(params = {})
+      @params_default_for_multi_provide ||= {}
+      params_for_new = @params_default_for_multi_provide.merge(params)
+      product_all(params_for_new.values.map{|val| Array(val)})\
+        .map{|values| Hash[params_for_new.keys.zip(values)]}\
+        .map{|hash| provide(hash)}
     end
 
+    private
+
+    def product_all(array)
+      return array if array.size <= 1
+      first = array.first
+      rest = array[1..-1]
+      first.product(*rest)
+    end
+  end
+
+  class Base
+    extend Providable
+
+    def initialize(id, params = {})
+      @id = id
+      @dim = params.fetch(:dim)
+      raise ArgumentError, "@dim: #{@dim}" if @dim < 0
+      @type = self.class.to_s.split('::').last
+    end
+    attr_reader :id, :dim, :type
+
     def to_s
-      "#{@stem}Dim#{dim}"
+      "#{@type}Dim#{@dim}"
     end
 
     def declare
+      @type + dimension()
+    end
+
+    def parenthesis
       if @dim >= 1
-        ", dimension#{self.parenthesis}"
+        "(" + colons() + ")"
       else
-        ""
+        ''
       end
     end
 
-    def colons
-      ([':']*@dim).join(', ')
-    end
+    private
 
-    def parenthesis
+    def dimension
       if @dim >= 1
-        "(#{self.colons})"
+        ", dimension" + parenthesis()
       else
         ''
       end
     end
 
-    def format
-      "#{@dim}"
+    def colons
+      if @dim >= 1
+        ([':']*@dim).join(', ')
+      end
+    end
+  end
+
+  class Numeric < Base
+    def initialize(id, params = {})
+      super
+      @kind = params.fetch(:kind)
+    end
+    attr_reader :kind
+
+    def to_s
+      super + "Kind#{@kind}"
+    end
+
+    def declare
+      "#{@type}(kind = #{@kind})#{dimension()}"
     end
   end
+
+  class Integer < Numeric
+    KINDS = [:INT8, :INT16, :INT32, :INT64]
+    @params_default = {dim: 0, kind: :INT32}
+    @params_default_for_multi_provide = {dim: ::Fort::Type::DIM_RANGE, kind: KINDS}
+  end
+
+  class Real < Numeric
+    KINDS = [:REAL32, :REAL64, :REAL128]
+    @params_default = {dim: 0, kind: :REAL32}
+    @params_default_for_multi_provide = {dim: ::Fort::Type::DIM_RANGE, kind: KINDS}
+  end
+
+  class Complex < Numeric
+    KINDS = [:REAL32, :REAL64, :REAL128]
+    @params_default = {dim: 0, kind: :REAL32}
+    @params_default_for_multi_provide = {dim: ::Fort::Type::DIM_RANGE, kind: KINDS}
+  end
+
+  class Character < Base
+    @params_default = {dim: 0, len: :*}
+    @params_default_for_multi_provide = {dim: ::Fort::Type::DIM_RANGE, len: :*}
+
+    def initialize(id, params)
+      super
+      @len = params.fetch(:len)
+    end
+    attr_reader :len
+
+    def to_s
+      super + "Len#{len_str()}"
+    end
+
+    def declare
+      "#{@type}(len = #{@len})#{dimension()}"
+    end
+
+    private
+
+    def len_str
+      if @len == :*
+        'Ast'
+      else
+        @len
+      end
+    end
+  end
+
+  class Logical < Base
+    @params_default = {dim: 0}
+    @params_default_for_multi_provide = {dim: ::Fort::Type::DIM_RANGE}
+  end
 end

data/lib/fort/version.rb

@@ -1,3 +1,3 @@
 module Fort
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

data/test/fort/type_test.rb

@@ -0,0 +1,69 @@
+require 'test_helper'
+
+class TypeTest < ::MiniTest::Unit::TestCase
+  T = ::Fort::Type
+
+  def test_different_ids_for_different_types
+    assert(not(T::Real.provide(dim: 1, kind: 'REAL32').id == T::Complex.provide(dim: 1, kind: 'REAL32').id))
+  end
+
+  def test_different_ids_for_different_hashs
+    assert(not(T::Real.provide(dim: 1, kind: 'REAL32').id == T::Real.provide(dim: 1, kind: 'REAL64').id))
+    assert(not(T::Real.provide(dim: 1, kind: 'REAL32').id == T::Real.provide(dim: 1, kind: 'REAL32', dummy: :dummy).id))
+  end
+
+  def test_same_id_for_same_type_and_hash
+    assert(T::Real.provide(dim: 1, kind: 'REAL32').id == T::Real.provide(kind: 'REAL32', dim: 1).id)
+  end
+
+  def test_base
+    assert_equal('BaseDim3', T::Base.provide(dim: 3).to_s)
+    assert_equal('Base, dimension(:, :, :)', T::Base.provide(dim: 3).declare)
+  end
+
+  def test_numeric
+    t = T::Numeric.provide(dim: 0, kind: 1)
+    assert_equal('NumericDim0Kind1', t.to_s)
+    assert_equal('Numeric(kind = 1)', t.declare)
+  end
+
+  def test_multi_provide
+    assert_equal(21, T::Numeric.multi_provide(dim: [1, 2, 3, 4, 5, 6, 7], kind: ['REAL32', 'REAL64', 'REAL128']).size)
+  end
+
+  def test_integer
+    t = T::Integer.provide(dim: 7, kind: :INT32)
+    assert_equal('IntegerDim7KindINT32', t.to_s)
+    assert_equal('Integer(kind = INT32), dimension(:, :, :, :, :, :, :)', t.declare)
+  end
+
+  def test_real
+    t = T::Real.provide(dim: 1, kind: :REAL128)
+    assert_equal('RealDim1KindREAL128', t.to_s)
+    assert_equal('Real(kind = REAL128), dimension(:)', t.declare)
+  end
+
+  def test_complex
+    t = T::Complex.provide(dim: 1, kind: :REAL128)
+    assert_equal('ComplexDim1KindREAL128', t.to_s)
+    assert_equal('Complex(kind = REAL128), dimension(:)', t.declare)
+  end
+
+  def test_character
+    t = T::Character.provide(dim: 1, len: 2)
+    assert_equal('CharacterDim1Len2', t.to_s)
+    assert_equal('Character(len = 2), dimension(:)', t.declare)
+  end
+
+  def test_character_asterisk
+    t = T::Character.provide(dim: 1, len: :*)
+    assert_equal('CharacterDim1LenAst', t.to_s)
+    assert_equal('Character(len = *), dimension(:)', t.declare)
+  end
+
+  def test_logical
+    t = T::Logical.provide(dim: 1)
+    assert_equal('LogicalDim1', t.to_s)
+    assert_equal('Logical, dimension(:)', t.declare)
+  end
+end

data/test/{helper_for_test.rb → test_helper.rb}

@@ -1,3 +1,4 @@
+require 'minitest/pride'
 require 'minitest/autorun'
 
 require 'fort'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fort
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: &69161810 !ruby/object:Gem::Requirement
+  requirement: &2156749900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *69161810
+  version_requirements: *2156749900
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &69176500 !ruby/object:Gem::Requirement
+  requirement: &2156771300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,13 +32,14 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *69176500
+  version_requirements: *2156771300
 description: Ruby library for Fortran 90 and newer.
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Rakefile
 - fort.gemspec
 - lib/fort.rb
 - lib/fort/src.rb
@@ -46,26 +47,13 @@ files:
 - lib/fort/src/code/depended_module.rb
 - lib/fort/src/code/program_unit.rb
 - lib/fort/type.rb
-- lib/fort/type/character_type.rb
-- lib/fort/type/complex_type.rb
-- lib/fort/type/integer_type.rb
-- lib/fort/type/logical_type.rb
-- lib/fort/type/numeric_type.rb
-- lib/fort/type/real_type.rb
 - lib/fort/version.rb
-- rakefile
 - spec/fort/src/code_spec.rb
 - spec/fort/src/lib_test.f90
 - spec/fort/src/test.f90
 - spec/fort/src/test_clean_code.f90
-- test/fort/test_type.rb
-- test/fort/type/test_character_type.rb
-- test/fort/type/test_complex_type.rb
-- test/fort/type/test_integer_type.rb
-- test/fort/type/test_logical_type.rb
-- test/fort/type/test_real_type.rb
-- test/helper_for_test.rb
-- test/test_fort.rb
+- test/fort/type_test.rb
+- test/test_helper.rb
 homepage: 
 licenses: []
 post_install_message: 
@@ -86,16 +74,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Library for Fortran 90 and newer.
 test_files:
-- test/fort/test_type.rb
-- test/fort/type/test_character_type.rb
-- test/fort/type/test_complex_type.rb
-- test/fort/type/test_integer_type.rb
-- test/fort/type/test_logical_type.rb
-- test/fort/type/test_real_type.rb
-- test/test_fort.rb
+- test/test_helper.rb
 has_rdoc: 

data/lib/fort/type/character_type.rb

@@ -1,31 +0,0 @@
-module Fort
-  class Type
-    class CharacterType < self
-      require 'ruby_patch'
-      extend ::RubyPatch::AutoLoad
-
-      attr_reader :len
-
-      def initialize(dim = 0, len = 1)
-        super(dim)
-        @len = len
-        @len_suf = case @len
-                   when '*'
-                     'Ast'
-                   when ':'
-                     'Colon'
-                   else
-                     @len
-                   end
-      end
-
-      def to_s
-        "#{super}Len#{@len_suf}"
-      end
-
-      def declare
-        "#{@stem}(len = #{@len})#{super}"
-      end
-    end
-  end
-end

data/lib/fort/type/complex_type.rb

@@ -1,15 +0,0 @@
-module Fort
-  class Type
-    class ComplexType < ::Fort::Type::NumericType
-      require 'ruby_patch'
-      extend ::RubyPatch::AutoLoad
-
-      attr_reader :kind, :kind_const
-
-      def initialize(dim = 0, kind = 32)
-        super
-        @kind_const = "REAL#{@kind}"
-      end
-    end
-  end
-end

data/lib/fort/type/integer_type.rb

@@ -1,13 +0,0 @@
-module Fort
-  class Type
-    class IntegerType < ::Fort::Type::NumericType
-      require 'ruby_patch'
-      extend ::RubyPatch::AutoLoad
-
-      def initialize(dim = 0, kind = 32)
-        super
-        @kind_const = "INT#{@kind}"
-      end
-    end
-  end
-end

data/lib/fort/type/logical_type.rb

@@ -1,16 +0,0 @@
-module Fort
-  class Type
-    class LogicalType < self
-      require 'ruby_patch'
-      extend ::RubyPatch::AutoLoad
-
-      def initialize(dim = 0)
-        super
-      end
-
-      def declare
-        "#{@stem}#{super}"
-      end
-    end
-  end
-end

data/lib/fort/type/numeric_type.rb

@@ -1,24 +0,0 @@
-module Fort
-  class Type
-    class NumericType < ::Fort::Type
-      require 'ruby_patch'
-      extend ::RubyPatch::AutoLoad
-
-      attr_reader :kind, :kind_const
-
-      def initialize(dim = 0, kind = 32)
-        super(dim)
-        @kind = kind
-        @kind_const = nil
-      end
-
-      def to_s
-        "#{super}Kind#{@kind}"
-      end
-
-      def declare
-        "#{@stem}(#{@kind_const})#{super}"
-      end
-    end
-  end
-end

data/lib/fort/type/real_type.rb

@@ -1,15 +0,0 @@
-module Fort
-  class Type
-    class RealType < ::Fort::Type::NumericType
-      require 'ruby_patch'
-      extend ::RubyPatch::AutoLoad
-
-      attr_reader :kind, :kind_const
-
-      def initialize(dim = 0, kind = 32)
-        super
-        @kind_const = "REAL#{@kind}"
-      end
-    end
-  end
-end

data/test/fort/test_type.rb

@@ -1,7 +0,0 @@
-require 'helper_for_test'
-
-class TestType < ::MiniTest::Unit::TestCase
-  def test_USE_ISO_FORTRAN_ENV
-    assert(::Fort::Type::USE_ISO_FORTRAN_ENV)
-  end
-end

data/test/fort/type/test_character_type.rb

@@ -1,21 +0,0 @@
-require 'helper_for_test'
-
-class TestCharacterType < ::MiniTest::Unit::TestCase
-  def setup
-    @cAst_0 = ::Fort::Type::CharacterType.new(0, '*')
-    @cColon_1 = ::Fort::Type::CharacterType.new(1, ':')
-    @c3_2 = ::Fort::Type::CharacterType.new(2, 3)
-  end
-
-  def test_to_s
-    assert_equal(@cAst_0.to_s, "CharacterDim0LenAst")
-    assert_equal(@cColon_1.to_s, "CharacterDim1LenColon")
-    assert_equal(@c3_2.to_s, "CharacterDim2Len3")
-  end
-
-  def test_declare
-    assert_equal(@cAst_0.declare, "Character(len = *)")
-    assert_equal(@cColon_1.declare, "Character(len = :), dimension(:)")
-    assert_equal(@c3_2.declare, "Character(len = 3), dimension(:, :)")
-  end
-end

data/test/fort/type/test_complex_type.rb

@@ -1,18 +0,0 @@
-require 'helper_for_test'
-
-class TestComplexType < ::MiniTest::Unit::TestCase
-  def setup
-    @d_0 = ::Fort::Type::ComplexType.new(0, 64)
-    @s_2 = ::Fort::Type::ComplexType.new(2, 32)
-  end
-
-  def test_to_s
-    assert_equal(@d_0.to_s, "ComplexDim0Kind64")
-    assert_equal(@s_2.to_s, "ComplexDim2Kind32")
-  end
-
-  def test_declare
-    assert_equal(@d_0.declare, "Complex(REAL64)")
-    assert_equal(@s_2.declare, "Complex(REAL32), dimension(:, :)")
-  end
-end

data/test/fort/type/test_integer_type.rb

@@ -1,18 +0,0 @@
-require 'helper_for_test'
-
-class TestIntegerType < ::MiniTest::Unit::TestCase
-  def setup
-    @d_0 = ::Fort::Type::IntegerType.new(0, 64)
-    @s_2 = ::Fort::Type::IntegerType.new(2, 32)
-  end
-
-  def test_to_s
-    assert_equal(@d_0.to_s, "IntegerDim0Kind64")
-    assert_equal(@s_2.to_s, "IntegerDim2Kind32")
-  end
-
-  def test_declare
-    assert_equal(@d_0.declare, "Integer(INT64)")
-    assert_equal(@s_2.declare, "Integer(INT32), dimension(:, :)")
-  end
-end

data/test/fort/type/test_logical_type.rb

@@ -1,18 +0,0 @@
-require 'helper_for_test'
-
-class TestLogicalType < ::MiniTest::Unit::TestCase
-  def setup
-    @l0 = ::Fort::Type::LogicalType.new(0)
-    @l2 = ::Fort::Type::LogicalType.new(2)
-  end
-
-  def test_to_s
-    assert_equal(@l0.to_s, "LogicalDim0")
-    assert_equal(@l2.to_s, "LogicalDim2")
-  end
-
-  def test_declare
-    assert_equal(@l0.declare, "Logical")
-    assert_equal(@l2.declare, "Logical, dimension(:, :)")
-  end
-end

data/test/fort/type/test_real_type.rb

@@ -1,18 +0,0 @@
-require 'helper_for_test'
-
-class TestRealType < ::MiniTest::Unit::TestCase
-  def setup
-    @d_0 = ::Fort::Type::RealType.new(0, 64)
-    @s_2 = ::Fort::Type::RealType.new(2, 32)
-  end
-
-  def test_to_s
-    assert_equal(@d_0.to_s, "RealDim0Kind64")
-    assert_equal(@s_2.to_s, "RealDim2Kind32")
-  end
-
-  def test_declare
-    assert_equal(@d_0.declare, "Real(REAL64)")
-    assert_equal(@s_2.declare, "Real(REAL32), dimension(:, :)")
-  end
-end

data/test/test_fort.rb

@@ -1,7 +0,0 @@
-require 'helper_for_test'
-
-class TestFort < ::MiniTest::Unit::TestCase
-  def test_VERSION
-    assert(::Fort::VERSION)
-  end
-end