BOAST 0.99993 → 0.99994

data/BOAST.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'BOAST'
-  s.version = "0.99993"
+  s.version = "0.99994"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/boast/"

data/lib/BOAST/DataTypes.rb

@@ -49,6 +49,15 @@ module BOAST
       return !!signed
     end
 
+    def suffix
+      s = ""
+#      if [C, CL, CUDA].include?( lang ) then
+#        s += "U" if not @signed
+#        s += "LL" if @size == 8
+#      end
+      return s
+    end
+
   end
  
   class Real < DataType
@@ -123,6 +132,17 @@ module BOAST
         return "double#{@vector_length}" if @size == 8
       end
     end
+
+    def suffix
+      s = ""
+      if [C, CL, CUDA].include?( lang ) then
+        s += "f" if @size == 4
+      elsif lang == FORTRAN then
+        s += "_wp" if @size == 8
+      end
+      return s
+    end
+
   end
 
   class Int < DataType
@@ -242,6 +262,12 @@ module BOAST
         end
       end
     end
+
+    def suffix
+      s = ""
+      return s
+    end
+
   end
 
   class CStruct < DataType

data/lib/BOAST/Index.rb

@@ -15,6 +15,27 @@ module BOAST
     end
 
     def to_s
+      if get_replace_constants then
+        begin
+          const = @source.constant
+          indxs = @indexes.reverse
+          dims = @source.dimension.reverse
+          (0...dims.length).each { |indx|
+            dim = dims[indx]
+            s = "#{indxs[indx]}"
+            if dim.val2 then
+              s += " - (#{dim.val1})"
+            elsif 0 != get_array_start then
+              s += " - (#{get_array_start})"
+            end
+            ind = eval(s)
+            ind = ind.to_i
+            const = const[ind]
+          }
+          return "#{const}#{@source.type.suffix}"
+        rescue Exception => e
+        end
+      end
       return to_s_fortran if lang == FORTRAN
       return to_s_c if [C, CL, CUDA].include?( lang )
     end
@@ -102,14 +123,6 @@ module BOAST
     def to_s_c
       return to_s_texture if @source.texture
       sub = to_s_c_reversed
-      if get_replace_constants then
-        begin
-         indx = eval(sub)
-         indx = indx.to_i
-         return "#{@source.constant[indx]}"
-        rescue Exception => e
-        end
-      end
       s = "#{@source}[" + sub + "]"
       return s
     end

data/lib/BOAST/Variable.rb

@@ -51,10 +51,10 @@ module BOAST
       return s if first.nil?
       s += "(/ &\n"
       s += first.to_s
-      s += "_wp" if @type and @type.size == 8
+      s += @type.suffix if @type
       self[1..-1].each { |v|
         s += ", &\n"+v.to_s
-        s += "_wp" if @type and @type.size == 8
+        s += @type.suffix if @type
       }
       s += " /)"
     end
@@ -63,9 +63,11 @@ module BOAST
       s = ""
       return s if first.nil?
       s += "{\n"
-      s += first.to_s 
+      s += first.to_s
+      s += @type.suffix if @type 
       self[1..-1].each { |v|
         s += ",\n"+v.to_s
+        s += @type.suffix if @type
       }
       s += "}"
     end
@@ -191,8 +193,7 @@ module BOAST
   
     def to_s
       if force_replace_constant? or ( replace_constant? and constant? and replace_constants? and not dimension? ) then
-        s = @constant.to_s 
-        s += "_wp" if lang == FORTRAN and @type and @type.size == 8
+        s = @constant.to_s + @type.suffix
         return s
       end
       if @scalar_output and [C, CL, CUDA].include?( lang ) then
@@ -343,7 +344,7 @@ module BOAST
       s += " :: #{@name}"
       if constant? then
         s += " = #{@constant}"
-        s += "_wp" if not dimension? and @type and @type.size == 8
+        s += @type.suffix if not dimension? and @type
       end
       s += finalize
       output.print s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: '0.99993'
+  version: '0.99994'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray