Author: ptw
Date: 2007-12-21 07:38:09 -0800 (Fri, 21 Dec 2007)
New Revision: 7656
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/server/sc/src/org/openlaszlo/sc/Parser.jjt
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/ParseTreePrinter.java
Log:
Change 20071221-ptw-3 by [EMAIL PROTECTED] on 2007-12-21 10:27:38 EST
in /Users/ptw/OpenLaszlo/devildog
for http://svn.openlaszlo.org/openlaszlo/branches/devildog
Summary: Permit super() calls
Technical Reviewer: [EMAIL PROTECTED] (pending)
QA Reviewer: [EMAIL PROTECTED] (pending)
Details:
Tests:
Henry will try it
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/server/sc/src/org/openlaszlo/sc/Parser.jjt
===================================================================
---
openlaszlo/branches/devildog/WEB-INF/lps/server/sc/src/org/openlaszlo/sc/Parser.jjt
2007-12-21 15:38:05 UTC (rev 7655)
+++
openlaszlo/branches/devildog/WEB-INF/lps/server/sc/src/org/openlaszlo/sc/Parser.jjt
2007-12-21 15:38:09 UTC (rev 7656)
@@ -449,7 +449,9 @@
void SuperCallExpression() #SuperCallExpression : {}
{
- "super" "." Identifier()
+ "super" ([ LOOKAHEAD("." Identifier() ("." | "("))
+ "." Identifier()
+ ] #EmptyExpression(jjtree.nodeArity()==0))
([ LOOKAHEAD("." Identifier(), { "apply".equals(getToken(2).image)
|| "call".equals(getToken(2).image) })
"." Identifier()
] #EmptyExpression(jjtree.nodeArity()==0))
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/ParseTreePrinter.java
===================================================================
---
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/ParseTreePrinter.java
2007-12-21 15:38:05 UTC (rev 7655)
+++
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/sc/ParseTreePrinter.java
2007-12-21 15:38:09 UTC (rev 7656)
@@ -420,7 +420,7 @@
}
public String visitSuperCallExpression(SimpleNode node, String[] children) {
// Same as above
- return "super." + children[0] + ("".equals(children[1])?"":("." +
children[1])) + "(" + children[2] + ")";
+ return "super" + ("".equals(children[0])?"":("." + children[0])) +
("".equals(children[1])?"":("." + children[1])) + "(" + children[2] + ")";
}
public String visitConditionalExpression(SimpleNode node, String[] children)
{
int thisPrec = prec(Ops.COLON, false);
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
