Author: dda
Date: 2008-03-05 07:27:47 -0800 (Wed, 05 Mar 2008)
New Revision: 8173
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/PropertyReference.java
Log:
Change 20080305-dda-u by [EMAIL PROTECTED] on 2008-03-05 10:20:16 EST
in /Users/dda/laszlo/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: j2doc must process ASTFormalInitializer
New Features:
Bugs Fixed: LPP-5538
Technical Reviewer: (pending)
QA Reviewer: mamye (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Parser is now generating ASTFormalInitializer for any formal
function parameter that is initialized using the new 'optional
arguments' feature. Since this feature is now being used in LFC
files in devildog the error has been seen there first, in the nightly build.
This fix has been verified to build doc in devildog.
It is fixed in trunk because the new language feature is also
in trunk, and will start to be used there as well.
Tests:
With this change in devildog, did 'ant build doc' on a clean tree
without errors. Without the change, observed the same errors
seen by Mamye on devildog.
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
2008-03-05 15:26:31 UTC (rev 8172)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
2008-03-05 15:27:47 UTC (rev 8173)
@@ -3,7 +3,7 @@
*
****************************************************************************/
/* J_LZ_COPYRIGHT_BEGIN *******************************************************
-* Copyright 2006-2007 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2006-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* J_LZ_COPYRIGHT_END *********************************************************/
@@ -253,7 +253,7 @@
if (parseNode instanceof ASTIdentifier) {
return ((ASTIdentifier) parseNode).getName();
} else if (parseNode instanceof ASTLiteral) {
- return ((ASTLiteral) parseNode).getValue().toString();
+ return String.valueOf(((ASTLiteral) parseNode).getValue());
} else
return "";
}
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/PropertyReference.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/PropertyReference.java
2008-03-05 15:26:31 UTC (rev 8172)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/js2doc/PropertyReference.java
2008-03-05 15:27:47 UTC (rev 8173)
@@ -3,7 +3,7 @@
*
****************************************************************************/
/* J_LZ_COPYRIGHT_BEGIN *******************************************************
-* Copyright 2007 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2007-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* J_LZ_COPYRIGHT_END *********************************************************/
@@ -141,6 +141,9 @@
}
private static void addFunctionParameter(SimpleNode parseNode,
org.w3c.dom.Element docNode) {
+ if (parseNode instanceof ASTFormalInitializer)
+ return;
+
org.w3c.dom.Element paramNode =
docNode.getOwnerDocument().createElement("parameter");
docNode.appendChild(paramNode);
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
