2 files changed, 29 insertions, 0 deletions

diff --git a/src/gamestate.cpp b/src/gamestate.cpp
index 3f09c3f..902d0a9 100644
--- a/src/gamestate.cpp
+++ b/src/gamestate.cpp
@@ -366,7 +366,30 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         break;
 
                 case AstNode::tForEach:
+
+                        break;
+
                 case AstNode::tWhile:
+                        {
+                                AstBranch::NodeList lWhile =
+                                        dynamic_cast<const AstBranch *>(*i)->getNodeList();
+                                AstBranch::NodeList::const_iterator iTest = lWhile.begin();
+                                AstBranch::NodeList::const_iterator iDo = iTest+1;
+
+                                for(;;)
+                                {
+                                        parse( dynamic_cast<const AstBranch *>(*iTest)->
+                                                getNodeList() );
+                                        Variable v = popDeref();
+                                        if( v.getType() != Variable::tBool )
+                                                throw Bu::ExceptionBase("conditional did not evaluate to boolean.");
+                                        if( !v.getBool() )
+                                                break;
+
+                                        parse( dynamic_cast<const AstBranch *>(*iDo)->
+                                                getNodeList() );
+                                }
+                        }
                         break;
                 }
 
diff --git a/test.stage b/test.stage
index c19dac9..3fa32c0 100644
--- a/test.stage
+++ b/test.stage
@@ -57,5 +57,11 @@ situation <<stuff>>
         enter
         {
                 display('''Entered stuff''' + player.name);
+                count = 0;
+                while count < 5 do
+                {
+                        display('thing to count!');
+                        count += 1;
+                }
         }
 }