[Laszlo-dev] For Review: Change 20080418-dda-r Summary: Tie functionality for tracking lines to 'nameFunctions' option.

[Donald Anderson]

Tucker,
I had to do with a variation on your suggestion (the comment should  
explain).
If you approve, I'll commit (is trunk open for changes?)
I've tested for the expected behavior.

- Don

Index: WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
===================================================================
--- WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java	(revision  
8771)
+++ WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java	(working  
copy)
@@ -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);
    }

On Apr 18, 2008, at 8:31 AM, P T Withington wrote:

> if (! options.containsKey(TRACK_LINES)){
>   options.setBoolean(TRACK_LINES, options.getBoolean(NAME_FUNCTIONS));
> }
>
> That lets you override trackLines, but defaults it to nameFunctions
>
> On 2008-04-18, at 08:09 EDT, Donald Anderson wrote:
>> I considered putting this at the end of defaultOptions:
>>
>> if (options.getBoolean(NAME_FUNCTIONS)) {
>>   options.setBoolean(TRACK_LINES, true);
>> }
>>
>> But that really amounts to having the single option.  Am I missing  
>> a better approach?
>>
>> On Apr 18, 2008, at 7:53 AM, P T Withington wrote:
>>
>>> Would it be better to just default trackLines in  
>>> sc.Compiler#defaultOptions?
>>>
>>> On 2008-04-18, at 07:30 EDT, Donald Anderson wrote:
>>>> 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.
>>>>
>>>> Files:
>>>> M      WEB-INF/lps/server/src/org/openlaszlo/sc/ 
>>>> JavascriptGenerator.java
>>>> M      WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9Generator.java
>>>> M      WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
>>>>
>>>> Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20080418-dda-r.tar
>>>>
>>>>
>>>>
>>>> --
>>>>
>>>> Don Anderson
>>>> Java/C/C++, Berkeley DB, systems consultant
>>>>
>>>> voice: 617-547-7881
>>>> email: dda at ddanderson.com
>>>> www: http://www.ddanderson.com
>>>>
>>>>
>>>>
>>>>
>>>
>>
>>
>> --
>>
>> Don Anderson
>> Java/C/C++, Berkeley DB, systems consultant
>>
>> voice: 617-547-7881
>> email: dda at ddanderson.com
>> www: http://www.ddanderson.com
>>
>>
>>
>>
>


--

Don Anderson
Java/C/C++, Berkeley DB, systems consultant

voice: 617-547-7881
email: dda at ddanderson.com
www: http://www.ddanderson.com