some tokenizer fixes. fix #435

This commit is contained in:
Fabian Jakobs 2011-10-04 16:06:10 +02:00
commit 0b25b7593f
4 changed files with 6 additions and 9 deletions

View file

@ -122,8 +122,7 @@ var c_cppHighlightRules = function() {
regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
}, {
token : "punctuation.operator",
regex : "\\?|\\:|\\,|\\;|\\.",
next : "regex_allowed"
regex : "\\?|\\:|\\,|\\;|\\."
}, {
token : "paren.lparen",
regex : "[[({]"

View file

@ -149,8 +149,7 @@ define(function(require, exports, module) {
regex : "#.*"
}, {
token : "punctuation.operator",
regex : "\\?|\\:|\\,|\\.",
next : "regex_allowed"
regex : "\\?|\\:|\\,|\\."
}, {
token : "paren.lparen",
regex : "[({[]"

View file

@ -68,8 +68,7 @@ var CSharpHighlightRules = function() {
regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
}, {
token : "punctuation.operator",
regex : "\\?|\\:|\\,|\\;|\\.",
next : "regex_allowed"
regex : "\\?|\\:|\\,|\\;|\\."
}, {
token : "paren.lparen",
regex : "[[({]"

View file

@ -86,17 +86,17 @@ var HtmlHighlightRules = function() {
}, {
token : "meta.tag",
regex : "[-_a-zA-Z0-9:]+",
next : name + "-attribute-list"
next : name + "embed-attribute-list"
}, {
token: "empty",
regex: "",
next : name + "-attribute-list"
next : name + "embed-attribute-list"
}];
states[name + "-qstring"] = multiLineString("'", name);
states[name + "-qqstring"] = multiLineString("\"", name);
states[name + "-attribute-list"] = [{
states[name + "embed-attribute-list"] = [{
token : "text",
regex : ">",
next : nextState