cauldron 0.1.0 → 0.1.1

data/lib/core/statement/ActsAsStatement.rb

@@ -36,7 +36,7 @@ protected
       when 0
         return StatementStructure::BLANK_STATEMENT     
       when 1
-        return StatementStructure::IF_STATEMENT if first.kind_of?(IfContainer)
+        return StatementStructure::IF_STATEMENT if first.kind_of?(If)
         #return StatementStructure::USAGE_STATEMENT if self.classes_match?(InstanceCallContainer)
         if self.classes_match?(InstanceCallContainer)
           if first.method_call.destructive?

data/lib/core/statement/ArrayAccess.rb

@@ -1,3 +1,5 @@
+# TODO  I'm sure Container could replace ArrayAccess InstanceCallCOntainer etc.
+
 # TODO  I am duplicating variables here with array, index, subject and method_call
 class ArrayAccess < InstanceCallContainer
   include VariableIncluded
@@ -67,9 +69,7 @@ class ArrayAccess < InstanceCallContainer
   def equivalent?(to)
     return false if to.class != self.class
     return false unless to.array.equivalent?(@array)
-    #return false unless to.array == @array
     return false unless to.index.equivalent?(@index)
-    #return false unless to.index == @index
     return true
   end      
   
@@ -91,6 +91,32 @@ class ArrayAccess < InstanceCallContainer
       @index.replace_theory_variables!(mapping)
     end
     
+  end
+  
+  def replace_variables_alt!(map)
+    if @array.kind_of?(TheoryVariable)
+      map.each do |key,value|
+        if @array.theory_variable_id == key.theory_variable_id
+          @array = value
+          break
+        end
+      end
+    else
+      @array.replace_variables_alt!(map)
+    end
+    
+    #
+    if @index.kind_of?(TheoryVariable)
+      map.each do |key,value|
+        if @index.theory_variable_id == key.theory_variable_id
+          @index = value
+          break
+        end
+      end
+    elsif(@index.kind_of?(Literal))
+    else
+      @index.replace_variables_alt!(map)
+    end        
   end  
   
 end

data/lib/core/statement/OpenStatement.rb

@@ -131,6 +131,13 @@ class OpenStatement < StatementGroup
     end    
   end
   
+  def subst_variable!(id,var)
+    @statement.subst_variable!(id,var)
+    self.each do |statement| 
+      statement.subst_variable!(id,var)
+    end
+  end
+  
   # Returns the statement_id of the embeded statement. 
   #
   # TODO  The nested statement should maybe have an idea 

data/lib/core/statement/Statement.rb

@@ -156,7 +156,6 @@ class Statement < Array
     self.each do |code|
       line += code.write
       break if code.object_id == self.last.object_id
-      line += ' '
     end
     return line
   end
@@ -170,7 +169,6 @@ class Statement < Array
     self.each do |code|
       line += code.describe
       break if code.object_id == self.last.object_id
-      line += ' '
     end
     return line  
   end  
@@ -206,9 +204,9 @@ class Statement < Array
       if code.kind_of?(Variable)
 
         line += code.write+'('+code.value.write+')'
-        unless code == self.last
-          line += ' '
-        end
+        # unless code == self.last
+          # line += ' '
+        # end
         next
       end
 
@@ -507,12 +505,8 @@ class Statement < Array
     raise FailedToFindVariableError.new('Couldn\'t find a variable with the id '+uniq_id.to_s+' in "'+self.write+'"')    
   end
 
-  # TODO  This doesn't check anything
-  #
   def replace_variable!(id,var)
-    
-    unless var.kind_of?(Variable) then raise StandardError.new('Only expecting a variable') end
-    
+
     # Find the variable to be replaced
     target = self.find_actual_variable(id)  
  
@@ -536,6 +530,24 @@ class Statement < Array
     
   end     
   
+  # TODO  Not sure whether both replace_variable! and subst_variable! are both needed  - either ways
+  #       their names aren't descriptive enough to distinguish that one uses the uniq_id and one uses
+  #       the variable.   
+  #
+  def subst_variable!(id,var)
+    # => TODO Use replace_variable_if?
+    self.each_with_index do |token,i|
+      if token.kind_of?(Variable) && id == token.variable_id
+        self[i] = var
+        next
+      end
+      if token.kind_of?(Container)
+        self[i] = token.subst_variable!(id,var)
+      end
+    end
+    self
+  end
+  
   # Returns a declaration for this statement.  So it will look something
   # like - 
   # Statement.new(StringVariable.new('test'),Equal.new,'test')
@@ -1139,14 +1151,6 @@ protected
     
   end
   
-  # This runs some simple checks of the structure of the statement
-  # for example if the statement had two = signs then that would
-  # invalidate it.
-  # 
-  def validate_statment_structure
-    
-  end
-  
   # Returns the two arrays split between the kind of class
   # provided.
   # 

data/lib/core/statement/TheoryStatement.rb

@@ -45,6 +45,14 @@ class TheoryStatement < Statement
     #return TheoryDependent.new(rewritten_statement,@theory_component_id)
   end  
   
+  # => 
+  # => map [<TheoryVariable>=><TheoryVariable>]
+  def replace_variables_alt!(map)
+    self.each do |x|
+      x.replace_variables_alt!(map)
+    end
+  end
+  
   # TODO  Maybe use a opject to handle the output of the statement.
   def describe(tab=0)
     line = ''
@@ -52,7 +60,6 @@ class TheoryStatement < Statement
     self.each do |code|
       line += code.describe
       break if code.object_id == self.last.object_id
-      line += ' '
     end
     return line
   end  

data/lib/core/syntax/Addition.rb

@@ -11,7 +11,7 @@ class Addition < InstanceCall
   end
   
   def write
-    return ' +'
+    return ' + '
   end
   
   def to_literal_string
@@ -19,7 +19,8 @@ class Addition < InstanceCall
   end
 
   def closure
-    return [' ','']
+    #return [' ','']
+    return ['','']
   end       
     
 end

data/lib/core/syntax/If.rb

@@ -9,6 +9,10 @@ class If
     return ("\t"*tab)+'if'
   end  
   
+  def describe(tab=0)
+    return write(tab) 
+  end
+  
   def copy
     return If.new
   end
@@ -17,6 +21,10 @@ class If
     return 'If.new'
   end    
   
+  def to_literal_string
+    return write
+  end
+  
 end
 
 # TODO  I need to go over my "if statement" construction

data/lib/core/syntax/Return.rb

@@ -7,7 +7,7 @@ class Return
   end
   
   def write(method_context=nil)
-    return 'return'
+    return 'return '
   end
   
   def describe

data/lib/core/variable/BaseVariable.rb

@@ -9,8 +9,6 @@ class BaseVariable < Array
   
   include Variable
   include Token
-  # TODO  VariableIncluded is in Variable so i can probably get rid of the VariableIncluded
-  #include VariableIncluded
   
   # TODO  I think I'll get rid of the id parameter and just use blocks
   # 

data/lib/core/variable/MethodParameter.rb

@@ -1,13 +1,9 @@
 class MethodParameter < BaseVariable
   attr_reader :usage_variable
+  attr_writer :variable_id
   
-  # TODO  I'm trying to move away from requirements
-  #
-  # @param  *requirements   Any number of requirements that describe the 
-  #                         the properties of the method variable.
-  #                         For example self == 6
-  def initialize(*requirements)
-    super(nil)
+  def initialize(id=nil)
+    super(id)
   end
   
   # Returns true if this variables meets the requirements of the
@@ -66,11 +62,7 @@ class MethodParameter < BaseVariable
     
     # Print out each of the requirements
     copied_var.each do |x|  
-      
-      #tmp = gets      
       desc = x.describe(context)
-
-      #tmp = gets
       desc.each_line do |l|
         line += "\t"+l
       end      
@@ -83,9 +75,7 @@ class MethodParameter < BaseVariable
   end  
 
   def copy
-    result = self.class.new(*self) {{:variable_id => self.variable_id,:uniq_id=>@uniq_id, :uniq_id_history=>@uniq_id_history.copy}}
-    result.instance_variable = @instance_variable
-    return result
+    return Marshal.load(Marshal.dump(self))
   end  
   
   # Returns a reference to the usage variable that is represented 
@@ -186,21 +176,4 @@ private
       
   end
   
-  # TODO Write tests for this
-  def meets_requirements_of_instance_call(instance_call)
-    #unless instance_call.literalisable?
-    #  raise StandardError.new('Unable to litralise instance call '+instance_call.write)
-    #end
-    
-    # Attempt to litralise the variable 
-    # TODO  The variable class returns a Literal the InstanceCallContainer returns a 
-    #       value.  They don't need to do different things.
-    if(self.literalisable?)
-      return self.literalise.value == instance_call.literalise
-    else
-      raise FailedVariableMatch.new('Unable to litralise variable to see if it meets requirements')
-    end
-    
-  end  
-  
 end

data/lib/core/variable/Unknown.rb

@@ -62,12 +62,8 @@ class Unknown < BaseVariable
     line += write
     
     # Print out each of the requirements
-    copied_var.each do |x|  
-      
-      #tmp = gets      
+    copied_var.each do |x|        
       desc = x.describe(context)
-
-      #tmp = gets
       desc.each_line do |l|
         line += "\t"+l
       end      

data/lib/implemented_chain.rb

@@ -3,11 +3,12 @@
 #
 class ImplementedChain
   
+  attr_reader :mapping
   # 
   #
   # 
-  def initialize(nodes)
-    @nodes = nodes
+  def initialize(nodes,mapping)
+    @nodes, @mapping = nodes, mapping
   end
   
   def each(&block)

data/lib/required.rb

