private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
static PHPOutlineInfo outlineInfo;
- private static boolean assigning;
-
/** The error level of the current ParseException. */
private static int errorLevel = ERROR;
/** The message of the current ParseException. If it's null it's because the parse exception wasn't handled */
private static int errorStart = -1;
private static int errorEnd = -1;
private static PHPDocument phpDocument;
+
+ private static final char[] SYNTAX_ERROR_CHAR = {'s','y','n','t','a','x',' ','e','r','r','o','r'};
/**
* The point where html starts.
* It will be used by the token manager to create HTMLCode objects
}
public final PHPOutlineInfo parseInfo(final Object parent, final String s) {
- currentSegment = new PHPDocument(parent);
+ phpDocument = new PHPDocument(parent,"_root".toCharArray());
+ currentSegment = phpDocument;
outlineInfo = new PHPOutlineInfo(parent, currentSegment);
final StringReader stream = new StringReader(s);
if (jj_input_stream == null) {
init();
try {
parse();
- phpDocument = new PHPDocument(null);
phpDocument.nodes = new AstNode[nodes.length];
System.arraycopy(nodes,0,phpDocument.nodes,0,nodes.length);
+ if (PHPeclipsePlugin.DEBUG) {
+ PHPeclipsePlugin.log(1,phpDocument.toString());
+ }
} catch (ParseException e) {
processParseException(e);
}
void PhpBlock() :
{
final int start = SimpleCharStream.getPosition();
+ final PHPEchoBlock phpEchoBlock;
}
{
- phpEchoBlock()
+ phpEchoBlock = phpEchoBlock()
+ {pushOnAstNodes(phpEchoBlock);}
|
- [ <PHPSTARTLONG>
+ [ <PHPSTARTLONG>
| <PHPSTARTSHORT>
{try {
setMarker(fileToParse,
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ processParseException(e);
}
}
final Token className;
Token superclassName = null;
final int pos;
+ char[] classNameImage = SYNTAX_ERROR_CHAR;
+ char[] superclassNameImage = null;
}
{
<CLASS>
+ {pos = SimpleCharStream.getPosition();}
try {
- {pos = SimpleCharStream.getPosition();}
className = <IDENTIFIER>
+ {classNameImage = className.image.toCharArray();}
} 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;
- throw e;
+ processParseException(e);
}
[
<EXTENDS>
try {
superclassName = <IDENTIFIER>
+ {superclassNameImage = superclassName.image.toCharArray();}
} 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;
- throw e;
+ processParseException(e);
+ superclassNameImage = SYNTAX_ERROR_CHAR;
}
]
{
- if (superclassName == null) {
+ if (superclassNameImage == null) {
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
+ classNameImage,
pos,
0);
} else {
classDeclaration = new ClassDeclaration(currentSegment,
- className.image.toCharArray(),
- superclassName.image.toCharArray(),
+ classNameImage,
+ superclassNameImage,
pos,
0);
}
FieldDeclaration field;
}
{
- method = MethodDeclaration() {method.setParent(classDeclaration);
- classDeclaration.addMethod(method);}
-| field = FieldDeclaration() {classDeclaration.addVariable(field);}
+ method = MethodDeclaration() {method.setParent(classDeclaration);}
+| field = FieldDeclaration()
}
/**
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ processParseException(e);
}
{list = new VariableDeclaration[arrayList.size()];
{
token = <DOLLAR_ID> [<LBRACE> expression = Expression() <RBRACE>]
{
- if (expression == null && !assigning) {
+ if (expression == null) {
return token.image.substring(1);
}
buff = new StringBuffer(token.image);
- buff.append('{');
+ buff.append("{");
buff.append(expression.toStringExpression());
- buff.append('}');
+ buff.append("}");
return buff.toString();
}
|
{return "$" + expr;}
}
+/**
+ * A Variable name (without the $)
+ * @return a variable name String
+ */
String VariableName():
{
final StringBuffer buff;
return token.image;
}
buff = new StringBuffer(token.image);
- buff.append('{');
+ buff.append("{");
buff.append(expression.toStringExpression());
- buff.append('}');
+ buff.append("}");
return buff.toString();
}
|
<DOLLAR> expr = VariableName()
{
- buff = new StringBuffer('$');
+ buff = new StringBuffer("$");
buff.append(expr);
return buff.toString();
}
Token reference = null;
final Hashtable formalParameters;
final int pos = SimpleCharStream.getPosition();
+ char[] identifierChar = SYNTAX_ERROR_CHAR;
}
{
- [reference = <BIT_AND>] identifier = <IDENTIFIER>
+ [reference = <BIT_AND>]
+ try {
+ identifier = <IDENTIFIER>
+ {identifierChar = identifier.image.toCharArray();}
+ } 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()
{return new MethodDeclaration(currentSegment,
- identifier.image.toCharArray(),
+ identifierChar,
formalParameters,
reference != null,
pos,
{final int pos;}
{
<STRING> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.STRING,
- pos,pos-6);}
+ return new ConstantIdentifier(Types.STRING,pos,pos-6);}
| <BOOL> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.BOOL,
- pos,pos-4);}
+ return new ConstantIdentifier(Types.BOOL,pos,pos-4);}
| <BOOLEAN> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.BOOLEAN,
- pos,pos-7);}
+ return new ConstantIdentifier(Types.BOOLEAN,pos,pos-7);}
| <REAL> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.REAL,
- pos,pos-4);}
+ return new ConstantIdentifier(Types.REAL,pos,pos-4);}
| <DOUBLE> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.DOUBLE,
- pos,pos-5);}
+ return new ConstantIdentifier(Types.DOUBLE,pos,pos-5);}
| <FLOAT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.FLOAT,
- pos,pos-5);}
+ return new ConstantIdentifier(Types.FLOAT,pos,pos-5);}
| <INT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.INT,
- pos,pos-3);}
+ return new ConstantIdentifier(Types.INT,pos,pos-3);}
| <INTEGER> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.INTEGER,
- pos,pos-7);}
+ return new ConstantIdentifier(Types.INTEGER,pos,pos-7);}
| <OBJECT> {pos = SimpleCharStream.getPosition();
- return new ConstantIdentifier(Types.OBJECT,
- pos,pos-6);}
+ return new ConstantIdentifier(Types.OBJECT,pos,pos-6);}
}
Expression Expression() :
try {
<SEMICOLON>
} catch (ParseException e) {
- if (e.currentToken.next.kind != 4) {
+ if (e.currentToken.next.kind != PHPParserConstants.PHPEND) {
errorMessage = "unexpected token : '"+ e.currentToken.next.image +"'. A ';' was expected";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
throw e;
}
{
- nbNodes = nodePtr-startIndex - 1;
+ nbNodes = nodePtr - startIndex;
blockNodes = new AstNode[nbNodes];
System.arraycopy(nodes,startIndex,blockNodes,0,nbNodes);
- return new HTMLBlock(nodes);}
+ nodePtr = startIndex;
+ return new HTMLBlock(blockNodes);}
}
/**
)*
try {
<SEMICOLON>
- {
- Expression[] exprs = new Expression[expressions.size()];
- expressions.toArray(exprs);
- return new EchoStatement(exprs,pos);}
} catch (ParseException e) {
if (e.currentToken.next.kind != 4) {
errorMessage = "';' expected after 'echo' statement";
throw e;
}
}
+ {Expression[] exprs = new Expression[expressions.size()];
+ expressions.toArray(exprs);
+ return new EchoStatement(exprs,pos);}
}
GlobalStatement GlobalStatement() :
final Statement statement;
}
{
- statement = Statement() {return statement;}
+ try {
+ statement = Statement() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+ return statement;}
+ } catch (ParseException e) {
+ errorMessage = "statement expected";
+ errorLevel = ERROR;
+ errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
+ errorEnd = SimpleCharStream.getPosition() + 1;
+ throw e;
+ }
| statement = ClassDeclaration() {return statement;}
-| statement = MethodDeclaration() {return statement;}
+| statement = MethodDeclaration() {if (phpDocument == currentSegment) pushOnAstNodes(statement);
+ return statement;}
}
/**
condition = Expression()
try {
<RPAREN>
- {return condition;}
} catch (ParseException e) {
errorMessage = "')' expected after " + keyword + " keyword";
errorLevel = ERROR;
errorStart = SimpleCharStream.getPosition() - e.currentToken.next.image.length() + 1;
errorEnd = SimpleCharStream.getPosition() + 1;
- throw e;
+ processParseException(e);
}
+ {return condition;}
}
IfStatement IfStatement0(Expression condition, final int start,final int end) :
stmts.toArray(statementsArray);
return new IfStatement(condition,
new Block(statementsArray,pos,endStatements),
- elseIfs,
- elseStatement,
- pos,
- SimpleCharStream.getPosition());
+ elseIfs,
+ elseStatement,
+ pos,
+ SimpleCharStream.getPosition());
}
}
git://secure.phpeclipse.com / phpeclipse.git / blobdiff