From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Mon, 7 May 2012 23:33:52 +0000 (+0100)
Subject: Rename ProducerStatement to IteratedStatement.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=055529073b9957e71bfc6e99fe98cd9c8bedd7ac;p=francis%2Fofc.git

Rename ProducerStatement to IteratedStatement.
---

diff --git a/src/ofc/codegen/FortranGenerator.scala b/src/ofc/codegen/FortranGenerator.scala
index 059e668..efccf6d 100644
--- a/src/ofc/codegen/FortranGenerator.scala
+++ b/src/ofc/codegen/FortranGenerator.scala
@@ -139,7 +139,7 @@ class FortranGenerator {
       case (x : NullStatement) => ()
       case (x : Comment) => addLine("!" + x.getValue)
       case (x : BlockStatement) => processScope(x)
-      case (x : ProducerStatement) => processStatement(x.toConcrete)
+      case (x : IteratedStatement) => processStatement(x.toConcrete)
       case (x : ForLoop) => processForLoop(x)
       case (a : AssignStatement) => processAssignment(a)
       case (i : IfStatement) => processIf(i)
diff --git a/src/ofc/codegen/ProducerStatement.scala b/src/ofc/codegen/IteratedStatement.scala
similarity index 95%
rename from src/ofc/codegen/ProducerStatement.scala
rename to src/ofc/codegen/IteratedStatement.scala
index 0c182ae..c50b3b1 100644
--- a/src/ofc/codegen/ProducerStatement.scala
+++ b/src/ofc/codegen/IteratedStatement.scala
@@ -2,7 +2,7 @@ package ofc.codegen
 import ofc.LogicError
 import ofc.util.DirectedGraph
 
-object ProducerStatement {
+object IteratedStatement {
   object Context {
     private def priority(context: Context) : Int = {
       // This ensures that the nesting ordering is Predicate, DerivedExpression, VariableRange
@@ -80,8 +80,8 @@ object ProducerStatement {
   }
 }
 
-class ProducerStatement extends Statement {
-  import ProducerStatement._
+class IteratedStatement extends Statement {
+  import IteratedStatement._
 
   var statement = new Comment("Placeholder statement for consumer.")
   var ranges : Seq[VariableRange] = Nil
@@ -104,8 +104,8 @@ class ProducerStatement extends Statement {
     predicates +:= new Predicate(condition)
   }
 
-  def merge(statement: ProducerStatement) : ProducerStatement = {
-    val result = new ProducerStatement
+  def merge(statement: IteratedStatement) : IteratedStatement = {
+    val result = new IteratedStatement
     result.ranges = ranges ++ statement.ranges
     result.predicates = predicates ++ statement.predicates
     result.expressions = expressions ++ statement.expressions