BOAST 0.9996 → 0.9997

data/BOAST.gemspec

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

data/lib/BOAST/Arithmetic.rb

@@ -61,5 +61,18 @@ module BOAST
       return Expression::new("*",nil,self)
     end
 
+    def and(x)
+      return Expression::new("&&", self, x)
+    end
+
+    def or(x)
+      return Expression::new("||", self, x)
+    end
+
+    def components( range )
+      existing_set = [*('0'..'9'),*('a'..'z')].first(self.type.vector_length)
+      eval "self.s#{existing_set[range].join("")}"
+    end
+
   end
 end

data/lib/BOAST/Index.rb

@@ -71,40 +71,41 @@ module BOAST
       return s
     end
 
-    def to_s_c
-      return to_s_texture if @source.texture
-      dim = @source.dimension.first
-      if dim.val2 then
-        start = dim.val1
-      else
-        start = get_array_start
-      end
-      sub = "#{@indexes.first} - (#{start})"
-      i=1
-      ss = ""
-      @source.dimension[0..-2].each{ |d|
-        if d.size then
-          ss += " * (#{d.size})"
-        elsif d.val2 then
-          ss += " * (#{d.val2} - (#{d.val1}) + 1)"
-        else
-          raise "Unkwown dimension size!"
-        end
-        dim = @source.dimension[i]
+    def to_s_c_reversed
+      indxs = @indexes.reverse
+      dims = @source.dimension.reverse
+      ss = nil
+      (0...dims.length).each { |indx|
+        s = ""
+        dim = dims[indx]
+        s += "#{indxs[indx]}"
         if dim.val2 then
-          start = dim.val1
-        else
-          start = get_array_start
+          s += " - (#{dim.val1})"
+        elsif 0 != get_array_start then
+          s += " - (#{get_array_start})"
         end
-        sub += " + (#{@indexes[i]} - (#{start}))"+ss
-        i+=1
+        if ss then
+          if dim.size then
+            s += " + (#{dim.size}) * "
+          elsif dim.val2 then
+            s += " + (#{dim.val2} - (#{dim.val1}) + 1) * "
+          else
+            raise "Unkwown dimension size!"
+          end
+          s += "(#{ss})"
+        end
+        ss = s
       }
+      return ss
+    end
+
+    def to_s_c
+      return to_s_texture if @source.texture
+      sub = to_s_c_reversed
       if get_replace_constants then
         begin
-#         puts sub
          indx = eval(sub)
          indx = indx.to_i
-#         puts indx
          return "#{@source.constant[indx]}"
         rescue Exception => e
         end

data/lib/BOAST/Variable.rb

@@ -10,35 +10,25 @@ module BOAST
     attr_reader :size
 
     def initialize(v1=nil,v2=nil)
-      @size = nil
-      @val1 = nil
-      @val2 = nil
-      if v2.nil? and v1 then
-        @val1 = get_array_start
-        @val2 = v1 + get_array_start - 1
-        @size = v1
+      if v1 then
+        if v2 then
+          @size = Expression::new(Substraction, v2, v1) + 1
+        else
+          @size = v1
+        end
       else
-        @val1 = v1
-        @val2 = v2
+        @size = nil
       end
+      @val1 = v1
+      @val2 = v2
     end
 
     def to_s
-      s = ""
-      if @val2 then
-        if lang == FORTRAN then
-          s += @val1.to_s
-          s += ":"
-          s += @val2.to_s
-        elsif [C, CL, CUDA].include?( lang ) then
-          s += (@val2 - @val1 + 1).to_s
-        end
-      elsif @val1.nil? then
-        return nil
+      if lang == FORTRAN and @val2 then
+        return "#{@val1}:#{@val2}"
       else
-        s += @val1.to_s
-      end
-      return s
+        return @size
+      end 
     end
   end
 
@@ -92,6 +82,14 @@ module BOAST
     def method_missing(m, *a, &b)
       if @type.methods.include?(:members) and @type.members[m.to_s] then
         return struct_reference(type.members[m.to_s])
+      elsif @type.methods.include?(:vector_length) and @type.vector_length > 1 and m.to_s[0] == 's' and lang == CL then
+        required_set = m.to_s[1..-1].chars.to_a
+        existing_set = [*('0'..'9'),*('a'..'z')].first(@type.vector_length)
+        if required_set.length == required_set.uniq.length and (required_set - existing_set).empty? then
+          return self.copy(name+"."+m.to_s, :vector_length => m.to_s[1..-1].length)
+        else
+          return orig_method_missing(m, *a, &b)
+        end
       else
         return orig_method_missing(m, *a, &b)
       end
@@ -284,7 +282,7 @@ module BOAST
       end
       if dimension? and ((local? and not device) or (allocate? and not constant?)) then
          s +="["
-         s += @dimension.reverse.join("*")
+         s += @dimension.collect{ |d| d.to_s }.reverse.join("*")
          s +="]"
       end 
       s += " = #{@constant}" if constant?

metadata

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