From c73464b39fadd2a3833d2e81a4beb623567c53e2 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 25 Dec 2015 22:54:25 -0500
Subject: [PATCH] Grammar: Converted from std::set to std::vector to preserve
 ordering

---
 src/Grammar.cpp | 12 ++++++------
 src/Grammar.h   |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Grammar.cpp b/src/Grammar.cpp
index a1d8b145..cf0e4320 100644
--- a/src/Grammar.cpp
+++ b/src/Grammar.cpp
@@ -144,24 +144,24 @@ std::string Grammar::start () const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::set <std::string> Grammar::rules () const
+std::vector <std::string> Grammar::rules () const
 {
-  std::set <std::string> results;
+  std::vector <std::string> results;
   for (auto& rule : _rules)
-    results.insert (rule.first);
+    results.push_back (rule.first);
 
   return results;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-std::set <std::string> Grammar::terminals () const
+std::vector <std::string> Grammar::terminals () const
 {
-  std::set <std::string> results;
+  std::vector <std::string> results;
   for (auto& rule : _rules)
     for (auto& production : rule.second)
       for (auto& token : production)
         if (_rules.find (token._token) == _rules.end ())
-          results.insert (token._token);
+          results.push_back (token._token);
 
   return results;
 }
diff --git a/src/Grammar.h b/src/Grammar.h
index cf0d1aaa..2dd789b6 100644
--- a/src/Grammar.h
+++ b/src/Grammar.h
@@ -29,7 +29,6 @@
 
 #include <FS.h>
 #include <string>
-#include <set>
 #include <vector>
 #include <map>
 
@@ -40,8 +39,8 @@ public:
   void loadFromFile (File&);
   void loadFromString (const std::string&);
   std::string start () const;
-  std::set <std::string> rules () const;
-  std::set <std::string> terminals () const;
+  std::vector <std::string> rules () const;
+  std::vector <std::string> terminals () const;
   std::string dump () const;
 
 protected: