Changeset 38722

Timestamp:

12/13/10 17:27:55 (3 years ago)

Author:

amachang

Message:

Fix FilterExpr? and PathExpr? bug And 0.1.12 released.

Location:

lang/javascript/javascript-xpath/trunk

Files:

• release/javascript-xpath-0.1.12-cmp.js (added)
• release/javascript-xpath-0.1.12.js (added)
• release/javascript-xpath-latest-cmp.js (modified) (1 diff)
• release/javascript-xpath-latest.js (modified) (2 diffs)
• src/baseExpr.js (modified) (1 diff)
• test/functional/data/0012 (modified) (2 diffs)
• test/functional/index.html (modified) (3 diffs)
• test/functional/json2.js (added)
• version.txt (modified) (1 diff)

lang/javascript/javascript-xpath/trunk/release/javascript-xpath-latest-cmp.js

@@ -40 +40 @@
 for(var n in Ga)Ha[n]=Ga[n];Ha.index=0;return Ha;};Ea.prototype.regs={token:/\$?(?:(?![0-9-])[\w-]+:)?(?![0-9-])[\w-]+|\/\/|\.\.|::|\d+(?:\.\d*)?|\.\d+|"[^"]*"|'[^']*'|[!<>]=|(?![0-9-])[\w-]+:\*|\s+|./g,strip:/^\s/};Ea.prototype.peek=function(i){return this[this.index+(i||0)];};Ea.prototype.next=function(){return this[this.index++];};Ea.prototype.back=function(){this.index--;};Ea.prototype.empty=function(){return this.length<=this.index;};var Ia=function(Ja,Ka,La){this.node=Ja;this.position=Ka||1;this.last=La||1;};var Ma=function(){};Ma.prototype.number=function(Na){var Oa=this.evaluate(Na);if(Oa.isNodeSet)return Oa.number();return+Oa;};Ma.prototype.string=function(Pa){var Qa=this.evaluate(Pa);if(Qa.isNodeSet)return Qa.string();return ''+Qa;};Ma.prototype.bool=function(Ra){var Sa=this.evaluate(Ra);if(Sa.isNodeSet)return Sa.bool();return!!Sa;};var Ta=function(){};Ta.parsePredicates=function(Ua,Va){while(Ua.peek()=='['){Ua.next();if(Ua.empty()){throw Error('missing predicate expr');}
 var Wa=oa.parse(Ua);Va.predicate(Wa);if(Ua.empty()){throw Error('unclosed predicate expr');}
-if(Ua.next()!=']'){Ua.back();throw Error('bad token: '+Ua.next());}}};Ta.prototyps=new Ma();Ta.prototype.evaluatePredicates=function(Xa,Ya){var Za,predicate,nodes,node,Xa,position,reverse;reverse=this.reverse;Za=this.predicates;Xa.sort();for(var i=Ya||0,l0=Za.length;i<l0;i++){predicate=Za[i];var $a=[];var ab=Xa.list();for(var j=0,l1=ab.length;j<l1;j++){position=reverse?(l1-j):(j+1);exrs=predicate.evaluate(new Ia(ab[j],position,l1));switch(typeof exrs){case 'number':exrs=(position==exrs);break;case 'string':exrs=!!exrs;break;case 'object':exrs=exrs.bool();break;}
+if(Ua.next()!=']'){Ua.back();throw Error('bad token: '+Ua.next());}}};Ta.prototype=new Ma();Ta.prototype.evaluatePredicates=function(Xa,Ya){var Za,predicate,nodes,node,Xa,position,reverse;reverse=this.reverse;Za=this.predicates;Xa.sort();for(var i=Ya||0,l0=Za.length;i<l0;i++){predicate=Za[i];var $a=[];var ab=Xa.list();for(var j=0,l1=ab.length;j<l1;j++){position=reverse?(l1-j):(j+1);exrs=predicate.evaluate(new Ia(ab[j],position,l1));switch(typeof exrs){case 'number':exrs=(position==exrs);break;case 'string':exrs=!!exrs;break;case 'object':exrs=exrs.bool();break;}
 if(!exrs){$a.push(j);}}
 for(var j=$a.length-1,l1=0;j>=l1;j--){Xa.del($a[j]);}}

lang/javascript/javascript-xpath/trunk/release/javascript-xpath-latest.js

@@ -1 @@
-/*  JavaScript-XPath 0.1.11
+/*  JavaScript-XPath 0.1.12
  *  (c) 2007 Cybozu Labs, Inc.
  *
@@ -309 +309 @@
 };
 
-BaseExprHasPredicates.prototyps = new BaseExpr();
+BaseExprHasPredicates.prototype = new BaseExpr();
 
 BaseExprHasPredicates.prototype.evaluatePredicates = function(nodeset, start) {

lang/javascript/javascript-xpath/trunk/src/baseExpr.js

@@ -46 +46 @@
 };
 
-BaseExprHasPredicates.prototyps = new BaseExpr();
+BaseExprHasPredicates.prototype = new BaseExpr();
 
 BaseExprHasPredicates.prototype.evaluatePredicates = function(nodeset, start) {

lang/javascript/javascript-xpath/trunk/test/functional/data/0012

@@ -37 +37 @@
             </tbody>
         </table>
+        <p id="ppp">1</p>
     </body>
 </html>
@@ -48 +49 @@
 /descendant::tr[2] => tr#id6
 (//tr)[2] => tr#id6
+(//p) + 1 => value(2)
+id('ppp')[true()] => p#ppp
+number(id('ppp')[true()]) => value(1)
+id('ppp')[true()] + 1 => value(2)
 

lang/javascript/javascript-xpath/trunk/test/functional/index.html

@@ -8 +8 @@
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
 
+  <script type="text/javascript" src="./json2.js"></script>
   <script type="text/javascript" src="./logger.js"></script>
   <!--LOCAL_DATA_HERE-->
@@ -430 +431 @@
         }
         else {
-            if (typeof tester.value != 'string') {
-                return { status: 'ng', detail: 'value(' + nodes + ')' }
-            }
-            else {
-                return { status: 'ng', detail: 'value("' + nodes.replace(/\\/, '\\\\').replace(/"/, '\\"') + '")' }
-            }
+            return { status: 'ng', detail: 'value(' + JSON.stringify(nodes) + ')' }
         }
     }
@@ -469 +465 @@
                 break;
             case 3:
-                t += 'text("' + node.nodeValue.replace(/\\/, '\\\\').replace(/"/, '\\"') + '")';
+                t += 'text(' + JSON.stringify(node.nodeValue) + ')';
                 break;
             case 7:
-                t += 'processing-instruction(' + node.nodeName + '="' + node.nodeValue.replace(/\\/, '\\\\').replace(/"/, '\\"') + '")';
+                t += 'processing-instruction(' + node.nodeName + '=' + JSON.stringify(node.nodeValue) + ')';
                 break;
             case 8:
-                t += 'comment("' + node.nodeValue.replace(/\\/, '\\\\').replace(/"/, '\\"') + '")';
+                t += 'comment(' + JSON.stringify(node.nodeValue) + ')';
                 break;
             case 9:

lang/javascript/javascript-xpath/trunk/version.txt

@@ -1 @@
-0.1.11
+0.1.12