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

[dda@openlaszlo.org]

Author: dda
Date: 2008-04-21 07:31:04 -0700 (Mon, 21 Apr 2008)
New Revision: 8803

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
Log:
Change 20080418-dda-r by dda at lester.local on 2008-04-18 07:03:38 EDT
    in /Users/dda/laszlo/src/svn/openlaszlo/trunk-a
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Tie functionality for tracking lines to 'nameFunctions' option.

New Features:

Bugs Fixed: LPP-5816

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

Documentation:

Release Notes:

Details:
    

Tests:
   smokecheck,weather x swf8,dhtml
   run one line test case from JIRA with nameFunctions on.



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java	2008-04-21 14:27:01 UTC (rev 8802)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java	2008-04-21 14:31:04 UTC (rev 8803)
@@ -262,6 +262,13 @@
 
   // Set internal flags that depend on external flags
   public void defaultOptions() {
+
+    // TODO: [2008-04-21 dda] defaultOptions() can be called multiple
+    // times: from Compiler() default constructor and also from
+    // Compiler.setProperties().  This makes the maintenence of this
+    // code needlessly tricky.  Should be reworked to only call this
+    // once.
+
     if (options.getBoolean(DEBUG)) {
       options.put(WARN_UNDEFINED_REFERENCES, Boolean.TRUE);
       if (! options.containsKey(WARN_GLOBAL_ASSIGNMENTS)) {
@@ -297,6 +304,9 @@
     if (options.getBoolean(PROFILE)) {
       options.putBoolean(NAME_FUNCTIONS, true);
     }
+    if (! options.containsKey(TRACK_LINES) && options.getBoolean(NAME_FUNCTIONS)) {
+      options.putBoolean(TRACK_LINES, true);
+    }
     options.putBoolean(GENERATE_FUNCTION_2, true);
     options.putBoolean(GENERATE_FUNCTION_2_FOR_LZX, true);
   }