fort 1.0.0 → 1.1.0

data/lib/fort/type/character_type.rb

@@ -1,6 +1,6 @@
 module Fort
   class Type
-    class CharacterType < Type
+    class CharacterType < self
       require 'ruby_patch'
       extend ::RubyPatch::AutoLoad
 

data/lib/fort/type/complex_type.rb

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

data/lib/fort/type/integer_type.rb

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

data/lib/fort/type/logical_type.rb

@@ -1,6 +1,6 @@
 module Fort
   class Type
-    class LogicalType < Type
+    class LogicalType < self
       require 'ruby_patch'
       extend ::RubyPatch::AutoLoad
 

data/lib/fort/type/numeric_type.rb

@@ -0,0 +1,24 @@
+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,22 +1,14 @@
 module Fort
   class Type
-    class RealType < Type
+    class RealType < ::Fort::Type::NumericType
       require 'ruby_patch'
       extend ::RubyPatch::AutoLoad
 
-      attr_reader :kind
+      attr_reader :kind, :kind_const
 
       def initialize(dim = 0, kind = 32)
-        super(dim)
-        @kind = kind
-      end
-
-      def to_s
-        "#{super}Kind#{@kind}"
-      end
-
-      def declare
-        "#{@stem}(REAL#{@kind})#{super}"
+        super
+        @kind_const = "REAL#{@kind}"
       end
     end
   end

data/lib/fort/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fort
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: &69729240 !ruby/object:Gem::Requirement
+  requirement: &69161810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *69729240
+  version_requirements: *69161810
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &69726510 !ruby/object:Gem::Requirement
+  requirement: &69176500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *69726510
+  version_requirements: *69176500
 description: Ruby library for Fortran 90 and newer.
 email: 
 executables: []
@@ -50,6 +50,7 @@ files:
 - 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