From 34000651ace6a3e05799864e78f0baa8114fe0a5 Mon Sep 17 00:00:00 2001 From: kpouer Date: Sat, 9 Aug 2003 18:29:00 +0000 Subject: [PATCH] *** empty log message *** --- .../internal/compiler/ast/AbstractVariable.java | 16 + .../internal/compiler/ast/ArrayDeclarator.java | 42 +- .../internal/compiler/ast/ArrayInitializer.java | 4 +- .../compiler/ast/ArrayVariableDeclaration.java | 4 +- .../phpdt/internal/compiler/ast/AstNode.java | 22 +- .../internal/compiler/ast/BinaryExpression.java | 2 +- .../phpdt/internal/compiler/ast/ClassAccess.java | 38 +- .../compiler/ast/ConditionalExpression.java | 2 +- .../phpdt/internal/compiler/ast/Define.java | 6 +- .../phpdt/internal/compiler/ast/EchoStatement.java | 2 +- .../internal/compiler/ast/FieldDeclaration.java | 2 +- .../phpdt/internal/compiler/ast/FunctionCall.java | 22 +- .../internal/compiler/ast/GlobalStatement.java | 11 +- .../phpdt/internal/compiler/ast/HTMLBlock.java | 2 +- .../internal/compiler/ast/InclusionStatement.java | 4 +- .../internal/compiler/ast/ListExpression.java | 22 +- .../internal/compiler/ast/MethodDeclaration.java | 2 +- .../compiler/ast/PostfixedUnaryExpression.java | 2 +- .../compiler/ast/PrefixedUnaryExpression.java | 2 +- .../internal/compiler/ast/StaticStatement.java | 14 +- .../phpdt/internal/compiler/ast/StringLiteral.java | 4 +- .../phpdt/internal/compiler/ast/Variable.java | 48 +- .../internal/compiler/ast/VariableDeclaration.java | 37 +- net.sourceforge.phpeclipse/src/test/PHPParser.java | 7912 +++++++++++--------- net.sourceforge.phpeclipse/src/test/PHPParser.jj | 412 +- .../src/test/PHPParserTokenManager.java | 2 +- 26 files changed, 4613 insertions(+), 4023 deletions(-) create mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AbstractVariable.java diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AbstractVariable.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AbstractVariable.java new file mode 100644 index 0000000..f5ed3d9 --- /dev/null +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AbstractVariable.java @@ -0,0 +1,16 @@ +package net.sourceforge.phpdt.internal.compiler.ast; + +/** + * Created by IntelliJ IDEA. + * User: Administrateur + * Date: 9 août 2003 + * Time: 15:57:05 + * To change this template use Options | File Templates. + */ +public abstract class AbstractVariable extends Expression { + public AbstractVariable(final int sourceStart, final int sourceEnd) { + super(sourceStart, sourceEnd); + } + + public abstract String getName(); +} diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayDeclarator.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayDeclarator.java index 3f3e474..e6c9163 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayDeclarator.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayDeclarator.java @@ -6,17 +6,17 @@ import java.util.ArrayList; /** * @author Matthieu Casanova */ -public class ArrayDeclarator extends AbstractSuffixExpression { +public class ArrayDeclarator extends AbstractVariable { - public Expression prefix; - public Expression vars; + public AbstractVariable prefix; + public Expression var; - public ArrayDeclarator(final Expression prefix, + public ArrayDeclarator(final AbstractVariable prefix, final Expression vars, final int sourceEnd) { - super(prefix.sourceStart, sourceEnd); + super(prefix.getSourceStart(), sourceEnd); this.prefix = prefix; - this.vars = vars; + this.var = vars; } /** @@ -26,19 +26,27 @@ public class ArrayDeclarator extends AbstractSuffixExpression { public String toStringExpression() { final StringBuffer buff = new StringBuffer(prefix.toStringExpression()); buff.append('['); - if (vars != null) { - buff.append(vars.toStringExpression()); + if (var != null) { + buff.append(var.toStringExpression()); } buff.append(']'); return buff.toString(); } - /** + /** + * Return the name of the variable. + * @return the name of the prefix variable + */ + public String getName() { + return prefix.getName(); + } + + /** * Get the variables from outside (parameters, globals ...) * @return the variables from outside */ public List getOutsideVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -46,9 +54,10 @@ public class ArrayDeclarator extends AbstractSuffixExpression { * @return the variables from we change value */ public List getModifiedVariable() { - final ArrayList list = new ArrayList(); - list.addAll(prefix.getModifiedVariable()); - list.addAll(vars.getModifiedVariable()); + final List list = prefix.getModifiedVariable(); + if (var != null) { + list.addAll(var.getModifiedVariable()); + } return list; } @@ -57,9 +66,10 @@ public class ArrayDeclarator extends AbstractSuffixExpression { * @return the variables used */ public List getUsedVariable() { - final ArrayList list = new ArrayList(); - list.addAll(prefix.getUsedVariable()); - list.addAll(vars.getUsedVariable()); + final List list = prefix.getUsedVariable(); + if (var != null) { + list.addAll(var.getUsedVariable()); + } return list; } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java index 9f3160f..42ab9e4 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java @@ -6,6 +6,8 @@ import java.util.List; import java.util.ArrayList; /** + * an array initializer. + * array('a','b','c') or array('a' => 2,'b' = '3'); * @author Matthieu Casanova */ public class ArrayInitializer extends Expression { @@ -41,7 +43,7 @@ public class ArrayInitializer extends Expression { * @return the variables from outside */ public List getOutsideVariable() { - return new ArrayList(); + return new ArrayList(1); } /** diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayVariableDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayVariableDeclaration.java index 4322f61..9e62673 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayVariableDeclaration.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayVariableDeclaration.java @@ -22,7 +22,7 @@ public class ArrayVariableDeclaration extends Expression { * @param value the value */ public ArrayVariableDeclaration(final Expression key, final Expression value) { - super(key.sourceStart, value.sourceEnd); + super(key.getSourceStart(), value.getSourceEnd()); this.key = key; this.value = value; } @@ -33,7 +33,7 @@ public class ArrayVariableDeclaration extends Expression { * @param sourceEnd the end position */ public ArrayVariableDeclaration(final Expression key, final int sourceEnd) { - super(key.sourceStart, sourceEnd); + super(key.getSourceStart(), sourceEnd); this.key = key; } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AstNode.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AstNode.java index 237ce92..2f0fe2d 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AstNode.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AstNode.java @@ -9,7 +9,7 @@ import java.util.List; public abstract class AstNode { /** Starting and ending position of the node in the sources. */ - public int sourceStart, sourceEnd; + private int sourceStart, sourceEnd; /** * Create a node giving starting and ending offset @@ -17,8 +17,8 @@ public abstract class AstNode { * @param sourceEnd ending offset */ public AstNode(final int sourceStart, final int sourceEnd) { - this.sourceStart = sourceStart; - this.sourceEnd = sourceEnd; + this.setSourceStart(sourceStart); + this.setSourceEnd(sourceEnd); } /** @@ -67,4 +67,20 @@ public abstract class AstNode { * @return the variables used */ public abstract List getUsedVariable(); + + public int getSourceStart() { + return sourceStart; + } + + public int getSourceEnd() { + return sourceEnd; + } + + public void setSourceStart(int sourceStart) { + this.sourceStart = sourceStart; + } + + public void setSourceEnd(int sourceEnd) { + this.sourceEnd = sourceEnd; + } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/BinaryExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/BinaryExpression.java index 3455363..1699c5e 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/BinaryExpression.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/BinaryExpression.java @@ -14,7 +14,7 @@ public class BinaryExpression extends OperatorExpression { public BinaryExpression(final Expression left, final Expression right, final int operator) { - super(operator, left.sourceStart, right.sourceEnd); + super(operator, left.getSourceStart(), right.getSourceEnd()); this.left = left; this.right = right; } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ClassAccess.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ClassAccess.java index 8e332c8..0fe5fec 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ClassAccess.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ClassAccess.java @@ -7,19 +7,32 @@ import java.util.ArrayList; * Any class access. * @author Matthieu Casanova */ -public class ClassAccess extends AbstractSuffixExpression { +public class ClassAccess extends AbstractVariable { + /** a static class access : "::" */ public static final int STATIC = 0; + + /** a normal class access : "->" */ public static final int NORMAL = 1; public Expression prefix; + + /** the suffix. */ public Expression suffix; + + /** the type of access. */ public int type; + /** + * Create a new class access. + * @param prefix + * @param suffix + * @param type the type of access {@link #STATIC} or {@link #NORMAL} + */ public ClassAccess(final Expression prefix, final Expression suffix, final int type) { - super(prefix.sourceStart, suffix.sourceEnd); + super(prefix.getSourceStart(), suffix.getSourceEnd()); this.prefix = prefix; this.suffix = suffix; this.type = type; @@ -45,12 +58,23 @@ public class ClassAccess extends AbstractSuffixExpression { return buff.toString(); } - /** + /** + * todo: find a better way to handle this + * @return + */ + public String getName() { + if (prefix instanceof AbstractVariable) { + return ((AbstractVariable)prefix).getName(); + } + return prefix.toStringExpression(); + } + + /** * Get the variables from outside (parameters, globals ...) * @return the variables from outside */ public List getOutsideVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -58,7 +82,7 @@ public class ClassAccess extends AbstractSuffixExpression { * @return the variables from we change value */ public List getModifiedVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -66,6 +90,8 @@ public class ClassAccess extends AbstractSuffixExpression { * @return the variables used */ public List getUsedVariable() { - return prefix.getUsedVariable(); + final List list = prefix.getUsedVariable(); + list.addAll(suffix.getUsedVariable()); + return list; } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java index 121a158..deaa787 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java @@ -14,7 +14,7 @@ public class ConditionalExpression extends OperatorExpression { public ConditionalExpression(final Expression condition, final Expression valueIfTrue, final Expression valueIfFalse) { - super(-1, condition.sourceStart, valueIfFalse.sourceEnd); + super(-1, condition.getSourceStart(), valueIfFalse.getSourceEnd()); this.condition = condition; this.valueIfTrue = valueIfTrue; this.valueIfFalse = valueIfFalse; diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Define.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Define.java index 669f90d..f3d0692 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Define.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Define.java @@ -68,7 +68,7 @@ public class Define extends Statement implements Outlineable { */ public List getOutsideVariable() { final ArrayList list = new ArrayList(1); - list.add(new VariableUsage(defineName.toStringExpression(),sourceStart));//todo: someday : evaluate the defineName + list.add(new VariableUsage(defineName.toStringExpression(),getSourceStart()));//todo: someday : evaluate the defineName return list; } @@ -77,7 +77,7 @@ public class Define extends Statement implements Outlineable { * @return the variables modified */ public List getModifiedVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -85,6 +85,6 @@ public class Define extends Statement implements Outlineable { * @return the variables used */ public List getUsedVariable() { - return new ArrayList(); + return new ArrayList(1); } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EchoStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EchoStatement.java index c5f3e98..6623bcf 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EchoStatement.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EchoStatement.java @@ -14,7 +14,7 @@ public class EchoStatement extends Statement { public Expression[] expressions; public EchoStatement (final Expression[] expressions, final int sourceStart) { - super(sourceStart, expressions[expressions.length-1].sourceEnd); + super(sourceStart, expressions[expressions.length-1].getSourceEnd()); this.expressions = expressions; } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldDeclaration.java index 4981987..71fc91e 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldDeclaration.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldDeclaration.java @@ -12,7 +12,7 @@ import java.util.ArrayList; * A Field declaration. * This is a variable declaration for a php class * In fact it's an array of VariableUsage, since a field could contains - * several vars : + * several var : * var $toto,$tata; * @author Matthieu Casanova */ diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FunctionCall.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FunctionCall.java index cb0b5dd..333e918 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FunctionCall.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FunctionCall.java @@ -4,17 +4,21 @@ import java.util.List; import java.util.ArrayList; /** + * A Function call. * @author Matthieu Casanova */ public class FunctionCall extends AbstractSuffixExpression { + /** the function name. */ public Expression prefix; + + /** the arguments. */ public Expression[] args; public FunctionCall(final Expression prefix, final Expression[] args, final int sourceEnd) { - super(prefix.sourceStart, sourceEnd); + super(prefix.getSourceStart(), sourceEnd); this.prefix = prefix; this.args = args; } @@ -39,12 +43,12 @@ public class FunctionCall extends AbstractSuffixExpression { return buff.toString(); } - /** + /** * Get the variables from outside (parameters, globals ...) * @return the variables from outside */ public List getOutsideVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -52,6 +56,9 @@ public class FunctionCall extends AbstractSuffixExpression { * @return the variables from we change value */ public List getModifiedVariable() { + if (args == null) { + return new ArrayList(1); + } final ArrayList list = new ArrayList(); for (int i = 0; i < args.length; i++) { list.addAll(args[i].getModifiedVariable()); @@ -64,10 +71,11 @@ public class FunctionCall extends AbstractSuffixExpression { * @return the variables used */ public List getUsedVariable() { - final ArrayList list = new ArrayList(); - list.addAll(prefix.getUsedVariable()); - for (int i = 0; i < args.length; i++) { - list.addAll(args[i].getUsedVariable()); + final List list = prefix.getUsedVariable(); + if (args != null) { + for (int i = 0; i < args.length; i++) { + list.addAll(args[i].getUsedVariable()); + } } return list; } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java index d50bafe..f86f678 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java @@ -1,7 +1,6 @@ package net.sourceforge.phpdt.internal.compiler.ast; import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; -import net.sourceforge.phpdt.internal.compiler.ast.declarations.VariableUsage; import net.sourceforge.phpdt.internal.ui.PHPUiImages; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.Position; @@ -16,14 +15,14 @@ import java.util.ArrayList; public class GlobalStatement extends Statement implements Outlineable { /** An array of the variables called by this global statement. */ - public String[] variables; + public AbstractVariable[] variables; private Object parent; private Position position; public GlobalStatement(final Object parent, - final String[] variables, + final AbstractVariable[] variables, final int sourceStart, final int sourceEnd) { super(sourceStart, sourceEnd); @@ -70,7 +69,7 @@ public class GlobalStatement extends Statement implements Outlineable { public List getOutsideVariable() { final ArrayList list = new ArrayList(variables.length); for (int i = 0; i < variables.length; i++) { - list.add(new VariableUsage(variables[i],sourceStart)); + list.addAll(variables[i].getModifiedVariable()); } return list; } @@ -80,7 +79,7 @@ public class GlobalStatement extends Statement implements Outlineable { * @return the variables modified */ public List getModifiedVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -88,6 +87,6 @@ public class GlobalStatement extends Statement implements Outlineable { * @return the variables used */ public List getUsedVariable() { - return new ArrayList(); + return new ArrayList(1); } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/HTMLBlock.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/HTMLBlock.java index 27d93fa..3bb2523 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/HTMLBlock.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/HTMLBlock.java @@ -11,7 +11,7 @@ public class HTMLBlock extends Statement { public AstNode[] nodes; public HTMLBlock(final AstNode[] nodes) { - super(nodes[0].sourceStart, nodes[nodes.length-1].sourceEnd); + super(nodes[0].getSourceStart(), nodes[nodes.length-1].getSourceEnd()); this.nodes = nodes; } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InclusionStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InclusionStatement.java index ddb2cb2..a5abc65 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InclusionStatement.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InclusionStatement.java @@ -30,11 +30,11 @@ public class InclusionStatement extends Statement implements Outlineable { final int keyword, final Expression expression, final int sourceStart) { - super(sourceStart, expression.sourceEnd); + super(sourceStart, expression.getSourceEnd()); this.keyword = keyword; this.expression = expression; this.parent = parent; - position = new Position(sourceStart, sourceEnd); + position = new Position(sourceStart, getSourceEnd()); } public String keywordToString() { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ListExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ListExpression.java index 80f1887..769dc4b 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ListExpression.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ListExpression.java @@ -1,7 +1,5 @@ package net.sourceforge.phpdt.internal.compiler.ast; -import net.sourceforge.phpdt.internal.compiler.ast.declarations.VariableUsage; - import java.util.List; import java.util.ArrayList; @@ -12,10 +10,10 @@ import java.util.ArrayList; */ public class ListExpression extends Expression { - public String[] vars; + public Expression[] vars; public Expression expression; - public ListExpression(final String[] vars, + public ListExpression(final Expression[] vars, final Expression expression, final int sourceStart, final int sourceEnd) { @@ -24,7 +22,7 @@ public class ListExpression extends Expression { this.expression = expression; } - public ListExpression(final String[] vars, + public ListExpression(final Expression[] vars, final int sourceStart, final int sourceEnd) { super(sourceStart, sourceEnd); @@ -38,12 +36,11 @@ public class ListExpression extends Expression { public String toStringExpression() { final StringBuffer buff = new StringBuffer("list("); for (int i = 0; i < vars.length; i++) { - final String var = vars[i]; if (i != 0) { buff.append(", "); } - if (var != null) { - buff.append(var); + if (vars[i] != null) { + buff.append(vars[i].toStringExpression()); } } if (expression != null) { @@ -68,7 +65,7 @@ public class ListExpression extends Expression { public List getModifiedVariable() { final ArrayList list = new ArrayList(); for (int i = 0; i < vars.length; i++) { - list.add(new VariableUsage(vars[i],sourceStart)); + list.addAll(vars[i].getModifiedVariable()); } if (expression != null) { list.addAll(expression.getModifiedVariable()); @@ -81,10 +78,9 @@ public class ListExpression extends Expression { * @return the variables used */ public List getUsedVariable() { - final ArrayList list = new ArrayList(); - if (expression != null) { - list.addAll(expression.getUsedVariable()); + if (expression == null) { + return new ArrayList(1); } - return list; + return expression.getUsedVariable(); } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java index 1118963..615fc04 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java @@ -160,7 +160,7 @@ public class MethodDeclaration extends Statement implements OutlineableWithChild if (arguments != null) { final Enumeration vars = arguments.keys(); while (vars.hasMoreElements()) { - list.add(new VariableUsage((String) vars.nextElement(), sourceStart)); + list.add(new VariableUsage((String) vars.nextElement(), getSourceStart())); } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PostfixedUnaryExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PostfixedUnaryExpression.java index a358e25..1e91ebd 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PostfixedUnaryExpression.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PostfixedUnaryExpression.java @@ -6,7 +6,7 @@ package net.sourceforge.phpdt.internal.compiler.ast; public class PostfixedUnaryExpression extends UnaryExpression { public PostfixedUnaryExpression(final Expression expression, final int operator, final int sourceEnd) { - super(expression, operator, expression.sourceStart, sourceEnd); + super(expression, operator, expression.getSourceStart(), sourceEnd); } public String toStringExpression() { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PrefixedUnaryExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PrefixedUnaryExpression.java index 966ea88..42920c4 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PrefixedUnaryExpression.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PrefixedUnaryExpression.java @@ -6,7 +6,7 @@ package net.sourceforge.phpdt.internal.compiler.ast; public class PrefixedUnaryExpression extends UnaryExpression { public PrefixedUnaryExpression(final Expression expression, final int operator, final int sourceStart) { - super(expression, operator, sourceStart, expression.sourceEnd); + super(expression, operator, sourceStart, expression.getSourceEnd()); } public String toStringExpression() { diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StaticStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StaticStatement.java index 9a9e409..ac8bd2d 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StaticStatement.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StaticStatement.java @@ -1,7 +1,5 @@ package net.sourceforge.phpdt.internal.compiler.ast; -import net.sourceforge.phpdt.internal.compiler.ast.declarations.VariableUsage; - import java.util.List; import java.util.ArrayList; @@ -12,9 +10,9 @@ import java.util.ArrayList; public class StaticStatement extends Statement { /** An array of the variables called by this global statement. */ - public String[] variables; + public VariableDeclaration[] variables; - public StaticStatement(final String[] variables, final int sourceStart, final int sourceEnd) { + public StaticStatement(final VariableDeclaration[] variables, final int sourceStart, final int sourceEnd) { super(sourceStart, sourceEnd); this.variables = variables; } @@ -39,9 +37,9 @@ public class StaticStatement extends Statement { * @return the variables from outside */ public List getOutsideVariable() { - final ArrayList list = new ArrayList(variables.length); + final ArrayList list = new ArrayList(); for (int i = 0; i < variables.length; i++) { - list.add(new VariableUsage(variables[i], sourceStart)); + list.addAll(variables[i].getModifiedVariable()); } return list; } @@ -51,7 +49,7 @@ public class StaticStatement extends Statement { * @return the variables modified */ public List getModifiedVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -59,6 +57,6 @@ public class StaticStatement extends Statement { * @return the variables used */ public List getUsedVariable() { - return new ArrayList(); + return new ArrayList(1); } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java index ca22a4c..436c102 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java @@ -103,13 +103,13 @@ public class StringLiteral extends Literal { * @deprecated - use field instead */ public int sourceEnd() { - return sourceEnd; + return getSourceEnd(); } /** * @deprecated - use field instead */ public int sourceStart() { - return sourceStart; + return getSourceStart(); } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Variable.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Variable.java index a6d027a..69163ca 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Variable.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Variable.java @@ -6,29 +6,53 @@ import java.util.List; import java.util.ArrayList; /** + * A variable. + * It could be a simple variable, or contains another variable. * @author Matthieu Casanova */ -public class Variable extends Expression { +public class Variable extends AbstractVariable { /** The name of the variable. */ - public char[] name; + private String name; + /** A variable inside ($$varname). */ + private AbstractVariable variable; - public Variable(final char[] name, final int sourceStart, final int sourceEnd) { + /** + * Create a new simple variable. + * @param name the name + * @param sourceStart the starting position + * @param sourceEnd the ending position + */ + public Variable(final String name, final int sourceStart, final int sourceEnd) { super(sourceStart, sourceEnd); this.name = name; } - /** + /** + * Create a special variable ($$toto for example). + * @param variable the variable contained + * @param sourceStart the starting position + * @param sourceEnd the ending position + */ + public Variable(final AbstractVariable variable, final int sourceStart, final int sourceEnd) { + super(sourceStart, sourceEnd); + this.variable = variable; + } + + /** * Return the expression as String. * @return the expression */ public String toStringExpression() { - return "$"+new String(name); + return "$" + getName(); } public String getName() { - return new String(name); + if (variable == null) { + return name; + } + return variable.toStringExpression(); } /** @@ -44,9 +68,7 @@ public class Variable extends Expression { * @return the variables modified */ public List getModifiedVariable() { - final ArrayList list = new ArrayList(1); - list.add(new VariableUsage(getName(),sourceStart)); - return list; + return new ArrayList(1); } /** @@ -54,6 +76,12 @@ public class Variable extends Expression { * @return the variables used */ public List getUsedVariable() { - return new ArrayList(1); + final ArrayList list = new ArrayList(1); + if (name == null) { + list.add(new VariableUsage(variable.getName(), getSourceStart())); + } else { + list.add(new VariableUsage(name, getSourceStart())); + } + return list; } } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VariableDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VariableDeclaration.java index 7f55b38..5d3f8b9 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VariableDeclaration.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/VariableDeclaration.java @@ -28,7 +28,7 @@ public class VariableDeclaration extends Expression implements Outlineable { public static final int LSHIFT_EQUAL = 11; public static final int RSIGNEDSHIFT_EQUAL = 12; - protected Variable variable; + protected AbstractVariable variable; /** The value for variable initialization. */ public Expression initialization; @@ -41,30 +41,31 @@ public class VariableDeclaration extends Expression implements Outlineable { /** * Create a variable. - * @param initialization the initialization * @param variable the name of the variable + * @param initialization the initialization + * @param operator the assign operator * @param sourceStart the start point */ public VariableDeclaration(final Object parent, - final Variable variable, + final AbstractVariable variable, final Expression initialization, final int operator, final int sourceStart) { - super(sourceStart, initialization.sourceEnd); + super(sourceStart, initialization.getSourceEnd()); this.initialization = initialization; this.variable = variable; this.operator = operator; this.parent = parent; - position = new Position(sourceStart, sourceEnd); + position = new Position(sourceStart, getSourceEnd()); } /** * Create a variable. - * @param name the name of the variable + * @param variable a variable (in case of $$variablename) * @param sourceStart the start point */ public VariableDeclaration(final Object parent, - final Variable variable, + final AbstractVariable variable, final int sourceStart, final int sourceEnd) { super(sourceStart, sourceEnd); @@ -79,14 +80,14 @@ public class VariableDeclaration extends Expression implements Outlineable { /** * Create a variable. * @param initialization the initialization - * @param name the name of the variable + * @param variable a variable (in case of $$variablename) * @param sourceStart the start point */ - public VariableDeclaration(final Variable variable, + public VariableDeclaration(final AbstractVariable variable, final Expression initialization, final int operator, final int sourceStart) { - super(sourceStart, initialization.sourceEnd); + super(sourceStart, initialization.getSourceEnd()); this.variable = variable; this.initialization = initialization; this.operator = operator; @@ -94,12 +95,12 @@ public class VariableDeclaration extends Expression implements Outlineable { /** * Create a variable. - * @param name the name of the variable + * @param variable a variable (in case of $$variablename) * @param sourceStart the start point */ - public VariableDeclaration(final Variable variable, + public VariableDeclaration(final AbstractVariable variable, final int sourceStart) { - super(sourceStart, variable.sourceEnd); + super(sourceStart, variable.getSourceEnd()); this.variable = variable; } @@ -191,7 +192,7 @@ public class VariableDeclaration extends Expression implements Outlineable { * @return the variables from outside */ public List getOutsideVariable() { - return new ArrayList(); + return new ArrayList(1); } /** @@ -199,8 +200,7 @@ public class VariableDeclaration extends Expression implements Outlineable { * @return the variables from we change value */ public List getModifiedVariable() { - final ArrayList list = new ArrayList(); - list.addAll(variable.getModifiedVariable()); + final List list = variable.getUsedVariable(); if (initialization != null) { list.addAll(initialization.getModifiedVariable()); } @@ -212,10 +212,9 @@ public class VariableDeclaration extends Expression implements Outlineable { * @return the variables used */ public List getUsedVariable() { - final ArrayList list = new ArrayList(); if (initialization != null) { - list.addAll(initialization.getModifiedVariable());//yes it's getModified variable (in a variable declaration $a = $b, $a is modified, event if you have only $a and no initialization + return initialization.getModifiedVariable();//yes it's getModified variable (in a variable declaration $a = $b, $a is modified, event if you have only $a and no initialization } - return list; + return new ArrayList(1); } } diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.java b/net.sourceforge.phpeclipse/src/test/PHPParser.java index f151bde..e41b9c8 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.java @@ -19,7 +19,7 @@ import net.sourceforge.phpdt.internal.compiler.ast.*; import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren; import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; -import junit.framework.Assert; +import net.sourceforge.phpdt.internal.corext.Assert; /** * A new php parser. @@ -60,7 +60,7 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon /** The cursor in expression stack. */ private static int nodePtr; - private static final boolean PARSER_DEBUG = false; + private static final boolean PARSER_DEBUG = true; public final void setFileToParse(final IFile fileToParse) { PHPParser.fileToParse = fileToParse; @@ -74,6 +74,46 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon PHPParser.fileToParse = fileToParse; } + public static final void phpParserTester(final String strEval) throws ParseException { + final StringReader stream = new StringReader(strEval); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(new StringReader(strEval)); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); + phpTest(); + } + + public static final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException { + final Reader stream = new FileReader(fileName); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + phpFile(); + } + + public static final void htmlParserTester(final String strEval) throws ParseException { + final StringReader stream = new StringReader(strEval); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + phpFile(); + } + /** * Reinitialize the parser. */ @@ -123,16 +163,18 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon return outlineInfo; } + private static void processParseExceptionDebug(final ParseException e) throws ParseException { + if (PARSER_DEBUG) { + throw e; + } + processParseException(e); + } /** * This method will process the parse exception. * If the error message is null, the parse exception wasn't catched and a trace is written in the log * @param e the ParseException */ private static void processParseException(final ParseException e) { - if (PARSER_DEBUG) { - e.printStackTrace(); - Assert.assertTrue(false); - } if (errorMessage == null) { PHPeclipsePlugin.log(e); errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it"; @@ -283,73 +325,87 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon phpFile(); } + static final public void phpTest() throws ParseException { + trace_call("phpTest"); + try { + Php(); + jj_consume_token(0); + } finally { + trace_return("phpTest"); + } + } + static final public void phpFile() throws ParseException { + trace_call("phpFile"); try { - label_1: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PHPSTARTSHORT: - case PHPSTARTLONG: - case PHPECHOSTART: - case PHPEND: - case CLASS: - case FUNCTION: - case IF: - case ARRAY: - case BREAK: - case LIST: - case PRINT: - case ECHO: - case INCLUDE: - case REQUIRE: - case INCLUDE_ONCE: - case REQUIRE_ONCE: - case GLOBAL: - case DEFINE: - case STATIC: - case CONTINUE: - case DO: - case FOR: - case NEW: - case NULL: - case RETURN: - case SWITCH: - case TRUE: - case FALSE: - case WHILE: - case FOREACH: - case AT: - case DOLLAR: - case BANG: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case BIT_AND: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case LBRACE: - case SEMICOLON: - case DOLLAR_ID: - ; - break; - default: - jj_la1[0] = jj_gen; - break label_1; + try { + label_1: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTSHORT: + case PHPSTARTLONG: + case PHPECHOSTART: + case PHPEND: + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case DEFINE: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case DOLLAR_ID: + ; + break; + default: + jj_la1[0] = jj_gen; + break label_1; + } + PhpBlock(); } - PhpBlock(); - } PHPParser.createNewHTMLCode(); - } catch (TokenMgrError e) { + } catch (TokenMgrError e) { PHPeclipsePlugin.log(e); errorStart = SimpleCharStream.getPosition(); errorEnd = errorStart + 1; errorMessage = e.getMessage(); errorLevel = ERROR; {if (true) throw generateParseException();} + } + } finally { + trace_return("phpFile"); } } @@ -359,131 +415,18 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * or */ static final public void PhpBlock() throws ParseException { + trace_call("PhpBlock"); + try { final int start = SimpleCharStream.getPosition(); final PHPEchoBlock phpEchoBlock; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PHPECHOSTART: - phpEchoBlock = phpEchoBlock(); - pushOnAstNodes(phpEchoBlock); - break; - case PHPSTARTSHORT: - case PHPSTARTLONG: - case PHPEND: - case CLASS: - case FUNCTION: - case IF: - case ARRAY: - case BREAK: - case LIST: - case PRINT: - case ECHO: - case INCLUDE: - case REQUIRE: - case INCLUDE_ONCE: - case REQUIRE_ONCE: - case GLOBAL: - case DEFINE: - case STATIC: - case CONTINUE: - case DO: - case FOR: - case NEW: - case NULL: - case RETURN: - case SWITCH: - case TRUE: - case FALSE: - case WHILE: - case FOREACH: - case AT: - case DOLLAR: - case BANG: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case BIT_AND: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case LBRACE: - case SEMICOLON: - case DOLLAR_ID: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPECHOSTART: + phpEchoBlock = phpEchoBlock(); + pushOnAstNodes(phpEchoBlock); + break; case PHPSTARTSHORT: case PHPSTARTLONG: - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PHPSTARTLONG: - jj_consume_token(PHPSTARTLONG); - break; - case PHPSTARTSHORT: - jj_consume_token(PHPSTARTSHORT); - try { - setMarker(fileToParse, - "You should use '' expected"; - errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } - break; - default: - jj_la1[3] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } - - static final public PHPEchoBlock phpEchoBlock() throws ParseException { - final Expression expr; - final int pos = SimpleCharStream.getPosition(); - final PHPEchoBlock echoBlock; - jj_consume_token(PHPECHOSTART); - expr = Expression(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case SEMICOLON: - jj_consume_token(SEMICOLON); - break; - default: - jj_la1[4] = jj_gen; - ; - } - jj_consume_token(PHPEND); - echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition()); - pushOnAstNodes(echoBlock); - {if (true) return echoBlock;} - throw new Error("Missing return statement in function"); - } - - static final public void Php() throws ParseException { - label_2: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPEND: case CLASS: case FUNCTION: case IF: @@ -517,7 +460,6 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case MINUS_MINUS: case PLUS: case MINUS: - case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: @@ -526,53 +468,182 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon case LBRACE: case SEMICOLON: case DOLLAR_ID: - ; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTSHORT: + case PHPSTARTLONG: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTLONG: + jj_consume_token(PHPSTARTLONG); + break; + case PHPSTARTSHORT: + jj_consume_token(PHPSTARTSHORT); + try { + setMarker(fileToParse, + "You should use '' expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + processParseExceptionDebug(e); + } break; default: - jj_la1[5] = jj_gen; - break label_2; + jj_la1[3] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } finally { + trace_return("PhpBlock"); + } + } + + static final public PHPEchoBlock phpEchoBlock() throws ParseException { + trace_call("phpEchoBlock"); + try { + final Expression expr; + final int pos = SimpleCharStream.getPosition(); + final PHPEchoBlock echoBlock; + jj_consume_token(PHPECHOSTART); + expr = Expression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case SEMICOLON: + jj_consume_token(SEMICOLON); + break; + default: + jj_la1[4] = jj_gen; + ; + } + jj_consume_token(PHPEND); + echoBlock = new PHPEchoBlock(expr,pos,SimpleCharStream.getPosition()); + pushOnAstNodes(echoBlock); + {if (true) return echoBlock;} + throw new Error("Missing return statement in function"); + } finally { + trace_return("phpEchoBlock"); + } + } + + static final public void Php() throws ParseException { + trace_call("Php"); + try { + label_2: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CLASS: + case FUNCTION: + case IF: + case ARRAY: + case BREAK: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case DEFINE: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case DOLLAR_ID: + ; + break; + default: + jj_la1[5] = jj_gen; + break label_2; + } + BlockStatement(); } - BlockStatement(); + } finally { + trace_return("Php"); } } static final public ClassDeclaration ClassDeclaration() throws ParseException { + trace_call("ClassDeclaration"); + try { final ClassDeclaration classDeclaration; final Token className,superclassName; final int pos; char[] classNameImage = SYNTAX_ERROR_CHAR; char[] superclassNameImage = null; - jj_consume_token(CLASS); + jj_consume_token(CLASS); pos = SimpleCharStream.getPosition(); - try { - className = jj_consume_token(IDENTIFIER); + try { + className = jj_consume_token(IDENTIFIER); classNameImage = className.image.toCharArray(); - } catch (ParseException e) { + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case EXTENDS: - jj_consume_token(EXTENDS); - try { - superclassName = jj_consume_token(IDENTIFIER); + processParseExceptionDebug(e); + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case EXTENDS: + jj_consume_token(EXTENDS); + try { + superclassName = jj_consume_token(IDENTIFIER); superclassNameImage = superclassName.image.toCharArray(); - } catch (ParseException e) { + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', identifier expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); superclassNameImage = SYNTAX_ERROR_CHAR; + } + break; + default: + jj_la1[6] = jj_gen; + ; } - break; - default: - jj_la1[6] = jj_gen; - ; - } if (superclassNameImage == null) { classDeclaration = new ClassDeclaration(currentSegment, classNameImage, @@ -587,45 +658,53 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon } currentSegment.add(classDeclaration); currentSegment = classDeclaration; - ClassBody(classDeclaration); + ClassBody(classDeclaration); currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - classDeclaration.sourceEnd = SimpleCharStream.getPosition(); + classDeclaration.setSourceEnd(SimpleCharStream.getPosition()); pushOnAstNodes(classDeclaration); {if (true) return classDeclaration;} throw new Error("Missing return statement in function"); + } finally { + trace_return("ClassDeclaration"); + } } static final public void ClassBody(final ClassDeclaration classDeclaration) throws ParseException { + trace_call("ClassBody"); try { - jj_consume_token(LBRACE); - } catch (ParseException e) { + try { + jj_consume_token(LBRACE); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image + "'. '{' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } - label_3: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case FUNCTION: - case VAR: - ; - break; - default: - jj_la1[7] = jj_gen; - break label_3; + processParseExceptionDebug(e); } - ClassBodyDeclaration(classDeclaration); - } - try { - jj_consume_token(RBRACE); - } catch (ParseException e) { + label_3: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case FUNCTION: + case VAR: + ; + break; + default: + jj_la1[7] = jj_gen; + break label_3; + } + ClassBodyDeclaration(classDeclaration); + } + try { + jj_consume_token(RBRACE); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. 'var', 'function' or '}' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); + } + } finally { + trace_return("ClassBody"); } } @@ -633,22 +712,27 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * A class can contain only methods and fields. */ static final public void ClassBodyDeclaration(final ClassDeclaration classDeclaration) throws ParseException { + trace_call("ClassBodyDeclaration"); + try { final MethodDeclaration method; final FieldDeclaration field; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case FUNCTION: - method = MethodDeclaration(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case FUNCTION: + method = MethodDeclaration(); method.analyzeCode(); classDeclaration.addMethod(method); - break; - case VAR: - field = FieldDeclaration(); + break; + case VAR: + field = FieldDeclaration(); classDeclaration.addField(field); - break; - default: - jj_la1[8] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + break; + default: + jj_la1[8] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } finally { + trace_return("ClassBodyDeclaration"); } } @@ -657,38 +741,40 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * it is only used by ClassBodyDeclaration() */ static final public FieldDeclaration FieldDeclaration() throws ParseException { + trace_call("FieldDeclaration"); + try { VariableDeclaration variableDeclaration; final VariableDeclaration[] list; final ArrayList arrayList = new ArrayList(); final int pos = SimpleCharStream.getPosition(); - jj_consume_token(VAR); - variableDeclaration = VariableDeclaratorNoSuffix(); + jj_consume_token(VAR); + variableDeclaration = VariableDeclaratorNoSuffix(); arrayList.add(variableDeclaration); outlineInfo.addVariable(new String(variableDeclaration.name())); - label_4: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: - ; - break; - default: - jj_la1[9] = jj_gen; - break label_4; - } - jj_consume_token(COMMA); - variableDeclaration = VariableDeclaratorNoSuffix(); + label_4: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + ; + break; + default: + jj_la1[9] = jj_gen; + break label_4; + } + jj_consume_token(COMMA); + variableDeclaration = VariableDeclaratorNoSuffix(); arrayList.add(variableDeclaration); outlineInfo.addVariable(new String(variableDeclaration.name())); - } - try { - jj_consume_token(SEMICOLON); - } catch (ParseException e) { + } + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected after variable declaration"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } + processParseExceptionDebug(e); + } list = new VariableDeclaration[arrayList.size()]; arrayList.toArray(list); {if (true) return new FieldDeclaration(list, @@ -696,6 +782,9 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon SimpleCharStream.getPosition(), currentSegment);} throw new Error("Missing return statement in function"); + } finally { + trace_return("FieldDeclaration"); + } } /** @@ -703,365 +792,427 @@ public final class PHPParser extends PHPParserSuperclass implements PHPParserCon * It will be used by fields and formal parameters */ static final public VariableDeclaration VariableDeclaratorNoSuffix() throws ParseException { + trace_call("VariableDeclaratorNoSuffix"); + try { final Token varName; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); - varName = jj_consume_token(DOLLAR_ID); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ASSIGN: - jj_consume_token(ASSIGN); - try { - initializer = VariableInitializer(); - } catch (ParseException e) { + varName = jj_consume_token(DOLLAR_ID); + final int pos = SimpleCharStream.getPosition()-varName.image.length(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ASSIGN: + jj_consume_token(ASSIGN); + try { + initializer = VariableInitializer(); + } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); + } + break; + default: + jj_la1[10] = jj_gen; + ; } - break; - default: - jj_la1[10] = jj_gen; - ; - } if (initializer == null) { {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()), + new Variable(varName.image.substring(1),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()), pos, SimpleCharStream.getPosition());} } {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()), + new Variable(varName.image.substring(1),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()), initializer, VariableDeclaration.EQUAL, pos);} throw new Error("Missing return statement in function"); + } finally { + trace_return("VariableDeclaratorNoSuffix"); + } } /** * this will be used by static statement */ static final public VariableDeclaration VariableDeclarator() throws ParseException { - final String varName; + trace_call("VariableDeclarator"); + try { + final AbstractVariable variable; Expression initializer = null; final int pos = SimpleCharStream.getPosition(); - varName = VariableDeclaratorId(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ASSIGN: - jj_consume_token(ASSIGN); - try { - initializer = VariableInitializer(); - } catch (ParseException e) { + variable = VariableDeclaratorId(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ASSIGN: + jj_consume_token(ASSIGN); + try { + initializer = VariableInitializer(); + } catch (ParseException e) { errorMessage = "Literal expression expected in variable initializer"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); + } + break; + default: + jj_la1[11] = jj_gen; + ; } - break; - default: - jj_la1[11] = jj_gen; - ; - } if (initializer == null) { {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()), - pos, - SimpleCharStream.getPosition());} + variable, + pos, + SimpleCharStream.getPosition());} } {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()), + variable, initializer, VariableDeclaration.EQUAL, pos);} throw new Error("Missing return statement in function"); + } finally { + trace_return("VariableDeclarator"); + } } /** * A Variable name. * @return the variable name (with suffix) */ - static final public String VariableDeclaratorId() throws ParseException { - final String var; - Expression expression = null; - final int pos = SimpleCharStream.getPosition(); - ConstantIdentifier ex; + static final public AbstractVariable VariableDeclaratorId() throws ParseException { + trace_call("VariableDeclaratorId"); try { - var = Variable(); - label_5: - while (true) { - if (jj_2_1(2)) { - ; - } else { - break label_5; + final Variable var; + AbstractVariable expression = null; + final int pos = SimpleCharStream.getPosition(); + try { + var = Variable(); + label_5: + while (true) { + if (jj_2_1(2)) { + ; + } else { + break label_5; + } + expression = VariableSuffix(var); } - ex = new ConstantIdentifier(var.toCharArray(), - pos, - SimpleCharStream.getPosition()); - expression = VariableSuffix(ex); - } if (expression == null) { {if (true) return var;} } - {if (true) return expression.toStringExpression();} - } catch (ParseException e) { + {if (true) return expression;} + } catch (ParseException e) { errorMessage = "'$' expected for variable identifier"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } + } throw new Error("Missing return statement in function"); + } finally { + trace_return("VariableDeclaratorId"); + } } /** * Return a variablename without the $. * @return a variable name */ - static final public String Variable() throws ParseException { + static final public Variable Variable() throws ParseException { + trace_call("Variable"); + try { final StringBuffer buff; Expression expression = null; final Token token; - final String expr; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR_ID: - token = jj_consume_token(DOLLAR_ID); + Variable expr; + final int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACE: - jj_consume_token(LBRACE); - expression = Expression(); - jj_consume_token(RBRACE); - break; - default: - jj_la1[12] = jj_gen; - ; - } + case DOLLAR_ID: + token = jj_consume_token(DOLLAR_ID); + pos = SimpleCharStream.getPosition()-token.image.length(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACE: + jj_consume_token(LBRACE); + expression = Expression(); + jj_consume_token(RBRACE); + break; + default: + jj_la1[12] = jj_gen; + ; + } if (expression == null) { - {if (true) return token.image.substring(1);} + {if (true) return new Variable(token.image.substring(1),pos,SimpleCharStream.getPosition());} } - buff = new StringBuffer(token.image); + String s = expression.toStringExpression(); + buff = new StringBuffer(token.image.length()+s.length()+2); + buff.append(token.image); buff.append("{"); - buff.append(expression.toStringExpression()); + buff.append(s); buff.append("}"); - {if (true) return buff.toString();} - break; - case DOLLAR: - jj_consume_token(DOLLAR); - expr = VariableName(); - {if (true) return expr;} - break; - default: - jj_la1[13] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + s = buff.toString(); + {if (true) return new Variable(s,pos,SimpleCharStream.getPosition());} + break; + case DOLLAR: + jj_consume_token(DOLLAR); + pos = SimpleCharStream.getPosition()-1; + expr = VariableName(); + {if (true) return new Variable(expr,pos,SimpleCharStream.getPosition());} + break; + default: + jj_la1[13] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("Variable"); + } } /** * A Variable name (without the $) * @return a variable name String */ - static final public String VariableName() throws ParseException { + static final public Variable VariableName() throws ParseException { + trace_call("VariableName"); + try { final StringBuffer buff; - final String expr; + String expr; + final Variable var; Expression expression = null; final Token token; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LBRACE: - jj_consume_token(LBRACE); - expression = Expression(); - jj_consume_token(RBRACE); - buff = new StringBuffer("{"); - buff.append(expression.toStringExpression()); - buff.append("}"); - {if (true) return buff.toString();} - break; - case IDENTIFIER: - token = jj_consume_token(IDENTIFIER); + int pos; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACE: jj_consume_token(LBRACE); + pos = SimpleCharStream.getPosition()-1; expression = Expression(); jj_consume_token(RBRACE); + expr = expression.toStringExpression(); + buff = new StringBuffer(expr.length()+2); + buff.append("{"); + buff.append(expr); + buff.append("}"); + pos = SimpleCharStream.getPosition(); + expr = buff.toString(); + {if (true) return new Variable(expr, + pos, + SimpleCharStream.getPosition());} break; - default: - jj_la1[14] = jj_gen; - ; - } + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + pos = SimpleCharStream.getPosition() - token.image.length(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACE: + jj_consume_token(LBRACE); + expression = Expression(); + jj_consume_token(RBRACE); + break; + default: + jj_la1[14] = jj_gen; + ; + } if (expression == null) { - {if (true) return token.image;} + {if (true) return new Variable(token.image, + pos, + SimpleCharStream.getPosition());} } - buff = new StringBuffer(token.image); + expr = expression.toStringExpression(); + buff = new StringBuffer(token.image.length()+expr.length()+2); + buff.append(token.image); buff.append("{"); - buff.append(expression.toStringExpression()); - buff.append("}"); - {if (true) return buff.toString();} - break; - case DOLLAR: - jj_consume_token(DOLLAR); - expr = VariableName(); - buff = new StringBuffer("$"); buff.append(expr); - {if (true) return buff.toString();} - break; - case DOLLAR_ID: - token = jj_consume_token(DOLLAR_ID); - {if (true) return token.image;} - break; - default: - jj_la1[15] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + buff.append("}"); + expr = buff.toString(); + {if (true) return new Variable(expr, + pos, + SimpleCharStream.getPosition());} + break; + case DOLLAR: + jj_consume_token(DOLLAR); + pos = SimpleCharStream.getPosition() - 1; + var = VariableName(); + {if (true) return new Variable(var, + pos, + SimpleCharStream.getPosition());} + break; + case DOLLAR_ID: + token = jj_consume_token(DOLLAR_ID); + pos = SimpleCharStream.getPosition(); + {if (true) return new Variable(token.image, + pos-token.image.length(), + pos);} + break; + default: + jj_la1[15] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("VariableName"); + } } static final public Expression VariableInitializer() throws ParseException { + trace_call("VariableInitializer"); + try { final Expression expr; final Token token; final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case NULL: - case TRUE: - case FALSE: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - expr = Literal(); - {if (true) return expr;} - break; - case MINUS: - jj_consume_token(MINUS); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case NULL: + case TRUE: + case FALSE: case INTEGER_LITERAL: - token = jj_consume_token(INTEGER_LITERAL); - break; case FLOATING_POINT_LITERAL: - token = jj_consume_token(FLOATING_POINT_LITERAL); + case STRING_LITERAL: + expr = Literal(); + {if (true) return expr;} break; - default: - jj_la1[16] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + case MINUS: + jj_consume_token(MINUS); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INTEGER_LITERAL: + token = jj_consume_token(INTEGER_LITERAL); + break; + case FLOATING_POINT_LITERAL: + token = jj_consume_token(FLOATING_POINT_LITERAL); + break; + default: + jj_la1[16] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(), pos, SimpleCharStream.getPosition()), OperatorIds.MINUS, pos);} - break; - case PLUS: - jj_consume_token(PLUS); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case INTEGER_LITERAL: - token = jj_consume_token(INTEGER_LITERAL); - break; - case FLOATING_POINT_LITERAL: - token = jj_consume_token(FLOATING_POINT_LITERAL); break; - default: - jj_la1[17] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + case PLUS: + jj_consume_token(PLUS); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INTEGER_LITERAL: + token = jj_consume_token(INTEGER_LITERAL); + break; + case FLOATING_POINT_LITERAL: + token = jj_consume_token(FLOATING_POINT_LITERAL); + break; + default: + jj_la1[17] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } {if (true) return new PrefixedUnaryExpression(new NumberLiteral(token.image.toCharArray(), pos, SimpleCharStream.getPosition()), OperatorIds.PLUS, pos);} - break; - case ARRAY: - expr = ArrayDeclarator(); + break; + case ARRAY: + expr = ArrayDeclarator(); {if (true) return expr;} - break; - case IDENTIFIER: - token = jj_consume_token(IDENTIFIER); + break; + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); {if (true) return new ConstantIdentifier(token.image.toCharArray(),pos,SimpleCharStream.getPosition());} - break; - default: - jj_la1[18] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[18] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("VariableInitializer"); + } } static final public ArrayVariableDeclaration ArrayVariable() throws ParseException { + trace_call("ArrayVariable"); + try { final Expression expr,expr2; - expr = Expression(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAYASSIGN: - jj_consume_token(ARRAYASSIGN); - expr2 = Expression(); + expr = Expression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAYASSIGN: + jj_consume_token(ARRAYASSIGN); + expr2 = Expression(); {if (true) return new ArrayVariableDeclaration(expr,expr2);} - break; - default: - jj_la1[19] = jj_gen; - ; - } + break; + default: + jj_la1[19] = jj_gen; + ; + } {if (true) return new ArrayVariableDeclaration(expr,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); + } finally { + trace_return("ArrayVariable"); + } } static final public ArrayVariableDeclaration[] ArrayInitializer() throws ParseException { + trace_call("ArrayInitializer"); + try { ArrayVariableDeclaration expr; final ArrayList list = new ArrayList(); - jj_consume_token(LPAREN); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case LIST: - case PRINT: - case NEW: - case NULL: - case TRUE: - case FALSE: - case AT: - case DOLLAR: - case BANG: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case BIT_AND: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case DOLLAR_ID: - expr = ArrayVariable(); - list.add(expr); - label_6: - while (true) { - if (jj_2_2(2)) { - ; - } else { - break label_6; - } - jj_consume_token(COMMA); + jj_consume_token(LPAREN); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case DOLLAR_ID: expr = ArrayVariable(); list.add(expr); + label_6: + while (true) { + if (jj_2_2(2)) { + ; + } else { + break label_6; + } + jj_consume_token(COMMA); + expr = ArrayVariable(); + list.add(expr); + } + break; + default: + jj_la1[20] = jj_gen; + ; } - break; - default: - jj_la1[20] = jj_gen; - ; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: - jj_consume_token(COMMA); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + jj_consume_token(COMMA); list.add(null); - break; - default: - jj_la1[21] = jj_gen; - ; - } - jj_consume_token(RPAREN); + break; + default: + jj_la1[21] = jj_gen; + ; + } + jj_consume_token(RPAREN); final ArrayVariableDeclaration[] vars = new ArrayVariableDeclaration[list.size()]; list.toArray(vars); {if (true) return vars;} throw new Error("Missing return statement in function"); + } finally { + trace_return("ArrayInitializer"); + } } /** @@ -1069,27 +1220,32 @@ final Expression expr,expr2; * function MetodDeclarator() Block() */ static final public MethodDeclaration MethodDeclaration() throws ParseException { + trace_call("MethodDeclaration"); + try { final MethodDeclaration functionDeclaration; final Block block; final OutlineableWithChildren seg = currentSegment; - jj_consume_token(FUNCTION); - try { - functionDeclaration = MethodDeclarator(); + jj_consume_token(FUNCTION); + try { + functionDeclaration = MethodDeclarator(); outlineInfo.addVariable(new String(functionDeclaration.name)); - } catch (ParseException e) { + } catch (ParseException e) { if (errorMessage != null) {if (true) throw e;} errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } + } currentSegment = functionDeclaration; - block = Block(); + block = Block(); functionDeclaration.statements = block.statements; currentSegment = seg; {if (true) return functionDeclaration;} throw new Error("Missing return statement in function"); + } finally { + trace_return("MethodDeclaration"); + } } /** @@ -1098,30 +1254,32 @@ final Expression expr,expr2; * @return a function description for the outline */ static final public MethodDeclaration MethodDeclarator() throws ParseException { + trace_call("MethodDeclarator"); + try { final Token identifier; Token reference = null; final Hashtable formalParameters; final int pos = SimpleCharStream.getPosition(); char[] identifierChar = SYNTAX_ERROR_CHAR; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BIT_AND: - reference = jj_consume_token(BIT_AND); - break; - default: - jj_la1[22] = jj_gen; - ; - } - try { - identifier = jj_consume_token(IDENTIFIER); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BIT_AND: + reference = jj_consume_token(BIT_AND); + break; + default: + jj_la1[22] = jj_gen; + ; + } + try { + identifier = jj_consume_token(IDENTIFIER); identifierChar = identifier.image.toCharArray(); - } catch (ParseException e) { + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function identifier expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } - formalParameters = FormalParameters(); + processParseExceptionDebug(e); + } + formalParameters = FormalParameters(); MethodDeclaration method = new MethodDeclaration(currentSegment, identifierChar, formalParameters, @@ -1130,6 +1288,9 @@ final Expression expr,expr2; SimpleCharStream.getPosition()); {if (true) return method;} throw new Error("Missing return statement in function"); + } finally { + trace_return("MethodDeclarator"); + } } /** @@ -1137,52 +1298,57 @@ final Expression expr,expr2; * (FormalParameter()) */ static final public Hashtable FormalParameters() throws ParseException { + trace_call("FormalParameters"); + try { VariableDeclaration var; final Hashtable parameters = new Hashtable(); - try { - jj_consume_token(LPAREN); - } catch (ParseException e) { + try { + jj_consume_token(LPAREN); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected after function identifier"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BIT_AND: - case DOLLAR_ID: - var = FormalParameter(); - parameters.put(new String(var.name()),var); - label_7: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: - ; - break; - default: - jj_la1[23] = jj_gen; - break label_7; - } - jj_consume_token(COMMA); + processParseExceptionDebug(e); + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BIT_AND: + case DOLLAR_ID: var = FormalParameter(); + parameters.put(new String(var.name()),var); + label_7: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + ; + break; + default: + jj_la1[23] = jj_gen; + break label_7; + } + jj_consume_token(COMMA); + var = FormalParameter(); parameters.put(new String(var.name()),var); + } + break; + default: + jj_la1[24] = jj_gen; + ; } - break; - default: - jj_la1[24] = jj_gen; - ; - } - try { - jj_consume_token(RPAREN); - } catch (ParseException e) { + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } + processParseExceptionDebug(e); + } {if (true) return parameters;} throw new Error("Missing return statement in function"); + } finally { + trace_return("FormalParameters"); + } } /** @@ -1190,124 +1356,135 @@ final Expression expr,expr2; * $varname[=value] (,$varname[=value]) */ static final public VariableDeclaration FormalParameter() throws ParseException { + trace_call("FormalParameter"); + try { final VariableDeclaration variableDeclaration; Token token = null; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BIT_AND: - token = jj_consume_token(BIT_AND); - break; - default: - jj_la1[25] = jj_gen; - ; - } - variableDeclaration = VariableDeclaratorNoSuffix(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BIT_AND: + token = jj_consume_token(BIT_AND); + break; + default: + jj_la1[25] = jj_gen; + ; + } + variableDeclaration = VariableDeclaratorNoSuffix(); if (token != null) { variableDeclaration.setReference(true); } {if (true) return variableDeclaration;} throw new Error("Missing return statement in function"); + } finally { + trace_return("FormalParameter"); + } } static final public ConstantIdentifier Type() throws ParseException { + trace_call("Type"); + try { final int pos; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case STRING: - jj_consume_token(STRING); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case STRING: + jj_consume_token(STRING); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.STRING,pos,pos-6);} - break; - case BOOL: - jj_consume_token(BOOL); + break; + case BOOL: + jj_consume_token(BOOL); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.BOOL,pos,pos-4);} - break; - case BOOLEAN: - jj_consume_token(BOOLEAN); + break; + case BOOLEAN: + jj_consume_token(BOOLEAN); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);} - break; - case REAL: - jj_consume_token(REAL); + break; + case REAL: + jj_consume_token(REAL); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.REAL,pos,pos-4);} - break; - case DOUBLE: - jj_consume_token(DOUBLE); + break; + case DOUBLE: + jj_consume_token(DOUBLE); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);} - break; - case FLOAT: - jj_consume_token(FLOAT); + break; + case FLOAT: + jj_consume_token(FLOAT); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.FLOAT,pos,pos-5);} - break; - case INT: - jj_consume_token(INT); + break; + case INT: + jj_consume_token(INT); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.INT,pos,pos-3);} - break; - case INTEGER: - jj_consume_token(INTEGER); + break; + case INTEGER: + jj_consume_token(INTEGER); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.INTEGER,pos,pos-7);} - break; - case OBJECT: - jj_consume_token(OBJECT); + break; + case OBJECT: + jj_consume_token(OBJECT); pos = SimpleCharStream.getPosition(); {if (true) return new ConstantIdentifier(Types.OBJECT,pos,pos-6);} - break; - default: - jj_la1[26] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[26] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("Type"); + } } static final public Expression Expression() throws ParseException { + trace_call("Expression"); + try { final Expression expr; Expression initializer = null; final int pos = SimpleCharStream.getPosition(); int assignOperator = -1; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case NEW: - case NULL: - case TRUE: - case FALSE: - case AT: - case DOLLAR: - case BANG: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case BIT_AND: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case DOLLAR_ID: - expr = ConditionalExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ASSIGN: - case PLUSASSIGN: - case MINUSASSIGN: - case STARASSIGN: - case SLASHASSIGN: - case ANDASSIGN: - case ORASSIGN: - case XORASSIGN: - case DOTASSIGN: - case REMASSIGN: - case TILDEEQUAL: - case LSHIFTASSIGN: - case RSIGNEDSHIFTASSIGN: - assignOperator = AssignmentOperator(); - try { - initializer = Expression(); - } catch (ParseException e) { + case ARRAY: + case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case DOLLAR_ID: + expr = ConditionalExpression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ASSIGN: + case PLUSASSIGN: + case MINUSASSIGN: + case STARASSIGN: + case SLASHASSIGN: + case ANDASSIGN: + case ORASSIGN: + case XORASSIGN: + case DOTASSIGN: + case REMASSIGN: + case TILDEEQUAL: + case LSHIFTASSIGN: + case RSIGNEDSHIFTASSIGN: + assignOperator = AssignmentOperator(); + try { + initializer = Expression(); + } catch (ParseException e) { if (errorMessage != null) { {if (true) throw e;} } @@ -1315,79 +1492,92 @@ final Expression expr,expr2; errorLevel = ERROR; errorEnd = SimpleCharStream.getPosition(); {if (true) throw e;} + } + break; + default: + jj_la1[27] = jj_gen; + ; } - break; - default: - jj_la1[27] = jj_gen; - ; - } - char[] varName = expr.toStringExpression().substring(1).toCharArray(); - if (assignOperator == -1) { + if (assignOperator != -1) {// todo : change this, very very bad :( + if (expr instanceof AbstractVariable) { + {if (true) return new VariableDeclaration(currentSegment, + (AbstractVariable) expr, + pos, + SimpleCharStream.getPosition());} + } + String varName = expr.toStringExpression().substring(1); {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()), + new Variable(varName,SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()), pos, SimpleCharStream.getPosition());} - {if (true) return expr;} } - {if (true) return new VariableDeclaration(currentSegment, - new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()), - initializer, - assignOperator, - pos);} - {if (true) return expr;} - break; - case LIST: - case PRINT: - expr = ExpressionWBang(); + {if (true) return expr;} + break; + case LIST: + case PRINT: + expr = ExpressionWBang(); {if (true) return expr;} - break; - default: - jj_la1[28] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[28] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("Expression"); + } } static final public Expression ExpressionWBang() throws ParseException { + trace_call("ExpressionWBang"); + try { final Expression expr; final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BANG: - jj_consume_token(BANG); - expr = ExpressionWBang(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BANG: + jj_consume_token(BANG); + expr = ExpressionWBang(); {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} - break; - case LIST: - case PRINT: - expr = ExpressionNoBang(); + break; + case LIST: + case PRINT: + expr = ExpressionNoBang(); {if (true) return expr;} - break; - default: - jj_la1[29] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[29] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("ExpressionWBang"); + } } static final public Expression ExpressionNoBang() throws ParseException { + trace_call("ExpressionNoBang"); + try { Expression expr; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PRINT: - expr = PrintExpression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LIST: + expr = ListExpression(); {if (true) return expr;} - break; - case LIST: - expr = ListExpression(); + break; + case PRINT: + expr = PrintExpression(); {if (true) return expr;} - break; - default: - jj_la1[30] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[30] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("ExpressionNoBang"); + } } /** @@ -1395,293 +1585,335 @@ final Expression expr,expr2; * @return the assignement operator id */ static final public int AssignmentOperator() throws ParseException { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ASSIGN: - jj_consume_token(ASSIGN); + trace_call("AssignmentOperator"); + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ASSIGN: + jj_consume_token(ASSIGN); {if (true) return VariableDeclaration.EQUAL;} - break; - case STARASSIGN: - jj_consume_token(STARASSIGN); + break; + case STARASSIGN: + jj_consume_token(STARASSIGN); {if (true) return VariableDeclaration.STAR_EQUAL;} - break; - case SLASHASSIGN: - jj_consume_token(SLASHASSIGN); + break; + case SLASHASSIGN: + jj_consume_token(SLASHASSIGN); {if (true) return VariableDeclaration.SLASH_EQUAL;} - break; - case REMASSIGN: - jj_consume_token(REMASSIGN); + break; + case REMASSIGN: + jj_consume_token(REMASSIGN); {if (true) return VariableDeclaration.REM_EQUAL;} - break; - case PLUSASSIGN: - jj_consume_token(PLUSASSIGN); + break; + case PLUSASSIGN: + jj_consume_token(PLUSASSIGN); {if (true) return VariableDeclaration.PLUS_EQUAL;} - break; - case MINUSASSIGN: - jj_consume_token(MINUSASSIGN); + break; + case MINUSASSIGN: + jj_consume_token(MINUSASSIGN); {if (true) return VariableDeclaration.MINUS_EQUAL;} - break; - case LSHIFTASSIGN: - jj_consume_token(LSHIFTASSIGN); + break; + case LSHIFTASSIGN: + jj_consume_token(LSHIFTASSIGN); {if (true) return VariableDeclaration.LSHIFT_EQUAL;} - break; - case RSIGNEDSHIFTASSIGN: - jj_consume_token(RSIGNEDSHIFTASSIGN); + break; + case RSIGNEDSHIFTASSIGN: + jj_consume_token(RSIGNEDSHIFTASSIGN); {if (true) return VariableDeclaration.RSIGNEDSHIFT_EQUAL;} - break; - case ANDASSIGN: - jj_consume_token(ANDASSIGN); + break; + case ANDASSIGN: + jj_consume_token(ANDASSIGN); {if (true) return VariableDeclaration.AND_EQUAL;} - break; - case XORASSIGN: - jj_consume_token(XORASSIGN); + break; + case XORASSIGN: + jj_consume_token(XORASSIGN); {if (true) return VariableDeclaration.XOR_EQUAL;} - break; - case ORASSIGN: - jj_consume_token(ORASSIGN); + break; + case ORASSIGN: + jj_consume_token(ORASSIGN); {if (true) return VariableDeclaration.OR_EQUAL;} - break; - case DOTASSIGN: - jj_consume_token(DOTASSIGN); + break; + case DOTASSIGN: + jj_consume_token(DOTASSIGN); {if (true) return VariableDeclaration.DOT_EQUAL;} - break; - case TILDEEQUAL: - jj_consume_token(TILDEEQUAL); + break; + case TILDEEQUAL: + jj_consume_token(TILDEEQUAL); {if (true) return VariableDeclaration.TILDE_EQUAL;} - break; - default: - jj_la1[31] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[31] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("AssignmentOperator"); + } } static final public Expression ConditionalExpression() throws ParseException { + trace_call("ConditionalExpression"); + try { final Expression expr; Expression expr2 = null; Expression expr3 = null; - expr = ConditionalOrExpression(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case HOOK: - jj_consume_token(HOOK); - expr2 = Expression(); - jj_consume_token(COLON); - expr3 = ConditionalExpression(); - break; - default: - jj_la1[32] = jj_gen; - ; - } + expr = ConditionalOrExpression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case HOOK: + jj_consume_token(HOOK); + expr2 = Expression(); + jj_consume_token(COLON); + expr3 = ConditionalExpression(); + break; + default: + jj_la1[32] = jj_gen; + ; + } if (expr3 == null) { {if (true) return expr;} } {if (true) return new ConditionalExpression(expr,expr2,expr3);} throw new Error("Missing return statement in function"); + } finally { + trace_return("ConditionalExpression"); + } } static final public Expression ConditionalOrExpression() throws ParseException { + trace_call("ConditionalOrExpression"); + try { Expression expr,expr2; int operator; - expr = ConditionalAndExpression(); - label_8: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case OR_OR: - case _ORL: - ; - break; - default: - jj_la1[33] = jj_gen; - break label_8; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case OR_OR: - jj_consume_token(OR_OR); + expr = ConditionalAndExpression(); + label_8: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case OR_OR: + case _ORL: + ; + break; + default: + jj_la1[33] = jj_gen; + break label_8; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case OR_OR: + jj_consume_token(OR_OR); operator = OperatorIds.OR_OR; - break; - case _ORL: - jj_consume_token(_ORL); + break; + case _ORL: + jj_consume_token(_ORL); operator = OperatorIds.ORL; - break; - default: - jj_la1[34] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - expr2 = ConditionalAndExpression(); + break; + default: + jj_la1[34] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr2 = ConditionalAndExpression(); expr = new BinaryExpression(expr,expr2,operator); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("ConditionalOrExpression"); + } } static final public Expression ConditionalAndExpression() throws ParseException { + trace_call("ConditionalAndExpression"); + try { Expression expr,expr2; int operator; - expr = ConcatExpression(); - label_9: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case AND_AND: - case _ANDL: - ; - break; - default: - jj_la1[35] = jj_gen; - break label_9; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case AND_AND: - jj_consume_token(AND_AND); + expr = ConcatExpression(); + label_9: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AND_AND: + case _ANDL: + ; + break; + default: + jj_la1[35] = jj_gen; + break label_9; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AND_AND: + jj_consume_token(AND_AND); operator = OperatorIds.AND_AND; - break; - case _ANDL: - jj_consume_token(_ANDL); + break; + case _ANDL: + jj_consume_token(_ANDL); operator = OperatorIds.ANDL; - break; - default: - jj_la1[36] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - expr2 = ConcatExpression(); + break; + default: + jj_la1[36] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr2 = ConcatExpression(); expr = new BinaryExpression(expr,expr2,operator); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("ConditionalAndExpression"); + } } static final public Expression ConcatExpression() throws ParseException { + trace_call("ConcatExpression"); + try { Expression expr,expr2; - expr = InclusiveOrExpression(); - label_10: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOT: - ; - break; - default: - jj_la1[37] = jj_gen; - break label_10; - } - jj_consume_token(DOT); - expr2 = InclusiveOrExpression(); + expr = InclusiveOrExpression(); + label_10: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case DOT: + ; + break; + default: + jj_la1[37] = jj_gen; + break label_10; + } + jj_consume_token(DOT); + expr2 = InclusiveOrExpression(); expr = new BinaryExpression(expr,expr2,OperatorIds.DOT); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("ConcatExpression"); + } } static final public Expression InclusiveOrExpression() throws ParseException { + trace_call("InclusiveOrExpression"); + try { Expression expr,expr2; - expr = ExclusiveOrExpression(); - label_11: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BIT_OR: - ; - break; - default: - jj_la1[38] = jj_gen; - break label_11; - } - jj_consume_token(BIT_OR); - expr2 = ExclusiveOrExpression(); + expr = ExclusiveOrExpression(); + label_11: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BIT_OR: + ; + break; + default: + jj_la1[38] = jj_gen; + break label_11; + } + jj_consume_token(BIT_OR); + expr2 = ExclusiveOrExpression(); expr = new BinaryExpression(expr,expr2,OperatorIds.OR); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("InclusiveOrExpression"); + } } static final public Expression ExclusiveOrExpression() throws ParseException { + trace_call("ExclusiveOrExpression"); + try { Expression expr,expr2; - expr = AndExpression(); - label_12: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case XOR: - ; - break; - default: - jj_la1[39] = jj_gen; - break label_12; - } - jj_consume_token(XOR); - expr2 = AndExpression(); + expr = AndExpression(); + label_12: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case XOR: + ; + break; + default: + jj_la1[39] = jj_gen; + break label_12; + } + jj_consume_token(XOR); + expr2 = AndExpression(); expr = new BinaryExpression(expr,expr2,OperatorIds.XOR); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("ExclusiveOrExpression"); + } } static final public Expression AndExpression() throws ParseException { + trace_call("AndExpression"); + try { Expression expr,expr2; - expr = EqualityExpression(); - label_13: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BIT_AND: - ; - break; - default: - jj_la1[40] = jj_gen; - break label_13; - } - jj_consume_token(BIT_AND); - expr2 = EqualityExpression(); + expr = EqualityExpression(); + label_13: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case BIT_AND: + ; + break; + default: + jj_la1[40] = jj_gen; + break label_13; + } + jj_consume_token(BIT_AND); + expr2 = EqualityExpression(); expr = new BinaryExpression(expr,expr2,OperatorIds.AND); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("AndExpression"); + } } static final public Expression EqualityExpression() throws ParseException { + trace_call("EqualityExpression"); + try { Expression expr,expr2; int operator; - expr = RelationalExpression(); - label_14: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case EQUAL_EQUAL: - case NOT_EQUAL: - case DIF: - case BANGDOUBLEEQUAL: - case TRIPLEEQUAL: - ; - break; - default: - jj_la1[41] = jj_gen; - break label_14; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case EQUAL_EQUAL: - jj_consume_token(EQUAL_EQUAL); + expr = RelationalExpression(); + label_14: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case EQUAL_EQUAL: + case NOT_EQUAL: + case DIF: + case BANGDOUBLEEQUAL: + case TRIPLEEQUAL: + ; + break; + default: + jj_la1[41] = jj_gen; + break label_14; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case EQUAL_EQUAL: + jj_consume_token(EQUAL_EQUAL); operator = OperatorIds.EQUAL_EQUAL; - break; - case DIF: - jj_consume_token(DIF); + break; + case DIF: + jj_consume_token(DIF); operator = OperatorIds.DIF; - break; - case NOT_EQUAL: - jj_consume_token(NOT_EQUAL); + break; + case NOT_EQUAL: + jj_consume_token(NOT_EQUAL); operator = OperatorIds.DIF; - break; - case BANGDOUBLEEQUAL: - jj_consume_token(BANGDOUBLEEQUAL); + break; + case BANGDOUBLEEQUAL: + jj_consume_token(BANGDOUBLEEQUAL); operator = OperatorIds.BANG_EQUAL_EQUAL; - break; - case TRIPLEEQUAL: - jj_consume_token(TRIPLEEQUAL); + break; + case TRIPLEEQUAL: + jj_consume_token(TRIPLEEQUAL); operator = OperatorIds.EQUAL_EQUAL_EQUAL; - break; - default: - jj_la1[42] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - try { - expr2 = RelationalExpression(); - } catch (ParseException e) { + break; + default: + jj_la1[42] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + try { + expr2 = RelationalExpression(); + } catch (ParseException e) { if (errorMessage != null) { {if (true) throw e;} } @@ -1690,225 +1922,226 @@ final Expression expr,expr2; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } + } expr = new BinaryExpression(expr,expr2,operator); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("EqualityExpression"); + } } static final public Expression RelationalExpression() throws ParseException { + trace_call("RelationalExpression"); + try { Expression expr,expr2; int operator; - expr = ShiftExpression(); - label_15: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case GT: - case LT: - case LE: - case GE: - ; - break; - default: - jj_la1[43] = jj_gen; - break label_15; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LT: - jj_consume_token(LT); + expr = ShiftExpression(); + label_15: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case GT: + case LT: + case LE: + case GE: + ; + break; + default: + jj_la1[43] = jj_gen; + break label_15; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LT: + jj_consume_token(LT); operator = OperatorIds.LESS; - break; - case GT: - jj_consume_token(GT); + break; + case GT: + jj_consume_token(GT); operator = OperatorIds.GREATER; - break; - case LE: - jj_consume_token(LE); + break; + case LE: + jj_consume_token(LE); operator = OperatorIds.LESS_EQUAL; - break; - case GE: - jj_consume_token(GE); + break; + case GE: + jj_consume_token(GE); operator = OperatorIds.GREATER_EQUAL; - break; - default: - jj_la1[44] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - expr2 = ShiftExpression(); + break; + default: + jj_la1[44] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr2 = ShiftExpression(); expr = new BinaryExpression(expr,expr2,operator); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("RelationalExpression"); + } } static final public Expression ShiftExpression() throws ParseException { + trace_call("ShiftExpression"); + try { Expression expr,expr2; int operator; - expr = AdditiveExpression(); - label_16: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LSHIFT: - case RSIGNEDSHIFT: - case RUNSIGNEDSHIFT: - ; - break; - default: - jj_la1[45] = jj_gen; - break label_16; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LSHIFT: - jj_consume_token(LSHIFT); + expr = AdditiveExpression(); + label_16: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LSHIFT: + case RSIGNEDSHIFT: + case RUNSIGNEDSHIFT: + ; + break; + default: + jj_la1[45] = jj_gen; + break label_16; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LSHIFT: + jj_consume_token(LSHIFT); operator = OperatorIds.LEFT_SHIFT; - break; - case RSIGNEDSHIFT: - jj_consume_token(RSIGNEDSHIFT); + break; + case RSIGNEDSHIFT: + jj_consume_token(RSIGNEDSHIFT); operator = OperatorIds.RIGHT_SHIFT; - break; - case RUNSIGNEDSHIFT: - jj_consume_token(RUNSIGNEDSHIFT); + break; + case RUNSIGNEDSHIFT: + jj_consume_token(RUNSIGNEDSHIFT); operator = OperatorIds.UNSIGNED_RIGHT_SHIFT; - break; - default: - jj_la1[46] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - expr2 = AdditiveExpression(); + break; + default: + jj_la1[46] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr2 = AdditiveExpression(); expr = new BinaryExpression(expr,expr2,operator); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("ShiftExpression"); + } } static final public Expression AdditiveExpression() throws ParseException { + trace_call("AdditiveExpression"); + try { Expression expr,expr2; int operator; - expr = MultiplicativeExpression(); - label_17: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PLUS: - case MINUS: - ; - break; - default: - jj_la1[47] = jj_gen; - break label_17; - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PLUS: - jj_consume_token(PLUS); - operator = OperatorIds.PLUS; - break; - case MINUS: - jj_consume_token(MINUS); - operator = OperatorIds.MINUS; - break; - default: - jj_la1[48] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - expr2 = MultiplicativeExpression(); + expr = MultiplicativeExpression(); + label_17: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PLUS: + case MINUS: + ; + break; + default: + jj_la1[47] = jj_gen; + break label_17; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PLUS: + jj_consume_token(PLUS); + operator = OperatorIds.PLUS; + break; + case MINUS: + jj_consume_token(MINUS); + operator = OperatorIds.MINUS; + break; + default: + jj_la1[48] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr2 = MultiplicativeExpression(); expr = new BinaryExpression(expr,expr2,operator); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("AdditiveExpression"); + } } static final public Expression MultiplicativeExpression() throws ParseException { + trace_call("MultiplicativeExpression"); + try { Expression expr,expr2; int operator; - try { - expr = UnaryExpression(); - } catch (ParseException e) { + try { + expr = UnaryExpression(); + } catch (ParseException e) { if (errorMessage != null) {if (true) throw e;} errorMessage = "unexpected token '"+e.currentToken.next.image+"'"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } - label_18: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case STAR: - case SLASH: - case REMAINDER: - ; - break; - default: - jj_la1[49] = jj_gen; - break label_18; } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case STAR: - jj_consume_token(STAR); + label_18: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case STAR: + case SLASH: + case REMAINDER: + ; + break; + default: + jj_la1[49] = jj_gen; + break label_18; + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case STAR: + jj_consume_token(STAR); operator = OperatorIds.MULTIPLY; - break; - case SLASH: - jj_consume_token(SLASH); + break; + case SLASH: + jj_consume_token(SLASH); operator = OperatorIds.DIVIDE; - break; - case REMAINDER: - jj_consume_token(REMAINDER); + break; + case REMAINDER: + jj_consume_token(REMAINDER); operator = OperatorIds.REMAINDER; - break; - default: - jj_la1[50] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - expr2 = UnaryExpression(); + break; + default: + jj_la1[50] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr2 = UnaryExpression(); expr = new BinaryExpression(expr,expr2,operator); - } + } {if (true) return expr;} throw new Error("Missing return statement in function"); + } finally { + trace_return("MultiplicativeExpression"); + } } /** * An unary expression starting with @, & or nothing */ static final public Expression UnaryExpression() throws ParseException { + trace_call("UnaryExpression"); + try { final Expression expr; final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case BIT_AND: - jj_consume_token(BIT_AND); - expr = UnaryExpressionNoPrefix(); - {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} - break; - case ARRAY: - case NEW: - case NULL: - case TRUE: - case FALSE: - case AT: - case DOLLAR: - case BANG: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case DOLLAR_ID: - expr = AtNotUnaryExpression(); + /* expr = UnaryExpressionNoPrefix() //why did I had that ? + {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} + | */ + expr = AtNotUnaryExpression(); {if (true) return expr;} - break; - default: - jj_la1[51] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } throw new Error("Missing return statement in function"); + } finally { + trace_return("UnaryExpression"); + } } /** @@ -1916,348 +2149,340 @@ final Expression expr,expr2; * @return the expression */ static final public Expression AtNotUnaryExpression() throws ParseException { + trace_call("AtNotUnaryExpression"); + try { final Expression expr; final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case AT: - jj_consume_token(AT); - expr = AtNotUnaryExpression(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AT: + jj_consume_token(AT); + expr = AtNotUnaryExpression(); {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.AT,pos);} - break; - case BANG: - jj_consume_token(BANG); - expr = AtNotUnaryExpression(); + break; + case BANG: + jj_consume_token(BANG); + expr = AtNotUnaryExpression(); {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.NOT,pos);} - break; - case ARRAY: - case NEW: - case NULL: - case TRUE: - case FALSE: - case DOLLAR: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case DOLLAR_ID: - expr = UnaryExpressionNoPrefix(); + break; + case ARRAY: + case NEW: + case NULL: + case TRUE: + case FALSE: + case DOLLAR: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case DOLLAR_ID: + expr = UnaryExpressionNoPrefix(); {if (true) return expr;} - break; - default: - jj_la1[52] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[51] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("AtNotUnaryExpression"); + } } static final public Expression UnaryExpressionNoPrefix() throws ParseException { + trace_call("UnaryExpressionNoPrefix"); + try { final Expression expr; - final int operator; final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PLUS: - case MINUS: switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: jj_consume_token(PLUS); - operator = OperatorIds.PLUS; + expr = AtNotUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.PLUS,pos);} break; case MINUS: jj_consume_token(MINUS); - operator = OperatorIds.MINUS; + expr = AtNotUnaryExpression(); + {if (true) return new PrefixedUnaryExpression(expr,OperatorIds.MINUS,pos);} + break; + case PLUS_PLUS: + case MINUS_MINUS: + expr = PreIncDecExpression(); + {if (true) return expr;} + break; + case ARRAY: + case NEW: + case NULL: + case TRUE: + case FALSE: + case DOLLAR: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case DOLLAR_ID: + expr = UnaryExpressionNotPlusMinus(); + {if (true) return expr;} break; default: - jj_la1[53] = jj_gen; + jj_la1[52] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - expr = UnaryExpression(); - {if (true) return new PrefixedUnaryExpression(expr,operator,pos);} - break; - case PLUS_PLUS: - case MINUS_MINUS: - expr = PreIncDecExpression(); - {if (true) return expr;} - break; - case ARRAY: - case NEW: - case NULL: - case TRUE: - case FALSE: - case DOLLAR: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case DOLLAR_ID: - expr = UnaryExpressionNotPlusMinus(); - {if (true) return expr;} - break; - default: - jj_la1[54] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } throw new Error("Missing return statement in function"); + } finally { + trace_return("UnaryExpressionNoPrefix"); + } } static final public Expression PreIncDecExpression() throws ParseException { + trace_call("PreIncDecExpression"); + try { final Expression expr; final int operator; final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PLUS_PLUS: - jj_consume_token(PLUS_PLUS); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PLUS_PLUS: + jj_consume_token(PLUS_PLUS); operator = OperatorIds.PLUS_PLUS; - break; - case MINUS_MINUS: - jj_consume_token(MINUS_MINUS); + break; + case MINUS_MINUS: + jj_consume_token(MINUS_MINUS); operator = OperatorIds.MINUS_MINUS; - break; - default: - jj_la1[55] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - expr = PrimaryExpression(); + break; + default: + jj_la1[53] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + expr = PrimaryExpression(); {if (true) return new PrefixedUnaryExpression(expr,operator,pos);} throw new Error("Missing return statement in function"); + } finally { + trace_return("PreIncDecExpression"); + } } static final public Expression UnaryExpressionNotPlusMinus() throws ParseException { + trace_call("UnaryExpressionNotPlusMinus"); + try { final Expression expr; final int pos = SimpleCharStream.getPosition(); - if (jj_2_3(2147483647)) { - expr = CastExpression(); + if (jj_2_3(2147483647)) { + expr = CastExpression(); {if (true) return expr;} - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case NEW: - case DOLLAR: - case IDENTIFIER: - case DOLLAR_ID: - expr = PostfixExpression(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case NEW: + case DOLLAR: + case IDENTIFIER: + case DOLLAR_ID: + expr = PostfixExpression(); {if (true) return expr;} - break; - case NULL: - case TRUE: - case FALSE: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - expr = Literal(); + break; + case NULL: + case TRUE: + case FALSE: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + expr = Literal(); {if (true) return expr;} - break; - case LPAREN: - jj_consume_token(LPAREN); - expr = Expression(); - try { - jj_consume_token(RPAREN); - } catch (ParseException e) { + break; + case LPAREN: + jj_consume_token(LPAREN); + expr = Expression(); + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { errorMessage = "')' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } + } {if (true) return expr;} - break; - default: - jj_la1[56] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + break; + default: + jj_la1[54] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } - } throw new Error("Missing return statement in function"); + } finally { + trace_return("UnaryExpressionNotPlusMinus"); + } } static final public CastExpression CastExpression() throws ParseException { + trace_call("CastExpression"); + try { final ConstantIdentifier type; final Expression expr; final int pos = SimpleCharStream.getPosition(); - jj_consume_token(LPAREN); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case STRING: - case OBJECT: - case BOOL: - case BOOLEAN: - case REAL: - case DOUBLE: - case FLOAT: - case INT: - case INTEGER: - type = Type(); - break; - case ARRAY: - jj_consume_token(ARRAY); + jj_consume_token(LPAREN); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + type = Type(); + break; + case ARRAY: + jj_consume_token(ARRAY); type = new ConstantIdentifier(Types.ARRAY,pos,SimpleCharStream.getPosition()); - break; - default: - jj_la1[57] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - jj_consume_token(RPAREN); - expr = UnaryExpression(); + break; + default: + jj_la1[55] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + jj_consume_token(RPAREN); + expr = UnaryExpression(); {if (true) return new CastExpression(type,expr,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); + } finally { + trace_return("CastExpression"); + } } static final public Expression PostfixExpression() throws ParseException { + trace_call("PostfixExpression"); + try { final Expression expr; int operator = -1; final int pos = SimpleCharStream.getPosition(); - expr = PrimaryExpression(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PLUS_PLUS: - case MINUS_MINUS: + expr = PrimaryExpression(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS_PLUS: - jj_consume_token(PLUS_PLUS); - operator = OperatorIds.PLUS_PLUS; - break; case MINUS_MINUS: - jj_consume_token(MINUS_MINUS); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PLUS_PLUS: + jj_consume_token(PLUS_PLUS); + operator = OperatorIds.PLUS_PLUS; + break; + case MINUS_MINUS: + jj_consume_token(MINUS_MINUS); operator = OperatorIds.MINUS_MINUS; + break; + default: + jj_la1[56] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } break; default: - jj_la1[58] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + jj_la1[57] = jj_gen; + ; } - break; - default: - jj_la1[59] = jj_gen; - ; - } if (operator == -1) { {if (true) return expr;} } {if (true) return new PostfixedUnaryExpression(expr,operator,pos);} throw new Error("Missing return statement in function"); + } finally { + trace_return("PostfixExpression"); + } } static final public Expression PrimaryExpression() throws ParseException { - Expression expr; + trace_call("PrimaryExpression"); + try { + Expression expr = null; + Expression expr2; int assignOperator = -1; final Token identifier; final String var; - final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case DOLLAR: - case IDENTIFIER: - case DOLLAR_ID: - expr = PrimaryPrefix(); - label_19: - while (true) { + final int pos; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + pos = SimpleCharStream.getPosition(); + expr = new ConstantIdentifier(token.image.toCharArray(), + pos-token.image.length(), + pos); + label_19: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case STATICCLASSACCESS: + ; + break; + default: + jj_la1[58] = jj_gen; + break label_19; + } + jj_consume_token(STATICCLASSACCESS); + expr2 = ClassIdentifier(); + expr = new ClassAccess(expr, + expr2, + ClassAccess.STATIC); + } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASSACCESS: - case STATICCLASSACCESS: - case LBRACKET: + case LPAREN: + expr = Arguments(expr); + break; + default: + jj_la1[59] = jj_gen; ; + } + {if (true) return expr;} + break; + case DOLLAR: + case DOLLAR_ID: + expr = VariableDeclaratorId(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + expr = Arguments(expr); break; default: jj_la1[60] = jj_gen; - break label_19; + ; } - expr = PrimarySuffix(expr); - } - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LPAREN: - expr = Arguments(expr); - break; - default: - jj_la1[61] = jj_gen; - ; - } {if (true) return expr;} - break; - case NEW: - jj_consume_token(NEW); - expr = ClassIdentifier(); + break; + case NEW: + jj_consume_token(NEW); + pos = SimpleCharStream.getPosition(); + expr = ClassIdentifier(); expr = new PrefixedUnaryExpression(expr, OperatorIds.NEW, - pos); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case LPAREN: - expr = Arguments(expr); + pos-3); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + expr = Arguments(expr); + break; + default: + jj_la1[61] = jj_gen; + ; + } + {if (true) return expr;} + break; + case ARRAY: + expr = ArrayDeclarator(); + {if (true) return expr;} break; default: jj_la1[62] = jj_gen; - ; + jj_consume_token(-1); + throw new ParseException(); } - {if (true) return expr;} - break; - case ARRAY: - expr = ArrayDeclarator(); - {if (true) return expr;} - break; - default: - jj_la1[63] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } throw new Error("Missing return statement in function"); - } - - static final public Expression PrimaryPrefix() throws ParseException { - final Expression expr; - final Token token; - final String var; - final int pos = SimpleCharStream.getPosition(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IDENTIFIER: - token = jj_consume_token(IDENTIFIER); - {if (true) return new ConstantIdentifier(token.image.toCharArray(), - pos, - SimpleCharStream.getPosition());} - break; - case DOLLAR: - case DOLLAR_ID: - var = VariableDeclaratorId(); - {if (true) return new Variable(var.toCharArray(), - pos, - SimpleCharStream.getPosition());} - break; - default: - jj_la1[64] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + } finally { + trace_return("PrimaryExpression"); } - throw new Error("Missing return statement in function"); - } - - static final public AbstractSuffixExpression PrimarySuffix(final Expression prefix) throws ParseException { - final AbstractSuffixExpression suffix; - final Expression expr; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASSACCESS: - case LBRACKET: - suffix = VariableSuffix(prefix); - {if (true) return suffix;} - break; - case STATICCLASSACCESS: - jj_consume_token(STATICCLASSACCESS); - expr = ClassIdentifier(); - suffix = new ClassAccess(prefix, - expr, - ClassAccess.STATIC); - {if (true) return suffix;} - break; - default: - jj_la1[65] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - throw new Error("Missing return statement in function"); } /** @@ -2266,112 +2491,67 @@ final int pos = SimpleCharStream.getPosition(); * @return an array */ static final public ArrayInitializer ArrayDeclarator() throws ParseException { + trace_call("ArrayDeclarator"); + try { final ArrayVariableDeclaration[] vars; final int pos = SimpleCharStream.getPosition(); - jj_consume_token(ARRAY); - vars = ArrayInitializer(); + jj_consume_token(ARRAY); + vars = ArrayInitializer(); {if (true) return new ArrayInitializer(vars,pos,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); + } finally { + trace_return("ArrayDeclarator"); + } } static final public PrefixedUnaryExpression classInstantiation() throws ParseException { + trace_call("classInstantiation"); + try { Expression expr; final StringBuffer buff; final int pos = SimpleCharStream.getPosition(); - jj_consume_token(NEW); - expr = ClassIdentifier(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case NEW: - case DOLLAR: - case IDENTIFIER: - case DOLLAR_ID: + jj_consume_token(NEW); + expr = ClassIdentifier(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case NEW: + case DOLLAR: + case IDENTIFIER: + case DOLLAR_ID: buff = new StringBuffer(expr.toStringExpression()); - expr = PrimaryExpression(); + expr = PrimaryExpression(); buff.append(expr.toStringExpression()); expr = new ConstantIdentifier(buff.toString().toCharArray(), pos, SimpleCharStream.getPosition()); - break; - default: - jj_la1[66] = jj_gen; - ; - } + break; + default: + jj_la1[63] = jj_gen; + ; + } {if (true) return new PrefixedUnaryExpression(expr, OperatorIds.NEW, pos);} throw new Error("Missing return statement in function"); + } finally { + trace_return("classInstantiation"); + } } - static final public ConstantIdentifier ClassIdentifier() throws ParseException { - final String expr; + static final public Expression ClassIdentifier() throws ParseException { + trace_call("ClassIdentifier"); + try { + final Expression expr; final Token token; - final int pos = SimpleCharStream.getPosition(); final ConstantIdentifier type; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IDENTIFIER: - token = jj_consume_token(IDENTIFIER); - {if (true) return new ConstantIdentifier(token.image.toCharArray(), - pos, - SimpleCharStream.getPosition());} - break; - case STRING: - case OBJECT: - case BOOL: - case BOOLEAN: - case REAL: - case DOUBLE: - case FLOAT: - case INT: - case INTEGER: - type = Type(); - {if (true) return type;} - break; - case DOLLAR: - case DOLLAR_ID: - expr = VariableDeclaratorId(); - {if (true) return new ConstantIdentifier(expr.toCharArray(), - pos, - SimpleCharStream.getPosition());} - break; - default: - jj_la1[67] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - throw new Error("Missing return statement in function"); - } - - static final public AbstractSuffixExpression VariableSuffix(final Expression prefix) throws ParseException { - String expr = null; - final int pos = SimpleCharStream.getPosition(); - Expression expression = null; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CLASSACCESS: - jj_consume_token(CLASSACCESS); - try { - expr = VariableName(); - } catch (ParseException e) { - errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; - errorLevel = ERROR; - errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; - errorEnd = SimpleCharStream.getPosition() + 1; - {if (true) throw e;} - } - {if (true) return new ClassAccess(prefix, - new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()), - ClassAccess.NORMAL);} - break; - case LBRACKET: - jj_consume_token(LBRACKET); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case LIST: - case PRINT: - case NEW: - case NULL: - case TRUE: - case FALSE: + case IDENTIFIER: + token = jj_consume_token(IDENTIFIER); + final int pos = SimpleCharStream.getPosition(); + {if (true) return new ConstantIdentifier(token.image.toCharArray(), + pos-token.image.length(), + pos);} + break; case STRING: case OBJECT: case BOOL: @@ -2381,20 +2561,52 @@ final int pos = SimpleCharStream.getPosition(); case FLOAT: case INT: case INTEGER: - case AT: + expr = Type(); + {if (true) return expr;} + break; case DOLLAR: - case BANG: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case BIT_AND: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: case DOLLAR_ID: + expr = VariableDeclaratorId(); + {if (true) return expr;} + break; + default: + jj_la1[64] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + throw new Error("Missing return statement in function"); + } finally { + trace_return("ClassIdentifier"); + } + } + +/** + * Used by Variabledeclaratorid and primarysuffix + */ + static final public AbstractVariable VariableSuffix(final AbstractVariable prefix) throws ParseException { + trace_call("VariableSuffix"); + try { + Variable expr = null; + final int pos = SimpleCharStream.getPosition(); + Expression expression = null; + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case CLASSACCESS: + jj_consume_token(CLASSACCESS); + try { + expr = VariableName(); + } catch (ParseException e) { + errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', function call or field access expected"; + errorLevel = ERROR; + errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; + errorEnd = SimpleCharStream.getPosition() + 1; + {if (true) throw e;} + } + {if (true) return new ClassAccess(prefix, + expr, + ClassAccess.NORMAL);} + break; + case LBRACKET: + jj_consume_token(LBRACKET); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ARRAY: case LIST: @@ -2403,6 +2615,15 @@ final int pos = SimpleCharStream.getPosition(); case NULL: case TRUE: case FALSE: + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: case AT: case DOLLAR: case BANG: @@ -2410,139 +2631,171 @@ final int pos = SimpleCharStream.getPosition(); case MINUS_MINUS: case PLUS: case MINUS: - case BIT_AND: case INTEGER_LITERAL: case FLOATING_POINT_LITERAL: case STRING_LITERAL: case IDENTIFIER: case LPAREN: case DOLLAR_ID: - expression = Expression(); - break; - case STRING: - case OBJECT: - case BOOL: - case BOOLEAN: - case REAL: - case DOUBLE: - case FLOAT: - case INT: - case INTEGER: - expression = Type(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case DOLLAR_ID: + expression = Expression(); + break; + case STRING: + case OBJECT: + case BOOL: + case BOOLEAN: + case REAL: + case DOUBLE: + case FLOAT: + case INT: + case INTEGER: + expression = Type(); + break; + default: + jj_la1[65] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } break; default: - jj_la1[68] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + jj_la1[66] = jj_gen; + ; } - break; - default: - jj_la1[69] = jj_gen; - ; - } - try { - jj_consume_token(RBRACKET); - } catch (ParseException e) { + try { + jj_consume_token(RBRACKET); + } catch (ParseException e) { errorMessage = "']' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } + } {if (true) return new ArrayDeclarator(prefix,expression,SimpleCharStream.getPosition());} - break; - default: - jj_la1[70] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[67] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("VariableSuffix"); + } } static final public Literal Literal() throws ParseException { + trace_call("Literal"); + try { final Token token; final int pos; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case INTEGER_LITERAL: - token = jj_consume_token(INTEGER_LITERAL); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INTEGER_LITERAL: + token = jj_consume_token(INTEGER_LITERAL); pos = SimpleCharStream.getPosition(); {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);} - break; - case FLOATING_POINT_LITERAL: - token = jj_consume_token(FLOATING_POINT_LITERAL); + break; + case FLOATING_POINT_LITERAL: + token = jj_consume_token(FLOATING_POINT_LITERAL); pos = SimpleCharStream.getPosition(); {if (true) return new NumberLiteral(token.image.toCharArray(),pos-token.image.length(),pos);} - break; - case STRING_LITERAL: - token = jj_consume_token(STRING_LITERAL); + break; + case STRING_LITERAL: + token = jj_consume_token(STRING_LITERAL); pos = SimpleCharStream.getPosition(); {if (true) return new StringLiteral(token.image.toCharArray(),pos-token.image.length());} - break; - case TRUE: - jj_consume_token(TRUE); + break; + case TRUE: + jj_consume_token(TRUE); pos = SimpleCharStream.getPosition(); {if (true) return new TrueLiteral(pos-4,pos);} - break; - case FALSE: - jj_consume_token(FALSE); + break; + case FALSE: + jj_consume_token(FALSE); pos = SimpleCharStream.getPosition(); {if (true) return new FalseLiteral(pos-4,pos);} - break; - case NULL: - jj_consume_token(NULL); + break; + case NULL: + jj_consume_token(NULL); pos = SimpleCharStream.getPosition(); {if (true) return new NullLiteral(pos-4,pos);} - break; - default: - jj_la1[71] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[68] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("Literal"); + } } static final public FunctionCall Arguments(final Expression func) throws ParseException { -Expression[] args = null; - jj_consume_token(LPAREN); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case ARRAY: - case LIST: - case PRINT: - case NEW: - case NULL: - case TRUE: - case FALSE: - case AT: - case DOLLAR: - case BANG: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case BIT_AND: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case DOLLAR_ID: - args = ArgumentList(); - break; - default: - jj_la1[72] = jj_gen; - ; - } + trace_call("Arguments"); try { - jj_consume_token(RPAREN); - } catch (ParseException e) { +Expression[] args = null; + jj_consume_token(LPAREN); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case ARRAY: + case LIST: + case PRINT: + case NEW: + case NULL: + case TRUE: + case FALSE: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case DOLLAR_ID: + args = ArgumentList(); + break; + default: + jj_la1[69] = jj_gen; + ; + } + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected to close the argument list"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } + } {if (true) return new FunctionCall(func,args,SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); + } finally { + trace_return("Arguments"); + } } /** @@ -2551,36 +2804,41 @@ Expression[] args = null; * @return an array of arguments */ static final public Expression[] ArgumentList() throws ParseException { + trace_call("ArgumentList"); + try { Expression arg; final ArrayList list = new ArrayList(); - arg = Expression(); + arg = Expression(); list.add(arg); - label_20: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case COMMA: - ; - break; - default: - jj_la1[73] = jj_gen; - break label_20; - } - jj_consume_token(COMMA); - try { - arg = Expression(); + label_20: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + ; + break; + default: + jj_la1[70] = jj_gen; + break label_20; + } + jj_consume_token(COMMA); + try { + arg = Expression(); list.add(arg); - } catch (ParseException e) { + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. An expression expected after a comma in argument list"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} + } } - } final Expression[] arguments = new Expression[list.size()]; list.toArray(arguments); {if (true) return arguments;} throw new Error("Missing return statement in function"); + } finally { + trace_return("ArgumentList"); + } } /** @@ -2588,99 +2846,104 @@ final ArrayList list = new ArrayList(); * @return a statement */ static final public Statement StatementNoBreak() throws ParseException { + trace_call("StatementNoBreak"); + try { final Statement statement; Token token = null; - if (jj_2_4(2)) { - statement = expressionStatement(); + if (jj_2_4(2)) { + statement = expressionStatement(); {if (true) return statement;} - } else { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IDENTIFIER: - statement = LabeledStatement(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENTIFIER: + statement = LabeledStatement(); {if (true) return statement;} - break; - case LBRACE: - statement = Block(); + break; + case LBRACE: + statement = Block(); {if (true) return statement;} - break; - case SEMICOLON: - statement = EmptyStatement(); + break; + case SEMICOLON: + statement = EmptyStatement(); {if (true) return statement;} - break; - case SWITCH: - statement = SwitchStatement(); + break; + case SWITCH: + statement = SwitchStatement(); {if (true) return statement;} - break; - case IF: - statement = IfStatement(); + break; + case IF: + statement = IfStatement(); {if (true) return statement;} - break; - case WHILE: - statement = WhileStatement(); + break; + case WHILE: + statement = WhileStatement(); {if (true) return statement;} - break; - case DO: - statement = DoStatement(); + break; + case DO: + statement = DoStatement(); {if (true) return statement;} - break; - case FOR: - statement = ForStatement(); + break; + case FOR: + statement = ForStatement(); {if (true) return statement;} - break; - case FOREACH: - statement = ForeachStatement(); + break; + case FOREACH: + statement = ForeachStatement(); {if (true) return statement;} - break; - case CONTINUE: - statement = ContinueStatement(); + break; + case CONTINUE: + statement = ContinueStatement(); {if (true) return statement;} - break; - case RETURN: - statement = ReturnStatement(); + break; + case RETURN: + statement = ReturnStatement(); {if (true) return statement;} - break; - case ECHO: - statement = EchoStatement(); + break; + case ECHO: + statement = EchoStatement(); {if (true) return statement;} - break; - case INCLUDE: - case REQUIRE: - case INCLUDE_ONCE: - case REQUIRE_ONCE: - case AT: - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case AT: - token = jj_consume_token(AT); break; - default: - jj_la1[74] = jj_gen; - ; - } - statement = IncludeStatement(); + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case AT: + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case AT: + token = jj_consume_token(AT); + break; + default: + jj_la1[71] = jj_gen; + ; + } + statement = IncludeStatement(); if (token != null) { ((InclusionStatement)statement).silent = true; } {if (true) return statement;} - break; - case STATIC: - statement = StaticStatement(); + break; + case STATIC: + statement = StaticStatement(); {if (true) return statement;} - break; - case GLOBAL: - statement = GlobalStatement(); + break; + case GLOBAL: + statement = GlobalStatement(); {if (true) return statement;} - break; - case DEFINE: - statement = defineStatement(); + break; + case DEFINE: + statement = defineStatement(); currentSegment.add((Outlineable)statement);{if (true) return statement;} - break; - default: - jj_la1[75] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + break; + default: + jj_la1[72] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } - } throw new Error("Missing return statement in function"); + } finally { + trace_return("StatementNoBreak"); + } } /** @@ -2689,11 +2952,13 @@ final ArrayList list = new ArrayList(); * @return an expression */ static final public Statement expressionStatement() throws ParseException { - final Statement statement; - statement = Expression(); + trace_call("expressionStatement"); try { - jj_consume_token(SEMICOLON); - } catch (ParseException e) { + final Statement statement; + statement = Expression(); + try { + jj_consume_token(SEMICOLON); + } catch (ParseException e) { if (e.currentToken.next.kind != PHPParserConstants.PHPEND) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected"; errorLevel = ERROR; @@ -2701,209 +2966,228 @@ final ArrayList list = new ArrayList(); errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} } - } + } {if (true) return statement;} throw new Error("Missing return statement in function"); + } finally { + trace_return("expressionStatement"); + } } static final public Define defineStatement() throws ParseException { + trace_call("defineStatement"); + try { final int start = SimpleCharStream.getPosition(); Expression defineName,defineValue; - jj_consume_token(DEFINE); - try { - jj_consume_token(LPAREN); - } catch (ParseException e) { + jj_consume_token(DEFINE); + try { + jj_consume_token(LPAREN); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', '(' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } - try { - defineName = Expression(); - } catch (ParseException e) { + processParseExceptionDebug(e); + } + try { + defineName = Expression(); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } - try { - jj_consume_token(COMMA); - } catch (ParseException e) { + } + try { + jj_consume_token(COMMA); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ',' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } - try { - defineValue = Expression(); - } catch (ParseException e) { + processParseExceptionDebug(e); + } + try { + defineValue = Expression(); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', expression expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; {if (true) throw e;} - } - try { - jj_consume_token(RPAREN); - } catch (ParseException e) { + } + try { + jj_consume_token(RPAREN); + } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"', ')' expected"; errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); - } + processParseExceptionDebug(e); + } {if (true) return new Define(currentSegment, defineName, defineValue, start, SimpleCharStream.getPosition());} throw new Error("Missing return statement in function"); + } finally { + trace_return("defineStatement"); + } } /** * A Normal statement. */ static final public Statement Statement() throws ParseException { + trace_call("Statement"); + try { final Statement statement; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case IF: - case ARRAY: - case LIST: - case PRINT: - case ECHO: - case INCLUDE: - case REQUIRE: - case INCLUDE_ONCE: - case REQUIRE_ONCE: - case GLOBAL: - case DEFINE: - case STATIC: - case CONTINUE: - case DO: - case FOR: - case NEW: - case NULL: - case RETURN: - case SWITCH: - case TRUE: - case FALSE: - case WHILE: - case FOREACH: - case AT: - case DOLLAR: - case BANG: - case PLUS_PLUS: - case MINUS_MINUS: - case PLUS: - case MINUS: - case BIT_AND: - case INTEGER_LITERAL: - case FLOATING_POINT_LITERAL: - case STRING_LITERAL: - case IDENTIFIER: - case LPAREN: - case LBRACE: - case SEMICOLON: - case DOLLAR_ID: - statement = StatementNoBreak(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IF: + case ARRAY: + case LIST: + case PRINT: + case ECHO: + case INCLUDE: + case REQUIRE: + case INCLUDE_ONCE: + case REQUIRE_ONCE: + case GLOBAL: + case DEFINE: + case STATIC: + case CONTINUE: + case DO: + case FOR: + case NEW: + case NULL: + case RETURN: + case SWITCH: + case TRUE: + case FALSE: + case WHILE: + case FOREACH: + case AT: + case DOLLAR: + case BANG: + case PLUS_PLUS: + case MINUS_MINUS: + case PLUS: + case MINUS: + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case IDENTIFIER: + case LPAREN: + case LBRACE: + case SEMICOLON: + case DOLLAR_ID: + statement = StatementNoBreak(); {if (true) return statement;} - break; - case BREAK: - statement = BreakStatement(); + break; + case BREAK: + statement = BreakStatement(); {if (true) return statement;} - break; - default: - jj_la1[76] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } + break; + default: + jj_la1[73] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } throw new Error("Missing return statement in function"); + } finally { + trace_return("Statement"); + } } /** * An html block inside a php syntax. */ static final public HTMLBlock htmlBlock() throws ParseException { + trace_call("htmlBlock"); + try { final int startIndex = nodePtr; final AstNode[] blockNodes; final int nbNodes; - jj_consume_token(PHPEND); - label_21: - while (true) { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PHPECHOSTART: - ; - break; - default: - jj_la1[77] = jj_gen; - break label_21; - } - phpEchoBlock(); - } - try { - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case PHPSTARTLONG: - jj_consume_token(PHPSTARTLONG); - break; - case PHPSTARTSHORT: - jj_consume_token(PHPSTARTSHORT); - break; - default: - jj_la1[78] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); + jj_consume_token(PHPEND); + label_21: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPECHOSTART: + ; + break; + default: + jj_la1[74] = jj_gen; + break label_21; + } + phpEchoBlock(); } - } catch (ParseException e) { + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case PHPSTARTLONG: + jj_consume_token(PHPSTARTLONG); + break; + case PHPSTARTSHORT: + jj_consume_token(PHPSTARTSHORT); + break; + default: + jj_la1[75] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } catch (ParseException e) { errorMessage = "unexpected end of file , '" + where); + } + } + + static final private void trace_scan(Token t1, int t2) { + if (trace_enabled) { + for (int i = 0; i < trace_indent; i++) { System.out.print(" "); } + System.out.print("Visited token: <" + tokenImage[t1.kind]); + if (t1.kind != 0 && !tokenImage[t1.kind].equals("\"" + t1.image + "\"")) { + System.out.print(": \"" + t1.image + "\""); + } + System.out.println(">; Expected token: <" + tokenImage[t2] + ">"); + } } static final private void jj_rescan_token() { diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj index 530693d..2c1b336 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj +++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj @@ -3,7 +3,7 @@ options { CHOICE_AMBIGUITY_CHECK = 2; OTHER_AMBIGUITY_CHECK = 1; STATIC = true; - DEBUG_PARSER = false; + DEBUG_PARSER = true; DEBUG_LOOKAHEAD = false; DEBUG_TOKEN_MANAGER = false; OPTIMIZE_TOKEN_MANAGER = false; @@ -40,7 +40,7 @@ import net.sourceforge.phpdt.internal.compiler.ast.*; import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren; import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; -import junit.framework.Assert; +import net.sourceforge.phpdt.internal.corext.Assert; /** * A new php parser. @@ -81,7 +81,7 @@ public final class PHPParser extends PHPParserSuperclass { /** The cursor in expression stack. */ private static int nodePtr; - private static final boolean PARSER_DEBUG = false; + private static final boolean PARSER_DEBUG = true; public final void setFileToParse(final IFile fileToParse) { PHPParser.fileToParse = fileToParse; @@ -95,6 +95,46 @@ public final class PHPParser extends PHPParserSuperclass { PHPParser.fileToParse = fileToParse; } + public static final void phpParserTester(final String strEval) throws ParseException { + final StringReader stream = new StringReader(strEval); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(new StringReader(strEval)); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + PHPParserTokenManager.SwitchTo(PHPParserTokenManager.PHPPARSING); + phpTest(); + } + + public static final void htmlParserTester(final File fileName) throws FileNotFoundException, ParseException { + final Reader stream = new FileReader(fileName); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + phpFile(); + } + + public static final void htmlParserTester(final String strEval) throws ParseException { + final StringReader stream = new StringReader(strEval); + if (jj_input_stream == null) { + jj_input_stream = new SimpleCharStream(stream, 1, 1); + } + ReInit(stream); + init(); + phpDocument = new PHPDocument(null,"_root".toCharArray()); + currentSegment = phpDocument; + outlineInfo = new PHPOutlineInfo(null, currentSegment); + phpFile(); + } + /** * Reinitialize the parser. */ @@ -144,16 +184,18 @@ public final class PHPParser extends PHPParserSuperclass { return outlineInfo; } + private static void processParseExceptionDebug(final ParseException e) throws ParseException { + if (PARSER_DEBUG) { + throw e; + } + processParseException(e); + } /** * This method will process the parse exception. * If the error message is null, the parse exception wasn't catched and a trace is written in the log * @param e the ParseException */ private static void processParseException(final ParseException e) { - if (PARSER_DEBUG) { - e.printStackTrace(); - Assert.assertTrue(false); - } if (errorMessage == null) { PHPeclipsePlugin.log(e); errorMessage = "this exception wasn't handled by the parser please tell us how to reproduce it"; @@ -581,6 +623,13 @@ MORE : > } +void phpTest() : +{} +{ + Php() + +} + void phpFile() : {} { @@ -632,7 +681,7 @@ void PhpBlock() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } } @@ -675,7 +724,7 @@ ClassDeclaration ClassDeclaration() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } [ @@ -687,7 +736,7 @@ ClassDeclaration ClassDeclaration() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); superclassNameImage = SYNTAX_ERROR_CHAR; } ] @@ -709,7 +758,7 @@ ClassDeclaration ClassDeclaration() : } ClassBody(classDeclaration) {currentSegment = (OutlineableWithChildren) currentSegment.getParent(); - classDeclaration.sourceEnd = SimpleCharStream.getPosition(); + classDeclaration.setSourceEnd(SimpleCharStream.getPosition()); pushOnAstNodes(classDeclaration); return classDeclaration;} } @@ -724,7 +773,7 @@ void ClassBody(final ClassDeclaration classDeclaration) : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } ( ClassBodyDeclaration(classDeclaration) )* try { @@ -734,7 +783,7 @@ void ClassBody(final ClassDeclaration classDeclaration) : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } } @@ -779,7 +828,7 @@ FieldDeclaration FieldDeclaration() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } {list = new VariableDeclaration[arrayList.size()]; @@ -798,10 +847,10 @@ VariableDeclaration VariableDeclaratorNoSuffix() : { final Token varName; Expression initializer = null; - final int pos = SimpleCharStream.getPosition(); } { varName = + {final int pos = SimpleCharStream.getPosition()-varName.image.length();} [ try { @@ -811,18 +860,18 @@ VariableDeclaration VariableDeclaratorNoSuffix() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } ] { if (initializer == null) { return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()), + new Variable(varName.image.substring(1),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()), pos, SimpleCharStream.getPosition()); } return new VariableDeclaration(currentSegment, - new Variable(varName.image.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()), + new Variable(varName.image.substring(1),SimpleCharStream.getPosition()-varName.image.length()-1,SimpleCharStream.getPosition()), initializer, VariableDeclaration.EQUAL, pos); @@ -834,12 +883,12 @@ VariableDeclaration VariableDeclaratorNoSuffix() : */ VariableDeclaration VariableDeclarator() : { - final String varName; + final AbstractVariable variable; Expression initializer = null; final int pos = SimpleCharStream.getPosition(); } { - varName = VariableDeclaratorId() + variable = VariableDeclaratorId() [ try { @@ -849,18 +898,18 @@ VariableDeclaration VariableDeclarator() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } ] { if (initializer == null) { return new VariableDeclaration(currentSegment, - new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()), - pos, - SimpleCharStream.getPosition()); + variable, + pos, + SimpleCharStream.getPosition()); } return new VariableDeclaration(currentSegment, - new Variable(varName.substring(1).toCharArray(),SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()), + variable, initializer, VariableDeclaration.EQUAL, pos); @@ -871,28 +920,24 @@ VariableDeclaration VariableDeclarator() : * A Variable name. * @return the variable name (with suffix) */ -String VariableDeclaratorId() : +AbstractVariable VariableDeclaratorId() : { - final String var; - Expression expression = null; + final Variable var; + AbstractVariable expression = null; final int pos = SimpleCharStream.getPosition(); - ConstantIdentifier ex; } { try { var = Variable() ( LOOKAHEAD(2) - {ex = new ConstantIdentifier(var.toCharArray(), - pos, - SimpleCharStream.getPosition());} - expression = VariableSuffix(ex) + expression = VariableSuffix(var) )* { if (expression == null) { return var; } - return expression.toStringExpression(); + return expression; } } catch (ParseException e) { errorMessage = "'$' expected for variable identifier"; @@ -907,68 +952,102 @@ String VariableDeclaratorId() : * Return a variablename without the $. * @return a variable name */ -String Variable(): +Variable Variable(): { final StringBuffer buff; Expression expression = null; final Token token; - final String expr; + Variable expr; + final int pos; } { - token = [ expression = Expression() ] + token = {pos = SimpleCharStream.getPosition()-token.image.length();} + [ expression = Expression() ] { if (expression == null) { - return token.image.substring(1); + return new Variable(token.image.substring(1),pos,SimpleCharStream.getPosition()); } - buff = new StringBuffer(token.image); + String s = expression.toStringExpression(); + buff = new StringBuffer(token.image.length()+s.length()+2); + buff.append(token.image); buff.append("{"); - buff.append(expression.toStringExpression()); + buff.append(s); buff.append("}"); - return buff.toString(); + s = buff.toString(); + return new Variable(s,pos,SimpleCharStream.getPosition()); } | - expr = VariableName() - {return expr;} + {pos = SimpleCharStream.getPosition()-1;} + expr = VariableName() + {return new Variable(expr,pos,SimpleCharStream.getPosition());} } /** * A Variable name (without the $) * @return a variable name String */ -String VariableName(): +Variable VariableName(): { final StringBuffer buff; - final String expr; + String expr; + final Variable var; Expression expression = null; final Token token; + int pos; } { - expression = Expression() - {buff = new StringBuffer("{"); - buff.append(expression.toStringExpression()); + + {pos = SimpleCharStream.getPosition()-1;} + expression = Expression() + {expr = expression.toStringExpression(); + buff = new StringBuffer(expr.length()+2); + buff.append("{"); + buff.append(expr); buff.append("}"); - return buff.toString();} + pos = SimpleCharStream.getPosition(); + expr = buff.toString(); + return new Variable(expr, + pos, + SimpleCharStream.getPosition()); + + } | - token = [ expression = Expression() ] + token = + {pos = SimpleCharStream.getPosition() - token.image.length();} + [ expression = Expression() ] { if (expression == null) { - return token.image; + return new Variable(token.image, + pos, + SimpleCharStream.getPosition()); } - buff = new StringBuffer(token.image); + expr = expression.toStringExpression(); + buff = new StringBuffer(token.image.length()+expr.length()+2); + buff.append(token.image); buff.append("{"); - buff.append(expression.toStringExpression()); + buff.append(expr); buff.append("}"); - return buff.toString(); + expr = buff.toString(); + return new Variable(expr, + pos, + SimpleCharStream.getPosition()); } | - expr = VariableName() + {pos = SimpleCharStream.getPosition() - 1;} + var = VariableName() { - buff = new StringBuffer("$"); - buff.append(expr); - return buff.toString(); + return new Variable(var, + pos, + SimpleCharStream.getPosition()); } | - token = {return token.image;} + token = + { + pos = SimpleCharStream.getPosition(); + return new Variable(token.image, + pos-token.image.length(), + pos); + } } Expression VariableInitializer() : @@ -1092,7 +1171,7 @@ MethodDeclaration MethodDeclarator() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } formalParameters = FormalParameters() {MethodDeclaration method = new MethodDeclaration(currentSegment, @@ -1121,7 +1200,7 @@ Hashtable FormalParameters() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } [ var = FormalParameter() @@ -1138,7 +1217,7 @@ Hashtable FormalParameters() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } {return parameters;} } @@ -1209,21 +1288,21 @@ Expression Expression() : } ] { - char[] varName = expr.toStringExpression().substring(1).toCharArray(); - if (assignOperator == -1) { + if (assignOperator != -1) {// todo : change this, very very bad :( + if (expr instanceof AbstractVariable) { + return new VariableDeclaration(currentSegment, + (AbstractVariable) expr, + pos, + SimpleCharStream.getPosition()); + } + String varName = expr.toStringExpression().substring(1); return new VariableDeclaration(currentSegment, - new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()), + new Variable(varName,SimpleCharStream.getPosition()-varName.length()-1,SimpleCharStream.getPosition()), pos, SimpleCharStream.getPosition()); - return expr; - } - return new VariableDeclaration(currentSegment, - new Variable(varName,SimpleCharStream.getPosition()-varName.length-1,SimpleCharStream.getPosition()), - initializer, - assignOperator, - pos); } - {return expr;} + return expr; + } | expr = ExpressionWBang() {return expr;} } @@ -1242,8 +1321,9 @@ Expression ExpressionNoBang() : Expression expr; } { + expr = ListExpression() {return expr;} +| expr = PrintExpression() {return expr;} -| expr = ListExpression() {return expr;} } /** @@ -1447,9 +1527,10 @@ Expression AdditiveExpression() : { expr = MultiplicativeExpression() ( - LOOKAHEAD(1) - ( {operator = OperatorIds.PLUS;} - | {operator = OperatorIds.MINUS;} ) + LOOKAHEAD(1) + ( {operator = OperatorIds.PLUS;} + | {operator = OperatorIds.MINUS;} + ) expr2 = MultiplicativeExpression() {expr = new BinaryExpression(expr,expr2,operator);} )* @@ -1491,9 +1572,9 @@ Expression UnaryExpression() : final int pos = SimpleCharStream.getPosition(); } { - expr = UnaryExpressionNoPrefix() + /* expr = UnaryExpressionNoPrefix() //why did I had that ? {return new PrefixedUnaryExpression(expr,OperatorIds.AND,pos);} -| +| */ expr = AtNotUnaryExpression() {return expr;} } @@ -1523,26 +1604,18 @@ Expression AtNotUnaryExpression() : Expression UnaryExpressionNoPrefix() : { final Expression expr; - final int operator; final int pos = SimpleCharStream.getPosition(); } { - ( - {operator = OperatorIds.PLUS;} - | - {operator = OperatorIds.MINUS;} - ) - expr = UnaryExpression() - {return new PrefixedUnaryExpression(expr,operator,pos);} + expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.PLUS,pos);} +| + expr = AtNotUnaryExpression() {return new PrefixedUnaryExpression(expr,OperatorIds.MINUS,pos);} | expr = PreIncDecExpression() {return expr;} | expr = UnaryExpressionNotPlusMinus() {return expr;} -/*| - LOOKAHEAD(2) - expr = PrintExpression() {return expr;}*/ } @@ -1625,22 +1698,40 @@ Expression PostfixExpression() : Expression PrimaryExpression() : { - Expression expr; + Expression expr = null; + Expression expr2; int assignOperator = -1; final Token identifier; final String var; - final int pos = SimpleCharStream.getPosition(); + final int pos; } { - expr = PrimaryPrefix() - (expr = PrimarySuffix(expr))* + token = + { + pos = SimpleCharStream.getPosition(); + expr = new ConstantIdentifier(token.image.toCharArray(), + pos-token.image.length(), + pos); + } + ( + expr2 = ClassIdentifier() + {expr = new ClassAccess(expr, + expr2, + ClassAccess.STATIC);} + )* [ expr = Arguments(expr) ] {return expr;} | - expr = ClassIdentifier() + expr = VariableDeclaratorId() + [ expr = Arguments(expr) ] + {return expr;} +| + + {pos = SimpleCharStream.getPosition();} + expr = ClassIdentifier() {expr = new PrefixedUnaryExpression(expr, OperatorIds.NEW, - pos); + pos-3); } [ expr = Arguments(expr) ] {return expr;} @@ -1649,37 +1740,6 @@ Expression PrimaryExpression() : {return expr;} } -Expression PrimaryPrefix() : -{ - final Expression expr; - final Token token; - final String var; - final int pos = SimpleCharStream.getPosition(); -} -{ - token = {return new ConstantIdentifier(token.image.toCharArray(), - pos, - SimpleCharStream.getPosition());} -| - var = VariableDeclaratorId() {return new Variable(var.toCharArray(), - pos, - SimpleCharStream.getPosition());} -} - -AbstractSuffixExpression PrimarySuffix(final Expression prefix) : -{ - final AbstractSuffixExpression suffix; - final Expression expr; -} -{ - suffix = VariableSuffix(prefix) {return suffix;} -| expr = ClassIdentifier() - {suffix = new ClassAccess(prefix, - expr, - ClassAccess.STATIC); - return suffix;} -} - /** * An array declarator. * array(vars) @@ -1716,26 +1776,28 @@ PrefixedUnaryExpression classInstantiation() : pos);} } -ConstantIdentifier ClassIdentifier(): +Expression ClassIdentifier(): { - final String expr; + final Expression expr; final Token token; - final int pos = SimpleCharStream.getPosition(); final ConstantIdentifier type; } { - token = {return new ConstantIdentifier(token.image.toCharArray(), - pos, - SimpleCharStream.getPosition());} -| type = Type() {return type;} -| expr = VariableDeclaratorId() {return new ConstantIdentifier(expr.toCharArray(), - pos, - SimpleCharStream.getPosition());} + token = + {final int pos = SimpleCharStream.getPosition(); + return new ConstantIdentifier(token.image.toCharArray(), + pos-token.image.length(), + pos);} +| expr = Type() {return expr;} +| expr = VariableDeclaratorId() {return expr;} } -AbstractSuffixExpression VariableSuffix(final Expression prefix) : +/** + * Used by Variabledeclaratorid and primarysuffix + */ +AbstractVariable VariableSuffix(final AbstractVariable prefix) : { - String expr = null; + Variable expr = null; final int pos = SimpleCharStream.getPosition(); Expression expression = null; } @@ -1751,7 +1813,7 @@ AbstractSuffixExpression VariableSuffix(final Expression prefix) : throw e; } {return new ClassAccess(prefix, - new ConstantIdentifier(expr.toCharArray(),pos,SimpleCharStream.getPosition()), + expr, ClassAccess.NORMAL);} | [ expression = Expression() | expression = Type() ] //Not good @@ -1910,7 +1972,7 @@ Define defineStatement() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } try { defineName = Expression() @@ -1928,7 +1990,7 @@ Define defineStatement() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } try { defineValue = Expression() @@ -1946,7 +2008,7 @@ Define defineStatement() : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } {return new Define(currentSegment, defineName, @@ -2051,7 +2113,7 @@ PrintExpression PrintExpression() : ListExpression ListExpression() : { - String expr = null; + Expression expr = null; final Expression expression; final ArrayList list = new ArrayList(); final int pos = SimpleCharStream.getPosition(); @@ -2095,17 +2157,17 @@ ListExpression ListExpression() : } [ expression = Expression() { - final String[] strings = new String[list.size()]; - list.toArray(strings); - return new ListExpression(strings, + final Variable[] vars = new Variable[list.size()]; + list.toArray(vars); + return new ListExpression(vars, expression, pos, SimpleCharStream.getPosition());} ] { - final String[] strings = new String[list.size()]; - list.toArray(strings); - return new ListExpression(strings,pos,SimpleCharStream.getPosition());} + final Variable[] vars = new Variable[list.size()]; + list.toArray(vars); + return new ListExpression(vars,pos,SimpleCharStream.getPosition());} } /** @@ -2144,25 +2206,25 @@ EchoStatement EchoStatement() : GlobalStatement GlobalStatement() : { final int pos = SimpleCharStream.getPosition(); - String expr; + Variable expr; final ArrayList vars = new ArrayList(); final GlobalStatement global; } { - expr = VariableDeclaratorId() + expr = Variable() {vars.add(expr);} ( - expr = VariableDeclaratorId() + expr = Variable() {vars.add(expr);} )* try { { - final String[] strings = new String[vars.size()]; - vars.toArray(strings); + final Variable[] variables = new Variable[vars.size()]; + vars.toArray(variables); global = new GlobalStatement(currentSegment, - strings, + variables, pos, SimpleCharStream.getPosition()); currentSegment.add(global); @@ -2183,16 +2245,18 @@ StaticStatement StaticStatement() : VariableDeclaration expr; } { - expr = VariableDeclarator() {vars.add(new String(expr.name()));} - ( expr = VariableDeclarator() {vars.add(new String(expr.name()));})* + expr = VariableDeclarator() {vars.add(expr);} + ( + expr = VariableDeclarator() {vars.add(expr);} + )* try { { - final String[] strings = new String[vars.size()]; - vars.toArray(strings); - return new StaticStatement(strings, - pos, - SimpleCharStream.getPosition());} + final VariableDeclaration[] variables = new VariableDeclaration[vars.size()]; + vars.toArray(variables); + return new StaticStatement(variables, + pos, + SimpleCharStream.getPosition());} } catch (ParseException e) { errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. a ';' was expected"; errorLevel = ERROR; @@ -2305,24 +2369,24 @@ VariableDeclaration[] LocalVariableDeclaration() : */ VariableDeclaration LocalVariableDeclarator() : { - final String varName; + final Variable varName; Expression initializer = null; final int pos = SimpleCharStream.getPosition(); } { - varName = VariableDeclaratorId() [ initializer = Expression() ] + varName = Variable() [ initializer = Expression() ] { if (initializer == null) { return new VariableDeclaration(currentSegment, - new Variable(varName.toCharArray(),SimpleCharStream.getPosition()-varName.length(),SimpleCharStream.getPosition()), - pos, - SimpleCharStream.getPosition()); + varName, + pos, + SimpleCharStream.getPosition()); } return new VariableDeclaration(currentSegment, - new Variable(varName.toCharArray(),SimpleCharStream.getPosition()-varName.length(),SimpleCharStream.getPosition()), - initializer, - VariableDeclaration.EQUAL, - pos); + varName, + initializer, + VariableDeclaration.EQUAL, + pos); } } @@ -2579,7 +2643,7 @@ Expression Condition(final String keyword) : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length(); errorEnd = errorStart +1; - processParseException(e); + processParseExceptionDebug(e); } condition = Expression() try { @@ -2589,7 +2653,7 @@ Expression Condition(final String keyword) : errorLevel = ERROR; errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1; errorEnd = SimpleCharStream.getPosition() + 1; - processParseException(e); + processParseExceptionDebug(e); } {return condition;} } diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 26fc6eb..dcc1814 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -16,7 +16,7 @@ import net.sourceforge.phpdt.internal.compiler.ast.*; import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren; import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; -import junit.framework.Assert; +import net.sourceforge.phpdt.internal.corext.Assert; public class PHPParserTokenManager implements PHPParserConstants { -- 1.7.1