BOAST 0.5 → 0.6

data/BOAST.gemspec

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

data/lib/BOAST/Algorithm.rb

@@ -250,19 +250,39 @@ module BOAST
       return Expression::new("-",nil,self)
     end
 
+    def Expression.to_str_base(op1, op2, oper)
+      s = ""
+      if op1 then
+        s += "(" if (oper == "*" or oper == "/") 
+        s += op1.to_s
+        s += ")" if (oper == "*" or oper == "/") 
+      end        
+      s += " " unless oper == "++" or oper == "."
+      s += oper 
+      s += " " unless oper == "." or oper == "&" or ( oper == "*" and op1.nil? )
+      if op2 then
+        s += "(" if (oper == "*" or oper == "/" or oper == "-") 
+        s += op2.to_s
+        s += ")" if (oper == "*" or oper == "/" or oper == "-") 
+      end
+      return s
+    end
+      
     def to_var
       op1 = nil
-      op1 = @operand1.to_var if @operand1 and @operand1.respond_to?(:to_var)
+      op1 = @operand1.to_var if @operand1.respond_to?(:to_var)
       op2 = nil
-      op2 = @operand2.to_var if @operand2 and @operand2.respond_to?(:to_var)
-      res_exp = Expression::new(@operator, op1.nil? ? @operand1 : op1, op2.nil? ? @operand2 : op2)
+      op2 = @operand2.to_var if @operand2.respond_to?(:to_var)
       if op1 and op2 then
         r_t, oper = BOAST::transition(op1, op2, @operator)
-        return r_t.copy("#{res_exp}", :const => nil, :constant => nil)
-      elsif op1
-        return op1.copy("#{res_exp}", :const => nil, :constant => nil)
+        res_exp = BOAST::Expression::to_str_base(op1, op2, oper)
+        return r_t.copy(res_exp, :const => nil, :constant => nil)
       elsif op2
-        return op2.copy("#{res_exp}", :const => nil, :constant => nil)
+        res_exp = BOAST::Expression::to_str_base(@operand1, op2, @operator)
+        return op2.copy(res_exp, :const => nil, :constant => nil)
+      elsif op1
+        res_exp = BOAST::Expression::to_str_base(op1, @operand2, @operator)
+        return op1.copy(res_exp, :const => nil, :constant => nil)
       else
         STDERR.puts "#{@operand1} #{@operand2}"
         raise "Expression on no operand!"
@@ -271,9 +291,9 @@ module BOAST
  
     def to_str
       op1 = nil
-      op1 = @operand1.to_var if @operand1 and @operand1.respond_to?(:to_var)
+      op1 = @operand1.to_var if @operand1.respond_to?(:to_var)
       op2 = nil
-      op2 = @operand2.to_var if @operand2 and @operand2.respond_to?(:to_var)
+      op2 = @operand2.to_var if @operand2.respond_to?(:to_var)
       if op1 and op2 then
         r_t, oper = BOAST::transition(op1, op2, @operator)
       else
@@ -282,22 +302,8 @@ module BOAST
 
       op1 = @operand1 if not op1
       op2 = @operand2 if not op2
-     
-      s = ""
-      if op1 then
-        s += "(" if (oper == "*" or oper == "/") 
-        s += op1.to_s
-        s += ")" if (oper == "*" or oper == "/") 
-      end        
-      s += " " unless oper == "++" or oper == "."
-      s += oper 
-      s += " " unless oper == "." or oper == "&" or ( oper == "*" and op1.nil? )
-      if op2 then
-        s += "(" if (oper == "*" or oper == "/" or oper == "-") 
-        s += op2.to_s
-        s += ")" if (oper == "*" or oper == "/" or oper == "-") 
-      end
-      return s
+
+      return BOAST::Expression::to_str_base(op1, op2, oper)
     end
 
     def print(final=true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: BOAST
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors: