Changing Decompiler.decompile to take just encoded source, flag argument controlling output format and property table so it would be possible to add more options to decompiler without changing the rest of code.

js/rhino/src/org/mozilla/javascript/BaseFunction.java

@@ -182,7 +182,7 @@ public class BaseFunction extends IdScriptable implements Function {
                 int indent = ScriptRuntime.toInt32(args, 0);
                 Object x = thisObj.getDefaultValue(ScriptRuntime.FunctionClass);
                 if (x instanceof BaseFunction) {
-                    return ((BaseFunction)x).decompile(cx, indent, false);
+                    return ((BaseFunction)x).decompile(cx, indent, 0);
                 }
                 throw ScriptRuntime.typeError1("msg.incompat.call", "toString");
               }
@@ -279,16 +279,16 @@ public class BaseFunction extends IdScriptable implements Function {
      * Decompile the source information associated with this js
      * function/script back into a string.
      *
-     * @param cx Current context
+     * @param cx Current context.
      *
-     * @param indent How much to indent the decompiled result
+     * @param indent How much to indent the decompiled result.
      *
-     * @param justbody Whether the decompilation should omit the
-     * function header and trailing brace.
+     * @param flags Flags specifying format of decompilation output.
      */
-
-    public String decompile(Context cx, int indent, boolean justbody) {
+    public String decompile(Context cx, int indent, int flags)
+    {
         StringBuffer sb = new StringBuffer();
+        boolean justbody = (0 != (flags & Decompiler.ONLY_BODY_FLAG));
         if (!justbody) {
             sb.append("function ");
             sb.append(getFunctionName());

js/rhino/src/org/mozilla/javascript/Context.java

@@ -1115,7 +1115,7 @@ public class Context
                                    int indent)
     {
         NativeFunction scriptImpl = (NativeFunction) script;
-        return scriptImpl.decompile(this, indent, false);
+        return scriptImpl.decompile(this, indent, 0);
     }
 
     /**
@@ -1133,7 +1133,7 @@ public class Context
      */
     public String decompileFunction(Function fun, int indent) {
         if (fun instanceof BaseFunction)
-            return ((BaseFunction)fun).decompile(this, indent, false);
+            return ((BaseFunction)fun).decompile(this, indent, 0);
         else
             return "function " + fun.getClassName() +
                    "() {\n\t[native code]\n}\n";
@@ -1153,12 +1153,12 @@ public class Context
      * @return a string representing the function body source.
      */
     public String decompileFunctionBody(Function fun, int indent) {
-        if (fun instanceof BaseFunction)
-            return ((BaseFunction)fun).decompile(this, indent, true);
-        else
-            // not sure what the right response here is.  JSRef currently
-            // dumps core.
-            return "[native code]\n";
+        if (fun instanceof BaseFunction) {
+            BaseFunction bf = (BaseFunction)fun;
+            return bf.decompile(this, indent, Decompiler.ONLY_BODY_FLAG);
+        }
+        // ALERT: not sure what the right response here is.
+        return "[native code]\n";
     }
 
     /**

js/rhino/src/org/mozilla/javascript/Decompiler.java

@@ -72,14 +72,31 @@ package org.mozilla.javascript;
  */
 public class Decompiler
 {
+    /**
+     * Flag to indicate that the decompilation should omit the
+     * function header and trailing brace.
+     */
+    public static final int ONLY_BODY_FLAG = 1 << 0;
+
+    /**
+     * Decompilation property to specify initial ident value.
+     */
+    public static final int INITIAL_INDENT_PROP = 1;
+
+    /**
+     * Decompilation property to specify default identation offset.
+     */
+    public static final int INDENT_GAP_PROP = 2;
+
+    /**
+     * Decompilation property to specify identation offset for case labels.
+     */
+    public static final int CASE_GAP_PROP = 3;
+
     // Marker to denote the last RC of function so it can be distinguished from
     // the last RC of object literals in case of function expressions
     private static final int FUNCTION_END = Token.LAST_TOKEN + 1;
 
-    public Decompiler()
-    {
-    }
-
     String getEncodedSource()
     {
         return sourceToString(0);
@@ -259,34 +276,28 @@ public class Decompiler
      * mapping the original source to the prettyprinted decompiled
      * version is done by the parser.
      *
-     * Note that support for Context.decompileFunctionBody is hacked
-     * on through special cases; I suspect that js makes a distinction
-     * between function header and function body that rhino
-     * decompilation does not.
+     * @param source encoded source tree presentation
      *
-     * @param encodedSourcesTree See {@link NativeFunction#getSourcesTree()}
-     *        for definition
+     * @param flags flags to select output format
      *
-     * @param justbody Whether the decompilation should omit the
-     * function header and trailing brace.
-     *
-     * @param indent How much to indent the decompiled result
-     *
-     * @param indentGap the default identation offset
-     *
-     * @param indentGap the identation offset for case labels
+     * @param properties indentation properties
      *
      */
-    public static String decompile(Object sourceObj,
-                                   boolean justFunctionBody,
-                                   int indent, int indentGap, int caseGap)
+    public static String decompile(String source, int flags,
+                                   UintMap properties)
     {
-        String source = (String)sourceObj;
-
         int length = source.length();
         if (length == 0) { return ""; }
 
+        int indent = properties.getInt(INITIAL_INDENT_PROP, 0);
+        if (indent < 0) Kit.badArg();
+        int indentGap = properties.getInt(INDENT_GAP_PROP, 4);
+        if (indentGap < 0) Kit.badArg();
+        int caseGap = properties.getInt(CASE_GAP_PROP, 2);
+        if (caseGap < 0) Kit.badArg();
+
         StringBuffer result = new StringBuffer();
+        boolean justFunctionBody = (0 != (flags & Decompiler.ONLY_BODY_FLAG));
 
         // Spew tokens in source, for debugging.
         // as TYPE number char

js/rhino/src/org/mozilla/javascript/IdFunction.java

@@ -105,9 +105,10 @@ public class IdFunction extends BaseFunction
         throw ScriptRuntime.typeError1("msg.not.ctor", functionName);
     }
 
-    public String decompile(Context cx, int indent, boolean justbody)
+    public String decompile(Context cx, int indent, int flags)
     {
         StringBuffer sb = new StringBuffer();
+        boolean justbody = (0 != (flags & Decompiler.ONLY_BODY_FLAG));
         if (!justbody) {
             sb.append("function ");
             sb.append(getFunctionName());

js/rhino/src/org/mozilla/javascript/Kit.java

@@ -360,7 +360,17 @@ public class Kit
     public static RuntimeException codeBug()
         throws RuntimeException
     {
-        throw new RuntimeException("FAILED ASSERTION");
+        throw new IllegalStateException("FAILED ASSERTION");
+    }
+
+    /**
+     * Convinient way to throw IllegalArgumentException to indicate bad
+     * argument.
+     */
+    public static void badArg()
+        throws IllegalArgumentException
+    {
+        throw new IllegalArgumentException();
     }
 
 }

js/rhino/src/org/mozilla/javascript/NativeFunction.java

@@ -71,19 +71,17 @@ public class NativeFunction extends BaseFunction
      *
      * @param indent How much to indent the decompiled result
      *
-     * @param justbody Whether the decompilation should omit the
-     * function header and trailing brace.
+     * @param flags Flags specifying format of decompilation output
      */
-    public final String decompile(Context cx, int indent, boolean justbody)
+    public final String decompile(Context cx, int indent, int flags)
     {
         String encodedSource = getEncodedSource();
         if (encodedSource == null) {
-            return super.decompile(cx, indent, justbody);
+            return super.decompile(cx, indent, flags);
         } else {
-            final int INDENT_GAP = 4;
-            final int CASE_GAP = 2; // less how much for case labels
-            return Decompiler.decompile(encodedSource, justbody,
-                                        indent, INDENT_GAP, CASE_GAP);
+            UintMap properties = new UintMap(1);
+            properties.put(Decompiler.INITIAL_INDENT_PROP, indent);
+            return Decompiler.decompile(encodedSource, flags, properties);
         }
     }
 

js/rhino/src/org/mozilla/javascript/NativeJavaMethod.java

@@ -107,9 +107,10 @@ public class NativeJavaMethod extends BaseFunction
         return sig.toString();
     }
 
-    public String decompile(Context cx, int indent, boolean justbody)
+    public String decompile(Context cx, int indent, int flags)
     {
         StringBuffer sb = new StringBuffer();
+        boolean justbody = (0 != (flags & Decompiler.ONLY_BODY_FLAG));
         if (!justbody) {
             sb.append("function ");
             sb.append(getFunctionName());

js/rhino/toolsrc/org/mozilla/javascript/tools/debugger/VariableModel.java

@@ -141,8 +141,7 @@ public class VariableModel extends AbstractTreeTableModel
                 String result;
                 try {
                     if (value instanceof BaseFunction) {
-                        result = ((BaseFunction)value).decompile(cx, 0,
-                                                                 false);
+                        result = ((BaseFunction)value).decompile(cx, 0, 0);
                     } else {
                         result = Context.toString(value);
                     }