[Laszlo-checkins] r12737 - openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc

[dda@openlaszlo.org]

Author: dda
Date: 2009-02-03 12:41:20 -0800 (Tue, 03 Feb 2009)
New Revision: 12737

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java
Log:
Change 20090203-dda-4 by dda at lester-2.local on 2009-02-03 13:21:14 EST
    in /Users/dda/laszlo/src/svn/openlaszlo/trunk-g
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: for catcherrors=true, conditionally generate call to reportExceptions based on $debug.

New Features:

Bugs Fixed: LPP-7710 [errors when compiler.swf9.catcherrors=true and runtime target = swf9]

Technical Reviewer: ptw (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    ** Changeset made against trunk - this is for consideration for 4.2.0.1 (as well as 4.2.1).

    We previously generated in the catch block:
      if ($debug) { $lzsc$runtime.reportException(...); }
    and this generated code did not get processed by the runtime constant handler.
    Since we don't have a non-debug version of the $lzsc$runtime class, this comes up undefined.
    Fix is to just not generate this code if debug is off.

Tests:
    With catcherrors=true:
      Test case in LPP-7710, with/without debug set on canvas.
      Test case in LPP-7514, with/without debug set in URL
    With catcherrors=false:
      {smokecheck,lzpix} x {swf8,swf9,dhtml}



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java	2009-02-03 18:44:44 UTC (rev 12736)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java	2009-02-03 20:41:20 UTC (rev 12737)
@@ -1246,10 +1246,11 @@
       
     String tryType = "";
     if (tryAll) {
-      error.add(parseFragment("if ($debug) {" +
-                              "  $lzsc$runtime.reportException(" +
-                              ScriptCompiler.quote(filename) + ", " +
-                              functionNameIdentifier.beginLine + ", $lzsc$e); }"));
+      if (options.getBoolean(Compiler.DEBUG) || options.getBoolean(Compiler.DEBUG_SWF9)) {
+        error.add(parseFragment("$lzsc$runtime.reportException(" +
+                                ScriptCompiler.quote(filename) + ", " +
+                                functionNameIdentifier.beginLine + ", $lzsc$e);"));
+      }
 
       predecls.add(new Compiler.PassThroughNode(parseFragment("var $lzsc$ret:* = 0;")));
       if (functionNameIdentifier != null && !functionNameIdentifier.isConstructor()) {