Changeset 1617

Timestamp:

11/16/07 13:54:10 (6 years ago)

Author:

gyuque

Message:

lang/javascript/javascript-xpath: updated analyzer (show function call params)

Files:

• lang/javascript/javascript-xpath/trunk/src/jxanalyzer.js (modified) (4 diffs)

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

@@ -74 +74 @@
                                 parserObj._parser_name += "( "+parserObj.digit+" )";
                         else if (parserObj._parser_name.match(JXAnalyzer.rxFunctionCall))
+                        {
+                                parserObj._az_is_funccall = true;
                                 parserObj._parser_name += "{"+parserObj.name+"}";
+                        }
                         else if(parserObj._parser_name.match(JXAnalyzer.rxXPathResult))
                                 parserObj._parser_name += "( "+(aArguments[0]._parser_name || aArguments[0])+" )";
@@ -117 +120 @@
                 {
                         e.curIndex = e.obj.index;
+                }
+                else if (e.name == "evaluate")
+                {
+                        if (e.obj._az_is_funccall)
+                        {
+                                e.fcArgLength = e.obj.args.length;
+                                e.fcArgv = [];
+                                
+                                for (var i = 0;i < e.fcArgLength;i++)
+                                        e.fcArgv.push(e.obj.args[i]._parser_name || e.obj.args[i]);
+
+                        }
                 }
                 
@@ -194 +209 @@
         makeEvaluateEventLog: function(e) {
                 var P = document.createElement("p");
-                P.innerHTML = this.createBasicLog(e).join('') + " &nbsp; at start + "+e.ET+ " &nbsp;hitcount= "+e.hitcount;
+                
+                var flds = this.createBasicLog(e);
+                
+                if (e.obj._az_is_funccall)
+                {
+                        flds.push(" argc="+e.fcArgLength);
+                        if (e.fcArgLength > 0)
+                                flds.push(" argv=("+e.fcArgv.join(', ')+")");
+                }
+                
+                flds.push(" &nbsp; at start + "+e.ET+ " &nbsp;hitcount= "+e.hitcount);
+                
+                P.innerHTML = flds.join('');
                 
                 return P;
@@ -255 +282 @@
                 if (nd.tagName)
                         datas.push("tagName='"+nd.tagName+"'");
+
+                if (nd.id)
+                        datas.push("id='"+nd.id+"'");
 
                 if (nd.className)