[Laszlo-checkins] r5913 - openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc

[ptw@openlaszlo.org]

Author: ptw
Date: 2007-08-02 12:53:23 -0700 (Thu, 02 Aug 2007)
New Revision: 5913

Modified:
   openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/CodeGenerator.java
   openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java
Log:
Change 20070802-ptw-S by ptw at dueling-banjos.local on 2007-08-02 13:37:54 EDT
    in /Users/ptw/OpenLaszlo/wafflecone
    for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone

Summary: Inline simple case of nextMethod

Bugs Fixed:
LPP-4414 'Improve startup performance' (partial)

Technical Reviewer: max (Message-ID: <46B22C21.7040805 at openlaszlo.org>)
QA Reviewer: pbr (Message-Id: <6.2.1.2.0.20070802145647.02207620 at na>)

Tests:
    smokecheck

    QA reviewer:  please test against target app.  Note
    you will have to do a clean build so that all sources are
    recompiled.



Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/CodeGenerator.java
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/CodeGenerator.java	2007-08-02 18:28:54 UTC (rev 5912)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/CodeGenerator.java	2007-08-02 19:53:23 UTC (rev 5913)
@@ -2013,7 +2013,7 @@
     SimpleNode args = children[2];
     String name;
     String ca = null;
-    String pattern = "this.nextMethod(arguments.callee, _1).call(this, _2)";
+    String pattern = "(arguments.callee.superclass?arguments.callee.superclass.prototype[_1]:this.nextMethod(arguments.callee, _1)).call(this, _2)";
     if (fname instanceof ASTEmptyExpression) {
       name = "constructor";
     } else {
@@ -2035,9 +2035,9 @@
     if (ca == null) {
       ;
     } else if ("call".equals(ca)) {
-      pattern = "this.nextMethod(arguments.callee, _1).call(_2)";
+      pattern = "(arguments.callee.superclass?arguments.callee.superclass.prototype[_1]:this.nextMethod(arguments.callee, _1)).call(_2)";
     } else if ("apply".equals(ca)) {
-      pattern = "this.nextMethod(arguments.callee, _1).apply(_2)";
+      pattern = "(arguments.callee.superclass?arguments.callee.superclass.prototype[_1]:this.nextMethod(arguments.callee, _1)).apply(_2)";
     } else {
       assert false: "Unhandled super call " + ca;
     }

Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java	2007-08-02 18:28:54 UTC (rev 5912)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptGenerator.java	2007-08-02 19:53:23 UTC (rev 5913)
@@ -1431,7 +1431,7 @@
     SimpleNode args = children[2];
     String name;
     String ca = null;
-    String pattern = "this.nextMethod(arguments.callee, _1).call(this, _2)";
+    String pattern = "(arguments.callee.superclass?arguments.callee.superclass.prototype[_1]:this.nextMethod(arguments.callee, _1)).call(this, _2)";
     if (fname instanceof ASTEmptyExpression) {
       name = "constructor";
     } else {
@@ -1446,9 +1446,9 @@
     if (ca == null) {
       ;
     } else if ("call".equals(ca)) {
-      pattern = "this.nextMethod(arguments.callee, _1).call(_2)";
+      pattern = "(arguments.callee.superclass?arguments.callee.superclass.prototype[_1]:this.nextMethod(arguments.callee, _1)).call(_2)";
     } else if ("apply".equals(ca)) {
-      pattern = "this.nextMethod(arguments.callee, _1).apply(_2)";
+      pattern = "(arguments.callee.superclass?arguments.callee.superclass.prototype[_1]:this.nextMethod(arguments.callee, _1)).apply(_2)";
     } else {
       assert false: "Unhandled super call " + ca;
     }