numo-narray 0.9.0.4 → 0.9.0.5

data/ext/numo/narray/depend.erb

@@ -13,21 +13,20 @@ TAGS : $(TAGSRC)
 doc :
 	yard doc *.c types/*.c
 
-C_TMPL = <%=Dir.glob("#{__dir__}/gen/tmpl*/*.c").join(" ")%>
+C_TMPL = <%=Dir.glob("gen/tmpl*/*.c").join(" ")%>
 
-COGEN = <%= __dir__ %>/gen/cogen.rb
-DTYPE = <%= __dir__ %>/gen/dtype.erb.c
-DEPENDS = $(C_TMPL) $(DTYPE) <%= __dir__ %>/gen/*.rb
+COGEN = gen/cogen.rb
+DEPENDS = $(C_TMPL) gen/*.rb
 
 <%
-   type_c = ["types/bit.c"]
-   type_rb = Dir.glob("#{__dir__}/gen/def/*.rb")
+   type_c = []
+   type_rb = Dir.glob("gen/def/*.rb")
    type_rb.each do |s|
      type_c << c = "types/"+File.basename(s,".rb")+".c"
 %>
 <%=c%>: <%=s%> $(DEPENDS)
 	$(MAKEDIRS) $(@D) types
-	ruby $(COGEN) -l -o $@ $(DTYPE) <%=s%>
+	ruby $(COGEN) -l -o $@ <%=s%>
 <% end %>
 
 src : <%= type_c.join(" ") %>

data/ext/numo/narray/gen/cogen.rb

@@ -1,9 +1,11 @@
 #! /usr/bin/env ruby
 
+thisdir = File.dirname(__FILE__)
 libpath = File.absolute_path(File.dirname(__FILE__))+"/../../../../lib"
 $LOAD_PATH.unshift libpath
 
-require "erbpp/narray_def"
+require_relative "./narray_def"
+
 while true
   if ARGV[0] == "-l"
     require "erbpp/line_number"
@@ -18,16 +20,37 @@ while true
   end
 end
 
-unless (1..2) === ARGV.size
-  puts "usage:\n  ruby #{$0} [-l] erb_path [type_file]"
+if ARGV.size != 1
+  puts "usage:\n  ruby #{$0} [-l] erb_base [type_file]"
   exit 1
 end
 
-erb_path, type_file = ARGV
+type_file, = ARGV
+type_name = File.basename(type_file,".rb")
+
+erb_dir = ["tmpl"]
+erb_dir.unshift("tmpl_bit") if (type_name == "bit")
+erb_dir.map!{|d| File.join(thisdir,d)}
+
+code = DefLib.new do
+  set erb_dir: erb_dir
+  set erb_suffix: ".c"
+  set ns_var: "mNumo"
+
+  set file_name: $output||""
+  set include_files: ["numo/types/#{type_name}.h"]
+  set lib_name: "numo_"+type_name
+
+  def_class do
+    extend NArrayMethod
+    extend NArrayType
+    eval File.read(type_file), binding, type_file
+    eval File.read(File.join(thisdir,"spec.rb")), binding, "spec.rb"
+  end
+end.result
 
 if $output
-  s = DataType.new(erb_path, type_file).result
-  open($output,"w").write(s)
+  open($output,"w").write(code)
 else
-  DataType.new(erb_path, type_file).run
+  $stdout.write(code)
 end

data/ext/numo/narray/gen/def/bit.rb

@@ -1,18 +1,21 @@
-class_name    "Bit"
-#ctype         ""
+set name:                "bit"
+set type_name:           "bit"
+set full_class_name:     "Numo::Bit"
+set class_name:          "Bit"
+set class_alias:         nil
+set class_var:           "cT"
+set ctype:               "BIT_DIGIT"
 
-template_dir  "tmpl_bit"
-
-has_math      false
-is_bit        true
-is_int        false
-is_unsigned   true
-is_float      false
-is_complex    false
-is_object     false
-is_real       false
-is_comparable false
-is_double_precision false
+set has_math:      false
+set is_bit:        true
+set is_int:        false
+set is_unsigned:   true
+set is_float:      false
+set is_complex:    false
+set is_object:     false
+set is_real:       false
+set is_comparable: false
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

data/ext/numo/narray/gen/def/dcomplex.rb

@@ -1,19 +1,23 @@
-class_name      "DComplex"
-class_alias     "Complex128"
-ctype           "dcomplex"
-real_class_name "DFloat"
-real_ctype      "double"
+set name:                "dcomplex"
+set type_name:           "dcomplex"
+set full_class_name:     "Numo::DComplex"
+set class_name:          "DComplex"
+set class_alias:         "Complex64"
+set class_var:           "cT"
+set ctype:               "dcomplex"
+set real_class_name:     "DFloat"
+set real_ctype:          "double"
 
-has_math      true
-is_bit        false
-is_int        false
-is_unsigned   false
-is_float      true
-is_real       false
-is_complex    true
-is_object     false
-is_comparable false
-is_double_precision true
+set has_math:            true
+set is_bit:              false
+set is_int:              false
+set is_unsigned:         false
+set is_float:            true
+set is_real:             false
+set is_complex:          true
+set is_object:           false
+set is_comparable:       false
+set is_double_precision: true
 
 upcast_rb "Integer"
 upcast_rb "Float"

data/ext/numo/narray/gen/def/dfloat.rb

@@ -1,17 +1,21 @@
-class_name      "DFloat"
-class_alias     "Float64"
-ctype           "double"
+set name:                "dfloat"
+set type_name:           "dfloat"
+set full_class_name:     "Numo::DFloat"
+set class_name:          "DFloat"
+set class_alias:         "Float64"
+set class_var:           "cT"
+set ctype:               "double"
 
-has_math      true
-is_bit        false
-is_int        false
-is_unsigned   false
-is_float      true
-is_complex    false
-is_object     false
-is_real       true
-is_comparable true
-is_double_precision true
+set has_math:            true
+set is_bit:              false
+set is_int:              false
+set is_unsigned:         false
+set is_float:            true
+set is_complex:          false
+set is_object:           false
+set is_real:             true
+set is_comparable:       true
+set is_double_precision: true
 
 upcast_rb "Integer"
 upcast_rb "Float"

data/ext/numo/narray/gen/def/int16.rb

@@ -1,16 +1,20 @@
-class_name    "Int16"
-ctype         "int16_t"
+set name:                "int16"
+set type_name:           "int16"
+set full_class_name:     "Numo::Int16"
+set class_name:          "Int16"
+set class_var:           "cT"
+set ctype:               "int16_t"
 
-has_math      false
-is_bit        false
-is_int        true
-is_unsigned   false
-is_float      false
-is_complex    false
-is_object     false
-is_real       true
-is_comparable true
-is_double_precision false
+set has_math:            false
+set is_bit:              false
+set is_int:              true
+set is_unsigned:         false
+set is_float:            false
+set is_complex:          false
+set is_object:           false
+set is_real:             true
+set is_comparable:       true
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

data/ext/numo/narray/gen/def/int32.rb

@@ -1,16 +1,20 @@
-class_name    "Int32"
-ctype         "int32_t"
+set name:                "int32"
+set type_name:           "int32"
+set full_class_name:     "Numo::Int32"
+set class_name:          "Int32"
+set class_var:           "cT"
+set ctype:               "int32_t"
 
-has_math      false
-is_bit        false
-is_int        true
-is_unsigned   false
-is_float      false
-is_complex    false
-is_object     false
-is_real       true
-is_comparable true
-is_double_precision false
+set has_math:            false
+set is_bit:              false
+set is_int:              true
+set is_unsigned:         false
+set is_float:            false
+set is_complex:          false
+set is_object:           false
+set is_real:             true
+set is_comparable:       true
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

data/ext/numo/narray/gen/def/int64.rb

@@ -1,16 +1,20 @@
-class_name    "Int64"
-ctype         "int64_t"
+set name:                "int64"
+set type_name:           "int64"
+set full_class_name:     "Numo::Int64"
+set class_name:          "Int64"
+set class_var:           "cT"
+set ctype:               "int64_t"
 
-has_math      false
-is_bit        false
-is_int        true
-is_unsigned   false
-is_float      false
-is_complex    false
-is_object     false
-is_real       true
-is_comparable true
-is_double_precision false
+set has_math:            false
+set is_bit:              false
+set is_int:              true
+set is_unsigned:         false
+set is_float:            false
+set is_complex:          false
+set is_object:           false
+set is_real:             true
+set is_comparable:       true
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

data/ext/numo/narray/gen/def/int8.rb

@@ -1,16 +1,20 @@
-class_name    "Int8"
-ctype         "int8_t"
+set name:                "int8"
+set type_name:           "int8"
+set full_class_name:     "Numo::Int8"
+set class_name:          "Int8"
+set class_var:           "cT"
+set ctype:               "int8_t"
 
-has_math      false
-is_bit        false
-is_int        true
-is_unsigned   false
-is_float      false
-is_complex    false
-is_object     false
-is_real       true
-is_comparable true
-is_double_precision false
+set has_math:            false
+set is_bit:              false
+set is_int:              true
+set is_unsigned:         false
+set is_float:            false
+set is_complex:          false
+set is_object:           false
+set is_real:             true
+set is_comparable:       true
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"

data/ext/numo/narray/gen/def/robject.rb

@@ -1,18 +1,22 @@
-class_name      "RObject"
-ctype           "VALUE"
-real_class_name "RObject"
-real_ctype      "VALUE"
+set name:                "robject"
+set type_name:           "robject"
+set full_class_name:     "Numo::RObject"
+set class_name:          "RObject"
+set class_var:           "cT"
+set ctype:               "VALUE"
+set real_class_name:     "RObject"
+set real_ctype:          "VALUE"
 
-has_math      false
-is_bit        false
-is_int        true
-is_unsigned   false
-is_float      true
-is_real       true
-is_complex    false
-is_object     true
-is_comparable true
-is_double_precision false
+set has_math:            false
+set is_bit:              false
+set is_int:              true
+set is_unsigned:         false
+set is_float:            true
+set is_real:             true
+set is_complex:          false
+set is_object:           true
+set is_comparable:       true
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float"

data/ext/numo/narray/gen/def/scomplex.rb

@@ -1,19 +1,23 @@
-class_name      "SComplex"
-class_alias     "Complex64"
-ctype           "scomplex"
-real_class_name "SFloat"
-real_ctype      "float"
+set name:                "scomplex"
+set type_name:           "scomplex"
+set full_class_name:     "Numo::SComplex"
+set class_name:          "SComplex"
+set class_alias:         "Complex32"
+set class_var:           "cT"
+set ctype:               "Scomplex"
+set real_class_name:     "SFloat"
+set real_ctype:          "float"
 
-has_math      true
-is_bit        false
-is_int        false
-is_unsigned   false
-is_float      true
-is_real       false
-is_complex    true
-is_object     false
-is_comparable false
-is_double_precision false
+set has_math:            true
+set is_bit:              false
+set is_int:              false
+set is_unsigned:         false
+set is_float:            true
+set is_real:             false
+set is_complex:          true
+set is_object:           false
+set is_comparable:       false
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float"

data/ext/numo/narray/gen/def/sfloat.rb

@@ -1,17 +1,21 @@
-class_name      "SFloat"
-class_alias     "Float32"
-ctype           "float"
+set name:                "sfloat"
+set type_name:           "sfloat"
+set full_class_name:     "Numo::SFloat"
+set class_name:          "SFloat"
+set class_alias:         "Float32"
+set class_var:           "cT"
+set ctype:               "float"
 
-has_math      true
-is_bit        false
-is_int        false
-is_unsigned   false
-is_float      true
-is_complex    false
-is_object     false
-is_real       true
-is_comparable true
-is_double_precision false
+set has_math:            true
+set is_bit:              false
+set is_int:              false
+set is_unsigned:         false
+set is_float:            true
+set is_complex:          false
+set is_object:           false
+set is_real:             true
+set is_comparable:       true
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float"

data/ext/numo/narray/gen/def/uint16.rb

@@ -1,16 +1,20 @@
-class_name    "UInt16"
-ctype         "u_int16_t"
+set name:                "uint16"
+set type_name:           "uint16"
+set full_class_name:     "Numo::UInt16"
+set class_name:          "UInt16"
+set class_var:           "cT"
+set ctype:               "u_int16_t"
 
-has_math      false
-is_bit        false
-is_int        true
-is_unsigned   true
-is_float      false
-is_complex    false
-is_object     false
-is_real       true
-is_comparable true
-is_double_precision false
+set has_math:            false
+set is_bit:              false
+set is_int:              true
+set is_unsigned:         true
+set is_float:            false
+set is_complex:          false
+set is_object:           false
+set is_real:             true
+set is_comparable:       true
+set is_double_precision: false
 
 upcast_rb "Integer"
 upcast_rb "Float", "DFloat"