aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2015-08-15 09:48:32 +0100
committerMichael Williamson <mike@zwobble.org>2015-08-15 09:48:32 +0100
commit1507381c0afbd2c2aaefe4fba8970c4a875886e9 (patch)
treeabba1bfe4bd5a00f02b52b5d45bf06413464caf3
parentfaf6bf75e5921fc1b1c418d6e575a0439f498d8c (diff)
Update lop to 0.3.0
-rw-r--r--lib/style-reader.js4
-rw-r--r--package.json2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/style-reader.js b/lib/style-reader.js
index 2560971..6a86eab 100644
--- a/lib/style-reader.js
+++ b/lib/style-reader.js
@@ -65,7 +65,7 @@ function documentMatcherRule() {
var stringRule = lop.rules.then(
lop.rules.tokenOfType("string"),
function(value) {
- return value.substring(1, value.length - 1);
+ return value;
}
);
@@ -222,7 +222,7 @@ function tokenise(string) {
{name: "close-paren", regex: /\)/},
{name: "open-square-bracket", regex: /\[/},
{name: "close-square-bracket", regex: /\]/},
- {name: "string", regex: /'[^']*'/},
+ {name: "string", regex: /'([^']*)'/},
{name: "integer", regex: /([0-9]+)/},
{name: "choice", regex: /\|/}
]);
diff --git a/package.json b/package.json
index 0f341f3..c2d90c5 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"bluebird": "~2.3.11",
"sax": "~0.5.2",
"underscore": "~1.6.0",
- "lop": "~0.2.8",
+ "lop": "~0.3.0",
"async": "~0.2.6",
"nomnom": "~1.6.2",
"jszip": "~2.5.0"