[Laszlo-checkins] r10858 - openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler

[hqm@openlaszlo.org]

Author: hqm
Date: 2008-09-03 06:09:45 -0700 (Wed, 03 Sep 2008)
New Revision: 10858

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CanvasCompiler.java
Log:
Change 20080902-hqm-w by hqm at badtzmaru.home on 2008-09-02 17:15:55 EDT
    in /Users/hqm/openlaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: find and declare globals inside of <import>'ed libraries

New Features:

Bugs Fixed: LPP-6843

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

Documentation:

Release Notes:

Details:

The code which walks the DOM looking for nodes with id attributes was only descending into
<library> elements, and ignoring <import> elements. 
    
Note: this is a little bit wrong because it makes the global declarations in the main app,
not in the imported library. It seems like we would want global var declarations for an imported
library to be in the source file for the library, not for the main app. But since everything
is compiled en-masse, I guess it doesn't really matter. 


Tests:

test case in bug report no longer gives undefined variable warning, test case still works
test/snippets/*




Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CanvasCompiler.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CanvasCompiler.java	2008-09-03 12:50:39 UTC (rev 10857)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CanvasCompiler.java	2008-09-03 13:09:45 UTC (rev 10858)
@@ -416,7 +416,8 @@
       Element child = (Element) iter.next();
       if (NodeModel.isPropertyElement(child)) {
         model.addPropertyElement(child);
-      } else if (LibraryCompiler.isElement(child)) {
+      } else if ( (LibraryCompiler.isElement(child)) ||
+                  (ImportCompiler.isElement(child))){
         Element libraryElement = LibraryCompiler.resolveLibraryElement(
           child, mEnv, visited);
         if (libraryElement != null) {