@@ -187,7 +187,6 @@ require $LOC+File.join(['core','syntax','Addition'])
 require $LOC+File.join(['core','syntax','Do'])
 require $LOC+File.join(['core','syntax','If'])
 require $LOC+File.join(['core','syntax','BlockContainer'])
-require $LOC+File.join(['core','syntax','IfContainer'])
 require $LOC+File.join(['core','syntax','This'])
 
 require $LOC+File.join(['theory','TheoryVariable'])

data/lib/ruby_code/String.rb

@@ -45,15 +45,6 @@ class String
     return Literal.new(self.clone)
   end 
   
-  # TODO  Write tests
-  # Returns a requirement instance declaring this as a literal.
-  #
-  # Example 'test'.to_requirement -> Requirement.new(This.new,Equivalent.new,'test'.to_literal)
-  #
-  def to_requirement
-    return Requirement.new(This.new,Equivalent.new,self.to_literal)
-  end
-  
   # Returns a statement declaring a variable with the value of
   # this string e.g. 
   #
@@ -67,19 +58,11 @@ class String
   # TODO  There is a BASH command `quote` and `quote_readline` that
   # might be more useful here.
   def escape_single_quotes
-    # TODO   I don't properly follow this
     return self.gsub(/[']/, '\\\\\'')    
   end
   
   def cauldron_method_calls
     return ['.length']
-  end  
-
-protected
-  
-  def identify(x)
-    # Check if it is a assignment
-    
   end
   
 end

data/lib/theories.rb

@@ -9,7 +9,31 @@ module ContainsTheories
   def setup
     @theory_1 = Theory.load_theory(1)
     @theory_2 = Theory.load_theory(2)
-    @theory_3 = Theory.load_theory(3)    
+    #@theory_3 = Theory.load_theory(3)
+    @theory_3 = theory_3    
+  end
+  
+  def theory_3
+    
+    dependent_one = TheoryDependent.new(
+      StringToTheory.run(
+        "if(var1.realise2(var2[var3][:params]).params[0].value.length == var2[var3][:output])\nreturn true\nend"
+      )
+    )
+    action_one = TheoryAction.new(
+      TheoryStatement.new(
+        StringToTheory.run(
+          'Statement.new(Return.new,InstanceCallContainer.new(var1.params[0],StringLength.new))'
+        )             
+      ),
+      StringToTheory.run("var1.statement_id") 
+    )
+    result_one = TheoryResult.new(
+      StringToTheory.run("if(var1.all_pass?(var2))\nreturn true\nend"),true
+    )      
+    Theory.new([dependent_one],action_one,[result_one]) 
+        
+    
   end
   
   def load_theory_implementation(implementation_id)

data/lib/theory/TheoryAction.rb

@@ -44,7 +44,7 @@ class TheoryAction
   # the values in the mapping hash. 
   # 
   def map_to(mapping)
-    
+
     # Duplicate the current statement before it is rewritten
     rewritten_statement = @action.copy
     target_id = @target_id.copy
@@ -53,10 +53,22 @@ class TheoryAction
     containers = [rewritten_statement,target_id].select_all {|x| x.respond_to?(:has?)}
     theory_variable_containers = containers.select {|x| x.has? {|y| y.kind_of?(TheoryVariable)}}
     
-    # Rewrite the statement replacing the values
-    theory_variable_containers.each do |z|
-      z.replace_theory_variables!(mapping)
-    end 
+    # Do any of the containers contain each other?
+    # => TODO Need to prevent this
+    all_theory_variables = Set.new
+    theory_variable_containers.each do |x|
+      results = x.select_all([]) {|y| y.kind_of?(TheoryVariable)}
+      all_theory_variables += results
+    end
+    
+    map = {}
+    all_theory_variables.each do |x|
+      next if mapping[x.theory_variable_id].nil?
+      map[x] = mapping[x.theory_variable_id]  
+    end
+        
+    rewritten_statement.replace_variables_alt!(map) 
+    target_id.replace_variables_alt!(map)
     
     return ActionImplementation.new(rewritten_statement,target_id,@theory_component_id)
     
@@ -66,5 +78,23 @@ class TheoryAction
     return TheoryAction.new(@action.copy,@target_id,@theory_component_id)
   end
   
+  def statements_with_variable(variable_id)
+    
+    # Duplicate the current statement before it is rewritten
+    rewritten_statement = @action.copy
+    target_id = @target_id.copy
+    
+    # Find all containers of VariableDeclarations that declare a TheoryVariable
+    containers = [rewritten_statement,target_id].select_all {|x| x.respond_to?(:has?)}
+    theory_variable_containers = containers.select {|x| x.has? {|y| y.kind_of?(TheoryVariable)}}
+    
+    results = theory_variable_containers.select do |x|
+      reg = eval '/var'+variable_id.to_s+'/'
+      x.write.match(reg)
+    end
+    return results
+    
+  end
+  
   
 end