fort 0.0.0 → 1.0.0

data/fort.gemspec

@@ -0,0 +1,19 @@
+require 'ruby_patch'
+
+gem_name = File.basename(__DIR__)
+lib = File.join(__DIR__, 'lib')
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "#{gem_name}"
+
+Gem::Specification.new do |s|
+  s.files = `git ls-files`.split
+  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_development_dependency 'pry', '~> 0.9'
+  s.author = 'kshramt'
+  s.description = "Ruby library for Fortran 90 and newer."
+  s.required_ruby_version = '~> 1.9'
+  s.test_files.concat `git ls-files test`.split.select{|path| path =~ /test_[^\/]+.rb/}
+end

data/lib/fort/type/character_type.rb

@@ -4,24 +4,27 @@ module Fort
       require 'ruby_patch'
       extend ::RubyPatch::AutoLoad
 
-      attr_reader :sym, :len
+      attr_reader :len
 
       def initialize(dim = 0, len = 1)
         super(dim)
         @len = len
-        len_suffix = case @len
-                     when '*'
-                       'Ast'
-                     when ':'
-                       'Colon'
-                     else
-                       @len
-                     end
-        @sym = "c#{len_suffix}"
+        @len_suf = case @len
+                   when '*'
+                     'Ast'
+                   when ':'
+                     'Colon'
+                   else
+                     @len
+                   end
       end
 
       def to_s
-        "Character(len = #{@len})"
+        "#{super}Len#{@len_suf}"
+      end
+
+      def declare
+        "#{@stem}(len = #{@len})#{super}"
       end
     end
   end

data/lib/fort/type/complex_type.rb

@@ -4,22 +4,19 @@ module Fort
       require 'ruby_patch'
       extend ::RubyPatch::AutoLoad
 
-      KIND_SYM = {
-        32 => 'S',              # Single
-        64 => 'D',              # Double
-        128 => 'Q',             # Quad
-      }
-
-      attr_reader :sym, :kind
+      attr_reader :kind
 
       def initialize(dim = 0, kind = 32)
         super(dim)
         @kind = kind
-        @sym = "z#{KIND_SYM[@kind]}"
       end
 
       def to_s
-        @to_s ||= "Complex(REAL#{@kind})"
+        "#{super}Kind#{@kind}"
+      end
+
+      def declare
+        "#{@stem}(REAL#{@kind})#{super}"
       end
     end
   end

data/lib/fort/type/integer_type.rb

@@ -4,23 +4,19 @@ module Fort
       require 'ruby_patch'
       extend ::RubyPatch::AutoLoad
 
-      KIND_SYM = {
-        8 => 'Hh',              # Harf-Harf
-        16 => 'H',              # Harf
-        32 => 'S',              # Single
-        64 => 'D'               # Double
-      }
-
-      attr_reader :sym, :kind
+      attr_reader :kind
 
       def initialize(dim = 0, kind = 32)
         super(dim)
         @kind = kind
-        @sym = "i#{KIND_SYM[@kind]}"
       end
 
       def to_s
-        @to_s ||= "Integer(INT#{@kind})"
+        "#{super}Kind#{@kind}"
+      end
+
+      def declare
+        "#{@stem}(INT#{@kind})#{super}"
       end
     end
   end

data/lib/fort/type/logical_type.rb

@@ -4,15 +4,12 @@ module Fort
       require 'ruby_patch'
       extend ::RubyPatch::AutoLoad
 
-      attr_reader :sym
-
       def initialize(dim = 0)
         super
-        @sym = 'l'
       end
 
-      def to_s
-        "Logical"
+      def declare
+        "#{@stem}#{super}"
       end
     end
   end

data/lib/fort/type/real_type.rb

@@ -4,22 +4,19 @@ module Fort
       require 'ruby_patch'
       extend ::RubyPatch::AutoLoad
 
-      KIND_SYM = {
-        32 => 'S',              # Single
-        64 => 'D',              # Double
-        128 => 'Q',             # Quad
-      }
-
-      attr_reader :sym, :kind
+      attr_reader :kind
 
       def initialize(dim = 0, kind = 32)
         super(dim)
         @kind = kind
-        @sym = "r#{KIND_SYM[@kind]}"
       end
 
       def to_s
-        @to_s ||= "Real(REAL#{@kind})"
+        "#{super}Kind#{@kind}"
+      end
+
+      def declare
+        "#{@stem}(REAL#{@kind})#{super}"
       end
     end
   end

data/lib/fort/type.rb

@@ -5,26 +5,39 @@ module Fort
 
     USE_ISO_FORTRAN_ENV = "use, intrinsic:: iso_fortran_env, only: INT8, INT16, INT32, INT64, REAL32, REAL64, REAL128"
 
-    attr_reader :dim
+    attr_reader :dim, :stem
 
     def initialize(dim = 0)
       @dim = dim
+      @stem = self.class.to_s.split('::').last.sub(/Type\z/, '')
+    end
+
+    def to_s
+      "#{@stem}Dim#{dim}"
+    end
+
+    def declare
+      if @dim >= 1
+        ", dimension#{self.parenthesis}"
+      else
+        ""
+      end
     end
 
     def colons
-      @colons ||= ([':']*@dim).join(', ')
+      ([':']*@dim).join(', ')
     end
 
     def parenthesis
-      @parenthesis ||= if @dim >= 1
-                         "(#{self.colons})"
-                       else
-                         ''
-                       end
+      if @dim >= 1
+        "(#{self.colons})"
+      else
+        ''
+      end
     end
 
