306268 - Decompilation of E4X dot query is broken

Status: RESOLVED FIXED

(Rhino Graveyard :: E4X, defect)

Description

[Igor Bukanov]

Patches from Olinda Spider ([e-mail]):

Here is another patch that fixes the displayed, decompiled output of
the E4X dot query operator.  It was missing the terminating right
parathesis.

--- rhino1_6R2pre-org/src/org/mozilla/javascript/Parser.java
+++ rhino1_6R2pre-new/src/org/mozilla/javascript/Parser.java
@@ -1702,6 +1702,7 @@
                 decompiler.addToken(Token.DOTQUERY);
                 pn = nf.createDotQuery(pn, expr(false),
ts.getLineno());
                 mustMatchToken(Token.RP, "msg.no.paren");
+                decompiler.addToken(Token.RP);
                 break;

               case Token.LB: 


Here is another patch that fixes the displayed, decompiled output of
the E4X dot query operator.  It was missing the terminating right
parathesis.

--- rhino1_6R2pre-org/src/org/mozilla/javascript/Parser.java
+++ rhino1_6R2pre-new/src/org/mozilla/javascript/Parser.java
@@ -1702,6 +1702,7 @@
                 decompiler.addToken(Token.DOTQUERY);
                 pn = nf.createDotQuery(pn, expr(false),
ts.getLineno());
                 mustMatchToken(Token.RP, "msg.no.paren");
+                decompiler.addToken(Token.RP);
                 break;

               case Token.LB:

Comment 1

[Igor Bukanov]

(In reply to comment #0)
> Patches from Olinda Spider ([e-mail]):

Wrong cut and paste, the fkirst patch was:

--- rhino1_6R2pre-org/src/org/mozilla/javascript/Decompiler.java
+++ rhino1_6R2pre-new/src/org/mozilla/javascript/Decompiler.java
@@ -783,6 +783,10 @@
                result.append("..");
                break;

+            case Token.DOTQUERY:
+                result.append(".(");
+                break;
+
            case Token.XMLATTR:
                result.append('@');
                break;

Comment 2

[Igor Bukanov]

Attachment: Cumulative patch

Comment 3

[Igor Bukanov]

I committed the fix