Have statements return the expressions they reference.

diff --git a/src/ofc/codegen/AllocateStatement.scala b/src/ofc/codegen/AllocateStatement.scala
index b99840afc3daaedf3abd56c5934ace1fcd2fa659..3782f7a5590b955a2d44af6541c2094bc27da296 100644 (file)
--- a/src/ofc/codegen/AllocateStatement.scala
+++ b/src/ofc/codegen/AllocateStatement.scala
@@ -12,4 +12,5 @@ class AllocateStatement(array: Expression[_], size: Seq[Expression[IntType]]) ex
 
   def getArray : Expression[_] = array
   def getSize : Seq[Expression[IntType]] = size
+  def getExpressions = array +: size
 }

diff --git a/src/ofc/codegen/AssignStatement.scala b/src/ofc/codegen/AssignStatement.scala
index e0b4d0ce913fc06033c8d9f3a45e0c3b96c08970..791b24a236166c323a81d8506d63cd203f0cf261 100644 (file)
--- a/src/ofc/codegen/AssignStatement.scala
+++ b/src/ofc/codegen/AssignStatement.scala
@@ -7,4 +7,5 @@ class AssignStatement(lhs: Expression[_ <: Type], rhs: Expression[_ <: Type]) ex
 
   def getLHS : Expression[_] = lhs
   def getRHS : Expression[_] = rhs
+  def getExpressions = List(lhs, rhs)
 }

diff --git a/src/ofc/codegen/Comment.scala b/src/ofc/codegen/Comment.scala
index 56f4f1a179fecd585d40d0b1301f479d0f122f99..01be110087ebaf1d3f61d59e9725664726ab9c65 100644 (file)
--- a/src/ofc/codegen/Comment.scala
+++ b/src/ofc/codegen/Comment.scala
@@ -2,4 +2,5 @@ package ofc.codegen
 
 class Comment(value: String) extends Statement {
   def getValue = value
+  def getExpressions = Nil
 }

diff --git a/src/ofc/codegen/DeallocateStatement.scala b/src/ofc/codegen/DeallocateStatement.scala
index 41efd47624f5b4dc14a3c9a8f37af71937262ca3..39ddc210b3b9518f2f310342565a82953e3ece5f 100644 (file)
--- a/src/ofc/codegen/DeallocateStatement.scala
+++ b/src/ofc/codegen/DeallocateStatement.scala
@@ -1,11 +1,12 @@
 package ofc.codegen
 import ofc.LogicError
 
-class DeallocateStatement(array: Expression[_]) extends Statement {
+class DeallocateStatement(array: Expression[_ <: Type]) extends Statement {
   array.getType match {
     case (_: ArrayType[_]) => ()
     case _ => throw new LogicError("Can only deallocate an array expression.")
   }
 
   def getArray : Expression[_] = array
+  def getExpressions = List(array)
 }

diff --git a/src/ofc/codegen/ForLoop.scala b/src/ofc/codegen/ForLoop.scala
index 1468bed5fe3c3dd5463501cc1a00feab6855af3d..0e91e6cbe02b2964c1f71b6c4cfdb1f45815328e 100644 (file)
--- a/src/ofc/codegen/ForLoop.scala
+++ b/src/ofc/codegen/ForLoop.scala
@@ -4,4 +4,5 @@ class ForLoop(index: VarSymbol[IntType], begin: Expression[IntType], end: Expres
   def getIndex = index
   def getBegin = begin
   def getEnd = end
+  def getExpressions = List(begin, end)
 }

diff --git a/src/ofc/codegen/FunctionCallStatement.scala b/src/ofc/codegen/FunctionCallStatement.scala
index f4c7fd613be3fe4091726f0cc5b89da2891ece2c..8447ce37c8849ea326aa2f3b5625db75e99a5d89 100644 (file)
--- a/src/ofc/codegen/FunctionCallStatement.scala
+++ b/src/ofc/codegen/FunctionCallStatement.scala
@@ -2,4 +2,5 @@ package ofc.codegen
 
 class FunctionCallStatement(call: FunctionCall[VoidType]) extends Statement {
   def getCall : FunctionCall[VoidType] = call
+  def getExpressions = call.getParams
 }

diff --git a/src/ofc/codegen/IfStatement.scala b/src/ofc/codegen/IfStatement.scala
index 2c97a53e6b8009adb6690c769c264d2d00443378..b23ae16dc9cd36d7300f01485d9b5d9476cd4233 100644 (file)
--- a/src/ofc/codegen/IfStatement.scala
+++ b/src/ofc/codegen/IfStatement.scala
@@ -2,4 +2,5 @@ package ofc.codegen
 
 class IfStatement(predicate: Expression[BoolType]) extends ScopeStatement {
   def getPredicate : Expression[BoolType] = predicate
+  def getExpressions = predicate
 }

diff --git a/src/ofc/codegen/IterationContext.scala b/src/ofc/codegen/IterationContext.scala
index 355576f83475f588e69a51611bdcd35de261463c..9654090a013608391d49ad58443b3203c9a093f7 100644 (file)
--- a/src/ofc/codegen/IterationContext.scala
+++ b/src/ofc/codegen/IterationContext.scala
@@ -173,4 +173,7 @@ class IterationContext extends Statement {
 
   def toConcrete : Statement = 
     toConcrete(new Comment("Placeholder statement for consumer."))
+
+  def getExpressions =
+    throw new LogicError("Call IterationContext::toConcrete() before trying to access expressions.")
 }

diff --git a/src/ofc/codegen/ScopeStatement.scala b/src/ofc/codegen/ScopeStatement.scala
index 3c1162cf2c7937483dc8da92240651029c1de7b1..f83eac7ccde1d1ff5e5e797f17b565404706bf99 100644 (file)
--- a/src/ofc/codegen/ScopeStatement.scala
+++ b/src/ofc/codegen/ScopeStatement.scala
@@ -18,4 +18,5 @@ abstract class ScopeStatement(initialStatements: Seq[Statement] = Nil) extends S
 }
 
 class BlockStatement(initialStatements: Seq[Statement] = Nil) extends ScopeStatement(initialStatements) {
+  def getExpressions = Nil
 }

diff --git a/src/ofc/codegen/Statement.scala b/src/ofc/codegen/Statement.scala
index 4028f7d8895d1c4ba3f9da0ec698105344daafed..24e0f03980ef97718cb9e1f8ae5e88670fc3f5b2 100644 (file)
--- a/src/ofc/codegen/Statement.scala
+++ b/src/ofc/codegen/Statement.scala
@@ -1,4 +1,9 @@
 package ofc.codegen
 
-trait Statement
-class NullStatement extends Statement
+trait Statement {
+  def getExpressions: Traversable[Expression[_]]
+}
+
+class NullStatement extends Statement {
+  def getExpressions = Nil
+}