-    def suf
-      @suf ||= "_#{self.sym}_#{@dim}"
+    def format
+      "#{@dim}"
     end
   end
 end

data/lib/fort/version.rb

@@ -1,3 +1,3 @@
 module Fort
-  VERSION = '0.0.0'
+  VERSION = '1.0.0'
 end

data/test/fort/type/test_character_type.rb

@@ -8,20 +8,14 @@ class TestCharacterType < ::MiniTest::Unit::TestCase
   end
 
   def test_to_s
-    assert_equal(@cAst_0.to_s, "Character(len = *)")
-    assert_equal(@cColon_1.to_s, "Character(len = :)")
-    assert_equal(@c3_2.to_s, "Character(len = 3)")
+    assert_equal(@cAst_0.to_s, "CharacterDim0LenAst")
+    assert_equal(@cColon_1.to_s, "CharacterDim1LenColon")
+    assert_equal(@c3_2.to_s, "CharacterDim2Len3")
   end
 
-  def test_dim
-    assert_equal(@cAst_0.dim, 0)
-    assert_equal(@cColon_1.dim, 1)
-    assert_equal(@c3_2.dim, 2)
-  end
-
-  def test_suf
-    assert_equal(@cAst_0.suf, '_cAst_0')
-    assert_equal(@cColon_1.suf, '_cColon_1')
-    assert_equal(@c3_2.suf, '_c3_2')
+  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

@@ -6,17 +6,13 @@ class TestComplexType < ::MiniTest::Unit::TestCase
     @s_2 = ::Fort::Type::ComplexType.new(2, 32)
   end
 
-  def test_KIND_SYM
-    assert(::Fort::Type::ComplexType::KIND_SYM)
-  end
-
   def test_to_s
-    assert_equal(@d_0.to_s, "Complex(REAL64)")
-    assert_equal(@s_2.to_s, "Complex(REAL32)")
+    assert_equal(@d_0.to_s, "ComplexDim0Kind64")
+    assert_equal(@s_2.to_s, "ComplexDim2Kind32")
   end
 
-  def test_suf
-    assert_equal(@d_0.suf, "_zD_0")
-    assert_equal(@s_2.suf, "_zS_2")
+  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

@@ -6,17 +6,13 @@ class TestIntegerType < ::MiniTest::Unit::TestCase
     @s_2 = ::Fort::Type::IntegerType.new(2, 32)
   end
 
-  def test_KIND_SYM
-    assert(::Fort::Type::IntegerType::KIND_SYM)
-  end
-
   def test_to_s
-    assert_equal(@d_0.to_s, "Integer(INT64)")
-    assert_equal(@s_2.to_s, "Integer(INT32)")
+    assert_equal(@d_0.to_s, "IntegerDim0Kind64")
+    assert_equal(@s_2.to_s, "IntegerDim2Kind32")
   end
 
-  def test_suf
-    assert_equal(@d_0.suf, "_iD_0")
-    assert_equal(@s_2.suf, "_iS_2")
+  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

@@ -7,12 +7,12 @@ class TestLogicalType < ::MiniTest::Unit::TestCase
   end
 
   def test_to_s
-    assert_equal(@l0.to_s, "Logical")
-    assert_equal(@l2.to_s, "Logical")
+    assert_equal(@l0.to_s, "LogicalDim0")
+    assert_equal(@l2.to_s, "LogicalDim2")
   end
 
-  def test_suf
-    assert_equal(@l0.suf, "_l_0")
-    assert_equal(@l2.suf, "_l_2")
+  def test_declare
+    assert_equal(@l0.declare, "Logical")
+    assert_equal(@l2.declare, "Logical, dimension(:, :)")
   end
 end

data/test/fort/type/test_real_type.rb

@@ -6,27 +6,13 @@ class TestRealType < ::MiniTest::Unit::TestCase
     @s_2 = ::Fort::Type::RealType.new(2, 32)
   end
 
-  def test_KIND_SYM
-    assert(::Fort::Type::RealType::KIND_SYM)
-  end
-
   def test_to_s
-    assert_equal(@d_0.to_s, "Real(REAL64)")
-    assert_equal(@s_2.to_s, "Real(REAL32)")
-  end
-
-  def test_dim
-    assert_equal(@d_0.dim, 0)
-    assert_equal(@s_2.dim, 2)
-  end
-
-  def test_suf
-    assert_equal(@d_0.suf, "_rD_0")
-    assert_equal(@s_2.suf, "_rS_2")
+    assert_equal(@d_0.to_s, "RealDim0Kind64")
+    assert_equal(@s_2.to_s, "RealDim2Kind32")
   end
 
-  def test_parenthesis
-    assert_equal(@d_0.parenthesis, "")
-    assert_equal(@s_2.parenthesis, "(:, :)")
+  def test_declare
+    assert_equal(@d_0.declare, "Real(REAL64)")
+    assert_equal(@s_2.declare, "Real(REAL32), dimension(:, :)")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fort
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: &79800780 !ruby/object:Gem::Requirement
+  requirement: &69729240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *79800780
+  version_requirements: *69729240
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &79800210 !ruby/object:Gem::Requirement
+  requirement: &69726510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,13 +32,14 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *79800210
+  version_requirements: *69726510
 description: Ruby library for Fortran 90 and newer.
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- fort.gemspec
 - lib/fort.rb
 - lib/fort/src.rb
 - lib/fort/src/code.rb