github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-04-09 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplify regexps

Browse Source
This commit is contained in:
cloudhead
2010-06-19 01:58:58 -04:00
parent a72966fa6a
commit 64832729b9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/less/parser.js
View File

@@ -408,7 +408,7 @@ less.Parser = function Parser(env) {
call: function () {
var name, args;
if (! (name = $(/([a-zA-Z0-9_-]+|%)\(/g))) return;
if (! (name = $(/([\w-]+|%)\(/g))) return;
if (name[1].toLowerCase() === 'alpha') { return $(this.alpha) }
@@ -444,7 +444,7 @@ less.Parser = function Parser(env) {
var value;
if (input.charAt(i) !== 'u' || !$(/url\(/g)) return;
value = $(this.entities.quoted) || $(/[-a-zA-Z0-9_%@$\/.&=:;#+?]+/g);
value = $(this.entities.quoted) || $(/[-\w%@$\/.&=:;#+?]+/g);
if (! $(')')) throw new(Error)("missing closing ) for url()");
return new(tree.URL)(value.value ? value : new(tree.Anonymous)(value));
@@ -461,7 +461,7 @@ less.Parser = function Parser(env) {
variable: function () {
var name, index = i;
if (input.charAt(i) === '@' && (name = $(/@[a-zA-Z0-9_-]+/g))) {
if (input.charAt(i) === '@' && (name = $(/@[\w-]+/g))) {
return new(tree.Variable)(name, index);
}
},
@@ -490,7 +490,7 @@ less.Parser = function Parser(env) {
var value, c = input.charCodeAt(i);
if ((c > 57 || c < 45) || c === 47) return;
if (value = $(/(-?[0-9]*\.?[0-9]+)(px|%|em|pc|ex|in|deg|s|ms|pt|cm|mm)?/g)) {
if (value = $(/(-?\d*\.?\d+)(px|%|em|pc|ex|in|deg|s|ms|pt|cm|mm)?/g)) {
return new(tree.Dimension)(value[1], value[2]);
}
}
@@ -504,7 +504,7 @@ less.Parser = function Parser(env) {
variable: function () {
var name;
if (input.charAt(i) === '@' && (name = $(/(@[a-zA-Z0-9_-]+)\s*:/g))) { return name[1] }
if (input.charAt(i) === '@' && (name = $(/(@[\w-]+)\s*:/g))) { return name[1] }
},
//
@@ -542,7 +542,7 @@ less.Parser = function Parser(env) {
call: function () {
var elements = [], e, c, args, index = i;
while (e = $(/[#.][a-zA-Z0-9_-]+/g)) {
while (e = $(/[#.][\w-]+/g)) {
elements.push(new(tree.Element)(c, e));
c = $('>');
}
@@ -577,7 +577,7 @@ less.Parser = function Parser(env) {
if (input.charAt(i) !== '.' || peek(/[^{]*(;|})/g)) return;
if (match = $(/([#.][a-zA-Z0-9_-]+)\s*\(/g)) {
if (match = $(/([#.][\w-]+)\s*\(/g)) {
name = match[1];
while (param = $(/@[\w-]+/g) || $(this.entities.literal)
@@ -636,7 +636,7 @@ less.Parser = function Parser(env) {
var value;
if (! $(/opacity=/gi)) return;
if (value = $(/[0-9]+/g) || $(this.entities.variable)) {
if (value = $(/\d+/g) || $(this.entities.variable)) {
if (! $(')')) throw new(Error)("missing closing ) for alpha()");
return new(tree.Alpha)(value);
}
@@ -658,7 +658,7 @@ less.Parser = function Parser(env) {
var e, t;
c = $(this.combinator);
e = $(/[.#:]?[a-zA-Z0-9_-]+/g) || $('*') || $(this.attribute) || $(/\([^)@]+\)/g);
e = $(/[.#:]?[\w-]+/g) || $('*') || $(this.attribute) || $(/\([^)@]+\)/g);
if (e) { return new(tree.Element)(c, e) }
},
@@ -734,7 +734,7 @@ less.Parser = function Parser(env) {
ruleset: function () {
var selectors = [], s, rules, match, memo = i;
if (match = peek(/([a-z.#: _-]+)[\s\n]*\{/g)) {
if (match = peek(/([.#: \w-]+)[\s\n]*\{/g)) {
i += match[0].length - 1;
selectors = [new(tree.Selector)([new(tree.Element)(null, match[1])])];
} else {