Added test / example for pausable eventqueue

21 files changed, 113 insertions, 101 deletions

diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp
index 0c77dfd..376561d 100644
--- a/src/uscxml/interpreter/BasicContentExecutor.cpp
+++ b/src/uscxml/interpreter/BasicContentExecutor.cpp
@@ -36,7 +36,7 @@ namespace uscxml {
 using namespace XERCESC_NS;
 
 std::shared_ptr<ContentExecutorImpl> BasicContentExecutor::create(ContentExecutorCallbacks* callbacks) {
-    return std::shared_ptr<ContentExecutorImpl>(new BasicContentExecutor(callbacks));
+	return std::shared_ptr<ContentExecutorImpl>(new BasicContentExecutor(callbacks));
 }
 
 void BasicContentExecutor::processRaise(XERCESC_NS::DOMElement* content) {
@@ -635,13 +635,13 @@ Data BasicContentExecutor::elementAsData(XERCESC_NS::DOMElement* element) {
 				contentSS << X((*textIter)->getNodeValue());
 			}
 #if 0
-            try {
+			try {
 				Data d = _callbacks->getAsData(contentSS.str());
 				if (!d.empty())
 					return d;
 			} catch(...) {}
 #endif
-            // test294, test562
+			// test294, test562
 			return Data(spaceNormalize(contentSS.str()), Data::VERBATIM);
 		}
 	}
diff --git a/src/uscxml/interpreter/BasicContentExecutor.h b/src/uscxml/interpreter/BasicContentExecutor.h
index 14f7881..db53eb2 100644
--- a/src/uscxml/interpreter/BasicContentExecutor.h
+++ b/src/uscxml/interpreter/BasicContentExecutor.h
@@ -35,7 +35,7 @@ public:
 	BasicContentExecutor(ContentExecutorCallbacks* callbacks) : ContentExecutorImpl(callbacks) {}
 	virtual ~BasicContentExecutor() {}
 
-    virtual std::shared_ptr<ContentExecutorImpl> create(ContentExecutorCallbacks* callbacks);
+	virtual std::shared_ptr<ContentExecutorImpl> create(ContentExecutorCallbacks* callbacks);
 
 	void processRaise(XERCESC_NS::DOMElement* content);
 	void processSend(XERCESC_NS::DOMElement* element);
diff --git a/src/uscxml/interpreter/BasicDelayedEventQueue.cpp b/src/uscxml/interpreter/BasicDelayedEventQueue.cpp
index 3ad9ebd..5081e05 100644
--- a/src/uscxml/interpreter/BasicDelayedEventQueue.cpp
+++ b/src/uscxml/interpreter/BasicDelayedEventQueue.cpp
@@ -64,7 +64,7 @@ BasicDelayedEventQueue::~BasicDelayedEventQueue() {
 }
 
 std::shared_ptr<DelayedEventQueueImpl> BasicDelayedEventQueue::create(DelayedEventQueueCallbacks* callbacks) {
-    return std::shared_ptr<DelayedEventQueueImpl>(new BasicDelayedEventQueue(callbacks));
+	return std::shared_ptr<DelayedEventQueueImpl>(new BasicDelayedEventQueue(callbacks));
 }
 
 void BasicDelayedEventQueue::timerCallback(evutil_socket_t fd, short what, void *arg) {
@@ -93,6 +93,8 @@ void BasicDelayedEventQueue::enqueueDelayed(const Event& event, size_t delayMs,
 	struct event* e = event_new(_eventLoop, -1, 0, timerCallback, &_callbackData[eventUUID]);
 
 	_callbackData[eventUUID].event = e;
+	gettimeofday(&(_callbackData[eventUUID].added), NULL);
+	timeradd(&delay, &_callbackData[eventUUID].added, &_callbackData[eventUUID].due);
 
 	event_add(e, &delay);
 }
diff --git a/src/uscxml/interpreter/BasicDelayedEventQueue.h b/src/uscxml/interpreter/BasicDelayedEventQueue.h
index 8666e9c..df5b13f 100644
--- a/src/uscxml/interpreter/BasicDelayedEventQueue.h
+++ b/src/uscxml/interpreter/BasicDelayedEventQueue.h
@@ -40,7 +40,7 @@ class USCXML_API BasicDelayedEventQueue : public BasicEventQueue, public Delayed
 public:
 	BasicDelayedEventQueue(DelayedEventQueueCallbacks* callbacks);
 	virtual ~BasicDelayedEventQueue();
-    virtual std::shared_ptr<DelayedEventQueueImpl> create(DelayedEventQueueCallbacks* callbacks);
+	virtual std::shared_ptr<DelayedEventQueueImpl> create(DelayedEventQueueCallbacks* callbacks);
 	virtual void enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID);
 	virtual void cancelDelayed(const std::string& eventId);
 	virtual void cancelAllDelayed();
@@ -53,10 +53,10 @@ public:
 	virtual void reset();
 
 protected:
-    virtual std::shared_ptr<EventQueueImpl> create() {
-        ErrorEvent e("Cannot create a DelayedEventQueue without callbacks");
-        throw e;
-    }
+	virtual std::shared_ptr<EventQueueImpl> create() {
+		ErrorEvent e("Cannot create a DelayedEventQueue without callbacks");
+		throw e;
+	}
 
 	struct callbackData {
 		Event userData;
@@ -64,6 +64,8 @@ protected:
 		bool persist;
 		struct event *event;
 		BasicDelayedEventQueue* eventQueue;
+		timeval added;
+		timeval due;
 	};
 
 	bool _isStarted;
diff --git a/src/uscxml/interpreter/BasicEventQueue.cpp b/src/uscxml/interpreter/BasicEventQueue.cpp
index 3b51117..104c9fa 100644
--- a/src/uscxml/interpreter/BasicEventQueue.cpp
+++ b/src/uscxml/interpreter/BasicEventQueue.cpp
@@ -22,6 +22,8 @@
 #include <event2/thread.h>
 #include <assert.h>
 
+//#include <iostream>
+
 #include "uscxml/interpreter/Logging.h"
 
 namespace uscxml {
@@ -36,12 +38,18 @@ Event BasicEventQueue::dequeue(size_t blockMs) {
 
 	if (blockMs > 0) {
 
-		// block for given milliseconds or until queue is filled
+		// block for given milliseconds or until queue is non-empty
 		auto endTime = std::chrono::system_clock::now() + std::chrono::milliseconds(blockMs);
+//        std::time_t ttp = std::chrono::system_clock::to_time_t(endTime);
+//        std::cout << "End: " << ttp << std::endl;
+//        std::cout << "Now: " << std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) << std::endl;
 
-		while (_queue.empty()) {
+		while (endTime > std::chrono::system_clock::now() && _queue.empty()) {
 			_cond.wait_until(_mutex, endTime);
+//            std::cout << "Aft: " << std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()) << std::endl;
+//            std::cout << blockMs << ".";
 		}
+
 	}
 
 	if (_queue.size() > 0) {
@@ -66,7 +74,7 @@ void BasicEventQueue::reset() {
 }
 
 std::shared_ptr<EventQueueImpl> BasicEventQueue::create() {
-    return std::shared_ptr<EventQueueImpl>(new BasicEventQueue());
+	return std::shared_ptr<EventQueueImpl>(new BasicEventQueue());
 }
 
 }
diff --git a/src/uscxml/interpreter/BasicEventQueue.h b/src/uscxml/interpreter/BasicEventQueue.h
index f9b6965..927b9c4 100644
--- a/src/uscxml/interpreter/BasicEventQueue.h
+++ b/src/uscxml/interpreter/BasicEventQueue.h
@@ -38,7 +38,7 @@ class USCXML_API BasicEventQueue : public EventQueueImpl {
 public:
 	BasicEventQueue();
 	virtual ~BasicEventQueue();
-    virtual std::shared_ptr<EventQueueImpl> create();
+	virtual std::shared_ptr<EventQueueImpl> create();
 	virtual Event dequeue(size_t blockMs);
 	virtual void enqueue(const Event& event);
 	virtual void reset();
diff --git a/src/uscxml/interpreter/ContentExecutor.cpp b/src/uscxml/interpreter/ContentExecutor.cpp
index aa623b6..ca9d877 100644
--- a/src/uscxml/interpreter/ContentExecutor.cpp
+++ b/src/uscxml/interpreter/ContentExecutor.cpp
@@ -44,7 +44,7 @@ void ContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::
 }
 
 std::shared_ptr<ContentExecutorImpl> ContentExecutor::getImpl() const {
-    return _impl;
+	return _impl;
 }
 
 }
diff --git a/src/uscxml/interpreter/ContentExecutor.h b/src/uscxml/interpreter/ContentExecutor.h
index ae8ec64..1559c5c 100644
--- a/src/uscxml/interpreter/ContentExecutor.h
+++ b/src/uscxml/interpreter/ContentExecutor.h
@@ -48,8 +48,8 @@ public:
 	virtual void uninvoke(XERCESC_NS::DOMElement* invoke);
 	virtual Data elementAsData(XERCESC_NS::DOMElement* element);
 	virtual void raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::DOMElement* doneData);
-    virtual std::shared_ptr<ContentExecutorImpl> getImpl() const;
-    
+	virtual std::shared_ptr<ContentExecutorImpl> getImpl() const;
+
 protected:
 	std::shared_ptr<ContentExecutorImpl> _impl;
 };
diff --git a/src/uscxml/interpreter/ContentExecutorImpl.h b/src/uscxml/interpreter/ContentExecutorImpl.h
index c085756..7eaebbc 100644
--- a/src/uscxml/interpreter/ContentExecutorImpl.h
+++ b/src/uscxml/interpreter/ContentExecutorImpl.h
@@ -29,14 +29,14 @@
 #include <set>
 
 namespace XERCESC_NS {
-    class DOMDocument;
-    class DOMNode;
+class DOMDocument;
+class DOMNode;
 }
 
 namespace uscxml {
 
 class X;
-    
+
 /**
  * @ingroup execcontent
  * @ingroup callback
@@ -84,8 +84,8 @@ class USCXML_API ContentExecutorImpl {
 public:
 	ContentExecutorImpl(ContentExecutorCallbacks* callbacks) : _callbacks(callbacks) {}
 
-    virtual std::shared_ptr<ContentExecutorImpl> create(ContentExecutorCallbacks* callbacks) = 0;
-    
+	virtual std::shared_ptr<ContentExecutorImpl> create(ContentExecutorCallbacks* callbacks) = 0;
+
 	virtual void process(XERCESC_NS::DOMElement* block, const X& xmlPrefix) = 0;
 
 	virtual void invoke(XERCESC_NS::DOMElement* invoke) = 0;
diff --git a/src/uscxml/interpreter/EventQueue.cpp b/src/uscxml/interpreter/EventQueue.cpp
index ab199b4..9b345d5 100644
--- a/src/uscxml/interpreter/EventQueue.cpp
+++ b/src/uscxml/interpreter/EventQueue.cpp
@@ -43,11 +43,11 @@ void EventQueue::reset() {
 }
 
 std::shared_ptr<EventQueueImpl> EventQueue::getImplBase() {
-    return _impl;
+	return _impl;
 }
 
-    
-    
+
+
 PIMPL_OPERATORS_INHERIT_IMPL(DelayedEventQueue, EventQueue)
 
 void DelayedEventQueue::enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID) {
@@ -62,7 +62,7 @@ void DelayedEventQueue::cancelAllDelayed() {
 }
 
 std::shared_ptr<DelayedEventQueueImpl> DelayedEventQueue::getImplDelayed() {
-    return _impl;
+	return _impl;
 }
 
 }
diff --git a/src/uscxml/interpreter/EventQueue.h b/src/uscxml/interpreter/EventQueue.h
index 7356b23..5ca1f52 100644
--- a/src/uscxml/interpreter/EventQueue.h
+++ b/src/uscxml/interpreter/EventQueue.h
@@ -39,7 +39,7 @@ public:
 	virtual Event dequeue(size_t blockMs);
 	virtual void enqueue(const Event& event);
 	virtual void reset();
-    virtual std::shared_ptr<EventQueueImpl> getImplBase();
+	virtual std::shared_ptr<EventQueueImpl> getImplBase();
 
 protected:
 	std::shared_ptr<EventQueueImpl> _impl;
@@ -57,8 +57,8 @@ public:
 	void enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID);
 	void cancelDelayed(const std::string& eventUUID);
 	void cancelAllDelayed();
-    virtual std::shared_ptr<DelayedEventQueueImpl> getImplDelayed();
-    
+	virtual std::shared_ptr<DelayedEventQueueImpl> getImplDelayed();
+
 protected:
 	std::shared_ptr<DelayedEventQueueImpl> _impl;
 };
diff --git a/src/uscxml/interpreter/EventQueueImpl.h b/src/uscxml/interpreter/EventQueueImpl.h
index 68c6d7c..2a33a75 100644
--- a/src/uscxml/interpreter/EventQueueImpl.h
+++ b/src/uscxml/interpreter/EventQueueImpl.h
@@ -38,7 +38,7 @@ namespace uscxml {
  */
 class USCXML_API EventQueueImpl {
 public:
-    virtual std::shared_ptr<EventQueueImpl> create() = 0;
+	virtual std::shared_ptr<EventQueueImpl> create() = 0;
 	virtual Event dequeue(size_t blockMs) = 0;
 	virtual void enqueue(const Event& event) = 0;
 	virtual void reset() = 0;
@@ -59,7 +59,7 @@ public:
  */
 class USCXML_API DelayedEventQueueImpl : public EventQueueImpl {
 public:
-    virtual std::shared_ptr<DelayedEventQueueImpl> create(DelayedEventQueueCallbacks*) = 0;
+	virtual std::shared_ptr<DelayedEventQueueImpl> create(DelayedEventQueueCallbacks*) = 0;
 	virtual void enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID) = 0;
 	virtual void cancelDelayed(const std::string& eventId) = 0;
 	virtual void cancelAllDelayed() = 0;
diff --git a/src/uscxml/interpreter/FastMicroStep.cpp b/src/uscxml/interpreter/FastMicroStep.cpp
index 6a5f9a1..ed11fca 100644
--- a/src/uscxml/interpreter/FastMicroStep.cpp
+++ b/src/uscxml/interpreter/FastMicroStep.cpp
@@ -90,7 +90,7 @@ FastMicroStep::~FastMicroStep() {
 }
 
 std::shared_ptr<MicroStepImpl> FastMicroStep::create(MicroStepCallbacks* callbacks) {
-    return std::shared_ptr<MicroStepImpl>(new FastMicroStep(callbacks));
+	return std::shared_ptr<MicroStepImpl>(new FastMicroStep(callbacks));
 }
 
 void FastMicroStep::resortStates(DOMElement* element, const X& xmlPrefix) {
@@ -1162,7 +1162,7 @@ bool FastMicroStep::hasLegalConfiguration() {
 				if (isMember(childs[j], config)) {
 					if (foundChildState) {
 						LOG(USCXML_ERROR) << "Invalid configuration: Multiple childs of compound '" << ATTR_CAST(config[i], "id")
-						           << "' are active '" << ATTR_CAST(foundChildState, "id") << "' and '" << ATTR_CAST(childs[j], "id") << "'";
+						                  << "' are active '" << ATTR_CAST(foundChildState, "id") << "' and '" << ATTR_CAST(childs[j], "id") << "'";
 						return false;
 					}
 					foundChildState = childs[j];
diff --git a/src/uscxml/interpreter/FastMicroStep.h b/src/uscxml/interpreter/FastMicroStep.h
index faf5f45..810b793 100644
--- a/src/uscxml/interpreter/FastMicroStep.h
+++ b/src/uscxml/interpreter/FastMicroStep.h
@@ -43,7 +43,7 @@ class FastMicroStep : public MicroStepImpl {
 public:
 	FastMicroStep(MicroStepCallbacks* callbacks);
 	virtual ~FastMicroStep();
-    virtual std::shared_ptr<MicroStepImpl> create(MicroStepCallbacks* callbacks);
+	virtual std::shared_ptr<MicroStepImpl> create(MicroStepCallbacks* callbacks);
 
 	virtual InterpreterState step(size_t blockMs);
 	virtual void reset();
diff --git a/src/uscxml/interpreter/Logging.cpp b/src/uscxml/interpreter/Logging.cpp
index bdb847a..70c29de 100644
--- a/src/uscxml/interpreter/Logging.cpp
+++ b/src/uscxml/interpreter/Logging.cpp
@@ -28,25 +28,25 @@ namespace uscxml {
 std::shared_ptr<LoggerImpl> LoggerImpl::_defaultLogger;
 
 std::shared_ptr<LoggerImpl> LoggerImpl::getDefault() {
-    if (!_defaultLogger)
-        _defaultLogger = std::shared_ptr<LoggerImpl>(new StdOutLogger());
-    return _defaultLogger;
+	if (!_defaultLogger)
+		_defaultLogger = std::shared_ptr<LoggerImpl>(new StdOutLogger());
+	return _defaultLogger;
 }
 
 Logger Logger::getDefault() {
-    return LoggerImpl::getDefault();
+	return LoggerImpl::getDefault();
 }
-    
+
 void log(LogSeverity severity, const Event& event) {
-    LoggerImpl::getDefault()->log(severity, event);
+	LoggerImpl::getDefault()->log(severity, event);
 }
 
 void log(LogSeverity severity, const Data& data) {
-    LoggerImpl::getDefault()->log(severity, data);
+	LoggerImpl::getDefault()->log(severity, data);
 }
 
 void Logger::log(LogSeverity severity, const Event& event) {
-	_impl->log(severity, event);	
+	_impl->log(severity, event);
 }
 
 void Logger::log(LogSeverity severity, const Data& data) {
@@ -54,15 +54,15 @@ void Logger::log(LogSeverity severity, const Data& data) {
 }
 
 void Logger::log(LogSeverity severity, const std::string& message) {
-    _impl->log(severity, message);
+	_impl->log(severity, message);
 }
 
 StreamLogger Logger::log(LogSeverity severity) {
-    return StreamLogger(severity, _impl);
+	return StreamLogger(severity, _impl);
 }
 
 StreamLogger::~StreamLogger() {
-    _logger->log(_severity, ss.str());
+	_logger->log(_severity, ss.str());
 }
 
 std::shared_ptr<LoggerImpl> Logger::getImpl() const {
@@ -70,30 +70,30 @@ std::shared_ptr<LoggerImpl> Logger::getImpl() const {
 }
 
 std::ostream& StreamLogger::operator<<(const std::string& message) {
-    ss << message; //_logger->log(_severity, event);
-    return ss;
+	ss << message; //_logger->log(_severity, event);
+	return ss;
 }
 
 std::string Logger::severityToString(LogSeverity severity) {
-    switch (severity) {
-    case USCXML_SCXML:
-        return "Interpreter";
-    case USCXML_TRACE:
-        return "Trace";
-    case USCXML_DEBUG:
-        return "Debug";
-    case USCXML_INFO:
-        return "Info";
-    case USCXML_WARN:
-        return "Warning";
-    case USCXML_ERROR:
-        return "Error";
-    case USCXML_FATAL:
-        return "Fatal";
-    default:
-        return "Unknown";
-            
-    }
+	switch (severity) {
+	case USCXML_SCXML:
+		return "Interpreter";
+	case USCXML_TRACE:
+		return "Trace";
+	case USCXML_DEBUG:
+		return "Debug";
+	case USCXML_INFO:
+		return "Info";
+	case USCXML_WARN:
+		return "Warning";
+	case USCXML_ERROR:
+		return "Error";
+	case USCXML_FATAL:
+		return "Fatal";
+	default:
+		return "Unknown";
+
+	}
 }
 
 }
diff --git a/src/uscxml/interpreter/Logging.h b/src/uscxml/interpreter/Logging.h
index 85d28ca..dd59e95 100644
--- a/src/uscxml/interpreter/Logging.h
+++ b/src/uscxml/interpreter/Logging.h
@@ -34,8 +34,8 @@
 namespace uscxml {
 
 enum LogSeverity {
-    USCXML_SCXML,
-    USCXML_TRACE,
+	USCXML_SCXML,
+	USCXML_TRACE,
 	USCXML_DEBUG,
 	USCXML_INFO,
 	USCXML_WARN,
@@ -50,37 +50,37 @@ void log(LogSeverity severity, const Data& data);
 
 class StreamLogger {
 public:
-    std::ostream& operator<<(const std::string& message);
-    ~StreamLogger();
+	std::ostream& operator<<(const std::string& message);
+	~StreamLogger();
 
 protected:
-    StreamLogger(LogSeverity severity, std::shared_ptr<LoggerImpl> logger) : _severity(severity), _logger(logger) {}
-    StreamLogger(const StreamLogger& other) : _severity(other._severity), _logger(other._logger) {}
-    
-    LogSeverity _severity;
-    std::shared_ptr<LoggerImpl> _logger;
-    std::stringstream ss;
-    
-    friend class Logger;
+	StreamLogger(LogSeverity severity, std::shared_ptr<LoggerImpl> logger) : _severity(severity), _logger(logger) {}
+	StreamLogger(const StreamLogger& other) : _severity(other._severity), _logger(other._logger) {}
+
+	LogSeverity _severity;
+	std::shared_ptr<LoggerImpl> _logger;
+	std::stringstream ss;
+
+	friend class Logger;
 };
 
 class USCXML_API Logger {
 public:
-    PIMPL_OPERATORS(Logger);
-    
+	PIMPL_OPERATORS(Logger);
+
 	virtual void log(LogSeverity severity, const Event& event);
-    virtual void log(LogSeverity severity, const Data& data);
-    virtual void log(LogSeverity severity, const std::string& message);
-    
-    virtual StreamLogger log(LogSeverity severity);
-    static std::string severityToString(LogSeverity severity);
-    
-    static Logger getDefault();
-    
+	virtual void log(LogSeverity severity, const Data& data);
+	virtual void log(LogSeverity severity, const std::string& message);
+
+	virtual StreamLogger log(LogSeverity severity);
+	static std::string severityToString(LogSeverity severity);
+
+	static Logger getDefault();
+
 	std::shared_ptr<LoggerImpl> getImpl() const;
 protected:
 	std::shared_ptr<LoggerImpl> _impl;
-	
+
 };
 
 }
diff --git a/src/uscxml/interpreter/LoggingImpl.h b/src/uscxml/interpreter/LoggingImpl.h
index c6003ca..ee17082 100644
--- a/src/uscxml/interpreter/LoggingImpl.h
+++ b/src/uscxml/interpreter/LoggingImpl.h
@@ -40,13 +40,13 @@ public:
 	virtual std::shared_ptr<LoggerImpl> create() = 0;
 
 	virtual void log(LogSeverity severity, const Event& event) = 0;
-    virtual void log(LogSeverity severity, const Data& data) = 0;
-    virtual void log(LogSeverity severity, const std::string& message) = 0;
+	virtual void log(LogSeverity severity, const Data& data) = 0;
+	virtual void log(LogSeverity severity, const std::string& message) = 0;
+
+	static std::shared_ptr<LoggerImpl> getDefault();
 
-    static std::shared_ptr<LoggerImpl> getDefault();
-    
 private:
-    static std::shared_ptr<LoggerImpl> _defaultLogger;
+	static std::shared_ptr<LoggerImpl> _defaultLogger;
 };
 
 }
diff --git a/src/uscxml/interpreter/MicroStep.cpp b/src/uscxml/interpreter/MicroStep.cpp
index 35e5d94..896c92a 100644
--- a/src/uscxml/interpreter/MicroStep.cpp
+++ b/src/uscxml/interpreter/MicroStep.cpp
@@ -45,6 +45,6 @@ void MicroStep::markAsCancelled() {
 }
 
 std::shared_ptr<MicroStepImpl> MicroStep::getImpl() const {
-    return _impl;
+	return _impl;
 }
 }
diff --git a/src/uscxml/interpreter/MicroStep.h b/src/uscxml/interpreter/MicroStep.h
index 9238fc8..56a7ee8 100644
--- a/src/uscxml/interpreter/MicroStep.h
+++ b/src/uscxml/interpreter/MicroStep.h
@@ -55,7 +55,7 @@ public:
 	virtual void init(XERCESC_NS::DOMElement* scxml);
 	virtual void markAsCancelled();
 
-    std::shared_ptr<MicroStepImpl> getImpl() const;
+	std::shared_ptr<MicroStepImpl> getImpl() const;
 protected:
 	std::shared_ptr<MicroStepImpl> _impl;
 };
diff --git a/src/uscxml/interpreter/MicroStepImpl.h b/src/uscxml/interpreter/MicroStepImpl.h
index 110dbd2..cdb98f2 100644
--- a/src/uscxml/interpreter/MicroStepImpl.h
+++ b/src/uscxml/interpreter/MicroStepImpl.h
@@ -73,8 +73,8 @@ public:
 	};
 
 	MicroStepImpl(MicroStepCallbacks* callbacks) : _callbacks(callbacks) {}
-    virtual std::shared_ptr<MicroStepImpl> create(MicroStepCallbacks* callbacks) = 0;
-    
+	virtual std::shared_ptr<MicroStepImpl> create(MicroStepCallbacks* callbacks) = 0;
+
 	virtual InterpreterState step(size_t blockMs) = 0;
 	virtual void reset() = 0; ///< Reset state machine
 	virtual bool isInState(const std::string& stateId) = 0;
diff --git a/src/uscxml/interpreter/StdOutLogger.cpp b/src/uscxml/interpreter/StdOutLogger.cpp
index 1794c1f..2cbe4c7 100644
--- a/src/uscxml/interpreter/StdOutLogger.cpp
+++ b/src/uscxml/interpreter/StdOutLogger.cpp
@@ -27,15 +27,15 @@ std::shared_ptr<LoggerImpl> StdOutLogger::create() {
 }
 
 void StdOutLogger::log(LogSeverity severity, const std::string& message) {
-    std::cout << Logger::severityToString(severity) << ": " << message << std::endl;
+	std::cout << Logger::severityToString(severity) << ": " << message << std::endl;
 }
 
 void StdOutLogger::log(LogSeverity severity, const Event& event) {
-    std::cout << Logger::severityToString(severity) << ": " << event << std::endl;
+	std::cout << Logger::severityToString(severity) << ": " << event << std::endl;
 }
 
 void StdOutLogger::log(LogSeverity severity, const Data& data) {
-    std::cout << Logger::severityToString(severity) << ": " << data << std::endl;
+	std::cout << Logger::severityToString(severity) << ": " << data << std::endl;
 }
 
 }