Changeset 20748 for lang/php/HTML_CSS_Mobile/trunk/HTML/CSS/lib/selectorToXPath.php

Timestamp:

10/05/08 06:21:43 (3 months ago)

Author:

drry

Message:

• fixed regexes.
  
• et cetera.
  

Files:

• lang/php/HTML_CSS_Mobile/trunk/HTML/CSS/lib/selectorToXPath.php (modified) (3 diffs)

lang/php/HTML_CSS_Mobile/trunk/HTML/CSS/lib/selectorToXPath.php

@@ -26 +26 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- */ 
+ */
 
 /**
@@ -34 +34 @@
  * のPHP移殖版
  *   理解のいたる範囲で移植したので劣化コピーかもしれない。
- */ 
+ */
 class selectorToXPath
 {
@@ -43 +43 @@
       'element'    => '/^(\*|[a-z_][a-z0-9_-]*)/i',
       'id_class'   => '/^([#.])([a-z0-9*_-]*)/i',
-      'attribute'  => '/^\[\s*([^~\|=\s]+)\s*([~\|]?=)\s*"([^"]+)"\s*\]/i',
-      'attr_box'   => '/^\[([^\]]*)\]/i',
-      'attr_not'   => '/^:not\((.*?)\)/i',
+      'attribute'  => '/^\[\s*([^~|=\s]+)\s*([~|]?=)\s*"([^"]+)"\s*\]/',
+      'attr_box'   => '/^\[([^\]]*)\]/',
+      'attr_not'   => '/^:not\(([^)]*)\)/i',
       'pseudo'     => '/^:([a-z0-9_-]+)(\(([a-z0-9_-]+)\))?/i',
       'combinator' => '/^(\s*[>+~\s])/i',
-      'comma'      => '/^,/i',
+      'comma'      => '/^,/',
     );