Move tokeniser into lop

2 files changed, 9 insertions, 39 deletions

diff --git a/lib/style-reader.js b/lib/style-reader.js
index 1da03ba..7ed4132 100644
--- a/lib/style-reader.js
+++ b/lib/style-reader.js
@@ -1,5 +1,5 @@
 var lop = require("lop");
-var StringSource = lop.StringSource;
+var RegexTokeniser = lop.RegexTokeniser;
 
 var styles = require("./styles");
 
@@ -65,41 +65,11 @@ function describeFailure(parseResult) {
 }
 
 function tokenise(string) {
-    var source = new StringSource(string, "raw string");
-    var index = 0;
-    var tokens = [];
-    
-    while (index < string.length) {
-        var nextToken = readNextToken(string, index, source);
-        if (!nextToken) {
-            throw new Error("Could not read token from: " + string.substring(index));
-        }
-        index += nextToken.value.length;
-        tokens.push(nextToken);
-    }
-    tokens.push(new lop.Token("end", null, source.range(string.length, string.length)));
-    return tokens;
-}
-
-function readNextToken(string, startIndex, source) {
-    for (var i = 0; i < tokenRegexes.length; i++) {
-        var regex = tokenRegexes[i].regex;
-        regex.lastIndex = startIndex;
-        var result = regex.exec(string);
-        if (result && result.index === startIndex) {
-            var value = result[0];
-            return new lop.Token(
-                tokenRegexes[i].name,
-                value,
-                source.range(startIndex, startIndex + value.length)
-            );
-        }
-    }
+    var tokeniser = new RegexTokeniser([
+        {name: "identifier", regex: /([a-z][a-z0-9\-]*)/},
+        {name: "dot", regex: /\./},
+        {name: "colon", regex: /:/},
+        {name: "whitespace", regex: /\s+/}
+    ]);
+    return tokeniser.tokenise(string);
 }
-
-var tokenRegexes = [
-    {name: "identifier", regex: /([a-z][a-z0-9\-]*)/g},
-    {name: "dot", regex: /\./g},
-    {name: "colon", regex: /:/g},
-    {name: "whitespace", regex: /\s+/g}
-];
diff --git a/package.json b/package.json
index 7c0c3c4..ce9978d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "q": "~0.9.2",
         "sax": "~0.5.2",
         "underscore": "~1.4.4",
-        "lop": "~0.2.5"
+        "lop": "~0.2.6"
     },
     "devDependencies": {
         "mocha": "~1.8"