Added a number of additional speed gains (we now hold our own against Dojo and DOMQue...
[jquery.git] / src / selector / selector.js
index e1abbf4..48c6e15 100644 (file)
@@ -61,22 +61,23 @@ jQuery.extend({
                        },
                        _prefix: "z=a[m[3]];if(!z||/href|src/.test(m[3]))z=jQuery.attr(a,m[3]);"
                },
-               "[": "jQuery.find(m[2],a).length"
+               "[": "parseInt(m[2])?jQuery.nth(a.parentNode.firstChild,parseInt(m[2]),'nextSibling',a)==a:jQuery.find(m[2],a).length"
        },
        
        // The regular expressions that power the parsing engine
        parse: [
                // Match: [@value='test'], [@foo]
-               /^\[ *(@)([a-z0-9_-]*) *([!*$^=]*) *('?"?)(.*?)\4 *\]/i,
+               /^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/,
 
                // Match: [div], [div p]
                /^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/,
 
                // Match: :contains('foo')
-               /^(:)([a-z0-9_-]*)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/i,
+               /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
 
-               // Match: :even, :last-chlid
-               /^([:.#]*)([a-z0-9_*-]*)/i
+               // Match: :even, :last-chlid, #id, .class
+               new RegExp("^([:.#]*)(" + 
+                       ( jQuery.chars = "(?:[\\w\u0128-\uFFFF*-]|\\\\.)" ) + "+)")
        ],
 
        token: [
@@ -126,7 +127,7 @@ jQuery.extend({
                        t = t.substr(2,t.length);
 
                // And the / root expression
-               } else if ( !t.indexOf("/") ) {
+               } else if ( !t.indexOf("/") && !context.ownerDocument ) {
                        context = context.documentElement;
                        t = t.substr(1,t.length);
                        if ( t.indexOf("/") >= 1 )
@@ -134,7 +135,7 @@ jQuery.extend({
                }
 
                // Initialize the search
-               var ret = [context], done = [], last = null;
+               var ret = [context], done = [], last;
 
                // Continue while a selector expression exists, and while
                // we're no longer looping upon ourselves
@@ -142,22 +143,21 @@ jQuery.extend({
                        var r = [];
                        last = t;
 
-                       t = jQuery.trim(t).replace( /^\/\//i, "" );
+                       t = jQuery.trim(t).replace( /^\/\//, "" );
 
                        var foundToken = false;
 
                        // An attempt at speeding up child selectors that
                        // point to a specific element tag
-                       var re = /^[\/>]\s*([a-z0-9*-]+)/i;
+                       var re = /^[\/>]\s*([\w*-]+)/;
                        var m = re.exec(t);
 
                        if ( m ) {
                                // Perform our own iteration and filter
-                               jQuery.each( ret, function(){
-                                       for ( var c = this.firstChild; c; c = c.nextSibling )
-                                               if ( c.nodeType == 1 && ( jQuery.nodeName(c, m[1]) || m[1] == "*" ) )
+                               for ( var i = 0; ret[i]; i++ )
+                                       for ( var c = ret[i].firstChild; c; c = c.nextSibling )
+                                               if ( c.nodeType == 1 && ( m[1] == "*" || jQuery.nodeName(c, m[1]) ) )
                                                        r.push( c );
-                               });
 
                                ret = r;
                                t = t.replace( re, "" );
@@ -165,18 +165,17 @@ jQuery.extend({
                                foundToken = true;
                        } else {
                                // Look for pre-defined expression tokens
-                               for ( var i = 0; i < jQuery.token.length; i += 2 ) {
+                               for ( var i = 0, tl = jQuery.token.length; i < tl; i += 2 ) {
                                        // Attempt to match each, individual, token in
                                        // the specified order
-                                       var re = jQuery.token[i];
+                                       var re = jQuery.token[i], fn = jQuery.token[i+1];
                                        var m = re.exec(t);
 
                                        // If the token match was found
                                        if ( m ) {
                                                // Map it against the token's handler
-                                               r = ret = jQuery.map( ret, jQuery.isFunction( jQuery.token[i+1] ) ?
-                                                       jQuery.token[i+1] :
-                                                       function(a){ return eval(jQuery.token[i+1]); });
+                                               r = ret = jQuery.map( ret, jQuery.isFunction( fn ) ?
+                                                       fn : new Function( "a", "return " + fn ) );
 
                                                // And remove the token
                                                t = jQuery.trim( t.replace( re, "" ) );
@@ -195,7 +194,7 @@ jQuery.extend({
                                        if ( ret[0] == context ) ret.shift();
 
                                        // Merge the result sets
-                                       jQuery.merge( done, ret );
+                                       done = jQuery.merge( done, ret );
 
                                        // Reset the context
                                        r = ret = [context];
@@ -205,7 +204,7 @@ jQuery.extend({
 
                                } else {
                                        // Optomize for the case nodeName#idName
-                                       var re2 = /^([a-z0-9_-]+)(#)([a-z0-9\\*_-]*)/i;
+                                       var re2 = new RegExp("^(\\w+)(#)(" + jQuery.chars + "+)");
                                        var m = re2.exec(t);
                                        
                                        // Re-organize the results, so that they're consistent
@@ -215,66 +214,56 @@ jQuery.extend({
                                        } else {
                                                // Otherwise, do a traditional filter check for
                                                // ID, class, and element selectors
-                                               re2 = /^([#.]?)([a-z0-9\\*_-]*)/i;
+                                               re2 = new RegExp("^([#.]?)(" + jQuery.chars + "*)");
                                                m = re2.exec(t);
                                        }
 
+                                       m[2] = m[2].replace(/\\/g, "");
+
+                                       var elem = ret[ret.length-1];
+
                                        // Try to do a global search by ID, where we can
-                                       if ( m[1] == "#" && ret[ret.length-1].getElementById ) {
+                                       if ( m[1] == "#" && elem && elem.getElementById ) {
                                                // Optimization for HTML document case
-                                               var oid = ret[ret.length-1].getElementById(m[2]);
+                                               var oid = elem.getElementById(m[2]);
                                                
                                                // Do a quick check for the existence of the actual ID attribute
                                                // to avoid selecting by the name attribute in IE
-                                               if ( jQuery.browser.msie && oid && oid.id != m[2] )
-                                                       oid = jQuery('[@id="'+m[2]+'"]', ret[ret.length-1])[0];
+                                               if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && oid.id != m[2] )
+                                                       oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
 
                                                // Do a quick check for node name (where applicable) so
                                                // that div#foo searches will be really fast
                                                ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-
                                        } else {
-                                               // Pre-compile a regular expression to handle class searches
-                                               if ( m[1] == "." )
-                                                       var rec = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
-
-                                               // We need to find all descendant elements, it is more
-                                               // efficient to use getAll() when we are already further down
-                                               // the tree - we try to recognize that here
-                                               jQuery.each( ret, function(){
+                                               // We need to find all descendant elements
+                                               for ( var i = 0; ret[i]; i++ ) {
                                                        // Grab the tag name being searched for
                                                        var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
 
                                                        // Handle IE7 being really dumb about <object>s
-                                                       if ( jQuery.nodeName(this, "object") && tag == "*" )
+                                                       if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
                                                                tag = "param";
 
-                                                       jQuery.merge( r,
-                                                               m[1] != "" && ret.length != 1 ?
-                                                                       jQuery.getAll( this, [], m[1], m[2], rec ) :
-                                                                       this.getElementsByTagName( tag )
-                                                       );
-                                               });
+                                                       r = jQuery.merge( r, ret[i].getElementsByTagName( tag ));
+                                               }
 
                                                // It's faster to filter by class and be done with it
-                                               if ( m[1] == "." && ret.length == 1 )
-                                                       r = jQuery.grep( r, function(e) {
-                                                               return rec.test(e.className);
-                                                       });
+                                               if ( m[1] == "." )
+                                                       r = jQuery.classFilter( r, m[2] );
 
                                                // Same with ID filtering
-                                               if ( m[1] == "#" && ret.length == 1 ) {
-                                                       // Remember, then wipe out, the result set
-                                                       var tmp = r;
-                                                       r = [];
-
-                                                       // Then try to find the element with the ID
-                                                       jQuery.each( tmp, function(){
-                                                               if ( this.getAttribute("id") == m[2] ) {
-                                                                       r = [ this ];
-                                                                       return false;
+                                               if ( m[1] == "#" ) {
+                                                       var tmp = [];
+
+                                                       // Try to find the element with the ID
+                                                       for ( var i = 0; r[i]; i++ )
+                                                               if ( r[i].getAttribute("id") == m[2] ) {
+                                                                       tmp = [ r[i] ];
+                                                                       break;
                                                                }
-                                                       });
+
+                                                       r = tmp;
                                                }
 
                                                ret = r;
@@ -294,26 +283,43 @@ jQuery.extend({
                        }
                }
 
+               // An error occurred with the selector;
+               // just return an empty set instead
+               if ( t )
+                       ret = [];
+
                // Remove the root context
-               if ( ret && ret[0] == context ) ret.shift();
+               if ( ret && ret[0] == context )
+                       ret.shift();
 
                // And combine the results
-               jQuery.merge( done, ret );
+               done = jQuery.merge( done, ret );
 
                return done;
        },
 
+       classFilter: function(r,m,not){
+               m = " " + m + " ";
+               var tmp = [];
+               for ( var i = 0; r[i]; i++ ) {
+                       var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
+                       if ( !not && pass || not && !pass )
+                               tmp.push( r[i] );
+               }
+               return tmp;
+       },
+
        filter: function(t,r,not) {
+               var last;
+
                // Look for common filter expressions
-               while ( t && /^[a-z[({<*:.#]/i.test(t) ) {
+               while ( t  && t != last ) {
+                       last = t;
 
                        var p = jQuery.parse, m;
 
-                       jQuery.each( p, function(i,re){
-               
-                               // Look for, and replace, string-like sequences
-                               // and finally build a regexp out of it
-                               m = re.exec( t );
+                       for ( var i = 0; p[i]; i++ ) {
+                               m = p[i].exec( t );
 
                                if ( m ) {
                                        // Remove what we just matched
@@ -323,26 +329,26 @@ jQuery.extend({
                                        if ( jQuery.expr[ m[1] ]._resort )
                                                m = jQuery.expr[ m[1] ]._resort( m );
 
-                                       return false;
+                                       m[2] = m[2].replace(/\\/g, "");
+
+                                       break;
                                }
-                       });
+                       }
+
+                       if ( !m )
+                               break;
 
                        // :not() is a special case that can be optimized by
                        // keeping it out of the expression list
                        if ( m[1] == ":" && m[2] == "not" )
                                r = jQuery.filter(m[3], r, true).r;
 
-                       // Handle classes as a special case (this will help to
-                       // improve the speed, as the regexp will only be compiled once)
-                       else if ( m[1] == "." ) {
-
-                               var re = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
-                               r = jQuery.grep( r, function(e){
-                                       return re.test(e.className || "");
-                               }, not);
+                       // We can get a big speed boost by filtering by class here
+                       else if ( m[1] == "." )
+                               r = jQuery.classFilter(r, m[2], not);
 
                        // Otherwise, find the expression to execute
-                       } else {
+                       else {
                                var f = jQuery.expr[m[1]];
                                if ( typeof f != "string" )
                                        f = jQuery.expr[m[1]][m[2]];
@@ -361,28 +367,6 @@ jQuery.extend({
                // and the modified expression string (t)
                return { r: r, t: t };
        },
-       
-       getAll: function( o, r, token, name, re ) {
-               for ( var s = o.firstChild; s; s = s.nextSibling )
-                       if ( s.nodeType == 1 ) {
-                               var add = true;
-
-                               if ( token == "." )
-                                       add = s.className && re.test(s.className);
-                               else if ( token == "#" )
-                                       add = s.getAttribute("id") == name;
-       
-                               if ( add )
-                                       r.push( s );
-
-                               if ( token == "#" && r.length ) break;
-
-                               if ( s.firstChild )
-                                       jQuery.getAll( s, r, token, name, re );
-                       }
-
-               return r;
-       },
 
        /**
         * All ancestors of a given element.