I can merge from trunk anytime, actually I was thinking today might be good.

On Feb 26, 2008, at 7:52 AM, P T Withington wrote:

We need to take an integration from trunk soon. And you will have some work to merge the applyArgs changes to your split code. Are we getting close to the point where you can unsplit the SWF9 bits?

On Feb 25, 2008, at 23:38, [EMAIL PROTECTED] wrote:

Author: hqm
Date: 2008-02-25 20:38:53 -0800 (Mon, 25 Feb 2008)
New Revision: 8104

Modified:
 openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.js
 openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js
Log:
Change 20080225-hqm-k by [EMAIL PROTECTED] on 2008-02-25 23:37:07 EST
  in /Users/hqm/openlaszlo/devildog/WEB-INF/lps/lfc
  for http://svn.openlaszlo.org/openlaszlo/branches/devildog/WEB-INF/lps/lfc

Summary: remove passthrough's now that "is" is accepted by the script compiler

New Features:

Bugs Fixed:

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

Documentation:

Release Notes:

Details:


Tests:



Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.js 2008-02-26 04:09:34 UTC (rev 8103) +++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.js 2008-02-26 04:38:53 UTC (rev 8104)
@@ -100,7 +100,11 @@
var lz = ConstructorMap;


-dynamic class LzInheritedHash {
+dynamic class LzInheritedHash extends Dictionary {
+    #passthrough (toplevel:true) {
+import flash.utils.Dictionary;
+}#
+
   function LzInheritedHash (sup:Object) {
       if(sup) {
           for (var k in sup) {
@@ -110,6 +114,8 @@
   }
}

+
+
class lzutils {
   /// TODO [hqm 2008-01] just for debugging until we get debugger up
             #passthrough {

Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js 2008-02-26 04:09:34 UTC (rev 8103) +++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js 2008-02-26 04:38:53 UTC (rev 8104)
@@ -119,7 +119,6 @@
               cleanup[k] = true;
             }
             // Check for object and array merges
-              #passthrough {
             if ( attrk is Object ) {
               var dattrk = dattrs[ k ];
               if ( dattrk is Object ) {
@@ -138,7 +137,6 @@
                 }
               }
             }
-              }#
             // Just a normal value, install it
             iargs[ k ] = attrk;
           }
@@ -594,7 +592,6 @@
       // A style does not override an explicit attribute
       if (! (k in initialArgs)) {
           // A style that is a function is a constraint
-            #passthrough {
           if (v is Function) {
//Only set styleConstraints[k] if this[k] is null. See LPP-2894 - CSS: subclasses and instances can't override style constraints set on superclass*
               if (this[k] == null) {
@@ -605,7 +602,6 @@
// Debug.format("%w[%s] (%#w) %#w -> %#w", this, k, stylemap[k], this.k, v);
               if (v != null) this.setAttribute(k, v);
           }
-            }#
       }
   }
   return styleConstraints;
@@ -1139,16 +1135,13 @@
   var x = ConstructorMap[ e.name ];
   // TODO: [2005-03-24 ptw] Remove this if we ever enable
   // warnings in the LFC as this will be redundant
-    #passthrough {
+ // TODO [hqm 2008-01] enable this warning unconditionally for now for swf9 debugging
+    //    if ($debug) {
+    if ((! x) || (! (x is Class))) {
+ Debug.error('Class for tag ', e.name, ' has not been defined yet', x);
+    }
+    //}

- // TODO [hqm 2008-01] enable this warning unconditionally for now for swf9 debugging
-        //    if ($debug) {
-        if ((! x) || (! (x is Class))) {
- Debug.error('Class for tag ', e.name, ' has not been defined yet', x);
-        }
-        //}
-
-    }#
   // TODO: [2005-04-20 ptw] Don't know what this means, preserved
   // for posterity:
   // ... new eval(namespace) [e.name]...
@@ -1385,11 +1378,9 @@
           }
           this.dataBindAttribute( p , pp );
       } else if ( !('dependencies' in rp && rp.dependencies) ){
-            #passthrough {
           if (rp is Function) {
-              rp.call(this);
+                rp.call(this);
           }
-            }#
       }
   }

@@ -1397,11 +1388,9 @@
   for ( var p in refs ){
       // The string check prevents a dhtml error
       var rp = refs[ p ];
-        #passthrough {
       if (rp is Function && ('dependencies' in rp)) {
this.applyConstraint( p , rp , rp.dependencies.call(this) );
       }
-        }#
   }
}

@@ -2096,14 +2085,12 @@
 * @access private
 */
function __LZmakeDatapath( dpobj ){
-    #passthrough {
-        if (! (dpobj is Object)) {
-            if ($debug) {
- Debug.debug('__LZmakeDatapath on non-object %w?', dpobj)
-                    }
-        }
-    }#
-  this.makeChild( dpobj , true);
+    if (! (dpobj is Object)) {
+        if ($debug) {
+            Debug.debug('__LZmakeDatapath on non-object %w?', dpobj)
+                }
+    }
+    this.makeChild( dpobj , true);
}




_______________________________________________
Laszlo-checkins mailing list
[EMAIL PROTECTED]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins


--

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

voice: 617-547-7881
email: [EMAIL PROTECTED]
www: http://www.ddanderson.com




Reply via email to