[Laszlo-checkins] r12739 - in openlaszlo/branches/4.2: . WEB-INF/lps/server/src/org/openlaszlo/sc

[ptw@openlaszlo.org]

Author: ptw
Date: 2009-02-03 13:25:02 -0800 (Tue, 03 Feb 2009)
New Revision: 12739

Modified:
   openlaszlo/branches/4.2/
   openlaszlo/branches/4.2/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java
Log:
Merged revisions 12737 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r12737 | dda | 2009-02-03 15:41:20 -0500 (Tue, 03 Feb 2009) | 35 lines
  
  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}
.......



Property changes on: openlaszlo/branches/4.2
___________________________________________________________________
Name: svnmerge-integrated
   - /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12345,12360,12403,12420,12424,12429,12457,12473,12477,12508,12594,12596,12603,12664,12669,12675,12677,12719
   + /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12345,12360,12403,12420,12424,12429,12457,12473,12477,12508,12594,12596,12603,12664,12669,12675,12677,12719,12737

Modified: openlaszlo/branches/4.2/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java	2009-02-03 21:20:42 UTC (rev 12738)
+++ openlaszlo/branches/4.2/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java	2009-02-03 21:25:02 UTC (rev 12739)
@@ -1257,10 +1257,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()) {