sassc 0.0.1

data/ext/libsass/test/test_superselector.cpp

@@ -0,0 +1,71 @@
+#include "../ast.hpp"
+#include "../context.hpp"
+#include "../parser.hpp"
+#include "../to_string.hpp"
+#include <string>
+
+using namespace Sass;
+
+Context ctx = Context(Context::Data());
+To_String to_string;
+
+Compound_Selector* compound_selector(string src)
+{ return Parser::from_c_str(src.c_str(), ctx, "", Position()).parse_simple_selector_sequence(); }
+
+Complex_Selector* complex_selector(string src)
+{ return Parser::from_c_str(src.c_str(), ctx, "", Position()).parse_selector_combination(); }
+
+void check_compound(string s1, string s2)
+{
+  cout << "Is "
+       << s1
+       << " a superselector of "
+       << s2
+       << "?\t"
+       << compound_selector(s1 + ";")->is_superselector_of(compound_selector(s2 + ";"))
+       << endl;
+}
+
+void check_complex(string s1, string s2)
+{
+  cout << "Is "
+       << s1
+       << " a superselector of "
+       << s2
+       << "?\t"
+       << complex_selector(s1 + ";")->is_superselector_of(complex_selector(s2 + ";"))
+       << endl;
+}
+
+int main()
+{
+  check_compound(".foo", ".foo.bar");
+  check_compound(".foo.bar", ".foo");
+  check_compound(".foo.bar", "div.foo");
+  check_compound(".foo", "div.foo");
+  check_compound("div.foo", ".foo");
+  check_compound("div.foo", "div.bar.foo");
+  check_compound("p.foo", "div.bar.foo");
+  check_compound(".hux", ".mumble");
+
+  cout << endl;
+
+  check_complex(".foo ~ .bar", ".foo + .bar");
+  check_complex(".foo .bar", ".foo + .bar");
+  check_complex(".foo .bar", ".foo > .bar");
+  check_complex(".foo .bar > .hux", ".foo.a .bar.b > .hux");
+  check_complex(".foo ~ .bar .hux", ".foo.a + .bar.b > .hux");
+  check_complex(".foo", ".bar .foo");
+  check_complex(".foo", ".foo.a");
+  check_complex(".foo.bar", ".foo");
+  check_complex(".foo .bar .hux", ".bar .hux");
+  check_complex(".foo ~ .bar .hux.x", ".foo.a + .bar.b > .hux.y");
+  check_complex(".foo ~ .bar .hux", ".foo.a + .bar.b > .mumble");
+  check_complex(".foo + .bar", ".foo ~ .bar");
+  check_complex("a c e", "a b c d e");
+  check_complex("c a e", "a b c d e");
+
+  return 0;
+}
+
+

data/ext/libsass/test/test_unification.cpp

@@ -0,0 +1,33 @@
+#include "../ast.hpp"
+#include "../context.hpp"
+#include "../parser.hpp"
+#include "../to_string.hpp"
+#include <string>
+
+using namespace Sass;
+
+Context ctx = Context(Context::Data());
+To_String to_string;
+
+Compound_Selector* selector(string src)
+{ return Parser::from_c_str(src.c_str(), ctx, "", Position()).parse_simple_selector_sequence(); }
+
+void unify(string lhs, string rhs)
+{
+  Compound_Selector* unified = selector(lhs + ";")->unify_with(selector(rhs + ";"), ctx);
+  cout << lhs << " UNIFIED WITH " << rhs << " =\t" << (unified ? unified->perform(&to_string) : "NOTHING") << endl;
+}
+
+int main()
+{
+  unify(".foo", ".foo.bar");
+  unify("div:nth-of-type(odd)", "div:first-child");
+  unify("div", "span:whatever");
+  unify("div", "span");
+  unify("foo:bar::after", "foo:bar::first-letter");
+  unify(".foo#bar.hux", ".hux.foo#bar");
+  unify(".foo#bar.hux", ".hux.foo#baz");
+  unify("*:blah:fudge", "p:fudge:blah");
+
+  return 0;
+}

data/ext/libsass/to_c.cpp

@@ -0,0 +1,61 @@
+#include "to_c.hpp"
+#include "ast.hpp"
+
+#include "sass_values.h"
+
+namespace Sass {
+  using namespace std;
+
+  Sass_Value* To_C::fallback_impl(AST_Node* n)
+  { return sass_make_null(); }
+
+  Sass_Value* To_C::operator()(Boolean* b)
+  { return sass_make_boolean(b->value()); }
+
+  Sass_Value* To_C::operator()(Number* n)
+  { return sass_make_number(n->value(), n->unit().c_str()); }
+
+  Sass_Value* To_C::operator()(Color* c)
+  { return sass_make_color(c->r(), c->g(), c->b(), c->a()); }
+
+  Sass_Value* To_C::operator()(String_Constant* s)
+  { return sass_make_string(s->value().c_str()); }
+
+  Sass_Value* To_C::operator()(List* l)
+  {
+    Sass_Value* v = sass_make_list(l->length(), l->separator() == List::COMMA ? SASS_COMMA : SASS_SPACE);
+    for (size_t i = 0, L = l->length(); i < L; ++i) {
+      sass_list_set_value(v, i, (*l)[i]->perform(this));
+    }
+    return v;
+  }
+
+  Sass_Value* To_C::operator()(Map* m)
+  {
+    Sass_Value* v = sass_make_map(m->length());
+    int i = 0;
+    for (auto key : m->keys()) {
+      sass_map_set_key(v, i, key->perform(this));
+      sass_map_set_value(v, i, m->at(key)->perform(this));
+      i++;
+    }
+    return v;
+  }
+
+  Sass_Value* To_C::operator()(Arguments* a)
+  {
+    Sass_Value* v = sass_make_list(a->length(), SASS_COMMA);
+    for (size_t i = 0, L = a->length(); i < L; ++i) {
+      sass_list_set_value(v, i, (*a)[i]->perform(this));
+    }
+    return v;
+  }
+
+  Sass_Value* To_C::operator()(Argument* a)
+  { return a->value()->perform(this); }
+
+  // not strictly necessary because of the fallback
+  Sass_Value* To_C::operator()(Null* n)
+  { return sass_make_null(); }
+
+};

data/ext/libsass/to_c.hpp

@@ -0,0 +1,44 @@
+#define SASS_TO_C
+
+#ifndef SASS_OPERATION
+#include "operation.hpp"
+#endif
+
+#include "sass_values.h"
+
+namespace Sass {
+  using namespace std;
+
+  class AST_Node;
+  class Boolean;
+  class Number;
+  class String_Constant;
+  class List;
+  class Map;
+  class Null;
+
+  class To_C : public Operation_CRTP<Sass_Value*, To_C> {
+
+    Sass_Value* fallback_impl(AST_Node* n);
+
+  public:
+
+    To_C() { }
+    virtual ~To_C() { }
+    using Operation<Sass_Value*>::operator();
+
+    Sass_Value* operator()(Boolean*);
+    Sass_Value* operator()(Number*);
+    Sass_Value* operator()(Color*);
+    Sass_Value* operator()(String_Constant*);
+    Sass_Value* operator()(List*);
+    Sass_Value* operator()(Map*);
+    Sass_Value* operator()(Null*);
+    Sass_Value* operator()(Arguments*);
+    Sass_Value* operator()(Argument*);
+
+    template <typename U>
+    Sass_Value* fallback(U x) { return fallback_impl(x); }
+  };
+
+}

data/ext/libsass/to_string.cpp

@@ -0,0 +1,29 @@
+#include <cmath>
+#include <sstream>
+#include <iomanip>
+
+#ifndef SASS_TO_STRING
+#include "to_string.hpp"
+#endif
+
+#include "inspect.hpp"
+#include "ast.hpp"
+#include "context.hpp"
+#include <iostream>
+
+namespace Sass {
+  using namespace std;
+
+  To_String::To_String(Context* ctx) : ctx(ctx) { }
+  To_String::~To_String() { }
+
+  inline string To_String::fallback_impl(AST_Node* n)
+  {
+    Inspect i(ctx);
+    n->perform(&i);
+    return i.get_buffer();
+  }
+
+  inline string To_String::operator()(Null* n)
+  { return ""; }
+}

data/ext/libsass/to_string.hpp

@@ -0,0 +1,32 @@
+#define SASS_TO_STRING
+
+#include <string>
+
+#ifndef SASS_OPERATION
+#include "operation.hpp"
+#endif
+
+namespace Sass {
+  using namespace std;
+
+  struct Context;
+  class Null;
+
+  class To_String : public Operation_CRTP<string, To_String> {
+    // import all the class-specific methods and override as desired
+    using Operation<string>::operator();
+    // override this to define a catch-all
+    string fallback_impl(AST_Node* n);
+
+    Context* ctx;
+
+  public:
+    To_String(Context* ctx = 0);
+    virtual ~To_String();
+
+    string operator()(Null* n);
+
+    template <typename U>
+    string fallback(U n) { return fallback_impl(n); }
+  };
+}

data/ext/libsass/token.hpp

@@ -0,0 +1,32 @@
+#define SASS_TOKEN
+
+#include <cstring>
+#include <string>
+#include <sstream>
+
+namespace Sass {
+  using namespace std;
+
+  // Token type for representing lexed chunks of text
+  struct Token {
+
+    const char* begin;
+    const char* end;
+
+    Token()                             : begin(0), end(0)             { }
+    Token(const char* s)                : begin(s), end(s + strlen(s)) { }
+    Token(const char* b, const char* e) : begin(b), end(e)             { }
+
+    size_t length()    const { return end - begin; }
+    string to_string() const { return string(begin, end - begin); }
+
+    string unquote() const;
+    void   unquote_to_stream(stringstream& buf) const;
+
+    operator bool()   { return begin && end && begin >= end; }
+    operator string() { return to_string(); }
+
+    bool operator==(Token t)  { return to_string() == t.to_string(); }
+  };
+
+}

data/ext/libsass/units.cpp

@@ -0,0 +1,54 @@
+#include "units.hpp"
+
+#define PI 3.14159265358979323846
+
+namespace Sass {
+
+  double conversion_factors[10][10] = {
+             /*  in         cm         pc         mm         pt         px                 deg        grad       rad        turn      */
+    /* in   */ { 1,         2.54,      6,         25.4,      72,        96,                1,         1,         1,         1         },
+    /* cm   */ { 1.0/2.54,  1,         6.0/2.54,  10,        72.0/2.54, 96.0/2.54,         1,         1,         1,         1         },
+    /* pc   */ { 1.0/6.0,   2.54/6.0,  1,         25.4/6.0,  72.0/6.0,  96.0/6.0,          1,         1,         1,         1         },
+    /* mm   */ { 1.0/25.4,  1.0/10.0,  6.0/25.4,  1,         72.0/25.4, 96.0/25.4,         1,         1,         1,         1         },
+    /* pt   */ { 1.0/72.0,  2.54/72.0, 6.0/72.0,  25.4/72.0, 1,         96.0/72.0,         1,         1,         1,         1         },
+    /* px   */ { 1.0/96.0,  2.54/96.0, 6.0/96.0,  25.4/96.0, 72.0/96.0, 1,                 1,         1,         1,         1         },
+    /* deg  */ { 1       ,  1        , 1       ,  1        , 1        , 1,                 1,         40.0/36.0, PI/180.0,  1.0/360.0 },
+    /* grad */ { 1       ,  1        , 1       ,  1        , 1        , 1,                 36.0/40.0, 1,         PI/200.0,  1.0/400.0 },
+    /* rad  */ { 1       ,  1        , 1       ,  1        , 1        , 1,                 180.0/PI,  200.0/PI,  1,         PI/2.0    },
+    /* turn */ { 1       ,  1        , 1       ,  1        , 1        , 1,                 360.0/1.0, 400.0/1.0, 2.0*PI,    1         }
+  };
+
+  Unit string_to_unit(const string& s)
+  {
+    if      (s == "in") return IN;
+    else if (s == "cm") return CM;
+    else if (s == "pc") return PC;
+    else if (s == "mm") return MM;
+    else if (s == "pt") return PT;
+    else if (s == "px") return PX;
+    else if (s == "deg") return DEG;
+    else if (s == "grad") return GRAD;
+    else if (s == "rad") return RAD;
+    else if (s == "turn") return TURN;
+    else                return INCOMMENSURABLE;
+  }
+
+  double conversion_factor(const string& s1, const string& s2)
+  {
+    Unit u1 = string_to_unit(s1);
+    Unit u2 = string_to_unit(s2);
+    double factor;
+    if (u1 == INCOMMENSURABLE || u2 == INCOMMENSURABLE)
+      factor = 0;
+    else
+      factor = conversion_factors[u1][u2];
+    return factor;
+  }
+
+  double convert(double n, const string& from, const string& to)
+  {
+    double factor = conversion_factor(from, to);
+    return factor ? factor * n : n;
+  }
+
+}

data/ext/libsass/units.hpp

@@ -0,0 +1,10 @@
+#include <string>
+
+namespace Sass {
+  using namespace std;
+  enum Unit { IN, CM, PC, MM, PT, PX, DEG, GRAD, RAD, TURN, INCOMMENSURABLE };
+  extern double conversion_factors[10][10];
+  Unit string_to_unit(const string&);
+  double conversion_factor(const string&, const string&);
+  double convert(double, const string&, const string&);
+}

data/ext/libsass/utf8.h

@@ -0,0 +1,34 @@
+// Copyright 2006 Nemanja Trifunovic
+
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "utf8/checked.h"
+#include "utf8/unchecked.h"
+
+#endif // header guard

data/ext/libsass/utf8/checked.h

@@ -0,0 +1,327 @@
+// Copyright 2006 Nemanja Trifunovic
+
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include "core.h"
+#include <stdexcept>
+
+namespace utf8
+{
+    // Base for the exceptions that may be thrown from the library
+    class exception : public ::std::exception {
+    };
+
+    // Exceptions that may be thrown from the library functions.
+    class invalid_code_point : public exception {
+        uint32_t cp;
+    public:
+        invalid_code_point(uint32_t cp) : cp(cp) {}
+        virtual const char* what() const throw() { return "Invalid code point"; }
+        uint32_t code_point() const {return cp;}
+    };
+
+    class invalid_utf8 : public exception {
+        uint8_t u8;
+    public:
+        invalid_utf8 (uint8_t u) : u8(u) {}
+        virtual const char* what() const throw() { return "Invalid UTF-8"; }
+        uint8_t utf8_octet() const {return u8;}
+    };
+
+    class invalid_utf16 : public exception {
+        uint16_t u16;
+    public:
+        invalid_utf16 (uint16_t u) : u16(u) {}
+        virtual const char* what() const throw() { return "Invalid UTF-16"; }
+        uint16_t utf16_word() const {return u16;}
+    };
+
+    class not_enough_room : public exception {
+    public:
+        virtual const char* what() const throw() { return "Not enough space"; }
+    };
+
+    /// The library API - functions intended to be called by the users
+
+    template <typename octet_iterator>
+    octet_iterator append(uint32_t cp, octet_iterator result)
+    {
+        if (!utf8::internal::is_code_point_valid(cp))
+            throw invalid_code_point(cp);
+
+        if (cp < 0x80)                        // one octet
+            *(result++) = static_cast<uint8_t>(cp);
+        else if (cp < 0x800) {                // two octets
+            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        else if (cp < 0x10000) {              // three octets
+            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
+            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        else {                                // four octets
+            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
+            *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)  | 0x80);
+            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
+            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
+        return result;
+    }
+
+    template <typename octet_iterator, typename output_iterator>
+    output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
+    {
+        while (start != end) {
+            octet_iterator sequence_start = start;
+            internal::utf_error err_code = utf8::internal::validate_next(start, end);
+            switch (err_code) {
+                case internal::UTF8_OK :
+                    for (octet_iterator it = sequence_start; it != start; ++it)
+                        *out++ = *it;
+                    break;
+                case internal::NOT_ENOUGH_ROOM:
+                    throw not_enough_room();
+                case internal::INVALID_LEAD:
+                    out = utf8::append (replacement, out);
+                    ++start;
+                    break;
+                case internal::INCOMPLETE_SEQUENCE:
+                case internal::OVERLONG_SEQUENCE:
+                case internal::INVALID_CODE_POINT:
+                    out = utf8::append (replacement, out);
+                    ++start;
+                    // just one replacement mark for the sequence
+                    while (start != end && utf8::internal::is_trail(*start))
+                        ++start;
+                    break;
+            }
+        }
+        return out;
+    }
+
+    template <typename octet_iterator, typename output_iterator>
+    inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
+    {
+        static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
+        return utf8::replace_invalid(start, end, out, replacement_marker);
+    }
+
+    template <typename octet_iterator>
+    uint32_t next(octet_iterator& it, octet_iterator end)
+    {
+        uint32_t cp = 0;
+        internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
+        switch (err_code) {
+            case internal::UTF8_OK :
+                break;
+            case internal::NOT_ENOUGH_ROOM :
+                throw not_enough_room();
+            case internal::INVALID_LEAD :
+            case internal::INCOMPLETE_SEQUENCE :
+            case internal::OVERLONG_SEQUENCE :
+                throw invalid_utf8(*it);
+            case internal::INVALID_CODE_POINT :
+                throw invalid_code_point(cp);
+        }
+        return cp;
+    }
+
+    template <typename octet_iterator>
+    uint32_t peek_next(octet_iterator it, octet_iterator end)
+    {
+        return utf8::next(it, end);
+    }
+
+    template <typename octet_iterator>
+    uint32_t prior(octet_iterator& it, octet_iterator start)
+    {
+        // can't do much if it == start
+        if (it == start)
+            throw not_enough_room();
+
+        octet_iterator end = it;
+        // Go back until we hit either a lead octet or start
+        while (utf8::internal::is_trail(*(--it)))
+            if (it == start)
+                throw invalid_utf8(*it); // error - no lead byte in the sequence
+        return utf8::peek_next(it, end);
+    }
+
+    /// Deprecated in versions that include "prior"
+    template <typename octet_iterator>
+    uint32_t previous(octet_iterator& it, octet_iterator pass_start)
+    {
+        octet_iterator end = it;
+        while (utf8::internal::is_trail(*(--it)))
+            if (it == pass_start)
+                throw invalid_utf8(*it); // error - no lead byte in the sequence
+        octet_iterator temp = it;
+        return utf8::next(temp, end);
+    }
+
+    template <typename octet_iterator, typename distance_type>
+    void advance (octet_iterator& it, distance_type n, octet_iterator end)
+    {
+        for (distance_type i = 0; i < n; ++i)
+            utf8::next(it, end);
+    }
+
+    template <typename octet_iterator>
+    typename std::iterator_traits<octet_iterator>::difference_type
+    distance (octet_iterator first, octet_iterator last)
+    {
+        typename std::iterator_traits<octet_iterator>::difference_type dist;
+        for (dist = 0; first < last; ++dist)
+            utf8::next(first, last);
+        return dist;
+    }
+
+    template <typename u16bit_iterator, typename octet_iterator>
+    octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
+    {
+        while (start != end) {
+            uint32_t cp = utf8::internal::mask16(*start++);
+            // Take care of surrogate pairs first
+            if (utf8::internal::is_lead_surrogate(cp)) {
+                if (start != end) {
+                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
+                    if (utf8::internal::is_trail_surrogate(trail_surrogate))
+                        cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
+                    else
+                        throw invalid_utf16(static_cast<uint16_t>(trail_surrogate));
+                }
+                else
+                    throw invalid_utf16(static_cast<uint16_t>(cp));
+
+            }
+            // Lone trail surrogate
+            else if (utf8::internal::is_trail_surrogate(cp))
+                throw invalid_utf16(static_cast<uint16_t>(cp));
+
+            result = utf8::append(cp, result);
+        }
+        return result;
+    }
+
+    template <typename u16bit_iterator, typename octet_iterator>
+    u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
+    {
+        while (start != end) {
+            uint32_t cp = utf8::next(start, end);
+            if (cp > 0xffff) { //make a surrogate pair
+                *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
+                *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
+            }
+            else
+                *result++ = static_cast<uint16_t>(cp);
+        }
+        return result;
+    }
+
+    template <typename octet_iterator, typename u32bit_iterator>
+    octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
+    {
+        while (start != end)
+            result = utf8::append(*(start++), result);
+
+        return result;
+    }
+
+    template <typename octet_iterator, typename u32bit_iterator>
+    u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
+    {
+        while (start != end)
+            (*result++) = utf8::next(start, end);
+
+        return result;
+    }
+
+    // The iterator class
+    template <typename octet_iterator>
+    class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+      octet_iterator it;
+      octet_iterator range_start;
+      octet_iterator range_end;
+      public:
+      iterator () {}
+      explicit iterator (const octet_iterator& octet_it,
+                         const octet_iterator& range_start,
+                         const octet_iterator& range_end) :
+               it(octet_it), range_start(range_start), range_end(range_end)
+      {
+          if (it < range_start || it > range_end)
+              throw std::out_of_range("Invalid utf-8 iterator position");
+      }
+      // the default "big three" are OK
+      octet_iterator base () const { return it; }
+      uint32_t operator * () const
+      {
+          octet_iterator temp = it;
+          return utf8::next(temp, range_end);
+      }
+      bool operator == (const iterator& rhs) const
+      {
+          if (range_start != rhs.range_start || range_end != rhs.range_end)
+              throw std::logic_error("Comparing utf-8 iterators defined with different ranges");
+          return (it == rhs.it);
+      }
+      bool operator != (const iterator& rhs) const
+      {
+          return !(operator == (rhs));
+      }
+      iterator& operator ++ ()
+      {
+          utf8::next(it, range_end);
+          return *this;
+      }
+      iterator operator ++ (int)
+      {
+          iterator temp = *this;
+          utf8::next(it, range_end);
+          return temp;
+      }
+      iterator& operator -- ()
+      {
+          utf8::prior(it, range_start);
+          return *this;
+      }
+      iterator operator -- (int)
+      {
+          iterator temp = *this;
+          utf8::prior(it, range_start);
+          return temp;
+      }
+    }; // class iterator
+
+} // namespace utf8
+
+#endif //header guard
+
+