Merge pull request #25 from Hopiu/expressionRegex2

Expression regex2
This commit is contained in:
David Deraedt 2014-03-27 15:18:10 +01:00
commit d68e2cadca
2 changed files with 28 additions and 4 deletions

View file

@ -81,7 +81,7 @@ define(function (require, exports, module) {
functionDeclarationRegex = new RegExp('^[a-z0-9]*\\s*\\n*\\bfunction\\b\\s*' + REGEX_PATTERNS.jsVariable + '\\s*\\(\\s*(' +
REGEX_PATTERNS.jsVariable + '\\s*,?)*\\s*\\)','g'),
functionExpresionRegex = new RegExp('^[a-z0-9]*\\s*\\n*(var|'+ REGEX_PATTERNS.jsVariable + '.)?\\s*'+ REGEX_PATTERNS.jsVariable + '\\s*=\\s*function\\s*\\(\\s*(' +
functionExpresionRegex = new RegExp('^[a-z0-9]*\\s*\\n*(var|(' + REGEX_PATTERNS.jsVariable + '.)*(' + REGEX_PATTERNS.jsVariable + ')?)?\\s*'+ REGEX_PATTERNS.jsVariable + '\\s*(=|:)\\s*function\\s*\\(\\s*(' +
REGEX_PATTERNS.jsVariable + '\\s*(,\\s*)?)*\\s*\\)\\s*','g');
pos.ch = 0;

View file

@ -8,7 +8,7 @@ define(function (require, exports, module) {
'use strict';
var greetings = "Hello world"),
var greetings = "Hello world";
function declaration(input) {
@ -30,11 +30,35 @@ define(function (require, exports, module) {
}
var _privateStuff = function(p1, p2) {
var content = "I start with an underscore";
};
var myObject = {};
myObject.myFunction = function (param1, param2, param3) {
};
myObject.prototype.myFunction = function (param1, param2) {
};
var a = {
doA: function(param1, param2){
var content = "stuff";
return content;
},
doB: function(param1, param2){
var content = "stuff";
return content;
}
};
});