Fix patterns of kind [aab]; rnd.next(char*, ...)

thepluck · Mar 21, 2017 · 7a922cf · 7a922cf
1 parent fbd2fd3
commit 7a922cf
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/common.h b/common.h
@@ -24,15 +24,15 @@ while (false)
 namespace jngen {
 
 template<typename ... Args>
-std::string format(const std::string& format, Args... args) {
+std::string format(const std::string& fmt, Args... args) {
     constexpr static char BUF_SIZE = 64;
     static char BUFFER[BUF_SIZE];
 
     int bufSize = BUF_SIZE;
     char *buf = BUFFER;
 
     while (true) {
-        int ret = snprintf(buf, bufSize, format.c_str(), args...);
+        int ret = snprintf(buf, bufSize, fmt.c_str(), args...);
         if (ret < bufSize) {
             break;
         }

diff --git a/jngen.h b/jngen.h
@@ -23,15 +23,15 @@ while (false)
 namespace jngen {
 
 template<typename ... Args>
-std::string format(const std::string& format, Args... args) {
+std::string format(const std::string& fmt, Args... args) {
     constexpr static char BUF_SIZE = 64;
     static char BUFFER[BUF_SIZE];
 
     int bufSize = BUF_SIZE;
     char *buf = BUFFER;
 
     while (true) {
-        int ret = snprintf(buf, bufSize, format.c_str(), args...);
+        int ret = snprintf(buf, bufSize, fmt.c_str(), args...);
         if (ret < bufSize) {
             break;
         }
@@ -165,6 +165,7 @@ void getopts(int argc, char *argv[], Args& ...args) {
 using jngen::getopts;
 
 
+#include <algorithm>
 #include <cctype>
 #include <functional>
 #include <set>
@@ -298,7 +299,7 @@ class Parser {
     }
 
     std::vector<char> parseBlock() {
-        std::set<char> allowed;
+        std::vector<char> allowed;
         char last = -1;
         bool inRange = false;
         while (control(peek()) != ']') {
@@ -311,13 +312,13 @@ class Parser {
             } else if (inRange) {
                 ensure(c >= last);
                 for (char i = last; i <= c; ++i) {
-                    allowed.insert(i);
+                    allowed.push_back(i);
                 }
                 inRange = false;
                 last = -1;
             } else {
                 if (last != -1) {
-                    allowed.insert(last);
+                    allowed.push_back(last);
                 }
                 last = c;
             }
@@ -327,10 +328,11 @@ class Parser {
 
         ensure(!inRange);
         if (last != -1) {
-            allowed.insert(last);
+            allowed.push_back(last);
         }
 
-        return std::vector<char>(allowed.begin(), allowed.end());
+        std::sort(allowed.begin(), allowed.end());
+        return allowed;
     }
 
     Pattern parsePattern() {
@@ -546,6 +548,11 @@ class Random {
         return Pattern(pattern).next([this](int n) { return next(n); });
     }
 
+    template<typename ... Args>
+    std::string next(const std::string& pattern, Args... args) {
+        return next(format(pattern, args...));
+    }
+
     template<typename T, typename ... Args>
     T tnext(Args... args) {
         return TypedRandom<T>{*this}.next(args...);
@@ -653,7 +660,6 @@ struct TypedRandom : public BaseTypedRandom {
     T next(Args... args) { return random.next(args...); }
 };
 
-
 struct OrderedPairTag {} opair;
 
 template<>

diff --git a/pattern.h b/pattern.h
@@ -2,6 +2,7 @@
 
 #include "common.h"
 
+#include <algorithm>
 #include <cctype>
 #include <functional>
 #include <set>
@@ -135,7 +136,7 @@ class Parser {
     }
 
     std::vector<char> parseBlock() {
-        std::set<char> allowed;
+        std::vector<char> allowed;
         char last = -1;
         bool inRange = false;
         while (control(peek()) != ']') {
@@ -148,13 +149,13 @@ class Parser {
             } else if (inRange) {
                 ensure(c >= last);
                 for (char i = last; i <= c; ++i) {
-                    allowed.insert(i);
+                    allowed.push_back(i);
                 }
                 inRange = false;
                 last = -1;
             } else {
                 if (last != -1) {
-                    allowed.insert(last);
+                    allowed.push_back(last);
                 }
                 last = c;
             }
@@ -164,10 +165,11 @@ class Parser {
 
         ensure(!inRange);
         if (last != -1) {
-            allowed.insert(last);
+            allowed.push_back(last);
         }
 
-        return std::vector<char>(allowed.begin(), allowed.end());
+        std::sort(allowed.begin(), allowed.end());
+        return allowed;
     }
 
     Pattern parsePattern() {

diff --git a/random.h b/random.h
@@ -134,6 +134,11 @@ class Random {
         return Pattern(pattern).next([this](int n) { return next(n); });
     }
 
+    template<typename ... Args>
+    std::string next(const std::string& pattern, Args... args) {
+        return next(format(pattern, args...));
+    }
+
     template<typename T, typename ... Args>
     T tnext(Args... args) {
         return TypedRandom<T>{*this}.next(args...);
@@ -241,7 +246,6 @@ struct TypedRandom : public BaseTypedRandom {
     T next(Args... args) { return random.next(args...); }
 };
 
-
 struct OrderedPairTag {} opair;
 
 template<>