From 96a56d95dcfcb58fc0257cfe33a85f264235e213 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 16 Nov 2016 19:38:11 +0000 Subject: Move tokeniser into its own module --- lib/style-reader.js | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'lib/style-reader.js') diff --git a/lib/style-reader.js b/lib/style-reader.js index b781792..a13c919 100644 --- a/lib/style-reader.js +++ b/lib/style-reader.js @@ -1,9 +1,9 @@ var _ = require("underscore"); var lop = require("lop"); -var RegexTokeniser = lop.RegexTokeniser; var documentMatchers = require("./document-matchers"); var htmlPaths = require("./html-paths"); +var tokenise = require("./styles/parser/tokeniser").tokenise; var results = require("../lib/results"); exports.readHtmlPath = readHtmlPath; @@ -255,26 +255,4 @@ function describeError(error) { "Expected " + error.expected + " but got " + error.actual; } -function tokenise(string) { - var tokeniser = new RegexTokeniser([ - {name: "identifier", regex: /([a-zA-Z][a-zA-Z0-9\-]*)/}, - {name: "cssClassName", regex: /(\.(?:[a-zA-Z0-9\-]|\\.)+)/}, - {name: "colon", regex: /:/}, - {name: "gt", regex: />/}, - {name: "whitespace", regex: /\s+/}, - {name: "arrow", regex: /=>/}, - {name: "equals", regex: /=/}, - {name: "open-paren", regex: /\(/}, - {name: "close-paren", regex: /\)/}, - {name: "open-square-bracket", regex: /\[/}, - {name: "close-square-bracket", regex: /\]/}, - {name: "string", regex: /'((?:\\.|[^'])*)'/}, - {name: "integer", regex: /([0-9]+)/}, - {name: "choice", regex: /\|/}, - {name: "bang", regex: /(!)/} - ]); - return tokeniser.tokenise(string); -} - - var styleRule = createStyleRule(); -- cgit v1.2.3