Random function added, other fixes.

7 files changed, 69 insertions, 6 deletions

diff --git a/src/functiondisplay.cpp b/src/functiondisplay.cpp
index ab37a08..7328293 100644
--- a/src/functiondisplay.cpp
+++ b/src/functiondisplay.cpp
@@ -15,12 +15,13 @@ FunctionDisplay::~FunctionDisplay()
 
 void FunctionDisplay::call( class GameState &gState )
 {
-//      Bu::String s = gState.popDeref().to( Variable::tString ).getString();
-
-//      sio << format( s ) << sio.nl;
+        Bu::String s = gState.popDeref().to( Variable::tString ).getString();
+        sio << format( s ) << sio.nl;
 
+/*
         Variable v = gState.popDeref();
         sio << "Display:  " << v << sio.nl;
+        */
 }
 
 Bu::String FunctionDisplay::format( const Bu::String &sSrc )
diff --git a/src/functionrandom.cpp b/src/functionrandom.cpp
new file mode 100644
index 0000000..2665a14
--- /dev/null
+++ b/src/functionrandom.cpp
@@ -0,0 +1,30 @@
+#include "functionrandom.h"
+
+#include "gamestate.h"
+
+#include <stdlib.h>
+
+FunctionRandom::FunctionRandom()
+{
+}
+
+FunctionRandom::~FunctionRandom()
+{
+}
+
+void FunctionRandom::call( class GameState &gState )
+{
+        Variable vHigh = gState.popDeref();
+        Variable vLow = gState.popDeref();
+
+        if( vHigh.getType() != vLow.getType() )
+                throw Bu::ExceptionBase("Different types in random!");
+
+        if( vLow.getType() == Variable::tInt )
+        {
+                gState.push( Variable( (int64_t)(
+                        (random()%(vHigh.getInt()-vLow.getInt()+1ll))+vLow.getInt()
+                        ) ) );
+        }
+}
+
diff --git a/src/functionrandom.h b/src/functionrandom.h
new file mode 100644
index 0000000..b30f110
--- /dev/null
+++ b/src/functionrandom.h
@@ -0,0 +1,16 @@
+#ifndef FUNCTION_RANDOM_H
+#define FUNCTION_RANDOM_H
+
+#include "function.h"
+
+class FunctionRandom : public Function
+{
+public:
+        FunctionRandom();
+        virtual ~FunctionRandom();
+
+        virtual Bu::String getName() const { return "random"; }
+        virtual void call( class GameState &gState );
+};
+
+#endif
diff --git a/src/game.cpp b/src/game.cpp
index 910cec2..c19b039 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -4,13 +4,16 @@
 #include "functionexists.h"
 #include "functiondelete.h"
 #include "functionexit.h"
+#include "functionrandom.h"
 
 Game::Game()
 {
+        hGlobalParam.insert("start", Variable::newSituationName("start") );
         addFunction( new FunctionDisplay() );
         addFunction( new FunctionExists() );
         addFunction( new FunctionDelete() );
         addFunction( new FunctionExit() );
+        addFunction( new FunctionRandom() );
 }
 
 Game::~Game()
diff --git a/src/gamestate.cpp b/src/gamestate.cpp
index dcae848..2032d5c 100644
--- a/src/gamestate.cpp
+++ b/src/gamestate.cpp
@@ -465,7 +465,8 @@ void GameState::parse( const AstBranch::NodeList &lCode )
                         {
                                 Variable v = popDeref();
                                 Variable x = popDeref();
-                                if( v.getType() == Variable::tDictionary )
+                                if( v.getType() == Variable::tDictionary ||
+                                        v.getType() == Variable::tList )
                                 {
                                         push( Variable( v.has( x ) ) );
                                 }
diff --git a/src/main.cpp b/src/main.cpp
index b3dbba7..1f532d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,6 +3,9 @@
 #include "gamestate.h"
 #include "parser.tab.h"
 
+#include <stdlib.h>
+#include <time.h>
+
 #include <bu/sio.h>
 using namespace Bu;
 
@@ -28,6 +31,8 @@ int main( int argc, char *argv[] )
 
         fclose( in );
 
+        srandom( time( NULL ) );
+
         Game *pGame = bld.getGame();
 
         GameState gs( pGame );
diff --git a/src/variable.cpp b/src/variable.cpp
index 5296848..a3fb4a2 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -242,8 +242,15 @@ bool Variable::has( const Variable &vKey )
 {
         if( eType == tDictionary )
                 return hValue->has( vKey );
-//      else if( eType == tList )
-//              return lValue->contains( vKey );
+        else if( eType == tList )
+        {
+                for( VariableList::const_iterator i = lValue->begin(); i; i++ )
+                {
+                        if( (*i) == vKey )
+                                return true;
+                }
+                return false;
+        }
         else
                 throw Bu::ExceptionBase("Insert on non-dictionary.");
 }