From 1d6e1df13b1b27bcf7144e03137b9a4f6acbcdcd Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 1 Apr 2016 20:45:40 +0200
Subject: Store spaces alongside tokens instead of as separate nodes

---
 src/line_accumulator.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/line_accumulator.h')

diff --git a/src/line_accumulator.h b/src/line_accumulator.h
index ea813a9..b3e78de 100644
--- a/src/line_accumulator.h
+++ b/src/line_accumulator.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <tuple>
 #include <string>
 #include <vector>
 
@@ -15,16 +16,12 @@ class LineAccumulator {
 	private:
 		const std::size_t max_length_;
 
-		utility::Random          random_;
-		std::size_t              length_;
-		std::vector<std::string> tokens_;
-		std::vector<std::size_t> spaces_;
+		utility::Random random_;
+		std::size_t     length_;
 
-		void add_token(const std::string& token);
-		void add_space();
-
-		void increase_space_at(const std::size_t index);
-		void pop_trailing_token();
+		std::vector<
+			std::pair<std::string, std::uint8_t>
+		> tokens_;
 
 		void discharge(const bool full);
 
-- 
cgit v1.2.3